Hi

Am 15.09.20 um 17:05 schrieb Christian König:

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 amdgpu. The only exception is gem_prime_mmap, which is non-trivial to convert.

v2:     * move object-function instance to amdgpu_gem.c (Christian)     * set callbacks in amdgpu_gem_object_create() (Christian)

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    |  6 ------   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c    | 23 +++++++++++++++++-----   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h    |  5 -----   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  1 +   4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 6edde2b9e402..840ca8f9c1e1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1505,19 +1505,13 @@ static struct drm_driver kms_driver = {       .lastclose = amdgpu_driver_lastclose_kms,       .irq_handler = amdgpu_irq_handler,       .ioctls = amdgpu_ioctls_kms, -    .gem_free_object_unlocked = amdgpu_gem_object_free, -    .gem_open_object = amdgpu_gem_object_open, -    .gem_close_object = amdgpu_gem_object_close,       .dumb_create = amdgpu_mode_dumb_create,       .dumb_map_offset = amdgpu_mode_dumb_mmap,       .fops = &amdgpu_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 = amdgpu_gem_prime_export,       .gem_prime_import = amdgpu_gem_prime_import, -    .gem_prime_vmap = amdgpu_gem_prime_vmap, -    .gem_prime_vunmap = amdgpu_gem_prime_vunmap,       .gem_prime_mmap = amdgpu_gem_prime_mmap,         .name = DRIVER_NAME, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index aa7f230c71bf..aeecd5dc3ce4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -36,9 +36,12 @@     #include "amdgpu.h"   #include "amdgpu_display.h" +#include "amdgpu_dma_buf.h"   #include "amdgpu_xgmi.h"   -void amdgpu_gem_object_free(struct drm_gem_object *gobj) +static const struct drm_gem_object_funcs amdgpu_gem_object_funcs;

+static void amdgpu_gem_object_free(struct drm_gem_object *gobj)   {       struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);   @@ -87,6 +90,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,           return r;       }       *obj = &bo->tbo.base; +    (*obj)->funcs = &amdgpu_gem_object_funcs;         return 0;   } @@ -119,8 +123,8 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)    * Call from drm_gem_handle_create which appear in both new and open ioctl    * case.    */ -int amdgpu_gem_object_open(struct drm_gem_object *obj, -               struct drm_file *file_priv) +static int amdgpu_gem_object_open(struct drm_gem_object *obj, +                  struct drm_file *file_priv)   {       struct amdgpu_bo *abo = gem_to_amdgpu_bo(obj);       struct amdgpu_device *adev = amdgpu_ttm_adev(abo->tbo.bdev); @@ -152,8 +156,8 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj,       return 0;   }   -void amdgpu_gem_object_close(struct drm_gem_object *obj, -                 struct drm_file *file_priv) +static void amdgpu_gem_object_close(struct drm_gem_object *obj, +                    struct drm_file *file_priv)   {       struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);       struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); @@ -211,6 +215,15 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj,       ttm_eu_backoff_reservation(&ticket, &list);   }   +static const struct drm_gem_object_funcs amdgpu_gem_object_funcs = { +    .free = amdgpu_gem_object_free, +    .open = amdgpu_gem_object_open, +    .close = amdgpu_gem_object_close, +    .export = amdgpu_gem_prime_export, +    .vmap = amdgpu_gem_prime_vmap, +    .vunmap = amdgpu_gem_prime_vunmap, +};

/*    * GEM ioctls.    */ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h index e0f025dd1b14..637bf51dbf06 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h @@ -33,11 +33,6 @@   #define AMDGPU_GEM_DOMAIN_MAX        0x3   #define gem_to_amdgpu_bo(gobj) container_of((gobj), struct amdgpu_bo, tbo.base)   -void amdgpu_gem_object_free(struct drm_gem_object *obj); -int amdgpu_gem_object_open(struct drm_gem_object *obj, -                struct drm_file *file_priv); -void amdgpu_gem_object_close(struct drm_gem_object *obj, -                struct drm_file *file_priv);   unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);     /* diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index ac043baac05d..c4e82a8fa53f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -561,6 +561,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,       bo = kzalloc(sizeof(struct amdgpu_bo), GFP_KERNEL);       if (bo == NULL)           return -ENOMEM;

The newline is not unrelated.

Apart from that the patch is Reviewed-by: Christian König christian.koenig@amd.com.

But I think we need some smoke testing of it.

I gave it a try on the HW/drivers that I listed in the cover letter. Appears to be working there. There was a bug reported by CI that will be fixed in the next iteration.

Best regards Thomas

Christian.

...

drm_gem_private_object_init(adev_to_drm(adev), &bo->tbo.base, size);       INIT_LIST_HEAD(&bo->shadow_list);       bo->vm_bo = NULL;

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Sep 15, 2020 at 04:59:39PM +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 armada.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

Acked-by: Russell King rmk+kernel@armlinux.org.uk

Thanks.

---

drivers/gpu/drm/armada/armada_drv.c | 3 --- drivers/gpu/drm/armada/armada_gem.c | 12 +++++++++++- drivers/gpu/drm/armada/armada_gem.h | 2 -- 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 980d3f1f8f16..22247cfce80b 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -37,13 +37,10 @@ DEFINE_DRM_GEM_FOPS(armada_drm_fops);

static struct drm_driver armada_drm_driver = { .lastclose = drm_fb_helper_lastclose,

• .gem_free_object_unlocked = armada_gem_free_object, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
• .gem_prime_export = armada_gem_prime_export, .gem_prime_import = armada_gem_prime_import, .dumb_create = armada_gem_dumb_create,
• .gem_vm_ops = &armada_gem_vm_ops, .major = 1, .minor = 0, .name = "armada-drm",

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index ecf8a55e93d9..c343fbefe47c 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -25,7 +25,7 @@ static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf) return vmf_insert_pfn(vmf->vma, vmf->address, pfn); }

