From 6a5cfab072d6f7b1277d491a17aecf6ea9acbc68 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 11 Apr 2025 12:54:14 +0300 Subject: [PATCH] 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 Link: https://lore.kernel.org/r/68ec70f6880b7af19bc93b9817959299634a555d.1744364975.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_pch.c | 4 +++- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/xe/xe_device_types.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_pch.c b/drivers/gpu/drm/i915/display/intel_pch.c index c5045d2527b44..fec1919e53867 100644 --- 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 + #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 38cd1750bc994..c0eec8fe5cad0 100644 --- 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 6a287549fb57c..e620f4f434c82 100644 --- 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 -- 2.50.1