On Fri, Nov 14, 2025 at 12:26:44PM +0200, Jani Nikula wrote:
> Add .fence_support_legacy() to display parent interface, removing more
> dependencies on struct drm_i915_private, i915_drv.h, and
> gt/intel_gt_types.h.
>
> This allows us to remove the xe compat gt/intel_gt_types.h.
>
> Signed-off-by: Jani Nikula <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_fbc.c | 8 ++------
> drivers/gpu/drm/i915/display/intel_parent.c | 5 +++++
> drivers/gpu/drm/i915/display/intel_parent.h | 2 ++
> drivers/gpu/drm/i915/i915_driver.c | 6 ++++++
> .../drm/xe/compat-i915-headers/gt/intel_gt_types.h | 11 -----------
> include/drm/intel/display_parent_interface.h | 3 +++
> 6 files changed, 18 insertions(+), 17 deletions(-)
> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c
> b/drivers/gpu/drm/i915/display/intel_fbc.c
> index ab0bcea5aa89..8c56c87d00a9 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -47,9 +47,6 @@
>
> #include "gem/i915_gem_stolen.h"
>
> -#include "gt/intel_gt_types.h"
> -
> -#include "i915_drv.h"
> #include "i915_vma.h"
> #include "i9xx_plane_regs.h"
> #include "intel_de.h"
> @@ -64,6 +61,7 @@
> #include "intel_fbc_regs.h"
> #include "intel_frontbuffer.h"
> #include "intel_parent.h"
> +#include "intel_step.h"
>
> #define for_each_fbc_id(__display, __fbc_id) \
> for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS;
> (__fbc_id)++) \
> @@ -267,9 +265,7 @@ static u16 intel_fbc_override_cfb_stride(const struct
> intel_plane_state *plane_s
>
> static bool intel_fbc_has_fences(struct intel_display *display)
> {
> - struct drm_i915_private __maybe_unused *i915 = to_i915(display->drm);
> -
> - return intel_gt_support_legacy_fencing(to_gt(i915));
> + return intel_parent_fence_support_legacy(display);
The naming is getting confusing. I'm thinking we should change
all of it to something like *_has_fenced_regions().
> }
>
> static u32 i8xx_fbc_ctl(struct intel_fbc *fbc)
> diff --git a/drivers/gpu/drm/i915/display/intel_parent.c
> b/drivers/gpu/drm/i915/display/intel_parent.c
> index 3786fd42827d..3dd31852e2e1 100644
> --- a/drivers/gpu/drm/i915/display/intel_parent.c
> +++ b/drivers/gpu/drm/i915/display/intel_parent.c
> @@ -36,3 +36,8 @@ bool intel_parent_vgpu_active(struct intel_display *display)
> {
> return display->parent->vgpu_active &&
> display->parent->vgpu_active(display->drm);
> }
> +
> +bool intel_parent_fence_support_legacy(struct intel_display *display)
> +{
> + return display->parent->fence_support_legacy &&
> display->parent->fence_support_legacy(display->drm);
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_parent.h
> b/drivers/gpu/drm/i915/display/intel_parent.h
> index 222c95836d35..fc6799db0361 100644
> --- a/drivers/gpu/drm/i915/display/intel_parent.h
> +++ b/drivers/gpu/drm/i915/display/intel_parent.h
> @@ -13,4 +13,6 @@ void intel_parent_irq_synchronize(struct intel_display
> *display);
>
> bool intel_parent_vgpu_active(struct intel_display *display);
>
> +bool intel_parent_fence_support_legacy(struct intel_display *display);
> +
> #endif /* __INTEL_PARENT_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_driver.c
> b/drivers/gpu/drm/i915/i915_driver.c
> index f21f1919a225..814b430de960 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -744,10 +744,16 @@ static bool vgpu_active(struct drm_device *drm)
> return intel_vgpu_active(to_i915(drm));
> }
>
> +static bool fence_support_legacy(struct drm_device *drm)
> +{
> + return intel_gt_support_legacy_fencing(to_gt(to_i915(drm)));
> +}
> +
> static const struct intel_display_parent_interface parent = {
> .rpm = &i915_display_rpm_interface,
> .irq = &i915_display_irq_interface,
> .vgpu_active = vgpu_active,
> + .fence_support_legacy = fence_support_legacy,
> };
>
> const struct intel_display_parent_interface
> *i915_driver_parent_interface(void)
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h
> b/drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h
> deleted file mode 100644
> index c15806d6c4f7..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2023 Intel Corporation
> - */
> -
> -#ifndef __INTEL_GT_TYPES__
> -#define __INTEL_GT_TYPES__
> -
> -#define intel_gt_support_legacy_fencing(gt) 0
> -
> -#endif
> diff --git a/include/drm/intel/display_parent_interface.h
> b/include/drm/intel/display_parent_interface.h
> index f3834f36ce74..11767adb0083 100644
> --- a/include/drm/intel/display_parent_interface.h
> +++ b/include/drm/intel/display_parent_interface.h
> @@ -51,6 +51,9 @@ struct intel_display_parent_interface {
>
> /** @vgpu_active: Is vGPU active? Optional. */
> bool (*vgpu_active)(struct drm_device *drm);
> +
> + /** @fence_support_legacy: Support legacy fencing? Optional. */
> + bool (*fence_support_legacy)(struct drm_device *drm);
> };
>
> #endif
> --
> 2.47.3
--
Ville Syrjälä
Intel
