From 27e3b4ee6320b466dec3f6f342ca4b372893b36b Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 29 May 2024 20:48:05 +0300 Subject: [PATCH] drm/i915/display: include gem/i915_gem_stolen.h where needed Include what you use. We need to move the compat i915_gem_stolen.h under gem subdir. 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/6ac3480a8689fda5aaf4007cb604e06e939a03f7.1717004739.git.jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_fbc.c | 1 + .../gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h | 0 drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h (100%) diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index e9189a864f69..6985abeb6102 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -43,6 +43,7 @@ #include #include +#include "gem/i915_gem_stolen.h" #include "i915_drv.h" #include "i915_reg.h" #include "i915_utils.h" diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h similarity index 100% rename from drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h rename to drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.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 ffaa4d2f1eed..0675c50edc6f 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_gem_stolen.h" #include "i915_gpu_error.h" #include "i915_reg_defs.h" #include "i915_utils.h" -- 2.25.1