From: Jani Nikula Date: Wed, 29 May 2024 17:48:09 +0000 (+0300) Subject: drm/i915/display: include intel_step.h where needed X-Git-Tag: v6.11-rc1~141^2~20^2~147 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61e22c77ded6dec109d1bfadaf0c4afd27095970;p=thirdparty%2Fkernel%2Flinux.git drm/i915/display: include intel_step.h where needed Include what you use. With this, we can drop the include along with xe_step.h 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/abee71a6c6edbd1a3ddf0f97838977e53feaa5ff.1717004739.git.jani.nikula@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index b5ebb0f5b2693..852c11aa32055 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -31,6 +31,7 @@ #include "intel_de.h" #include "intel_dmc.h" #include "intel_dmc_regs.h" +#include "intel_step.h" /** * DOC: DMC Firmware Support 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 3b3533ec07a44..ef04d965a574f 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@ -18,10 +18,8 @@ #include "xe_device.h" #include "xe_bo.h" #include "xe_pm.h" -#include "xe_step.h" #include "i915_reg_defs.h" #include "i915_utils.h" -#include "intel_step.h" #include "intel_runtime_pm.h" #include