drm/i915/pch: clean up includes

We no longer need i915_drv.h in intel_pch.c, and we no longer need
intel_pch.h universally.

With intel_pch.h being included from intel_display_core.h, it's still
included pretty much everywhere, but there's no need to include it
explicitly from i915_drv.h or xe_device_types.h.

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/68ec70f6880b7af19bc93b9817959299634a555d.1744364975.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_pch.c b/drivers/gpu/drm/i915/display/intel_pch.c
index c5045d2527b449ec4c3150df059ce1706dc45fcf..fec1919e53867d9bd4c502368e8a5f418e0b2751 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pch.c
+++ b/drivers/gpu/drm/i915/display/intel_pch.c
@@ -3,8 +3,10 @@
  * Copyright 2025 Intel Corporation.
  */
 
-#include "i915_drv.h"
+#include <drm/drm_print.h>
+
 #include "i915_utils.h"
+#include "intel_display_core.h"
 #include "intel_pch.h"
 
 #define INTEL_PCH_DEVICE_ID_MASK               0xff80

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 38cd1750bc9943825facc1993effa97fa35b232d..c0eec8fe5cad064ea0b625d73e43cd0bb54c7482 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -38,7 +38,6 @@
 
 #include "display/intel_display_limits.h"
 #include "display/intel_display_core.h"
-#include "display/intel_pch.h"
 
 #include "gem/i915_gem_context_types.h"
 #include "gem/i915_gem_shrinker.h"

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 6a287549fb57cc3243dfb41fd6f18d3309de0441..e620f4f434c8218b79638db056f34b80691a7565 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -30,7 +30,6 @@
 #endif
 
 #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
-#include "intel_pch.h"
 #include "intel_display_core.h"
 #include "intel_display_device.h"
 #endif