From: Jani Nikula Date: Wed, 29 May 2024 17:48:07 +0000 (+0300) Subject: drm/i915/display: include i915_gpu_error.h where needed X-Git-Tag: v6.11-rc1~141^2~20^2~149 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8411aa0c5541a1f2f03938c83445e2a1e7ce84a5;p=thirdparty%2Fkernel%2Flinux.git drm/i915/display: include i915_gpu_error.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/a5dbb8d46403761bd8518db45fa71dc55930d3cf.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 63fccdda56c0e..b5ebb0f5b2693 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -26,6 +26,7 @@ #include #include "i915_drv.h" +#include "i915_gpu_error.h" #include "i915_reg.h" #include "intel_de.h" #include "intel_dmc.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 f976588ed6289..bf2f2efe7beb8 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@ -19,7 +19,6 @@ #include "xe_bo.h" #include "xe_pm.h" #include "xe_step.h" -#include "i915_gpu_error.h" #include "i915_reg_defs.h" #include "i915_utils.h" #include "intel_step.h"