From: Jani Nikula Date: Wed, 29 May 2024 17:48:08 +0000 (+0300) Subject: drm/i915/display: include intel_uncore.h where needed X-Git-Tag: nvme-6.11-2024-08-08~76^2~20^2~148 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=37310936c36bd3e4d2a6415f3ca0dc5e1eae899a;p=nvme.git drm/i915/display: include intel_uncore.h where needed Include what you use. With this, we can drop the include from xe compat i915_drv.h. Reviewed-by: Rodrigo Vivi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/bc3a722413e20db905671e58627ba6d757f41c63.1717004739.git.jani.nikula@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 128fe9250f40..def2ade61954 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -36,6 +36,7 @@ #include "intel_display.h" #include "intel_display_types.h" #include "intel_gmbus.h" +#include "intel_uncore.h" #define _INTEL_BIOS_PRIVATE #include "intel_vbt_defs.h" diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h index bf2f2efe7beb..3b3533ec07a4 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@ -22,7 +22,6 @@ #include "i915_reg_defs.h" #include "i915_utils.h" #include "intel_step.h" -#include "intel_uncore.h" #include "intel_runtime_pm.h" #include