Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/mediatek: Introduce GEM object functions

GEM object functions deprecate several similar callback interfaces in
struct drm_driver. This patch replaces the per-driver callbacks with
per-instance callbacks in mediatek. The only exception is gem_prime_mmap,
which is non-trivial to convert.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

authored by

Thomas Zimmermann and committed by
Chun-Kuang Hu
eea70586 f8c76863

+11 -5
-5
drivers/gpu/drm/mediatek/mtk_drm_drv.c
··· 303 303 static struct drm_driver mtk_drm_driver = { 304 304 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, 305 305 306 - .gem_free_object_unlocked = mtk_drm_gem_free_object, 307 - .gem_vm_ops = &drm_gem_cma_vm_ops, 308 306 .dumb_create = mtk_drm_gem_dumb_create, 309 307 310 308 .prime_handle_to_fd = drm_gem_prime_handle_to_fd, 311 309 .prime_fd_to_handle = drm_gem_prime_fd_to_handle, 312 310 .gem_prime_import = mtk_drm_gem_prime_import, 313 - .gem_prime_get_sg_table = mtk_gem_prime_get_sg_table, 314 311 .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, 315 312 .gem_prime_mmap = mtk_drm_gem_mmap_buf, 316 - .gem_prime_vmap = mtk_drm_gem_prime_vmap, 317 - .gem_prime_vunmap = mtk_drm_gem_prime_vunmap, 318 313 .fops = &mtk_drm_fops, 319 314 320 315 .name = DRIVER_NAME,
+11
drivers/gpu/drm/mediatek/mtk_drm_gem.c
··· 8 8 #include <drm/drm.h> 9 9 #include <drm/drm_device.h> 10 10 #include <drm/drm_gem.h> 11 + #include <drm/drm_gem_cma_helper.h> 11 12 #include <drm/drm_prime.h> 12 13 13 14 #include "mtk_drm_drv.h" 14 15 #include "mtk_drm_gem.h" 16 + 17 + static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs = { 18 + .free = mtk_drm_gem_free_object, 19 + .get_sg_table = mtk_gem_prime_get_sg_table, 20 + .vmap = mtk_drm_gem_prime_vmap, 21 + .vunmap = mtk_drm_gem_prime_vunmap, 22 + .vm_ops = &drm_gem_cma_vm_ops, 23 + }; 15 24 16 25 static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev, 17 26 unsigned long size) ··· 33 24 mtk_gem_obj = kzalloc(sizeof(*mtk_gem_obj), GFP_KERNEL); 34 25 if (!mtk_gem_obj) 35 26 return ERR_PTR(-ENOMEM); 27 + 28 + mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs; 36 29 37 30 ret = drm_gem_object_init(dev, &mtk_gem_obj->base, size); 38 31 if (ret < 0) {