-const struct vm_operations_struct armada_gem_vm_ops = { +static const struct vm_operations_struct armada_gem_vm_ops = { .fault = armada_gem_vm_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, @@ -184,6 +184,12 @@ armada_gem_map_object(struct drm_device *dev, struct armada_gem_object *dobj) return dobj->addr; }

+static const struct drm_gem_object_funcs armada_gem_object_funcs = {

• .free = armada_gem_free_object,
• .export = armada_gem_prime_export,
• .vm_ops = &armada_gem_vm_ops,

+};

struct armada_gem_object * armada_gem_alloc_private_object(struct drm_device *dev, size_t size) { @@ -195,6 +201,8 @@ armada_gem_alloc_private_object(struct drm_device *dev, size_t size) if (!obj) return NULL;

• obj->obj.funcs = &armada_gem_object_funcs;

• drm_gem_private_object_init(dev, &obj->obj, size);

  DRM_DEBUG_DRIVER("alloc private obj %p size %zu\n", obj, size);

@@ -214,6 +222,8 @@ static struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev, if (!obj) return NULL;

• obj->obj.funcs = &armada_gem_object_funcs;
• if (drm_gem_object_init(dev, &obj->obj, size)) { kfree(obj); return NULL;

diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h index de04cc2c8f0e..ffcc7e8dd351 100644 --- a/drivers/gpu/drm/armada/armada_gem.h +++ b/drivers/gpu/drm/armada/armada_gem.h @@ -21,8 +21,6 @@ struct armada_gem_object { void *update_data; };

-extern const struct vm_operations_struct armada_gem_vm_ops;

#define drm_to_armada_gem(o) container_of(o, struct armada_gem_object, obj)

void armada_gem_free_object(struct drm_gem_object *);

2.28.0

On Tue, Sep 15, 2020 at 04:59:40PM +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 etnaviv. The only exception is gem_prime_mmap, which is non-trivial to convert.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 ------------- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index a9a3afaef9a1..aa270b79e585 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -468,12 +468,6 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = { ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW), };

-static const struct vm_operations_struct vm_ops = {

• .fault = etnaviv_gem_fault,
• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

-};

static const struct file_operations fops = { .owner = THIS_MODULE, .open = drm_open, @@ -490,16 +484,9 @@ static struct drm_driver etnaviv_drm_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = etnaviv_open, .postclose = etnaviv_postclose,

• .gem_free_object_unlocked = etnaviv_gem_free_object,
• .gem_vm_ops = &vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
• .gem_prime_pin = etnaviv_gem_prime_pin,
• .gem_prime_unpin = etnaviv_gem_prime_unpin,
• .gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table, .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table,
• .gem_prime_vmap = etnaviv_gem_prime_vmap,
• .gem_prime_vunmap = etnaviv_gem_prime_vunmap, .gem_prime_mmap = etnaviv_gem_prime_mmap,

#ifdef CONFIG_DEBUG_FS .debugfs_init = etnaviv_debugfs_init, diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index 4d8dc9236e5f..914f0867ff71 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -49,7 +49,6 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_file *file);

int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma); -vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf); int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset); struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj); void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index ea19f1d27275..312e9d58d5a7 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -171,7 +171,7 @@ int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma) return obj->ops->mmap(obj, vma); }

-vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf) +static vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; @@ -561,6 +561,22 @@ void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj) mutex_unlock(&priv->gem_lock); }

+static const struct vm_operations_struct vm_ops = {

• .fault = etnaviv_gem_fault,
• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+};

+static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = {

• .free = etnaviv_gem_free_object,
• .pin = etnaviv_gem_prime_pin,
• .unpin = etnaviv_gem_prime_unpin,
• .get_sg_table = etnaviv_gem_prime_get_sg_table,
• .vmap = etnaviv_gem_prime_vmap,
• .vunmap = etnaviv_gem_prime_vunmap,
• .vm_ops = &vm_ops,

+};

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags, const struct etnaviv_gem_ops *ops, struct drm_gem_object **obj) { @@ -595,6 +611,7 @@ static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags, INIT_LIST_HEAD(&etnaviv_obj->vram_list);

*obj = &etnaviv_obj->base;

• (*obj)->funcs = &etnaviv_gem_object_funcs;

  return 0;

}

2.28.0

On Tue, Sep 15, 2020 at 04:59:41PM +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 exynos. The only exception is gem_prime_mmap, which is non-trivial to convert.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 ---------- drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index dbd80f1e4c78..fe46680ca208 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -75,11 +75,6 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) file->driver_priv = NULL; }

-static const struct vm_operations_struct exynos_drm_gem_vm_ops = {

• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

-};

static const struct drm_ioctl_desc exynos_ioctls[] = { DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, DRM_RENDER_ALLOW), @@ -124,16 +119,11 @@ static struct drm_driver exynos_drm_driver = { .open = exynos_drm_open, .lastclose = drm_fb_helper_lastclose, .postclose = exynos_drm_postclose,

• .gem_free_object_unlocked = exynos_drm_gem_free_object,
• .gem_vm_ops = &exynos_drm_gem_vm_ops, .dumb_create = exynos_drm_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_import = exynos_drm_gem_prime_import,
• .gem_prime_get_sg_table = exynos_drm_gem_prime_get_sg_table, .gem_prime_import_sg_table = exynos_drm_gem_prime_import_sg_table,
• .gem_prime_vmap = exynos_drm_gem_prime_vmap,
• .gem_prime_vunmap = exynos_drm_gem_prime_vunmap, .gem_prime_mmap = exynos_drm_gem_prime_mmap, .ioctls = exynos_ioctls, .num_ioctls = ARRAY_SIZE(exynos_ioctls),

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index efa476858db5..69a5cf28b4ae 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -129,6 +129,19 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem) kfree(exynos_gem); }

