Re: [PATCH v2 12/21] drm/radeon: Introduce GEM object functions

Christian König
2020-09-15T15:13:56Z

Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:
> GEM object functions deprecate several similar callback interfaces in
> struct drm_driver. This patch replaces the per-driver callbacks with
> per-instance callbacks in radeon.
>
> v2:
> * move object-function instance to radeon_gem.c (Christian)
> * set callbacks in radeon_gem_object_create() (Christian)
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
> drivers/gpu/drm/radeon/radeon_drv.c | 23 +--------------------
> drivers/gpu/drm/radeon/radeon_gem.c | 31 +++++++++++++++++++++++++----
> 2 files changed, 28 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 4cd30613fa1d..65061c949aee 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -124,13 +124,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
> int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
> void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
> irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg);
> -void radeon_gem_object_free(struct drm_gem_object *obj);
> -int radeon_gem_object_open(struct drm_gem_object *obj,
> - struct drm_file *file_priv);
> -void radeon_gem_object_close(struct drm_gem_object *obj,
> - struct drm_file *file_priv);
> -struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
> - int flags);
> extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc,
> unsigned int flags, int *vpos, int *hpos,
> ktime_t *stime, ktime_t *etime,
> @@ -145,14 +138,9 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,
> int radeon_mode_dumb_create(struct drm_file *file_priv,
> struct drm_device *dev,
> struct drm_mode_create_dumb *args);
> -struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj);
> struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,
> struct dma_buf_attachment *,
> struct sg_table *sg);
> -int radeon_gem_prime_pin(struct drm_gem_object *obj);
> -void radeon_gem_prime_unpin(struct drm_gem_object *obj);
> -void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
> -void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
>
> /* atpx handler */
> #if defined(CONFIG_VGA_SWITCHEROO)
> @@ -550,7 +538,7 @@ long radeon_drm_ioctl(struct file *filp,
> }
>
> ret = drm_ioctl(filp, cmd, arg);
> -
> +
> pm_runtime_mark_last_busy(dev->dev);
> pm_runtime_put_autosuspend(dev->dev);
> return ret;
> @@ -609,22 +597,13 @@ static struct drm_driver kms_driver = {
> .irq_uninstall = radeon_driver_irq_uninstall_kms,
> .irq_handler = radeon_driver_irq_handler_kms,
> .ioctls = radeon_ioctls_kms,
> - .gem_free_object_unlocked = radeon_gem_object_free,
> - .gem_open_object = radeon_gem_object_open,
> - .gem_close_object = radeon_gem_object_close,
> .dumb_create = radeon_mode_dumb_create,
> .dumb_map_offset = radeon_mode_dumb_mmap,
> .fops = &radeon_driver_kms_fops,
>
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> - .gem_prime_export = radeon_gem_prime_export,
> - .gem_prime_pin = radeon_gem_prime_pin,
> - .gem_prime_unpin = radeon_gem_prime_unpin,
> - .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table,
> .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table,
> - .gem_prime_vmap = radeon_gem_prime_vmap,
> - .gem_prime_vunmap = radeon_gem_prime_vunmap,
>
> .name = DRIVER_NAME,
> .desc = DRIVER_DESC,
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
> index e5c4271e64ed..0ccd7213e41f 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -35,7 +35,17 @@
>
> #include "radeon.h"
>
> -void radeon_gem_object_free(struct drm_gem_object *gobj)
> +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
> + int flags);
> +struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj);
> +int radeon_gem_prime_pin(struct drm_gem_object *obj);
> +void radeon_gem_prime_unpin(struct drm_gem_object *obj);
> +void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
> +void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
> +
> +static const struct drm_gem_object_funcs radeon_gem_object_funcs;
> +
> +static void radeon_gem_object_free(struct drm_gem_object *gobj)
> {
> struct radeon_bo *robj = gem_to_radeon_bo(gobj);
>
> @@ -85,6 +95,7 @@ int radeon_gem_object_create(struct radeon_device *rdev, unsigned long size,
> return r;
> }
> *obj = &robj->tbo.base;
> + (*obj)->funcs = &radeon_gem_object_funcs;
> robj->pid = task_pid_nr(current);
>
> mutex_lock(&rdev->gem.mutex);
> @@ -146,7 +157,7 @@ void radeon_gem_fini(struct radeon_device *rdev)
> * Call from drm_gem_handle_create which appear in both new and open ioctl
> * case.
> */
> -int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv)
> +static int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv)
> {
> struct radeon_bo *rbo = gem_to_radeon_bo(obj);
> struct radeon_device *rdev = rbo->rdev;
> @@ -176,8 +187,8 @@ int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_pri
> return 0;
> }
>
> -void radeon_gem_object_close(struct drm_gem_object *obj,
> - struct drm_file *file_priv)
> +static void radeon_gem_object_close(struct drm_gem_object *obj,
> + struct drm_file *file_priv)
> {
> struct radeon_bo *rbo = gem_to_radeon_bo(obj);
> struct radeon_device *rdev = rbo->rdev;
> @@ -216,6 +227,18 @@ static int radeon_gem_handle_lockup(struct radeon_device *rdev, int r)
> return r;
> }
>
> +static const struct drm_gem_object_funcs radeon_gem_object_funcs = {
> + .free = radeon_gem_object_free,
> + .open = radeon_gem_object_open,
> + .close = radeon_gem_object_close,
> + .export = radeon_gem_prime_export,
> + .pin = radeon_gem_prime_pin,
> + .unpin = radeon_gem_prime_unpin,
> + .get_sg_table = radeon_gem_prime_get_sg_table,
> + .vmap = radeon_gem_prime_vmap,
> + .vunmap = radeon_gem_prime_vunmap,
> +};
> +
> /*
> * GEM ioctls.
> */