| Message ID | 20210622165511.3169559-11-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | implicit fencing/dma-resv rules for shared buffers | expand |
Am 22.06.21 um 18:55 schrieb Daniel Vetter: > Like we have for the shadow helpers too, and roll it out to drivers. > > Acked-by: Tian Tao <tiantao6@hisilicon.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Tian Tao <tiantao6@hisilicon.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/ast/ast_mode.c | 3 +-- > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +-- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +-- > include/drm/drm_gem_vram_helper.h | 12 ++++++++++++ > 4 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index e5996ae03c49..f5d58c3088fe 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -612,8 +612,7 @@ ast_primary_plane_helper_atomic_disable(struct drm_plane *plane, > } > > static const struct drm_plane_helper_funcs ast_primary_plane_helper_funcs = { > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > .atomic_check = ast_primary_plane_helper_atomic_check, > .atomic_update = ast_primary_plane_helper_atomic_update, > .atomic_disable = ast_primary_plane_helper_atomic_disable, > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > index 29b8332b2bca..ccf80e369b4b 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > @@ -158,8 +158,7 @@ static const struct drm_plane_funcs hibmc_plane_funcs = { > }; > > static const struct drm_plane_helper_funcs hibmc_plane_helper_funcs = { > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > .atomic_check = hibmc_plane_atomic_check, > .atomic_update = hibmc_plane_atomic_update, > }; > diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c > index 964381d55fc1..972c83b720aa 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c > @@ -488,8 +488,7 @@ static const struct drm_plane_helper_funcs vbox_primary_helper_funcs = { > .atomic_check = vbox_primary_atomic_check, > .atomic_update = vbox_primary_atomic_update, > .atomic_disable = vbox_primary_atomic_disable, > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > }; > > static const struct drm_plane_funcs vbox_primary_plane_funcs = { > diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h > index 27ed7e9243b9..f48d181c824b 100644 > --- a/include/drm/drm_gem_vram_helper.h > +++ b/include/drm/drm_gem_vram_helper.h > @@ -124,6 +124,18 @@ void > drm_gem_vram_plane_helper_cleanup_fb(struct drm_plane *plane, > struct drm_plane_state *old_state); > > +/** > + * DRM_GEM_VRAM_PLANE_HELPER_FUNCS - > + * Initializes struct drm_plane_helper_funcs for VRAM handling > + * > + * Drivers may use GEM BOs as VRAM helpers for the framebuffer memory. This > + * macro initializes struct drm_plane_helper_funcs to use the respective helper > + * functions. > + */ > +#define DRM_GEM_VRAM_PLANE_HELPER_FUNCS \ > + .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, \ > + .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb > + > /* > * Helpers for struct drm_simple_display_pipe_funcs > */ >
Hi Am 22.06.21 um 18:55 schrieb Daniel Vetter: > Like we have for the shadow helpers too, and roll it out to drivers. In addition to the plane-helper macro, you may also want to add DRM_GEM_VRAM_SIMPLE_DISPLAY_PIPE_FUNCS and use it in bochs. Best regards Thomas > > Acked-by: Tian Tao <tiantao6@hisilicon.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Tian Tao <tiantao6@hisilicon.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/ast/ast_mode.c | 3 +-- > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +-- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +-- > include/drm/drm_gem_vram_helper.h | 12 ++++++++++++ > 4 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index e5996ae03c49..f5d58c3088fe 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -612,8 +612,7 @@ ast_primary_plane_helper_atomic_disable(struct drm_plane *plane, > } > > static const struct drm_plane_helper_funcs ast_primary_plane_helper_funcs = { > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > .atomic_check = ast_primary_plane_helper_atomic_check, > .atomic_update = ast_primary_plane_helper_atomic_update, > .atomic_disable = ast_primary_plane_helper_atomic_disable, > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > index 29b8332b2bca..ccf80e369b4b 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > @@ -158,8 +158,7 @@ static const struct drm_plane_funcs hibmc_plane_funcs = { > }; > > static const struct drm_plane_helper_funcs hibmc_plane_helper_funcs = { > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > .atomic_check = hibmc_plane_atomic_check, > .atomic_update = hibmc_plane_atomic_update, > }; > diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c > index 964381d55fc1..972c83b720aa 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c > @@ -488,8 +488,7 @@ static const struct drm_plane_helper_funcs vbox_primary_helper_funcs = { > .atomic_check = vbox_primary_atomic_check, > .atomic_update = vbox_primary_atomic_update, > .atomic_disable = vbox_primary_atomic_disable, > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > }; > > static const struct drm_plane_funcs vbox_primary_plane_funcs = { > diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h > index 27ed7e9243b9..f48d181c824b 100644 > --- a/include/drm/drm_gem_vram_helper.h > +++ b/include/drm/drm_gem_vram_helper.h > @@ -124,6 +124,18 @@ void > drm_gem_vram_plane_helper_cleanup_fb(struct drm_plane *plane, > struct drm_plane_state *old_state); > > +/** > + * DRM_GEM_VRAM_PLANE_HELPER_FUNCS - > + * Initializes struct drm_plane_helper_funcs for VRAM handling > + * > + * Drivers may use GEM BOs as VRAM helpers for the framebuffer memory. This > + * macro initializes struct drm_plane_helper_funcs to use the respective helper > + * functions. > + */ > +#define DRM_GEM_VRAM_PLANE_HELPER_FUNCS \ > + .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, \ > + .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb > + > /* > * Helpers for struct drm_simple_display_pipe_funcs > */ >
On Thu, Jun 24, 2021 at 09:46:20AM +0200, Thomas Zimmermann wrote: > Hi > > Am 22.06.21 um 18:55 schrieb Daniel Vetter: > > Like we have for the shadow helpers too, and roll it out to drivers. > > In addition to the plane-helper macro, you may also want to add > DRM_GEM_VRAM_SIMPLE_DISPLAY_PIPE_FUNCS and use it in bochs. Hm I guess we can do that when we have a 2nd such case. I was more aiming to make it as friction-less as possible that drivers end up with a prepare_fb implementation which fishes out the implicit fences as needed in this series. Thanks for looking at this patch, I'm merging them all to drm-misc-next now. -Daniel > > Best regards > Thomas > > > > > Acked-by: Tian Tao <tiantao6@hisilicon.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Dave Airlie <airlied@redhat.com> > > Cc: Thomas Zimmermann <tzimmermann@suse.de> > > Cc: Hans de Goede <hdegoede@redhat.com> > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Cc: Maxime Ripard <mripard@kernel.org> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Tian Tao <tiantao6@hisilicon.com> > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > drivers/gpu/drm/ast/ast_mode.c | 3 +-- > > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +-- > > drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +-- > > include/drm/drm_gem_vram_helper.h | 12 ++++++++++++ > > 4 files changed, 15 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > > index e5996ae03c49..f5d58c3088fe 100644 > > --- a/drivers/gpu/drm/ast/ast_mode.c > > +++ b/drivers/gpu/drm/ast/ast_mode.c > > @@ -612,8 +612,7 @@ ast_primary_plane_helper_atomic_disable(struct drm_plane *plane, > > } > > static const struct drm_plane_helper_funcs ast_primary_plane_helper_funcs = { > > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > > .atomic_check = ast_primary_plane_helper_atomic_check, > > .atomic_update = ast_primary_plane_helper_atomic_update, > > .atomic_disable = ast_primary_plane_helper_atomic_disable, > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > > index 29b8332b2bca..ccf80e369b4b 100644 > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > > @@ -158,8 +158,7 @@ static const struct drm_plane_funcs hibmc_plane_funcs = { > > }; > > static const struct drm_plane_helper_funcs hibmc_plane_helper_funcs = { > > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > > .atomic_check = hibmc_plane_atomic_check, > > .atomic_update = hibmc_plane_atomic_update, > > }; > > diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c > > index 964381d55fc1..972c83b720aa 100644 > > --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c > > +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c > > @@ -488,8 +488,7 @@ static const struct drm_plane_helper_funcs vbox_primary_helper_funcs = { > > .atomic_check = vbox_primary_atomic_check, > > .atomic_update = vbox_primary_atomic_update, > > .atomic_disable = vbox_primary_atomic_disable, > > - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, > > - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, > > + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, > > }; > > static const struct drm_plane_funcs vbox_primary_plane_funcs = { > > diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h > > index 27ed7e9243b9..f48d181c824b 100644 > > --- a/include/drm/drm_gem_vram_helper.h > > +++ b/include/drm/drm_gem_vram_helper.h > > @@ -124,6 +124,18 @@ void > > drm_gem_vram_plane_helper_cleanup_fb(struct drm_plane *plane, > > struct drm_plane_state *old_state); > > +/** > > + * DRM_GEM_VRAM_PLANE_HELPER_FUNCS - > > + * Initializes struct drm_plane_helper_funcs for VRAM handling > > + * > > + * Drivers may use GEM BOs as VRAM helpers for the framebuffer memory. This > > + * macro initializes struct drm_plane_helper_funcs to use the respective helper > > + * functions. > > + */ > > +#define DRM_GEM_VRAM_PLANE_HELPER_FUNCS \ > > + .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, \ > > + .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb > > + > > /* > > * Helpers for struct drm_simple_display_pipe_funcs > > */ > > > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer >
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index e5996ae03c49..f5d58c3088fe 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -612,8 +612,7 @@ ast_primary_plane_helper_atomic_disable(struct drm_plane *plane, } static const struct drm_plane_helper_funcs ast_primary_plane_helper_funcs = { - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, .atomic_check = ast_primary_plane_helper_atomic_check, .atomic_update = ast_primary_plane_helper_atomic_update, .atomic_disable = ast_primary_plane_helper_atomic_disable, diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 29b8332b2bca..ccf80e369b4b 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -158,8 +158,7 @@ static const struct drm_plane_funcs hibmc_plane_funcs = { }; static const struct drm_plane_helper_funcs hibmc_plane_helper_funcs = { - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, .atomic_check = hibmc_plane_atomic_check, .atomic_update = hibmc_plane_atomic_update, }; diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c index 964381d55fc1..972c83b720aa 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c @@ -488,8 +488,7 @@ static const struct drm_plane_helper_funcs vbox_primary_helper_funcs = { .atomic_check = vbox_primary_atomic_check, .atomic_update = vbox_primary_atomic_update, .atomic_disable = vbox_primary_atomic_disable, - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, + DRM_GEM_VRAM_PLANE_HELPER_FUNCS, }; static const struct drm_plane_funcs vbox_primary_plane_funcs = { diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h index 27ed7e9243b9..f48d181c824b 100644 --- a/include/drm/drm_gem_vram_helper.h +++ b/include/drm/drm_gem_vram_helper.h @@ -124,6 +124,18 @@ void drm_gem_vram_plane_helper_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state); +/** + * DRM_GEM_VRAM_PLANE_HELPER_FUNCS - + * Initializes struct drm_plane_helper_funcs for VRAM handling + * + * Drivers may use GEM BOs as VRAM helpers for the framebuffer memory. This + * macro initializes struct drm_plane_helper_funcs to use the respective helper + * functions. + */ +#define DRM_GEM_VRAM_PLANE_HELPER_FUNCS \ + .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, \ + .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb + /* * Helpers for struct drm_simple_display_pipe_funcs */