+static const struct vm_operations_struct exynos_drm_gem_vm_ops = {

• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+};

Hm moving the drm_gem_cma_vm_ops into drm_gem.h or so and maybe calling them drm_gem_simple_ops or so would remove a pile of these. But perhaps a quick follow up series.

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

+static const struct drm_gem_object_funcs exynos_drm_gem_object_funcs = {

• .free = exynos_drm_gem_free_object,
• .get_sg_table = exynos_drm_gem_prime_get_sg_table,
• .vmap = exynos_drm_gem_prime_vmap,
• .vunmap = exynos_drm_gem_prime_vunmap,
• .vm_ops = &exynos_drm_gem_vm_ops,

+};

static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev, unsigned long size) { @@ -143,6 +156,8 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev, exynos_gem->size = size; obj = &exynos_gem->base;

• obj->funcs = &exynos_drm_gem_object_funcs;
• ret = drm_gem_object_init(dev, obj, size); if (ret < 0) { DRM_DEV_ERROR(dev->dev, "failed to initialize gem object\n");

-- 2.28.0

On Wed, Sep 16, 2020 at 12:36:28PM +0200, Thomas Zimmermann wrote:

Hi

Am 16.09.20 um 12:03 schrieb Daniel Vetter:

...

On Tue, Sep 15, 2020 at 04:59:41PM +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 exynos. The only exception is gem_prime_mmap, which is non-trivial to convert.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 ---------- drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index dbd80f1e4c78..fe46680ca208 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -75,11 +75,6 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) file->driver_priv = NULL; }

-static const struct vm_operations_struct exynos_drm_gem_vm_ops = {

• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

-};

static const struct drm_ioctl_desc exynos_ioctls[] = { DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, DRM_RENDER_ALLOW), @@ -124,16 +119,11 @@ static struct drm_driver exynos_drm_driver = { .open = exynos_drm_open, .lastclose = drm_fb_helper_lastclose, .postclose = exynos_drm_postclose,

• .gem_free_object_unlocked = exynos_drm_gem_free_object,
• .gem_vm_ops = &exynos_drm_gem_vm_ops, .dumb_create = exynos_drm_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_import = exynos_drm_gem_prime_import,
• .gem_prime_get_sg_table = exynos_drm_gem_prime_get_sg_table, .gem_prime_import_sg_table = exynos_drm_gem_prime_import_sg_table,
• .gem_prime_vmap = exynos_drm_gem_prime_vmap,
• .gem_prime_vunmap = exynos_drm_gem_prime_vunmap, .gem_prime_mmap = exynos_drm_gem_prime_mmap, .ioctls = exynos_ioctls, .num_ioctls = ARRAY_SIZE(exynos_ioctls),

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index efa476858db5..69a5cf28b4ae 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -129,6 +129,19 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem) kfree(exynos_gem); }

+static const struct vm_operations_struct exynos_drm_gem_vm_ops = {

• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+};

Hm moving the drm_gem_cma_vm_ops into drm_gem.h or so and maybe calling them drm_gem_simple_ops or so would remove a pile of these. But perhaps a quick follow up series.

Good idea. Several interfaces use the term 'default' in their name, so something like drm_gem_default_vm_ops seems appropriate.

Default sounds like a fine naming choice too.

BTW is there a reason why we have file operations like DEFINE_DRM_GEM_CMA_FOPS() in each module? It seems like this could also be provided by the rsp memory-manager library.

It's for the module reference counting of the underlying file. So file_operations need this. -Daniel

Best regards Thomas

...

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

...

+static const struct drm_gem_object_funcs exynos_drm_gem_object_funcs = {

• .free = exynos_drm_gem_free_object,
• .get_sg_table = exynos_drm_gem_prime_get_sg_table,
• .vmap = exynos_drm_gem_prime_vmap,
• .vunmap = exynos_drm_gem_prime_vunmap,
• .vm_ops = &exynos_drm_gem_vm_ops,

+};

