On Fri, Nov 14, 2025 at 12:26:48PM +0200, Jani Nikula wrote: > Add .fence_priority_display() to display parent interface, removing a > display dependency on gem/i915_gem_object.h. > > This allows us to remove the xe compat gem/i915_gem_object.h. > > v2: Don't mix this with the rps interface (Ville) > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_parent.c | 6 ++++++ > drivers/gpu/drm/i915/display/intel_parent.h | 2 ++ > drivers/gpu/drm/i915/display/intel_plane.c | 5 ++--- > drivers/gpu/drm/i915/i915_driver.c | 7 +++++++ > .../xe/compat-i915-headers/gem/i915_gem_object.h | 13 ------------- > include/drm/intel/display_parent_interface.h | 3 +++ > 6 files changed, 20 insertions(+), 16 deletions(-) > delete mode 100644 > drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h > > diff --git a/drivers/gpu/drm/i915/display/intel_parent.c > b/drivers/gpu/drm/i915/display/intel_parent.c > index 9370da9d215c..789bc11a324c 100644 > --- a/drivers/gpu/drm/i915/display/intel_parent.c > +++ b/drivers/gpu/drm/i915/display/intel_parent.c > @@ -64,3 +64,9 @@ bool intel_parent_fence_support_legacy(struct intel_display > *display) > { > return display->parent->fence_support_legacy && > display->parent->fence_support_legacy(display->drm); > } > + > +void intel_parent_fence_priority_display(struct intel_display *display, > struct dma_fence *fence) > +{ > + if (display->parent->fence_priority_display) > + display->parent->fence_priority_display(fence); > +} > diff --git a/drivers/gpu/drm/i915/display/intel_parent.h > b/drivers/gpu/drm/i915/display/intel_parent.h > index 41d6943786fb..b3cce2c6b017 100644 > --- a/drivers/gpu/drm/i915/display/intel_parent.h > +++ b/drivers/gpu/drm/i915/display/intel_parent.h > @@ -21,4 +21,6 @@ bool intel_parent_vgpu_active(struct intel_display > *display); > > bool intel_parent_fence_support_legacy(struct intel_display *display); > > +void intel_parent_fence_priority_display(struct intel_display *display, > struct dma_fence *fence); > + > #endif /* __INTEL_PARENT_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_plane.c > b/drivers/gpu/drm/i915/display/intel_plane.c > index 5105e3278bc4..a7fec5ba6ac0 100644 > --- a/drivers/gpu/drm/i915/display/intel_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_plane.c > @@ -45,7 +45,6 @@ > #include <drm/drm_panic.h> > #include <drm/drm_print.h> > > -#include "gem/i915_gem_object.h" > #include "i9xx_plane_regs.h" > #include "intel_cdclk.h" > #include "intel_cursor.h" > @@ -56,6 +55,7 @@ > #include "intel_fb_pin.h" > #include "intel_fbdev.h" > #include "intel_panic.h" > +#include "intel_parent.h" > #include "intel_plane.h" > #include "intel_psr.h" > #include "skl_scaler.h" > @@ -1180,8 +1180,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, > goto unpin_fb; > > if (new_plane_state->uapi.fence) { > - > i915_gem_fence_wait_priority_display(new_plane_state->uapi.fence); > - > + intel_parent_fence_priority_display(display, > new_plane_state->uapi.fence); > intel_display_rps_boost_after_vblank(new_plane_state->hw.crtc, > > new_plane_state->uapi.fence); > } > diff --git a/drivers/gpu/drm/i915/i915_driver.c > b/drivers/gpu/drm/i915/i915_driver.c > index ac189b90f985..7cc74b76774a 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -750,12 +750,19 @@ static bool fence_support_legacy(struct drm_device *drm) > return intel_gt_support_legacy_fencing(to_gt(to_i915(drm))); > } > > +static void fence_priority_display(struct dma_fence *fence) > +{ > + if (dma_fence_is_i915(fence)) > + i915_gem_fence_wait_priority_display(fence); > +} > + > static const struct intel_display_parent_interface parent = { > .rpm = &i915_display_rpm_interface, > .irq = &i915_display_irq_interface, > .rps = &i915_display_rps_interface, > .vgpu_active = vgpu_active, > .fence_support_legacy = fence_support_legacy, > + .fence_priority_display = fence_priority_display, > }; > > const struct intel_display_parent_interface > *i915_driver_parent_interface(void) > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h > b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h > deleted file mode 100644 > index 0548b2e0316f..000000000000 > --- a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h > +++ /dev/null > @@ -1,13 +0,0 @@ > -/* SPDX-License-Identifier: MIT */ > -/* Copyright © 2025 Intel Corporation */ > - > -#ifndef __I915_GEM_OBJECT_H__ > -#define __I915_GEM_OBJECT_H__ > - > -struct dma_fence; > - > -static inline void i915_gem_fence_wait_priority_display(struct dma_fence > *fence) > -{ > -} > - > -#endif > diff --git a/include/drm/intel/display_parent_interface.h > b/include/drm/intel/display_parent_interface.h > index 2ea68a31224d..fd066309184d 100644 > --- a/include/drm/intel/display_parent_interface.h > +++ b/include/drm/intel/display_parent_interface.h > @@ -64,6 +64,9 @@ struct intel_display_parent_interface { > > /** @fence_support_legacy: Support legacy fencing? Optional. */ > bool (*fence_support_legacy)(struct drm_device *drm); > + > + /** @fence_priority_display: Set display priority. Optional. */ > + void (*fence_priority_display)(struct dma_fence *fence); > }; > > #endif > -- > 2.47.3 -- Ville Syrjälä Intel
