Commit 0d590af3 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-15-tzimmermann@suse.de
parent 552f9d60

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+0 −5
Original line number Diff line number Diff line
@@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { 
static struct drm_driver rockchip_drm_driver = {

	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,

	.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,

	.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	= rockchip_gem_prime_get_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,

	.fops			= &rockchip_drm_driver_fops,

	.name	= DRIVER_NAME,

drivers/gpu/drm/rockchip/rockchip_drm_gem.c

+11 −1
Original line number Diff line number Diff line
@@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *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 *

	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->funcs = &rockchip_gem_object_funcs;



	drm_gem_object_init(drm, obj, size);



	return rk_obj;
@@ -338,7 +348,7 @@ err_free_rk_obj: 
}



/*

 * rockchip_gem_free_object - (struct drm_driver)->gem_free_object_unlocked

 * rockchip_gem_free_object - (struct drm_gem_object_funcs)->free

 * callback function

 */

void rockchip_gem_free_object(struct drm_gem_object *obj)

CRA Git | Maintained and supported by SUSTech CRA and CCSE