static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev, unsigned long size) { @@ -143,6 +156,8 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev, exynos_gem->size = size; obj = &exynos_gem->base;

• obj->funcs = &exynos_drm_gem_object_funcs;
• ret = drm_gem_object_init(dev, obj, size); if (ret < 0) { DRM_DEV_ERROR(dev->dev, "failed to initialize gem object\n");

-- 2.28.0

-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer

On Tue, Sep 15, 2020 at 04:59:42PM +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 gma500.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

---

drivers/gpu/drm/gma500/framebuffer.c | 2 ++ drivers/gpu/drm/gma500/gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/gma500/gem.h | 3 +++ drivers/gpu/drm/gma500/psb_drv.c | 9 --------- drivers/gpu/drm/gma500/psb_drv.h | 2 -- 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 54d9876b5305..5ede24fb44ae 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -24,6 +24,7 @@ #include <drm/drm_gem_framebuffer_helper.h>

#include "framebuffer.h" +#include "gem.h" #include "gtt.h" #include "psb_drv.h" #include "psb_intel_drv.h" @@ -285,6 +286,7 @@ static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size) /* Begin by trying to use stolen memory backing */ backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1, PAGE_SIZE); if (backing) {

• backing->gem.funcs = &psb_gem_object_funcs;
  

  drm_gem_private_object_init(dev, &backing->gem, aligned_size); return backing; }

diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index f9c4b1d76f56..8f07de83b6fb 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c @@ -18,7 +18,9 @@

#include "psb_drv.h"

-void psb_gem_free_object(struct drm_gem_object *obj) +static vm_fault_t psb_gem_fault(struct vm_fault *vmf);

+static void psb_gem_free_object(struct drm_gem_object *obj) { struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);

@@ -36,6 +38,17 @@ int psb_gem_get_aperture(struct drm_device *dev, void *data, return -EINVAL; }

+static const struct vm_operations_struct psb_gem_vm_ops = {

• .fault = psb_gem_fault,
• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+};

+const struct drm_gem_object_funcs psb_gem_object_funcs = {

• .free = psb_gem_free_object,
• .vm_ops = &psb_gem_vm_ops,

+};

/**

• psb_gem_create - create a mappable object
• @file: the DRM file of the client

@@ -63,6 +76,7 @@ int psb_gem_create(struct drm_file *file, struct drm_device *dev, u64 size, dev_err(dev->dev, "no memory for %lld byte GEM object\n", size); return -ENOSPC; }

• r->gem.funcs = &psb_gem_object_funcs; /* Initialize the extra goodies GEM needs to do all the hard work */ if (drm_gem_object_init(dev, &r->gem, size) != 0) { psb_gtt_free_range(dev, r);

@@ -123,7 +137,7 @@ int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,

• vma->vm_private_data points to the GEM object that is backing this
• mapping.

*/ -vm_fault_t psb_gem_fault(struct vm_fault *vmf) +static vm_fault_t psb_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj; diff --git a/drivers/gpu/drm/gma500/gem.h b/drivers/gpu/drm/gma500/gem.h index 4a74dc623b6b..3741a711b9fd 100644 --- a/drivers/gpu/drm/gma500/gem.h +++ b/drivers/gpu/drm/gma500/gem.h @@ -8,6 +8,9 @@ #ifndef _GEM_H #define _GEM_H

+extern const struct drm_gem_object_funcs psb_gem_object_funcs;

extern int psb_gem_create(struct drm_file *file, struct drm_device *dev, u64 size, u32 *handlep, int stolen, u32 align);

#endif diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 34b4aae9a15e..b13376a6fb91 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -480,12 +480,6 @@ static const struct dev_pm_ops psb_pm_ops = { .runtime_idle = psb_runtime_idle, };

-static const struct vm_operations_struct psb_gem_vm_ops = {

• .fault = psb_gem_fault,
• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

-};

static const struct file_operations psb_gem_fops = { .owner = THIS_MODULE, .open = drm_open, @@ -507,9 +501,6 @@ static struct drm_driver driver = { .irq_uninstall = psb_irq_uninstall, .irq_handler = psb_irq_handler,

• .gem_free_object_unlocked = psb_gem_free_object,
• .gem_vm_ops = &psb_gem_vm_ops,
• .dumb_create = psb_gem_dumb_create, .ioctls = psb_ioctls, .fops = &psb_gem_fops,

diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 956926341316..c71a5a4e912c 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -735,12 +735,10 @@ extern const struct drm_connector_helper_funcs extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;

/* gem.c */ -extern void psb_gem_free_object(struct drm_gem_object *obj); extern int psb_gem_get_aperture(struct drm_device *dev, void *data, struct drm_file *file); extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev, struct drm_mode_create_dumb *args); -extern vm_fault_t psb_gem_fault(struct vm_fault *vmf);

/* psb_device.c */ extern const struct psb_ops psb_chip_ops; -- 2.28.0

On 15/09/2020 15:59, 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 i915.

v2:

• move object-function instance to i915_gem_object.c (Jani)

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 ++++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 --- drivers/gpu/drm/i915/i915_drv.c | 4 ---- .../gpu/drm/i915/selftests/mock_gem_device.c | 3 --- 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index c8421fd9d2dc..3389ac972d16 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -39,9 +39,18 @@ static struct i915_global_object { struct kmem_cache *slab_objects; } global;

+static const struct drm_gem_object_funcs i915_gem_object_funcs;

• struct drm_i915_gem_object *i915_gem_object_alloc(void) {

• return kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);

• struct drm_i915_gem_object *obj;

• obj = kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);

• if (!obj)

• return NULL;
  

• obj->base.funcs = &i915_gem_object_funcs;

• return obj; }

  void i915_gem_object_free(struct drm_i915_gem_object *obj)

@@ -101,7 +110,7 @@ void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, !(obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_WRITE); }

-void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file) +static void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file) { struct drm_i915_gem_object *obj = to_intel_bo(gem); struct drm_i915_file_private *fpriv = file->driver_priv; @@ -264,7 +273,7 @@ static void __i915_gem_free_work(struct work_struct *work) i915_gem_flush_free_objects(i915); }

-void i915_gem_free_object(struct drm_gem_object *gem_obj) +static void i915_gem_free_object(struct drm_gem_object *gem_obj) { struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); struct drm_i915_private *i915 = to_i915(obj->base.dev); @@ -403,6 +412,12 @@ int __init i915_global_objects_init(void) return 0; }

+static const struct drm_gem_object_funcs i915_gem_object_funcs = {

• .free = i915_gem_free_object,
• .close = i915_gem_close_object,
• .export = i915_gem_prime_export,

+};

• #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c"

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index d46db8d8f38e..eaf3d4147be0 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -38,9 +38,6 @@ void __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,

int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align);

-void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file); -void i915_gem_free_object(struct drm_gem_object *obj);

