> -----Original Message----- > From: Intel-gfx <[email protected]> On Behalf Of Jani > Nikula > Sent: Thursday, May 22, 2025 3:19 PM > To: [email protected]; [email protected] > Cc: Nikula, Jani <[email protected]>; De Marchi, Lucas > <[email protected]>; Vivi, Rodrigo <[email protected]> > Subject: [PATCH v2 3/3] drm/xe: stop including intel_display_{core, device}.h > from xe_device_types.h > > Make xe->display pointer opaque to most of core xe driver. A few places now > need explicit include of intel_display_core.h. > > With this dependency broken, changes in display should cause radically less > recompilation of xe. >
LGTM Reviewed-by: Chaitanya Kumar Borah <[email protected]> > Acked-by: Lucas De Marchi <[email protected]> > Signed-off-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 1 + > drivers/gpu/drm/xe/display/xe_display.c | 1 + > drivers/gpu/drm/xe/display/xe_display_rpm.c | 1 + > drivers/gpu/drm/xe/display/xe_display_wa.c | 2 +- > drivers/gpu/drm/xe/display/xe_fb_pin.c | 1 + > drivers/gpu/drm/xe/display/xe_plane_initial.c | 1 + > drivers/gpu/drm/xe/display/xe_tdf.c | 4 ++-- > drivers/gpu/drm/xe/xe_device_types.h | 6 +----- > 8 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > index e8191562d122..b28a94df824f 100644 > --- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > +++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > @@ -5,6 +5,7 @@ > > #include <drm/drm_fb_helper.h> > > +#include "intel_display_core.h" > #include "intel_display_types.h" > #include "intel_fb.h" > #include "intel_fbdev_fb.h" > diff --git a/drivers/gpu/drm/xe/display/xe_display.c > b/drivers/gpu/drm/xe/display/xe_display.c > index db7ef8737e1d..3f92bf51813e 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -20,6 +20,7 @@ > #include "intel_audio.h" > #include "intel_bw.h" > #include "intel_display.h" > +#include "intel_display_core.h" > #include "intel_display_driver.h" > #include "intel_display_irq.h" > #include "intel_display_types.h" > diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c > b/drivers/gpu/drm/xe/display/xe_display_rpm.c > index ef76efe42e9f..3825376e98cc 100644 > --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c > +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: MIT > /* Copyright © 2025 Intel Corporation */ > > +#include "intel_display_core.h" > #include "intel_display_rpm.h" > #include "xe_device.h" > #include "xe_device_types.h" > diff --git a/drivers/gpu/drm/xe/display/xe_display_wa.c > b/drivers/gpu/drm/xe/display/xe_display_wa.c > index 2933ca97d673..68d1387d81a0 100644 > --- a/drivers/gpu/drm/xe/display/xe_display_wa.c > +++ b/drivers/gpu/drm/xe/display/xe_display_wa.c > @@ -3,8 +3,8 @@ > * Copyright © 2024 Intel Corporation > */ > > +#include "intel_display_core.h" > #include "intel_display_wa.h" > - > #include "xe_device.h" > #include "xe_wa.h" > > diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c > b/drivers/gpu/drm/xe/display/xe_fb_pin.c > index c2b4be72f7a0..461ecdfdb742 100644 > --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c > +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c > @@ -6,6 +6,7 @@ > #include <drm/ttm/ttm_bo.h> > > #include "i915_vma.h" > +#include "intel_display_core.h" > #include "intel_display_types.h" > #include "intel_dpt.h" > #include "intel_fb.h" > diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c > b/drivers/gpu/drm/xe/display/xe_plane_initial.c > index 6502b8274173..fada6f877bca 100644 > --- a/drivers/gpu/drm/xe/display/xe_plane_initial.c > +++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c > @@ -14,6 +14,7 @@ > #include "intel_atomic_plane.h" > #include "intel_crtc.h" > #include "intel_display.h" > +#include "intel_display_core.h" > #include "intel_display_types.h" > #include "intel_fb.h" > #include "intel_fb_pin.h" > diff --git a/drivers/gpu/drm/xe/display/xe_tdf.c > b/drivers/gpu/drm/xe/display/xe_tdf.c > index 2a7fccbeb1d5..78bda4c47874 100644 > --- a/drivers/gpu/drm/xe/display/xe_tdf.c > +++ b/drivers/gpu/drm/xe/display/xe_tdf.c > @@ -3,9 +3,9 @@ > * Copyright © 2024 Intel Corporation > */ > > -#include "xe_device.h" > -#include "intel_display_types.h" > +#include "intel_display_core.h" > #include "intel_tdf.h" > +#include "xe_device.h" > > void intel_td_flush(struct intel_display *display) { diff --git > a/drivers/gpu/drm/xe/xe_device_types.h > b/drivers/gpu/drm/xe/xe_device_types.h > index 7659222703d2..0482e00e58df 100644 > --- a/drivers/gpu/drm/xe/xe_device_types.h > +++ b/drivers/gpu/drm/xe/xe_device_types.h > @@ -30,11 +30,7 @@ > #define TEST_VM_OPS_ERROR > #endif > > -#if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) > -#include "intel_display_core.h" > -#include "intel_display_device.h" > -#endif > - > +struct intel_display; > struct xe_ggtt; > struct xe_pat_ops; > struct xe_pxp; > -- > 2.39.5
