Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/a12918f4d404e2d6d4e963126ce96df01d5064f3.1747907216.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula e6ba4316 62384da2

+9 -8
+1
drivers/gpu/drm/xe/display/intel_fbdev_fb.c
··· 5 5 6 6 #include <drm/drm_fb_helper.h> 7 7 8 + #include "intel_display_core.h" 8 9 #include "intel_display_types.h" 9 10 #include "intel_fb.h" 10 11 #include "intel_fbdev_fb.h"
+1
drivers/gpu/drm/xe/display/xe_display.c
··· 20 20 #include "intel_audio.h" 21 21 #include "intel_bw.h" 22 22 #include "intel_display.h" 23 + #include "intel_display_core.h" 23 24 #include "intel_display_driver.h" 24 25 #include "intel_display_irq.h" 25 26 #include "intel_display_types.h"
+1
drivers/gpu/drm/xe/display/xe_display_rpm.c
··· 1 1 // SPDX-License-Identifier: MIT 2 2 /* Copyright © 2025 Intel Corporation */ 3 3 4 + #include "intel_display_core.h" 4 5 #include "intel_display_rpm.h" 5 6 #include "xe_device.h" 6 7 #include "xe_device_types.h"
+1 -1
drivers/gpu/drm/xe/display/xe_display_wa.c
··· 3 3 * Copyright © 2024 Intel Corporation 4 4 */ 5 5 6 + #include "intel_display_core.h" 6 7 #include "intel_display_wa.h" 7 - 8 8 #include "xe_device.h" 9 9 #include "xe_wa.h" 10 10
+1
drivers/gpu/drm/xe/display/xe_fb_pin.c
··· 6 6 #include <drm/ttm/ttm_bo.h> 7 7 8 8 #include "i915_vma.h" 9 + #include "intel_display_core.h" 9 10 #include "intel_display_types.h" 10 11 #include "intel_dpt.h" 11 12 #include "intel_fb.h"
+1
drivers/gpu/drm/xe/display/xe_plane_initial.c
··· 14 14 #include "intel_atomic_plane.h" 15 15 #include "intel_crtc.h" 16 16 #include "intel_display.h" 17 + #include "intel_display_core.h" 17 18 #include "intel_display_types.h" 18 19 #include "intel_fb.h" 19 20 #include "intel_fb_pin.h"
+2 -2
drivers/gpu/drm/xe/display/xe_tdf.c
··· 3 3 * Copyright © 2024 Intel Corporation 4 4 */ 5 5 6 - #include "xe_device.h" 7 - #include "intel_display_types.h" 6 + #include "intel_display_core.h" 8 7 #include "intel_tdf.h" 8 + #include "xe_device.h" 9 9 10 10 void intel_td_flush(struct intel_display *display) 11 11 {
+1 -5
drivers/gpu/drm/xe/xe_device_types.h
··· 30 30 #define TEST_VM_OPS_ERROR 31 31 #endif 32 32 33 - #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) 34 - #include "intel_display_core.h" 35 - #include "intel_display_device.h" 36 - #endif 37 - 33 + struct intel_display; 38 34 struct xe_ggtt; 39 35 struct xe_pat_ops; 40 36 struct xe_pxp;