* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-19 5:53 kernel test robot
0 siblings, 0 replies; 23+ messages in thread
From: kernel test robot @ 2020-09-19 5:53 UTC (permalink / raw)
To: kbuild
[-- Attachment #1: Type: text/plain, Size: 4574 bytes --]
CC: kbuild-all(a)lists.01.org
In-Reply-To: <20200915145958.19993-22-tzimmermann@suse.de>
References: <20200915145958.19993-22-tzimmermann@suse.de>
TO: Thomas Zimmermann <tzimmermann@suse.de>
TO: alexander.deucher(a)amd.com
TO: christian.koenig(a)amd.com
TO: airlied(a)linux.ie
TO: daniel(a)ffwll.ch
TO: linux(a)armlinux.org.uk
TO: maarten.lankhorst(a)linux.intel.com
TO: mripard(a)kernel.org
TO: l.stach(a)pengutronix.de
TO: christian.gmeiner(a)gmail.com
TO: inki.dae(a)samsung.com
Hi Thomas,
I love your patch! Perhaps something to improve:
[auto build test WARNING on next-20200915]
[cannot apply to drm-intel/for-linux-next arm/drm-armada-devel linus/master arm/drm-armada-fixes anholt/for-next v5.9-rc5 v5.9-rc4 v5.9-rc3 v5.9-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
base: 6b02addb1d1748d21dd1261e46029b264be4e5a0
:::::: branch date: 4 days ago
:::::: commit date: 4 days ago
config: i386-randconfig-m021-20200917 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
New smatch warnings:
drivers/gpu/drm/drm_prime.c:389 export_and_register_object() error: uninitialized symbol 'dmabuf'.
Old smatch warnings:
drivers/gpu/drm/drm_prime.c:359 drm_gem_prime_fd_to_handle() warn: inconsistent returns 'dev->object_name_lock'.
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +/dmabuf +389 drivers/gpu/drm/drm_prime.c
89177644a7b630 Aaron Plattner 2013-01-15 374
319c933c71f3db Daniel Vetter 2013-08-15 375 static struct dma_buf *export_and_register_object(struct drm_device *dev,
319c933c71f3db Daniel Vetter 2013-08-15 376 struct drm_gem_object *obj,
319c933c71f3db Daniel Vetter 2013-08-15 377 uint32_t flags)
319c933c71f3db Daniel Vetter 2013-08-15 378 {
319c933c71f3db Daniel Vetter 2013-08-15 379 struct dma_buf *dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 380
319c933c71f3db Daniel Vetter 2013-08-15 381 /* prevent races with concurrent gem_close. */
319c933c71f3db Daniel Vetter 2013-08-15 382 if (obj->handle_count == 0) {
319c933c71f3db Daniel Vetter 2013-08-15 383 dmabuf = ERR_PTR(-ENOENT);
319c933c71f3db Daniel Vetter 2013-08-15 384 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 385 }
319c933c71f3db Daniel Vetter 2013-08-15 386
b39b5394fabc79 Noralf Trønnes 2018-11-10 387 if (obj->funcs && obj->funcs->export)
b39b5394fabc79 Noralf Trønnes 2018-11-10 388 dmabuf = obj->funcs->export(obj, flags);
319c933c71f3db Daniel Vetter 2013-08-15 @389 if (IS_ERR(dmabuf)) {
319c933c71f3db Daniel Vetter 2013-08-15 390 /* normally the created dma-buf takes ownership of the ref,
319c933c71f3db Daniel Vetter 2013-08-15 391 * but if that fails then drop the ref
319c933c71f3db Daniel Vetter 2013-08-15 392 */
319c933c71f3db Daniel Vetter 2013-08-15 393 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 394 }
319c933c71f3db Daniel Vetter 2013-08-15 395
319c933c71f3db Daniel Vetter 2013-08-15 396 /*
319c933c71f3db Daniel Vetter 2013-08-15 397 * Note that callers do not need to clean up the export cache
319c933c71f3db Daniel Vetter 2013-08-15 398 * since the check for obj->handle_count guarantees that someone
319c933c71f3db Daniel Vetter 2013-08-15 399 * will clean it up.
319c933c71f3db Daniel Vetter 2013-08-15 400 */
319c933c71f3db Daniel Vetter 2013-08-15 401 obj->dma_buf = dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 402 get_dma_buf(obj->dma_buf);
319c933c71f3db Daniel Vetter 2013-08-15 403
319c933c71f3db Daniel Vetter 2013-08-15 404 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 405 }
319c933c71f3db Daniel Vetter 2013-08-15 406
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 34183 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
2020-09-15 14:59 ` Thomas Zimmermann
@ 2020-09-21 8:11 ` Dan Carpenter
-1 siblings, 0 replies; 23+ messages in thread
From: Dan Carpenter @ 2020-09-21 8:11 UTC (permalink / raw)
To: kbuild
[-- Attachment #1: Type: text/plain, Size: 3589 bytes --]
Hi Thomas,
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
base: 6b02addb1d1748d21dd1261e46029b264be4e5a0
config: i386-randconfig-m021-20200917 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
New smatch warnings:
drivers/gpu/drm/drm_prime.c:389 export_and_register_object() error: uninitialized symbol 'dmabuf'.
Old smatch warnings:
drivers/gpu/drm/drm_prime.c:359 drm_gem_prime_fd_to_handle() warn: inconsistent returns 'dev->object_name_lock'.
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +/dmabuf +389 drivers/gpu/drm/drm_prime.c
319c933c71f3db Daniel Vetter 2013-08-15 375 static struct dma_buf *export_and_register_object(struct drm_device *dev,
319c933c71f3db Daniel Vetter 2013-08-15 376 struct drm_gem_object *obj,
319c933c71f3db Daniel Vetter 2013-08-15 377 uint32_t flags)
319c933c71f3db Daniel Vetter 2013-08-15 378 {
319c933c71f3db Daniel Vetter 2013-08-15 379 struct dma_buf *dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 380
319c933c71f3db Daniel Vetter 2013-08-15 381 /* prevent races with concurrent gem_close. */
319c933c71f3db Daniel Vetter 2013-08-15 382 if (obj->handle_count == 0) {
319c933c71f3db Daniel Vetter 2013-08-15 383 dmabuf = ERR_PTR(-ENOENT);
319c933c71f3db Daniel Vetter 2013-08-15 384 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 385 }
319c933c71f3db Daniel Vetter 2013-08-15 386
b39b5394fabc79 Noralf Trønnes 2018-11-10 387 if (obj->funcs && obj->funcs->export)
b39b5394fabc79 Noralf Trønnes 2018-11-10 388 dmabuf = obj->funcs->export(obj, flags);
dmabuf is not initialized on else path.
319c933c71f3db Daniel Vetter 2013-08-15 @389 if (IS_ERR(dmabuf)) {
^^^^^^^^^^^^^^
319c933c71f3db Daniel Vetter 2013-08-15 390 /* normally the created dma-buf takes ownership of the ref,
319c933c71f3db Daniel Vetter 2013-08-15 391 * but if that fails then drop the ref
319c933c71f3db Daniel Vetter 2013-08-15 392 */
319c933c71f3db Daniel Vetter 2013-08-15 393 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 394 }
319c933c71f3db Daniel Vetter 2013-08-15 395
319c933c71f3db Daniel Vetter 2013-08-15 396 /*
319c933c71f3db Daniel Vetter 2013-08-15 397 * Note that callers do not need to clean up the export cache
319c933c71f3db Daniel Vetter 2013-08-15 398 * since the check for obj->handle_count guarantees that someone
319c933c71f3db Daniel Vetter 2013-08-15 399 * will clean it up.
319c933c71f3db Daniel Vetter 2013-08-15 400 */
319c933c71f3db Daniel Vetter 2013-08-15 401 obj->dma_buf = dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 402 get_dma_buf(obj->dma_buf);
319c933c71f3db Daniel Vetter 2013-08-15 403
319c933c71f3db Daniel Vetter 2013-08-15 404 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 405 }
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 34183 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-21 8:11 ` Dan Carpenter
0 siblings, 0 replies; 23+ messages in thread
From: Dan Carpenter @ 2020-09-21 8:11 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3589 bytes --]
Hi Thomas,
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
base: 6b02addb1d1748d21dd1261e46029b264be4e5a0
config: i386-randconfig-m021-20200917 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
New smatch warnings:
drivers/gpu/drm/drm_prime.c:389 export_and_register_object() error: uninitialized symbol 'dmabuf'.
Old smatch warnings:
drivers/gpu/drm/drm_prime.c:359 drm_gem_prime_fd_to_handle() warn: inconsistent returns 'dev->object_name_lock'.
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +/dmabuf +389 drivers/gpu/drm/drm_prime.c
319c933c71f3db Daniel Vetter 2013-08-15 375 static struct dma_buf *export_and_register_object(struct drm_device *dev,
319c933c71f3db Daniel Vetter 2013-08-15 376 struct drm_gem_object *obj,
319c933c71f3db Daniel Vetter 2013-08-15 377 uint32_t flags)
319c933c71f3db Daniel Vetter 2013-08-15 378 {
319c933c71f3db Daniel Vetter 2013-08-15 379 struct dma_buf *dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 380
319c933c71f3db Daniel Vetter 2013-08-15 381 /* prevent races with concurrent gem_close. */
319c933c71f3db Daniel Vetter 2013-08-15 382 if (obj->handle_count == 0) {
319c933c71f3db Daniel Vetter 2013-08-15 383 dmabuf = ERR_PTR(-ENOENT);
319c933c71f3db Daniel Vetter 2013-08-15 384 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 385 }
319c933c71f3db Daniel Vetter 2013-08-15 386
b39b5394fabc79 Noralf Trønnes 2018-11-10 387 if (obj->funcs && obj->funcs->export)
b39b5394fabc79 Noralf Trønnes 2018-11-10 388 dmabuf = obj->funcs->export(obj, flags);
dmabuf is not initialized on else path.
319c933c71f3db Daniel Vetter 2013-08-15 @389 if (IS_ERR(dmabuf)) {
^^^^^^^^^^^^^^
319c933c71f3db Daniel Vetter 2013-08-15 390 /* normally the created dma-buf takes ownership of the ref,
319c933c71f3db Daniel Vetter 2013-08-15 391 * but if that fails then drop the ref
319c933c71f3db Daniel Vetter 2013-08-15 392 */
319c933c71f3db Daniel Vetter 2013-08-15 393 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 394 }
319c933c71f3db Daniel Vetter 2013-08-15 395
319c933c71f3db Daniel Vetter 2013-08-15 396 /*
319c933c71f3db Daniel Vetter 2013-08-15 397 * Note that callers do not need to clean up the export cache
319c933c71f3db Daniel Vetter 2013-08-15 398 * since the check for obj->handle_count guarantees that someone
319c933c71f3db Daniel Vetter 2013-08-15 399 * will clean it up.
319c933c71f3db Daniel Vetter 2013-08-15 400 */
319c933c71f3db Daniel Vetter 2013-08-15 401 obj->dma_buf = dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 402 get_dma_buf(obj->dma_buf);
319c933c71f3db Daniel Vetter 2013-08-15 403
319c933c71f3db Daniel Vetter 2013-08-15 404 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 405 }
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 34183 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
2020-09-15 14:59 ` Thomas Zimmermann
` (3 preceding siblings ...)
(?)
@ 2020-09-16 17:55 ` Thomas Zimmermann
-1 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-16 17:55 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, nouveau, linux-tegra,
xen-devel, freedreno, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 14578 bytes --]
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@emeril.freedesktop.org/
> 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 */
>
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 17:55 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-16 17:55 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, nouveau, linux-tegra,
xen-devel, freedreno, linux-arm-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 14578 bytes --]
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@emeril.freedesktop.org/
> 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 */
>
--
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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 17:55 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-16 17:55 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, nouveau, linux-tegra,
xen-devel, freedreno, linux-arm-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 14578 bytes --]
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@emeril.freedesktop.org/
> 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 */
>
--
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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 17:55 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-16 17:55 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, nouveau, linux-tegra,
xen-devel, freedreno, linux-arm-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 14578 bytes --]
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@emeril.freedesktop.org/
> 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 */
>
--
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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 17:55 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-16 17:55 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, nouveau, linux-tegra,
xen-devel, freedreno, linux-arm-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 14578 bytes --]
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@emeril.freedesktop.org/
> 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 */
>
--
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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 17:55 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-16 17:55 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, nouveau, linux-tegra,
xen-devel, freedreno, linux-arm-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 14578 bytes --]
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@emeril.freedesktop.org/
> 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 */
>
--
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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 12:12 ` Daniel Vetter
0 siblings, 0 replies; 23+ messages in thread
From: Daniel Vetter @ 2020-09-16 12:12 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov, amd-gfx, dri-devel, etnaviv,
linux-arm-kernel, linux-samsung-soc, intel-gfx, linux-mediatek,
linux-arm-msm, freedreno, nouveau, linux-rockchip, linux-tegra,
xen-devel
On Tue, Sep 15, 2020 at 04:59:58PM +0200, Thomas Zimmermann wrote:
> 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>
Nice work!
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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);
> 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 */
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 12:12 ` Daniel Vetter
0 siblings, 0 replies; 23+ messages in thread
From: Daniel Vetter @ 2020-09-16 12:12 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: hamohammed.sa-Re5JQEeQqe8AvxtiuMwx3w,
heiko-4mtYJXux2i+zQB+pC5nmwQ, andrey.grodzovsky-5C7GfCeVMHo,
airlied-cv59FeDIM0c, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
joonas.lahtinen-VuQAYsv1563Yd54FQh9/CA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
michal.simek-gjFFaj9aHVfQT0dZR+AlfA, eric-WhKQ6XTQaPysTnJN9+BGXg,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
robdclark-Re5JQEeQqe8AvxtiuMwx3w, krzk-DgEjT+Ai2ygdnm+yROfE0A,
sam-uyr5N9Q2VtJg9hUCZPvPmw, sumit.semwal-QSEj5FYQhm4dnm+yROfE0A,
emil.velikov-ZGY8ohtN/8qB+jHODAdFcQ,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
jy0922.shim-Sze3O3UU22JBDgjK7y7TUQ,
oleksandr_andrushchenko-uRwfk40T5oI, tomi.valkeinen-l0cyMroinI0,
linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-I+IVW8TIWO2tmTQ+vhA3Yw,
patrik.r.jakobsson-Re5JQEeQqe8AvxtiuMwx3w,
jonathanh-DDmLM1+adcrQT0dZR+AlfA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
kgene-DgEjT+Ai2ygdnm+yROfE0A, bskeggs-H+wXaHxf7aLQT0dZR+AlfA,
xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b,
miaoqinglang-hv44wF8Li93QT0dZR+AlfA,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
matthew.auld-ral2JQCrhuEAvxtiuMwx3w,
chunkuang.hu-DgEjT+Ai2ygdnm+yROfE0A,
andi.shyti-ral2JQCrhuEAvxtiuMwx3w, daniel-/w4YWyX8dFk,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, marek.olsak
On Tue, Sep 15, 2020 at 04:59:58PM +0200, Thomas Zimmermann wrote:
> 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-l3A5Bk7waGM@public.gmane.org>
Nice work!
Acked-by: Daniel Vetter <daniel.vetter-/w4YWyX8dFk@public.gmane.org>
> ---
> 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);
> 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 */
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 12:12 ` Daniel Vetter
0 siblings, 0 replies; 23+ messages in thread
From: Daniel Vetter @ 2020-09-16 12:12 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: hamohammed.sa, heiko, andrey.grodzovsky, airlied, nouveau,
joonas.lahtinen, dri-devel, michal.simek, eric, thierry.reding,
robdclark, krzk, sam, sumit.semwal, emil.velikov,
linux-samsung-soc, jy0922.shim, oleksandr_andrushchenko,
tomi.valkeinen, linux-tegra, linux, patrik.r.jakobsson,
jonathanh, linux-rockchip, kgene, bskeggs, xen-devel,
miaoqinglang, intel-gfx, matthew.auld, chunkuang.hu, andi.shyti,
daniel, linux-arm-msm, marek.olsak, tianci.yin,
maarten.lankhorst, etnaviv, jani.nikula, inki.dae, hdegoede,
christian.gmeiner, linux-mediatek, mripard, rodrigo.vivi,
matthias.bgg, evan.quan, sean, linux-arm-kernel, tvrtko.ursulin,
amd-gfx, laurent.pinchart, hyun.kwon, rodrigosiqueiramelo,
aaron.liu, Felix.Kuehling, xinhui.pan, sw0312.kim, hjc, chris,
kyungmin.park, nirmoy.das, p.zabel, alexander.deucher,
Hawking.Zhang, freedreno, christian.koenig, l.stach
On Tue, Sep 15, 2020 at 04:59:58PM +0200, Thomas Zimmermann wrote:
> 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>
Nice work!
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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);
> 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 */
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 12:12 ` Daniel Vetter
0 siblings, 0 replies; 23+ messages in thread
From: Daniel Vetter @ 2020-09-16 12:12 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: hamohammed.sa, heiko, andrey.grodzovsky, airlied, nouveau,
joonas.lahtinen, dri-devel, michal.simek, eric, thierry.reding,
robdclark, krzk, sam, sumit.semwal, emil.velikov,
linux-samsung-soc, jy0922.shim, oleksandr_andrushchenko,
tomi.valkeinen, linux-tegra, linux, patrik.r.jakobsson,
jonathanh, linux-rockchip, kgene, bskeggs, xen-devel,
miaoqinglang, intel-gfx, matthew.auld, chunkuang.hu, andi.shyti,
daniel, linux-arm-msm, marek.olsak, tianci.yin,
maarten.lankhorst, etnaviv, jani.nikula, inki.dae, hdegoede,
christian.gmeiner, linux-mediatek, mripard, rodrigo.vivi,
matthias.bgg, evan.quan, sean, linux-arm-kernel, tvrtko.ursulin,
amd-gfx, laurent.pinchart, hyun.kwon, rodrigosiqueiramelo,
aaron.liu, Felix.Kuehling, xinhui.pan, sw0312.kim, hjc, chris,
kyungmin.park, nirmoy.das, p.zabel, alexander.deucher,
Hawking.Zhang, freedreno, christian.koenig, l.stach
On Tue, Sep 15, 2020 at 04:59:58PM +0200, Thomas Zimmermann wrote:
> 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>
Nice work!
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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);
> 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 */
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 12:12 ` Daniel Vetter
0 siblings, 0 replies; 23+ messages in thread
From: Daniel Vetter @ 2020-09-16 12:12 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: hamohammed.sa, airlied, nouveau, dri-devel, michal.simek,
thierry.reding, krzk, sam, emil.velikov, linux-samsung-soc,
jy0922.shim, oleksandr_andrushchenko, tomi.valkeinen,
linux-tegra, linux, jonathanh, linux-rockchip, kgene, bskeggs,
xen-devel, miaoqinglang, intel-gfx, matthew.auld, chunkuang.hu,
andi.shyti, linux-arm-msm, marek.olsak, tianci.yin, etnaviv,
hdegoede, linux-mediatek, rodrigo.vivi, matthias.bgg, evan.quan,
sean, linux-arm-kernel, tvrtko.ursulin, amd-gfx,
laurent.pinchart, hyun.kwon, rodrigosiqueiramelo, aaron.liu,
Felix.Kuehling, xinhui.pan, sw0312.kim, hjc, chris,
kyungmin.park, nirmoy.das, alexander.deucher, Hawking.Zhang,
freedreno, christian.koenig
On Tue, Sep 15, 2020 at 04:59:58PM +0200, Thomas Zimmermann wrote:
> 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>
Nice work!
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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);
> 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 */
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-16 12:12 ` Daniel Vetter
0 siblings, 0 replies; 23+ messages in thread
From: Daniel Vetter @ 2020-09-16 12:12 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: hamohammed.sa, heiko, andrey.grodzovsky, airlied, nouveau,
joonas.lahtinen, dri-devel, michal.simek, eric, thierry.reding,
robdclark, krzk, sam, sumit.semwal, emil.velikov,
linux-samsung-soc, jy0922.shim, oleksandr_andrushchenko,
tomi.valkeinen, linux-tegra, linux, patrik.r.jakobsson,
jonathanh, linux-rockchip, kgene, bskeggs, xen-devel,
miaoqinglang, intel-gfx, matthew.auld, chunkuang.hu, andi.shyti,
daniel, linux-arm-msm, marek.olsak, tianci.yin,
maarten.lankhorst, etnaviv, jani.nikula, inki.dae, hdegoede,
christian.gmeiner, linux-mediatek, mripard, rodrigo.vivi,
matthias.bgg, evan.quan, sean, linux-arm-kernel, tvrtko.ursulin,
amd-gfx, laurent.pinchart, hyun.kwon, rodrigosiqueiramelo,
aaron.liu, Felix.Kuehling, xinhui.pan, sw0312.kim, hjc, chris,
kyungmin.park, nirmoy.das, p.zabel, alexander.deucher,
Hawking.Zhang, freedreno, christian.koenig, l.stach
On Tue, Sep 15, 2020 at 04:59:58PM +0200, Thomas Zimmermann wrote:
> 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>
Nice work!
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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);
> 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 */
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
2020-09-15 14:59 ` Thomas Zimmermann
` (5 preceding siblings ...)
(?)
@ 2020-09-16 10:16 ` kernel test robot
-1 siblings, 0 replies; 23+ messages in thread
From: kernel test robot @ 2020-09-16 10:16 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 9466 bytes --]
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200915]
[cannot apply to drm-intel/for-linux-next arm/drm-armada-devel linus/master arm/drm-armada-fixes anholt/for-next v5.9-rc5 v5.9-rc4 v5.9-rc3 v5.9-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
base: 6b02addb1d1748d21dd1261e46029b264be4e5a0
config: arm64-allyesconfig (attached as .config)
compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:31:3: error: 'struct drm_driver' has no member named 'gem_free_object_unlocked'
31 | .gem_free_object_unlocked = drm_gem_cma_free_object,
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:31:30: error: initialization of 'const struct drm_ioctl_desc *' from incompatible pointer type 'void (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
31 | .gem_free_object_unlocked = drm_gem_cma_free_object,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:31:30: note: (near initialization for 'dcss_kms_driver.ioctls')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:3: error: 'struct drm_driver' has no member named 'gem_vm_ops'
32 | .gem_vm_ops = &drm_gem_cma_vm_ops,
| ^~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: warning: initialization of 'int' from 'const struct vm_operations_struct *' makes integer from pointer without a cast [-Wint-conversion]
32 | .gem_vm_ops = &drm_gem_cma_vm_ops,
| ^
drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: note: (near initialization for 'dcss_kms_driver.num_ioctls')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: error: initializer element is not computable at load time
drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: note: (near initialization for 'dcss_kms_driver.num_ioctls')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:3: error: 'struct drm_driver' has no member named 'gem_prime_export'; did you mean 'gem_prime_import'?
38 | .gem_prime_export = drm_gem_prime_export,
| ^~~~~~~~~~~~~~~~
| gem_prime_import
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: error: initialization of 'struct drm_gem_object * (*)(struct drm_device *, struct dma_buf_attachment *, struct sg_table *)' from incompatible pointer type 'struct dma_buf * (*)(struct drm_gem_object *, int)' [-Werror=incompatible-pointer-types]
38 | .gem_prime_export = drm_gem_prime_export,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: note: (near initialization for 'dcss_kms_driver.gem_prime_import_sg_table')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:3: error: 'struct drm_driver' has no member named 'gem_prime_get_sg_table'; did you mean 'gem_prime_import_sg_table'?
39 | .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
| ^~~~~~~~~~~~~~~~~~~~~~
| gem_prime_import_sg_table
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: error: initialization of 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' from incompatible pointer type 'struct sg_table * (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
39 | .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:40:31: warning: initialized field overwritten [-Woverride-init]
40 | .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:40:31: note: (near initialization for 'dcss_kms_driver.gem_prime_import_sg_table')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:3: error: 'struct drm_driver' has no member named 'gem_prime_vmap'; did you mean 'gem_prime_mmap'?
41 | .gem_prime_vmap = drm_gem_cma_prime_vmap,
| ^~~~~~~~~~~~~~
| gem_prime_mmap
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: error: initialization of 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' from incompatible pointer type 'void * (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
41 | .gem_prime_vmap = drm_gem_cma_prime_vmap,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: warning: initialized field overwritten [-Woverride-init]
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:42:3: error: 'struct drm_driver' has no member named 'gem_prime_vunmap'; did you mean 'gem_prime_mmap'?
42 | .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
| ^~~~~~~~~~~~~~~~
| gem_prime_mmap
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: error: initialization of 'int (*)(struct drm_file *, struct drm_device *, struct drm_mode_create_dumb *)' from incompatible pointer type 'void (*)(struct drm_gem_object *, void *)' [-Werror=incompatible-pointer-types]
42 | .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: note: (near initialization for 'dcss_kms_driver.dumb_create')
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: warning: initialized field overwritten [-Woverride-init]
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: note: (near initialization for 'dcss_kms_driver.dumb_create')
drivers/gpu/drm/imx/dcss/dcss-kms.c:43:21: warning: initialized field overwritten [-Woverride-init]
43 | .gem_prime_mmap = drm_gem_cma_prime_mmap,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:43:21: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
cc1: some warnings being treated as errors
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +31 drivers/gpu/drm/imx/dcss/dcss-kms.c
9021c317b77024f Laurentiu Palcu 2020-07-31 28
9021c317b77024f Laurentiu Palcu 2020-07-31 29 static struct drm_driver dcss_kms_driver = {
9021c317b77024f Laurentiu Palcu 2020-07-31 30 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
9021c317b77024f Laurentiu Palcu 2020-07-31 @31 .gem_free_object_unlocked = drm_gem_cma_free_object,
9021c317b77024f Laurentiu Palcu 2020-07-31 @32 .gem_vm_ops = &drm_gem_cma_vm_ops,
9021c317b77024f Laurentiu Palcu 2020-07-31 33 .dumb_create = drm_gem_cma_dumb_create,
9021c317b77024f Laurentiu Palcu 2020-07-31 34
9021c317b77024f Laurentiu Palcu 2020-07-31 35 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
9021c317b77024f Laurentiu Palcu 2020-07-31 36 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
9021c317b77024f Laurentiu Palcu 2020-07-31 37 .gem_prime_import = drm_gem_prime_import,
9021c317b77024f Laurentiu Palcu 2020-07-31 @38 .gem_prime_export = drm_gem_prime_export,
9021c317b77024f Laurentiu Palcu 2020-07-31 @39 .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 @40 .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 @41 .gem_prime_vmap = drm_gem_cma_prime_vmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 @42 .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 43 .gem_prime_mmap = drm_gem_cma_prime_mmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 44 .fops = &dcss_cma_fops,
9021c317b77024f Laurentiu Palcu 2020-07-31 45 .name = "imx-dcss",
9021c317b77024f Laurentiu Palcu 2020-07-31 46 .desc = "i.MX8MQ Display Subsystem",
9021c317b77024f Laurentiu Palcu 2020-07-31 47 .date = "20190917",
9021c317b77024f Laurentiu Palcu 2020-07-31 48 .major = 1,
9021c317b77024f Laurentiu Palcu 2020-07-31 49 .minor = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 50 .patchlevel = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 51 };
9021c317b77024f Laurentiu Palcu 2020-07-31 52
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 74690 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
2020-09-15 14:59 ` Thomas Zimmermann
` (4 preceding siblings ...)
(?)
@ 2020-09-16 8:01 ` kernel test robot
-1 siblings, 0 replies; 23+ messages in thread
From: kernel test robot @ 2020-09-16 8:01 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 9991 bytes --]
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200915]
[cannot apply to drm-intel/for-linux-next arm/drm-armada-devel linus/master arm/drm-armada-fixes anholt/for-next v5.9-rc5 v5.9-rc4 v5.9-rc3 v5.9-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
base: 6b02addb1d1748d21dd1261e46029b264be4e5a0
config: arm64-randconfig-r015-20200916 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 9e3842d60351f986d77dfe0a94f76e4fd895f188)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:31:3: error: field designator 'gem_free_object_unlocked' does not refer to any field in type 'struct drm_driver'
.gem_free_object_unlocked = drm_gem_cma_free_object,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:3: error: field designator 'gem_vm_ops' does not refer to any field in type 'struct drm_driver'
.gem_vm_ops = &drm_gem_cma_vm_ops,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:3: error: field designator 'gem_prime_export' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_import'?
.gem_prime_export = drm_gem_prime_export,
^~~~~~~~~~~~~~~~
gem_prime_import
include/drm/drm_drv.h:370:28: note: 'gem_prime_import' declared here
struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: error: incompatible function pointer types initializing 'struct drm_gem_object *(*)(struct drm_device *, struct dma_buf *)' with an expression of type 'struct dma_buf *(struct drm_gem_object *, int)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_export = drm_gem_prime_export,
^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_export = drm_gem_prime_export,
^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:37:22: note: previous initialization is here
.gem_prime_import = drm_gem_prime_import,
^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:3: error: field designator 'gem_prime_get_sg_table' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_import_sg_table'?
.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
^~~~~~~~~~~~~~~~~~~~~~
gem_prime_import_sg_table
include/drm/drm_drv.h:378:27: note: 'gem_prime_import_sg_table' declared here
struct drm_gem_object *(*gem_prime_import_sg_table)(
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: error: incompatible function pointer types initializing 'struct drm_gem_object *(*)(struct drm_device *, struct dma_buf_attachment *, struct sg_table *)' with an expression of type 'struct sg_table *(struct drm_gem_object *)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:40:31: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: note: previous initialization is here
.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:3: error: field designator 'gem_prime_vmap' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_mmap'?
.gem_prime_vmap = drm_gem_cma_prime_vmap,
^~~~~~~~~~~~~~
gem_prime_mmap
include/drm/drm_drv.h:391:8: note: 'gem_prime_mmap' declared here
int (*gem_prime_mmap)(struct drm_gem_object *obj,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: error: incompatible function pointer types initializing 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' with an expression of type 'void *(struct drm_gem_object *)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_vmap = drm_gem_cma_prime_vmap,
^~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:42:3: error: field designator 'gem_prime_vunmap' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_mmap'?
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~
gem_prime_mmap
include/drm/drm_drv.h:391:8: note: 'gem_prime_mmap' declared here
int (*gem_prime_mmap)(struct drm_gem_object *obj,
^
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: error: incompatible function pointer types initializing 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' with an expression of type 'void (struct drm_gem_object *, void *)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: note: previous initialization is here
.gem_prime_vmap = drm_gem_cma_prime_vmap,
^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:43:21: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_mmap = drm_gem_cma_prime_mmap,
^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: note: previous initialization is here
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~~
4 warnings and 10 errors generated.
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157
git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +31 drivers/gpu/drm/imx/dcss/dcss-kms.c
9021c317b77024f Laurentiu Palcu 2020-07-31 28
9021c317b77024f Laurentiu Palcu 2020-07-31 29 static struct drm_driver dcss_kms_driver = {
9021c317b77024f Laurentiu Palcu 2020-07-31 30 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
9021c317b77024f Laurentiu Palcu 2020-07-31 @31 .gem_free_object_unlocked = drm_gem_cma_free_object,
9021c317b77024f Laurentiu Palcu 2020-07-31 @32 .gem_vm_ops = &drm_gem_cma_vm_ops,
9021c317b77024f Laurentiu Palcu 2020-07-31 33 .dumb_create = drm_gem_cma_dumb_create,
9021c317b77024f Laurentiu Palcu 2020-07-31 34
9021c317b77024f Laurentiu Palcu 2020-07-31 35 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
9021c317b77024f Laurentiu Palcu 2020-07-31 36 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
9021c317b77024f Laurentiu Palcu 2020-07-31 37 .gem_prime_import = drm_gem_prime_import,
9021c317b77024f Laurentiu Palcu 2020-07-31 @38 .gem_prime_export = drm_gem_prime_export,
9021c317b77024f Laurentiu Palcu 2020-07-31 @39 .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 40 .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 @41 .gem_prime_vmap = drm_gem_cma_prime_vmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 @42 .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 43 .gem_prime_mmap = drm_gem_cma_prime_mmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 44 .fops = &dcss_cma_fops,
9021c317b77024f Laurentiu Palcu 2020-07-31 45 .name = "imx-dcss",
9021c317b77024f Laurentiu Palcu 2020-07-31 46 .desc = "i.MX8MQ Display Subsystem",
9021c317b77024f Laurentiu Palcu 2020-07-31 47 .date = "20190917",
9021c317b77024f Laurentiu Palcu 2020-07-31 48 .major = 1,
9021c317b77024f Laurentiu Palcu 2020-07-31 49 .minor = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 50 .patchlevel = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 51 };
9021c317b77024f Laurentiu Palcu 2020-07-31 52
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 39162 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-15 14:59 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-15 14:59 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: amd-gfx, dri-devel, etnaviv, linux-arm-kernel, linux-samsung-soc,
intel-gfx, linux-mediatek, linux-arm-msm, freedreno, nouveau,
linux-rockchip, linux-tegra, xen-devel, 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);
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 */
--
2.28.0
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-15 14:59 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-15 14:59 UTC (permalink / raw)
To: alexander.deucher-5C7GfCeVMHo, christian.koenig-5C7GfCeVMHo,
airlied-cv59FeDIM0c, daniel-/w4YWyX8dFk,
linux-I+IVW8TIWO2tmTQ+vhA3Yw,
maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA,
mripard-DgEjT+Ai2ygdnm+yROfE0A, l.stach-bIcnvbaLZ9MEGnE8C9+IrQ,
christian.gmeiner-Re5JQEeQqe8AvxtiuMwx3w,
inki.dae-Sze3O3UU22JBDgjK7y7TUQ,
jy0922.shim-Sze3O3UU22JBDgjK7y7TUQ,
sw0312.kim-Sze3O3UU22JBDgjK7y7TUQ,
kyungmin.park-Sze3O3UU22JBDgjK7y7TUQ,
kgene-DgEjT+Ai2ygdnm+yROfE0A, krzk-DgEjT+Ai2ygdnm+yROfE0A,
patrik.r.jakobsson-Re5JQEeQqe8AvxtiuMwx3w,
jani.nikula-VuQAYsv1563Yd54FQh9/CA,
joonas.lahtinen-VuQAYsv1563Yd54FQh9/CA,
rodrigo.vivi-ral2JQCrhuEAvxtiuMwx3w,
chunkuang.hu-DgEjT+Ai2ygdnm+yROfE0A,
p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
robdclark-Re5JQEeQqe8AvxtiuMwx3w, sean-p7yTbzM4H96eqtR555YLDQ,
bskeggs-H+wXaHxf7aLQT0dZR+AlfA, tomi.valkeinen-l0cyMroinI0,
eric-WhKQ6XTQaPysTnJN9+BGXg, hjc-TNX95d0MmH7DzftRWevZcw,
heiko-4mtYJXux2i+zQB+pC5nmwQ,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
jonathanh-DDmLM1+adcrQT0dZR+AlfA,
rodrigosiqueiramelo-Re5JQEeQqe8AvxtiuMwx3w,
hamohammed.sa-Re5JQEeQqe8AvxtiuMwx3w,
oleksandr_andrushchenko-uRwfk40T5oI,
hyun.kwon-gjFFaj9aHVfQT0dZR+AlfA,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw, michal.simek
Cc: linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
etnaviv-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Thomas Zimmermann,
nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
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-l3A5Bk7waGM@public.gmane.org>
---
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);
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 */
--
2.28.0
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-15 14:59 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-15 14:59 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, Thomas Zimmermann,
nouveau, linux-tegra, xen-devel, freedreno, linux-arm-kernel
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);
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 */
--
2.28.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-15 14:59 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-15 14:59 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, Thomas Zimmermann,
nouveau, linux-tegra, xen-devel, freedreno, linux-arm-kernel
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);
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 */
--
2.28.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-15 14:59 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-15 14:59 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, Thomas Zimmermann,
nouveau, linux-tegra, xen-devel, freedreno, linux-arm-kernel
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);
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 */
--
2.28.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
@ 2020-09-15 14:59 ` Thomas Zimmermann
0 siblings, 0 replies; 23+ messages in thread
From: Thomas Zimmermann @ 2020-09-15 14:59 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, linux,
maarten.lankhorst, mripard, l.stach, christian.gmeiner, inki.dae,
jy0922.shim, sw0312.kim, kyungmin.park, kgene, krzk,
patrik.r.jakobsson, jani.nikula, joonas.lahtinen, rodrigo.vivi,
chunkuang.hu, p.zabel, matthias.bgg, robdclark, sean, bskeggs,
tomi.valkeinen, eric, hjc, heiko, thierry.reding, jonathanh,
rodrigosiqueiramelo, hamohammed.sa, oleksandr_andrushchenko,
hyun.kwon, laurent.pinchart, michal.simek, sumit.semwal,
evan.quan, Hawking.Zhang, tianci.yin, marek.olsak, hdegoede,
andrey.grodzovsky, Felix.Kuehling, xinhui.pan, aaron.liu,
nirmoy.das, chris, matthew.auld, tvrtko.ursulin, andi.shyti, sam,
miaoqinglang, emil.velikov
Cc: linux-samsung-soc, linux-arm-msm, intel-gfx, etnaviv, dri-devel,
linux-rockchip, linux-mediatek, amd-gfx, Thomas Zimmermann,
nouveau, linux-tegra, xen-devel, freedreno, linux-arm-kernel
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);
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 */
--
2.28.0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2020-09-21 8:11 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-19 5:53 [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2020-09-15 14:59 [PATCH v2 00/21] Convert all remaining drivers to GEM object functions Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver Thomas Zimmermann
2020-09-15 14:59 ` Thomas Zimmermann
2020-09-15 14:59 ` Thomas Zimmermann
2020-09-15 14:59 ` Thomas Zimmermann
2020-09-15 14:59 ` Thomas Zimmermann
2020-09-15 14:59 ` Thomas Zimmermann
2020-09-16 8:01 ` kernel test robot
2020-09-16 10:16 ` kernel test robot
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-21 8:11 ` Dan Carpenter
2020-09-21 8:11 ` Dan Carpenter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.