On Tue, Sep 15, 2020 at 04:59:50PM +0200, Thomas Zimmermann wrote:
> 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.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 -----
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index 0f3eb392fe39..b7654f5e4225 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -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,
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> index 0055d86576f7..bddc7d99efe3 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> @@ -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;
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
