[Nouveau] [PATCH 12/20] drm/radeon: Introduce GEM object functions

[Christian König]

Am 13.08.20 um 12:41 schrieb Thomas Zimmermann:
> Hi
>
> Am 13.08.20 um 12:24 schrieb Christian König:
>> Am 13.08.20 um 10:36 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.
>>>
>>> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
>>> ---
>>>    drivers/gpu/drm/radeon/radeon_drv.c    | 23 +----------------------
>>>    drivers/gpu/drm/radeon/radeon_object.c | 26 ++++++++++++++++++++++++++
>>>    2 files changed, 27 insertions(+), 22 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_object.c
>>> b/drivers/gpu/drm/radeon/radeon_object.c
>>> index bb7582afd803..882390e15dfe 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_object.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_object.c
>>> @@ -45,6 +45,19 @@ int radeon_ttm_init(struct radeon_device *rdev);
>>>    void radeon_ttm_fini(struct radeon_device *rdev);
>>>    static void radeon_bo_clear_surface_reg(struct radeon_bo *bo);
>>>    +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);
>>> +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);
>>> +
>>>    /*
>>>     * To exclude mutual BO access we rely on bo_reserve exclusion, as all
>>>     * function are calling it.
>>> @@ -180,6 +193,18 @@ void radeon_ttm_placement_from_domain(struct
>>> radeon_bo *rbo, u32 domain)
>>>        }
>>>    }
>>>    +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,
>>> +};
>>> +
>> Same comment as for amdgpu, please put that into radeon_gem.c instead.
> There's no good header file to put the declarations, right? I'm asking
> because checkpatch warns about declarations in the source files.

Yes, that is kind of a mess because radeon used to support both KMS and UMS.

Thanks for cleaning this up,
Christian.

>
> Best regards
> Thomas
>
>> Christian.
>>
>>>    int radeon_bo_create(struct radeon_device *rdev,
>>>                 unsigned long size, int byte_align, bool kernel,
>>>                 u32 domain, u32 flags, struct sg_table *sg,
>>> @@ -209,6 +234,7 @@ int radeon_bo_create(struct radeon_device *rdev,
>>>        bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
>>>        if (bo == NULL)
>>>            return -ENOMEM;
>>> +    bo->tbo.base.funcs = &radeon_gem_object_funcs;
>>>        drm_gem_private_object_init(rdev->ddev, &bo->tbo.base, size);
>>>        bo->rdev = rdev;
>>>        bo->surface_reg = -1;