• void i915_gem_flush_free_objects(struct drm_i915_private *i915);

  struct sg_table *

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 94e00e450683..011a3fb41ece 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1750,12 +1750,8 @@ static struct drm_driver driver = { .lastclose = i915_driver_lastclose, .postclose = i915_driver_postclose,

• .gem_close_object = i915_gem_close_object,

• .gem_free_object_unlocked = i915_gem_free_object,

• .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,

• .gem_prime_export = i915_gem_prime_export, .gem_prime_import = i915_gem_prime_import,

  .dumb_create = i915_gem_dumb_create,

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c index f127e633f7ca..9244b5d6fb01 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c @@ -87,9 +87,6 @@ static struct drm_driver mock_driver = { .name = "mock", .driver_features = DRIVER_GEM, .release = mock_device_release,

• .gem_close_object = i915_gem_close_object,

• .gem_free_object_unlocked = i915_gem_free_object, };

  static void release_dev(struct device *dev)

Looks obviously fine.

Reviewed-by: Tvrtko Ursulin tvrtko.ursulin@intel.com

Regards,

Tvrtko

On Tue, Sep 15, 2020 at 04:59:44PM +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 mediatek. The only exception is gem_prime_mmap, which is non-trivial to convert.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ----- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 040a8f393fe2..2f8d0043fca7 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -301,18 +301,13 @@ struct drm_gem_object *mtk_drm_gem_prime_import(struct drm_device *dev, static struct drm_driver mtk_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,

• .gem_free_object_unlocked = mtk_drm_gem_free_object,

• .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = mtk_drm_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_import = mtk_drm_gem_prime_import,

• .gem_prime_get_sg_table = mtk_gem_prime_get_sg_table, .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, .gem_prime_mmap = mtk_drm_gem_mmap_buf,

• .gem_prime_vmap = mtk_drm_gem_prime_vmap,

• .gem_prime_vunmap = mtk_drm_gem_prime_vunmap, .fops = &mtk_drm_fops,

  .name = DRIVER_NAME,

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index 6190cc3b7b0d..591b90410e4a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -8,11 +8,20 @@ #include <drm/drm.h> #include <drm/drm_device.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_cma_helper.h> #include <drm/drm_prime.h>

#include "mtk_drm_drv.h" #include "mtk_drm_gem.h"

+static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs = {

• .free = mtk_drm_gem_free_object,
• .get_sg_table = mtk_gem_prime_get_sg_table,
• .vmap = mtk_drm_gem_prime_vmap,
• .vunmap = mtk_drm_gem_prime_vunmap,
• .vm_ops = &drm_gem_cma_vm_ops,

+};

static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev, unsigned long size) { @@ -25,6 +34,8 @@ static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev, if (!mtk_gem_obj) return ERR_PTR(-ENOMEM);

• mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs;
• ret = drm_gem_object_init(dev, &mtk_gem_obj->base, size); if (ret < 0) { DRM_ERROR("failed to initialize gem object\n");

-- 2.28.0

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

On Tue, Sep 15, 2020 at 04:59:45PM +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 msm. The only exception is gem_prime_mmap, which is non-trivial to convert.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

---

drivers/gpu/drm/msm/msm_drv.c | 13 ------------- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_gem.c | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 79333842f70a..5952767ea478 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -978,12 +978,6 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), };

-static const struct vm_operations_struct vm_ops = {

• .fault = msm_gem_fault,
• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

-};

static const struct file_operations fops = { .owner = THIS_MODULE, .open = drm_open, @@ -1009,18 +1003,11 @@ static struct drm_driver msm_driver = { .irq_preinstall = msm_irq_preinstall, .irq_postinstall = msm_irq_postinstall, .irq_uninstall = msm_irq_uninstall,

• .gem_free_object_unlocked = msm_gem_free_object,
• .gem_vm_ops = &vm_ops, .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_gem_dumb_map_offset, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
• .gem_prime_pin = msm_gem_prime_pin,
• .gem_prime_unpin = msm_gem_prime_unpin,
• .gem_prime_get_sg_table = msm_gem_prime_get_sg_table, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table,
• .gem_prime_vmap = msm_gem_prime_vmap,
• .gem_prime_vunmap = msm_gem_prime_vunmap, .gem_prime_mmap = msm_gem_prime_mmap,

#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init, diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index af259b0573ea..7bcea10be81f 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -269,7 +269,6 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev); int msm_gem_mmap_obj(struct drm_gem_object *obj, struct vm_area_struct *vma); int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma); -vm_fault_t msm_gem_fault(struct vm_fault *vmf); uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); int msm_gem_get_iova(struct drm_gem_object *obj, struct msm_gem_address_space *aspace, uint64_t *iova); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index b4553caaa196..de915ff6f4b4 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -247,7 +247,7 @@ int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma) return msm_gem_mmap_obj(vma->vm_private_data, vma); }

-vm_fault_t msm_gem_fault(struct vm_fault *vmf) +static vm_fault_t msm_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; @@ -994,6 +994,22 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, return ret; }

+static const struct vm_operations_struct vm_ops = {

• .fault = msm_gem_fault,
• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+};

+static const struct drm_gem_object_funcs msm_gem_object_funcs = {

• .free = msm_gem_free_object,
• .pin = msm_gem_prime_pin,
• .unpin = msm_gem_prime_unpin,
• .get_sg_table = msm_gem_prime_get_sg_table,
• .vmap = msm_gem_prime_vmap,
• .vunmap = msm_gem_prime_vunmap,
• .vm_ops = &vm_ops,

+};

static int msm_gem_new_impl(struct drm_device *dev, uint32_t size, uint32_t flags, struct drm_gem_object **obj) @@ -1024,6 +1040,7 @@ static int msm_gem_new_impl(struct drm_device *dev, INIT_LIST_HEAD(&msm_obj->vmas);

*obj = &msm_obj->base;

• (*obj)->funcs = &msm_gem_object_funcs;

  return 0;

}

2.28.0

On Tue, Sep 15, 2020 at 04:59:46PM +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 nouveau.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

Hm ttm and gem mmap world still quite disjoint ... Anyway that's an entirely different thing.

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

---

drivers/gpu/drm/nouveau/nouveau_drm.c | 9 --------- drivers/gpu/drm/nouveau/nouveau_gem.c | 13 +++++++++++++ drivers/gpu/drm/nouveau/nouveau_gem.h | 2 ++ drivers/gpu/drm/nouveau/nouveau_prime.c | 2 ++ 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 42fc5c813a9b..72640bca1617 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -1207,16 +1207,7 @@ driver_stub = {

.prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,

• .gem_prime_pin = nouveau_gem_prime_pin,

• .gem_prime_unpin = nouveau_gem_prime_unpin,

• .gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table, .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table,

• .gem_prime_vmap = nouveau_gem_prime_vmap,

• .gem_prime_vunmap = nouveau_gem_prime_vunmap,

• .gem_free_object_unlocked = nouveau_gem_object_del,

• .gem_open_object = nouveau_gem_object_open,

• .gem_close_object = nouveau_gem_object_close,

  .dumb_create = nouveau_display_dumb_create, .dumb_map_offset = nouveau_display_dumb_map_offset,

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 89adadf4706b..28e0cbb00876 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -169,6 +169,17 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) ttm_bo_unreserve(&nvbo->bo); }

+const struct drm_gem_object_funcs nouveau_gem_object_funcs = {

• .free = nouveau_gem_object_del,
• .open = nouveau_gem_object_open,
• .close = nouveau_gem_object_close,
• .pin = nouveau_gem_prime_pin,
• .unpin = nouveau_gem_prime_unpin,
• .get_sg_table = nouveau_gem_prime_get_sg_table,
• .vmap = nouveau_gem_prime_vmap,
• .vunmap = nouveau_gem_prime_vunmap,

+};

int nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, uint32_t tile_mode, uint32_t tile_flags, @@ -186,6 +197,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, if (IS_ERR(nvbo)) return PTR_ERR(nvbo);

• nvbo->bo.base.funcs = &nouveau_gem_object_funcs;
• /* Initialize the embedded gem-object. We return a single gem-reference
  • to the caller, instead of a normal nouveau_bo ttm reference. */
  ret = drm_gem_object_init(drm->dev, &nvbo->bo.base, size);

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h b/drivers/gpu/drm/nouveau/nouveau_gem.h index 978e07591990..b35c180322e2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.h +++ b/drivers/gpu/drm/nouveau/nouveau_gem.h @@ -5,6 +5,8 @@ #include "nouveau_drv.h" #include "nouveau_bo.h"

+extern const struct drm_gem_object_funcs nouveau_gem_object_funcs;

static inline struct nouveau_bo * nouveau_gem_object(struct drm_gem_object *gem) { diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index b2ecb91f8ddc..a8264aebf3d4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -77,6 +77,8 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,

nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_GART;

• nvbo->bo.base.funcs = &nouveau_gem_object_funcs;
• /* Initialize the embedded gem-object. We return a single gem-reference
  • to the caller, instead of a normal nouveau_bo ttm reference. */
  ret = drm_gem_object_init(dev, &nvbo->bo.base, size);

-- 2.28.0

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.
  */

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@suse.de

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

---

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

Hi Thomas,

Thank you for the patch.

On Tue, Sep 15, 2020 at 04:59:57PM +0200, Thomas Zimmermann wrote:

The xlnx driver uses CMA helpers with default callback functions. Initialize the driver structure with the rsp CMA helper macro. The driver is being converted to use GEM object functions as part of this change.

Two callbacks, .dumb_destroy and .gem_prime_import, were initialized to their default implementations, so they are just kept empty now.

v2:

• initialize with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (Laurent)

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com

---

drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c index 8e69303aad3f..f3ffc3703a0e 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c @@ -80,19 +80,7 @@ static struct drm_driver zynqmp_dpsub_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,

• .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
• .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
• .gem_prime_export = drm_gem_prime_export,
• .gem_prime_import = drm_gem_prime_import,
• .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
• .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
• .gem_prime_vmap = drm_gem_cma_prime_vmap,
• .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
• .gem_prime_mmap = drm_gem_cma_prime_mmap,
• .gem_free_object_unlocked = drm_gem_cma_free_object,
• .gem_vm_ops = &drm_gem_cma_vm_ops,
• .dumb_create = zynqmp_dpsub_dumb_create,
• .dumb_destroy = drm_gem_dumb_destroy,

• DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(zynqmp_dpsub_dumb_create),

  .fops = &zynqmp_dpsub_drm_fops,

Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:

Several GEM and PRIME callbacks have been deprecated in favor of per-instance GEM object functions. Remove the callbacks as they are now unused. The only exception is .gem_prime_mmap, which is still in use by several drivers.

What is also gone is gem_vm_ops in struct drm_driver. All drivers now use struct drm_gem_object_funcs.vm_ops instead.

While at it, the patch also improves error handling around calls to .free and .get_sg_table callbacks.

v2:

• update related TODO item (Sam)

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

Documentation/gpu/todo.rst | 7 +-- drivers/gpu/drm/drm_gem.c | 35 +++--------- drivers/gpu/drm/drm_gem_cma_helper.c | 6 +- drivers/gpu/drm/drm_prime.c | 17 +++--- include/drm/drm_drv.h | 85 ++-------------------------- 5 files changed, 25 insertions(+), 125 deletions(-)

diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst index b0ea17da8ff6..0fc6bc222392 100644 --- a/Documentation/gpu/todo.rst +++ b/Documentation/gpu/todo.rst @@ -289,11 +289,8 @@ struct drm_gem_object_funcs

---

GEM objects can now have a function table instead of having the callbacks on the -DRM driver struct. This is now the preferred way and drivers can be moved over.

-We also need a 2nd version of the CMA define that doesn't require the -vmapping to be present (different hook for prime importing). Plus this needs to -be rolled out to all drivers using their own implementations, too. +DRM driver struct. This is now the preferred way. Callbacks in drivers have been +converted, except for struct drm_driver.gem_prime_mmap.

Level: Intermediate

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 19d73868490e..96945bed8291 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -247,12 +247,9 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) { struct drm_file *file_priv = data; struct drm_gem_object *obj = ptr;

• struct drm_device *dev = obj->dev;

  if (obj->funcs && obj->funcs->close) obj->funcs->close(obj, file_priv);

• else if (dev->driver->gem_close_object)

• dev->driver->gem_close_object(obj, file_priv);
  
  

  drm_gem_remove_prime_handles(obj, file_priv); drm_vma_node_revoke(&obj->vma_node, file_priv);

@@ -407,10 +404,6 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, ret = obj->funcs->open(obj, file_priv); if (ret) goto err_revoke;

• } else if (dev->driver->gem_open_object) {

• ret = dev->driver->gem_open_object(obj, file_priv);
  

• if (ret)
  

• 	goto err_revoke;
  

  }

  *handlep = handle;

@@ -982,12 +975,11 @@ drm_gem_object_free(struct kref *kref) { struct drm_gem_object *obj = container_of(kref, struct drm_gem_object, refcount);

• struct drm_device *dev = obj->dev;

• if (obj->funcs)

• obj->funcs->free(obj);
  

• else if (dev->driver->gem_free_object_unlocked)

• dev->driver->gem_free_object_unlocked(obj);
  

• if (drm_WARN_ON_ONCE(obj->dev, !obj->funcs || !obj->funcs->free))

• return;
  

• obj->funcs->free(obj);

} EXPORT_SYMBOL(drm_gem_object_free);

@@ -1049,9 +1041,9 @@ EXPORT_SYMBOL(drm_gem_vm_close);

• @obj_size: the object size to be mapped, in bytes
• @vma: VMA for the area to be mapped

• • Set up the VMA to prepare mapping of the GEM object using the gem_vm_ops
• • provided by the driver. Depending on their requirements, drivers can either
• • provide a fault handler in their gem_vm_ops (in which case any accesses to

• • Set up the VMA to prepare mapping of the GEM object using the GEM object's
• • vm_ops. Depending on their requirements, GEM objects can either
• • provide a fault handler in their vm_ops (in which case any accesses to
  • the object will be trapped, to perform migration, GTT binding, surface
  • register allocation, or performance monitoring), or mmap the buffer memory
  • synchronously after calling drm_gem_mmap_obj.

@@ -1065,12 +1057,11 @@ EXPORT_SYMBOL(drm_gem_vm_close);

• callers must verify access restrictions before calling this helper.
• Return 0 or success or -EINVAL if the object size is smaller than the VMA

• • size, or if no gem_vm_ops are provided.

• • size, or if no vm_ops are provided.
  */

int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, struct vm_area_struct *vma) {

• struct drm_device *dev = obj->dev; int ret;

  /* Check for valid size. */

@@ -1095,8 +1086,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, } else { if (obj->funcs && obj->funcs->vm_ops) vma->vm_ops = obj->funcs->vm_ops;

• else if (dev->driver->gem_vm_ops)
  

• 	vma->vm_ops = dev->driver->gem_vm_ops;
  

  else { drm_gem_object_put(obj); return -EINVAL;

@@ -1206,8 +1195,6 @@ int drm_gem_pin(struct drm_gem_object *obj) { if (obj->funcs && obj->funcs->pin) return obj->funcs->pin(obj);

• else if (obj->dev->driver->gem_prime_pin)

• return obj->dev->driver->gem_prime_pin(obj);
  

  else return 0;

} @@ -1216,8 +1203,6 @@ void drm_gem_unpin(struct drm_gem_object *obj) { if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin(obj);

• else if (obj->dev->driver->gem_prime_unpin)

• obj->dev->driver->gem_prime_unpin(obj);
  

}

void *drm_gem_vmap(struct drm_gem_object *obj) @@ -1226,8 +1211,6 @@ void *drm_gem_vmap(struct drm_gem_object *obj)

if (obj->funcs && obj->funcs->vmap) vaddr = obj->funcs->vmap(obj);

• else if (obj->dev->driver->gem_prime_vmap)

• vaddr = obj->dev->driver->gem_prime_vmap(obj);
  

  else vaddr = ERR_PTR(-EOPNOTSUPP);

@@ -1244,8 +1227,6 @@ void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)

if (obj->funcs && obj->funcs->vunmap) obj->funcs->vunmap(obj, vaddr);

• else if (obj->dev->driver->gem_prime_vunmap)

• obj->dev->driver->gem_prime_vunmap(obj, vaddr);
  

}

/** diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 822edeadbab3..209202257cc2 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -419,7 +419,7 @@ EXPORT_SYMBOL(drm_gem_cma_print_info);

• This function exports a scatter/gather table suitable for PRIME usage by
• calling the standard DMA mapping API. Drivers using the CMA helpers should

• • set this as their &drm_driver.gem_prime_get_sg_table callback.

• • set this as their &drm_gem_object_funcs.get_sg_table callback.
  • Returns:
  • A pointer to the scatter/gather table of pinned pages or NULL on failure.

@@ -542,7 +542,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_mmap);

• virtual address space. Since the CMA buffers are already mapped into the
• kernel virtual address space this simply returns the cached virtual
• address. Drivers using the CMA helpers should set this as their DRM

• • driver's &drm_driver.gem_prime_vmap callback.

• • driver's &drm_gem_object_funcs.vmap callback.
  • Returns:
  • The kernel virtual address of the CMA GEM object's backing store.

@@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_vmap);

• This function removes a buffer exported via DRM PRIME from the kernel's
• virtual address space. This is a no-op because CMA buffers cannot be
• unmapped from kernel space. Drivers using the CMA helpers should set this

• • as their &drm_driver.gem_prime_vunmap callback.

• • as their &drm_gem_object_funcs.vunmap callback.
  */

void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) { diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 8a6a3c99b7d8..1cffb004d3c8 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -386,10 +386,6 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,

if (obj->funcs && obj->funcs->export) dmabuf = obj->funcs->export(obj, flags);

• else if (dev->driver->gem_prime_export)

• dmabuf = dev->driver->gem_prime_export(obj, flags);
  

• else

• dmabuf = drm_gem_prime_export(obj, flags);
  

Oops, these two lines were not supposed to be removed. They'll return in v3 of the patchset. That will also fix the error report that was posted by the CI. [1]

Best regards Thomas

[1] https://lore.kernel.org/intel-gfx/160018797587.30601.1382075328491651866@eme...

if (IS_ERR(dmabuf)) { /* normally the created dma-buf takes ownership of the ref, * but if that fails then drop the ref @@ -419,7 +415,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,

• This is the PRIME export function which must be used mandatorily by GEM
• drivers to ensure correct lifetime management of the underlying GEM object.
• The actual exporting from GEM object to a dma-buf is done through the

• • &drm_driver.gem_prime_export driver callback.

• • &drm_gem_object_funcs.export callback.
  */

int drm_gem_prime_handle_to_fd(struct drm_device *dev, struct drm_file *file_priv, uint32_t handle, @@ -616,15 +612,18 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, enum dma_data_direction dir) { struct drm_gem_object *obj = attach->dmabuf->priv;

• struct sg_table *sgt;

• struct sg_table *sgt = NULL;

  if (WARN_ON(dir == DMA_NONE)) return ERR_PTR(-EINVAL);

• if (obj->funcs)

• if (obj->funcs && obj->funcs->get_sg_table) sgt = obj->funcs->get_sg_table(obj);

• else

• sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
  

• if (!sgt)

• return ERR_PTR(-EINVAL);
  

• else if (IS_ERR(sgt))

• return sgt;
  
  

  if (!dma_map_sg_attrs(attach->dev, sgt->sgl, sgt->nents, dir, DMA_ATTR_SKIP_CPU_SYNC)) {

diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 9b11a2f0babc..240b0eab8018 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -36,10 +36,12 @@ struct drm_file; struct drm_gem_object; struct drm_master; struct drm_minor; +struct dma_buf; struct dma_buf_attachment; struct drm_display_mode; struct drm_mode_create_dumb; struct drm_printer; +struct sg_table;

/**

• enum drm_driver_feature - feature flags

@@ -326,32 +328,6 @@ struct drm_driver { */ void (*debugfs_init)(struct drm_minor *minor);

• /**

• * @gem_free_object_unlocked: deconstructor for drm_gem_objects
  

• *
  

• * This is deprecated and should not be used by new drivers. Use
  

• * &drm_gem_object_funcs.free instead.
  

• */
  

• void (*gem_free_object_unlocked) (struct drm_gem_object *obj);
• /**

• * @gem_open_object:
  

• *
  

• * This callback is deprecated in favour of &drm_gem_object_funcs.open.
  

• *
  

• * Driver hook called upon gem handle creation
  

• */
  

• int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
• /**

• * @gem_close_object:
  

• *
  

• * This callback is deprecated in favour of &drm_gem_object_funcs.close.
  

• *
  

• * Driver hook called upon gem handle release
  

• */
  

• void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
• /**
  • @gem_create_object: constructor for gem objects

@@ -360,6 +336,7 @@ struct drm_driver { */ struct drm_gem_object *(*gem_create_object)(struct drm_device *dev, size_t size);

• /**
  • @prime_handle_to_fd:

@@ -382,14 +359,7 @@ struct drm_driver { */ int (*prime_fd_to_handle)(struct drm_device *dev, struct drm_file *file_priv, int prime_fd, uint32_t *handle);

• /**

• * @gem_prime_export:
  

• *
  

• * Export hook for GEM drivers. Deprecated in favour of
  

• * &drm_gem_object_funcs.export.
  

• */
  

• struct dma_buf * (*gem_prime_export)(struct drm_gem_object *obj,

• 			     int flags);
  

• /**
  • @gem_prime_import:

@@ -399,29 +369,6 @@ struct drm_driver { */ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev, struct dma_buf *dma_buf);

• /**

• * @gem_prime_pin:
  

• *
  

• * Deprecated hook in favour of &drm_gem_object_funcs.pin.
  

• */
  

• int (*gem_prime_pin)(struct drm_gem_object *obj);
• /**

• * @gem_prime_unpin:
  

• *
  

• * Deprecated hook in favour of &drm_gem_object_funcs.unpin.
  

• */
  

• void (*gem_prime_unpin)(struct drm_gem_object *obj);
• /**

• * @gem_prime_get_sg_table:
  

• *
  

• * Deprecated hook in favour of &drm_gem_object_funcs.get_sg_table.
  

• */
  

• struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj);
• /**
  • @gem_prime_import_sg_table:

@@ -432,22 +379,6 @@ struct drm_driver { struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt);

• /**

• * @gem_prime_vmap:
  

• *
  

• * Deprecated vmap hook for GEM drivers. Please use
  

• * &drm_gem_object_funcs.vmap instead.
  

• */
  

• void *(*gem_prime_vmap)(struct drm_gem_object *obj);
• /**

• * @gem_prime_vunmap:
  

• *
  

• * Deprecated vunmap hook for GEM drivers. Please use
  

• * &drm_gem_object_funcs.vunmap instead.
  

• */
  

• void (*gem_prime_vunmap)(struct drm_gem_object *obj, void *vaddr);
• /**
  • @gem_prime_mmap:

@@ -522,14 +453,6 @@ struct drm_driver { struct drm_device *dev, uint32_t handle);

• /**

• * @gem_vm_ops: Driver private ops for this object
  

• *
  

• * For GEM drivers this is deprecated in favour of
  

• * &drm_gem_object_funcs.vm_ops.
  

• */
  

• const struct vm_operations_struct *gem_vm_ops;
• /** @major: driver major number */ int major; /** @minor: driver minor number */