On Wed, May 29, 2024 at 08:48:06PM +0300, Jani Nikula wrote:
> Include what you use. We need to move the compat intel_gt_types.h under
> gt subdir.
ditto
> With this, we can drop the include from xe compat i915_drv.h.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_fbc.c | 1 +
> drivers/gpu/drm/xe/compat-i915-headers/{ => gt}/intel_gt_types.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/{ => gt}/intel_gt_types.h (100%)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index 6985abeb6102..8e956e7a1964 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -44,6 +44,7 @@
> #include <drm/drm_fourcc.h>
>
> #include "gem/i915_gem_stolen.h"
> +#include "gt/intel_gt_types.h"
> #include "i915_drv.h"
> #include "i915_reg.h"
> #include "i915_utils.h"
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_gt_types.h b/drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h
> similarity index 100%
> rename from drivers/gpu/drm/xe/compat-i915-headers/intel_gt_types.h
> rename to drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.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 3be3d419530a..fb784ab64cd4 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_gpu_error.h"
> #include "i915_reg_defs.h"
> #include "i915_utils.h"
> -#include "intel_gt_types.h"
> #include "intel_step.h"
> #include "intel_uncore.h"
> #include "intel_runtime_pm.h"
> --
> 2.39.2
>
