openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/rockchip: Convert to drm_gem_object_funcs 

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

v3:
	* update documentation

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-15-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2020-09-23 12:21:51 +02:00
parent 552f9d60f6
commit 0d590af314
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
View File

@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = {
static struct drm_driver rockchip_drm_driver = { static struct drm_driver rockchip_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
.gem_vm_ops = &drm_gem_cma_vm_ops,
.gem_free_object_unlocked = rockchip_gem_free_object,
.dumb_create = rockchip_gem_dumb_create, .dumb_create = rockchip_gem_dumb_create,
.prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
.gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table,
.gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table,
.gem_prime_vmap = rockchip_gem_prime_vmap,
.gem_prime_vunmap = rockchip_gem_prime_vunmap,
.gem_prime_mmap = rockchip_gem_mmap_buf, .gem_prime_mmap = rockchip_gem_mmap_buf,
.fops = &rockchip_drm_driver_fops, .fops = &rockchip_drm_driver_fops,
.name = DRIVER_NAME, .name = DRIVER_NAME,

12
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
View File

@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj)
kfree(rk_obj); kfree(rk_obj);
} }
static const struct drm_gem_object_funcs rockchip_gem_object_funcs = {
.free = rockchip_gem_free_object,
.get_sg_table = rockchip_gem_prime_get_sg_table,
.vmap = rockchip_gem_prime_vmap,
.vunmap = rockchip_gem_prime_vunmap,
.vm_ops = &drm_gem_cma_vm_ops,
};
static struct rockchip_gem_object * static struct rockchip_gem_object *
rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size)
{ {
@ -310,6 +318,8 @@ static struct rockchip_gem_object *
obj = &rk_obj->base; obj = &rk_obj->base;
obj->funcs = &rockchip_gem_object_funcs;
drm_gem_object_init(drm, obj, size); drm_gem_object_init(drm, obj, size);
return rk_obj; return rk_obj;
@ -338,7 +348,7 @@ rockchip_gem_create_object(struct drm_device *drm, unsigned int size,
} }
/* /*
* rockchip_gem_free_object - (struct drm_driver)->gem_free_object_unlocked * rockchip_gem_free_object - (struct drm_gem_object_funcs)->free
* callback function * callback function
*/ */
void rockchip_gem_free_object(struct drm_gem_object *obj) void rockchip_gem_free_object(struct drm_gem_object *obj)