Message ID | 20200603083132.4610-9-tzimmermann@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm: Convert most CMA-based drivers to GEM object functions | expand |
On Wed, Jun 3, 2020 at 1:31 AM Thomas Zimmermann <tzimmermann@suse.de> wrote: > > The kirin driver uses the default implementation for CMA functions. The > DRM_GEM_CMA_DRIVER_OPS macro now sets these defaults in struct drm_driver. > > Using DRM_GEM_CMA_DRIVER_OPS introduces several changes: 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: > * use DRM_GEM_CMA_DRIVER_OPS > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Acked-by: Emil Velikov <emil.velikov@collabora.com> > Cc: Xu YiPing <xuyiping@hisilicon.com> > Cc: Rongrong Zou <zourongrong@gmail.com> > Cc: Xinliang Liu <z.liuxinliang@hisilicon.com> Thanks for sending this out! Works fine on my HiKey board. Tested-by: John Stultz <john.stultz@linaro.org> thanks -john
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 18e57e571e054..e1108c1735ad0 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -921,17 +921,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ade_fops); static struct drm_driver ade_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &ade_fops, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .dumb_create = drm_gem_cma_dumb_create, - .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, - + DRM_GEM_CMA_DRIVER_OPS, .name = "kirin", .desc = "Hisilicon Kirin620 SoC DRM Driver", .date = "20150718",