On Thu, 16 Oct 2025, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Convert intel_bo_flush_if_display() to be an operation on the > frontbuffer object rather than the underlying gem bo. This > will help with cleaning up the frontbuffer xe/i915 vs. display > split. > > Acked-by: Jani Nikula <[email protected]>
Upgrade to Reviewed-by: Jani Nikula <[email protected]> > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_bo.c | 10 +++++----- > drivers/gpu/drm/i915/display/intel_bo.h | 2 +- > drivers/gpu/drm/i915/display/intel_fb.c | 2 +- > drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 +- > drivers/gpu/drm/xe/display/intel_bo.c | 8 ++++---- > 5 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bo.c > b/drivers/gpu/drm/i915/display/intel_bo.c > index 6ae1374d5c2b..2792aca7bc22 100644 > --- a/drivers/gpu/drm/i915/display/intel_bo.c > +++ b/drivers/gpu/drm/i915/display/intel_bo.c > @@ -29,11 +29,6 @@ bool intel_bo_is_protected(struct drm_gem_object *obj) > return i915_gem_object_is_protected(to_intel_bo(obj)); > } > > -void intel_bo_flush_if_display(struct drm_gem_object *obj) > -{ > - i915_gem_object_flush_if_display(to_intel_bo(obj)); > -} > - > int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) > { > return i915_gem_fb_mmap(to_intel_bo(obj), vma); > @@ -55,6 +50,11 @@ struct intel_frontbuffer *intel_bo_set_frontbuffer(struct > drm_gem_object *obj, > return i915_gem_object_set_frontbuffer(to_intel_bo(obj), front); > } > > +void intel_bo_frontbuffer_flush_for_display(struct intel_frontbuffer *front) > +{ > + i915_gem_object_flush_if_display(to_intel_bo(front->obj)); > +} > + > void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj) > { > i915_debugfs_describe_obj(m, to_intel_bo(obj)); > diff --git a/drivers/gpu/drm/i915/display/intel_bo.h > b/drivers/gpu/drm/i915/display/intel_bo.h > index 48d87019e48a..08247bf36d40 100644 > --- a/drivers/gpu/drm/i915/display/intel_bo.h > +++ b/drivers/gpu/drm/i915/display/intel_bo.h > @@ -16,13 +16,13 @@ bool intel_bo_is_tiled(struct drm_gem_object *obj); > bool intel_bo_is_userptr(struct drm_gem_object *obj); > bool intel_bo_is_shmem(struct drm_gem_object *obj); > bool intel_bo_is_protected(struct drm_gem_object *obj); > -void intel_bo_flush_if_display(struct drm_gem_object *obj); > int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); > int intel_bo_read_from_page(struct drm_gem_object *obj, u64 offset, void > *dst, int size); > > struct intel_frontbuffer *intel_bo_get_frontbuffer(struct drm_gem_object > *obj); > struct intel_frontbuffer *intel_bo_set_frontbuffer(struct drm_gem_object > *obj, > struct intel_frontbuffer > *front); > +void intel_bo_frontbuffer_flush_for_display(struct intel_frontbuffer *front); > > void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj); > > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c > b/drivers/gpu/drm/i915/display/intel_fb.c > index 3958628c73e9..ab301c657395 100644 > --- a/drivers/gpu/drm/i915/display/intel_fb.c > +++ b/drivers/gpu/drm/i915/display/intel_fb.c > @@ -2194,7 +2194,7 @@ static int intel_user_framebuffer_dirty(struct > drm_framebuffer *fb, > return ret; > > flush: > - intel_bo_flush_if_display(obj); > + intel_bo_frontbuffer_flush_for_display(front); > intel_frontbuffer_flush(front, ORIGIN_DIRTYFB); > return ret; > } > diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c > b/drivers/gpu/drm/i915/display/intel_frontbuffer.c > index 53e93985c7d4..5562801d2ea3 100644 > --- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c > +++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c > @@ -167,7 +167,7 @@ static void intel_frontbuffer_flush_work(struct > work_struct *work) > struct intel_frontbuffer *front = > container_of(work, struct intel_frontbuffer, flush_work); > > - intel_bo_flush_if_display(front->obj); > + intel_bo_frontbuffer_flush_for_display(front); > intel_frontbuffer_flush(front, ORIGIN_DIRTYFB); > intel_frontbuffer_put(front); > } > diff --git a/drivers/gpu/drm/xe/display/intel_bo.c > b/drivers/gpu/drm/xe/display/intel_bo.c > index 27437c22bd70..2437c00a2d3e 100644 > --- a/drivers/gpu/drm/xe/display/intel_bo.c > +++ b/drivers/gpu/drm/xe/display/intel_bo.c > @@ -28,10 +28,6 @@ bool intel_bo_is_protected(struct drm_gem_object *obj) > return xe_bo_is_protected(gem_to_xe_bo(obj)); > } > > -void intel_bo_flush_if_display(struct drm_gem_object *obj) > -{ > -} > - > int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) > { > return drm_gem_prime_mmap(obj, vma); > @@ -55,6 +51,10 @@ struct intel_frontbuffer *intel_bo_set_frontbuffer(struct > drm_gem_object *obj, > return front; > } > > +void intel_bo_frontbuffer_flush_for_display(struct intel_frontbuffer *front) > +{ > +} > + > void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj) > { > /* FIXME */ -- Jani Nikula, Intel
