| Message ID | 20200603083132.4610-15-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: Convert most CMA-based drivers to GEM object functions | expand |
On 03/06/2020 10:31, Thomas Zimmermann wrote: > The meson driver uses the default implementation for CMA functions; except > for the .dumb_create callback. The DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() > macro now sets these defaults and .dumb_create in struct drm_driver. > > By using DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE() the driver now > sets .gem_create_object to drm_cma_gem_create_object_default_funcs(), > which sets CMA GEM object functions. GEM object functions implement the > rsp operations where possible. Corresponding interfaces in struct drm_driver > are cleared. Prime import now uses drm_gem_cma_prime_import_sg_table_vmap(), > which maps the imported buffer upon import. Mmap operations are performed > by drm_gem_prime_mmap(), which goes through GEM file operations. These > changes have been part of the aspeed driver for some time. > > v2: > * update for DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Acked-by: Emil Velikov <emil.velikov@collabora.com> > --- > drivers/gpu/drm/meson/meson_drv.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c > index 4c5aafcec7991..8b9c8dd788c41 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -96,19 +96,8 @@ static struct drm_driver meson_driver = { > /* IRQ */ > .irq_handler = meson_irq, > > - /* PRIME Ops */ > - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, > - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, > - .gem_prime_vmap = drm_gem_cma_prime_vmap, > - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, > - .gem_prime_mmap = drm_gem_cma_prime_mmap, > - > - /* GEM Ops */ > - .dumb_create = meson_dumb_create, > - .gem_free_object_unlocked = drm_gem_cma_free_object, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > + /* CMA Ops */ > + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(meson_dumb_create), > > /* Misc */ > .fops = &fops, > Acked-by: Neil Armstrong <narmstrong@baylibre.com>
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 4c5aafcec7991..8b9c8dd788c41 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -96,19 +96,8 @@ static struct drm_driver meson_driver = { /* IRQ */ .irq_handler = meson_irq, - /* PRIME Ops */ - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - - /* GEM Ops */ - .dumb_create = meson_dumb_create, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, + /* CMA Ops */ + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(meson_dumb_create), /* Misc */ .fops = &fops,