]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/zte: Use GEM CMA object functions
authorThomas Zimmermann <tzimmermann@suse.de>
Fri, 5 Jun 2020 07:32:45 +0000 (09:32 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Wed, 10 Jun 2020 07:06:17 +0000 (09:06 +0200)
Create GEM objects with drm_gem_cma_create_object_default_funcs(), which
allocates the object and sets CMA's default object functions. Corresponding
callbacks in struct drm_driver are cleared. No functional changes are made.

Driver and object-function instances use the same callback functions, with
the exception of vunmap. The implementation of vunmap is empty and left out
in CMA's default object functions.

v3:
* convert to DRIVER_OPS macro in a separate patch

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605073247.4057-42-tzimmermann@suse.de
drivers/gpu/drm/zte/zx_drm_drv.c

index 1141c1ed1ed04c76f2c6260057851a1eb4371758..305394923e04cc0b4d59bbe4c8ccfedc1b4d3235 100644 (file)
@@ -36,15 +36,11 @@ DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops);
 
 static struct drm_driver zx_drm_driver = {
        .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
-       .gem_free_object_unlocked = drm_gem_cma_free_object,
-       .gem_vm_ops = &drm_gem_cma_vm_ops,
+       .gem_create_object = drm_gem_cma_create_object_default_funcs,
        .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,
        .fops = &zx_drm_fops,
        .name = "zx-vou",