drm: Allow PRIME 'self-import' for all drivers
Subsystems (29)
Thomas Zimmermann
maintainerv2 cover drm: Allow PRIME 'self-import' for all drivers
Set drm_gem_prime_handle_to_fd() and drm_gem_prime_fd_to_handle() for all DRM drivers. Even drivers that do not support PRIME import or export of dma-bufs can now import their own buffer objects. This is required by some userspace, such as wlroots-based compositors, to share buffers among processes.
The only driver that does not use the drm_gem_prime_*() helpers is vmwgfx. Leave a comment on the callbacks in struct drm_driver, so that no other driver uses them.
Simon Ser implemented the feature for drivers based on GEM VRAM helpers in [1]. This patchset generalizes the code for all drivers that do not otherwise support PRIME. Tested by running sway with gma500 hardware.
v2:
* documentation and TODO cleanups (Simon, Zack)
* small style cleanups
[1] https://lore.kernel.org/dri-devel/[email protected]/
Thomas Zimmermann (3):
drm: Enable PRIME import/export for all drivers
drm: Clear fd/handle callbacks in struct drm_driver drm/prime: Unexport helpers for fd/handle conversion
drivers/accel/ivpu/ivpu_drv.c | 2 - drivers/accel/qaic/qaic_drv.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 -- drivers/gpu/drm/armada/armada_drv.c | 2 - drivers/gpu/drm/drm_ioctl.c | 3 +- drivers/gpu/drm/drm_prime.c | 67 +++++++++---------- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 - drivers/gpu/drm/i915/i915_driver.c | 2 - drivers/gpu/drm/lima/lima_drv.c | 2 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 - drivers/gpu/drm/msm/msm_drv.c | 2 - drivers/gpu/drm/nouveau/nouveau_drm.c | 2 - drivers/gpu/drm/omapdrm/omap_drv.c | 2 - drivers/gpu/drm/panfrost/panfrost_drv.c | 2 - drivers/gpu/drm/pl111/pl111_drv.c | 2 - drivers/gpu/drm/qxl/qxl_drv.c | 2 - drivers/gpu/drm/radeon/radeon_drv.c | 2 - drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 2 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 - drivers/gpu/drm/tegra/drm.c | 2 - drivers/gpu/drm/v3d/v3d_drv.c | 2 - drivers/gpu/drm/virtio/virtgpu_drv.c | 2 - drivers/gpu/drm/xen/xen_drm_front.c | 2 - include/drm/drm_drv.h | 12 +--- include/drm/drm_gem_dma_helper.h | 8 +-- include/drm/drm_gem_shmem_helper.h | 4 +- include/drm/drm_gem_vram_helper.h | 8 +-- include/drm/drm_prime.h | 7 -- 29 files changed, 40 insertions(+), 114 deletions(-)
base-commit: 32e260cd0d16cee6f33e747679f168d63ea54bf6
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v2 1/3 drm: Enable PRIME import/export for all drivers
Call drm_gem_prime_handle_to_fd() and drm_gem_prime_fd_to_handle() by default if no PRIME import/export helpers have been set. Both functions are the default for almost all drivers.
DRM drivers implement struct drm_driver.gem_prime_import_sg_table to import dma-buf objects from other drivers. Having the function drm_gem_prime_fd_to_handle() functions set by default allows each driver to import dma-buf objects to itself, even without support for other drivers.
For drm_gem_prime_handle_to_fd() it is similar: using it by default allows each driver to export to itself, even without support for other drivers.
This functionality enables userspace to share per-driver buffers across process boundaries via PRIME (e.g., wlroots requires this functionality). The patch generalizes a pattern that has previously been implemented by GEM VRAM helpers [1] to work with any driver. For example, gma500 can now run the wlroots-based sway compositor.
v2:
* clean up docs and TODO comments (Simon, Zack)
* clean up style in drm_getcap()
--- drivers/gpu/drm/drm_ioctl.c | 3 +-- drivers/gpu/drm/drm_prime.c | 21 ++++++++++++--------- include/drm/drm_drv.h | 12 ++---------- 3 files changed, 15 insertions(+), 21 deletions(-)
drivers/gpu/drm/drm_ioctl.c +1 -2
@@ -245,8 +245,7 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ req->value =1 ;return 0 ;case DRM_CAP_PRIME : - req->value |= dev->driver->prime_fd_to_handle ?DRM_PRIME_CAP_IMPORT :0 ; - req->value |= dev->driver->prime_handle_to_fd ?DRM_PRIME_CAP_EXPORT :0 ; + req->value =DRM_PRIME_CAP_IMPORT |DRM_PRIME_CAP_EXPORT ;return 0 ;case DRM_CAP_SYNCOBJ : req->value =drm_core_check_feature (dev,DRIVER_SYNCOBJ );
drivers/gpu/drm/drm_prime.c +12 -9
@@ -372,11 +372,12 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, {struct drm_prime_handle *args = data; -if (!dev->driver->prime_fd_to_handle) -return -ENOSYS ; +if (dev->driver->prime_fd_to_handle) { +return dev->driver->prime_fd_to_handle (dev, file_priv, args->fd, + &args->handle); + } -return dev->driver->prime_fd_to_handle (dev, file_priv, - args->fd, &args->handle); +return drm_gem_prime_fd_to_handle (dev, file_priv, args->fd, &args->handle); } static struct dma_buf *export_and_register_object(struct drm_device *dev,
@@ -518,15 +519,17 @@ int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, {struct drm_prime_handle *args = data; -if (!dev->driver->prime_handle_to_fd) -return -ENOSYS ; -/* check flags are valid */ if (args->flags & ~(DRM_CLOEXEC |DRM_RDWR ))return -EINVAL ; -return dev->driver->prime_handle_to_fd (dev, file_priv, - args->handle, args->flags, &args->fd); +if (dev->driver->prime_handle_to_fd) { +return dev->driver->prime_handle_to_fd (dev, file_priv, + args->handle, args->flags, + &args->fd); + } +return drm_gem_prime_handle_to_fd (dev, file_priv, args->handle, + args->flags, &args->fd); }/**
include/drm/drm_drv.h +2 -10
@@ -304,22 +304,14 @@ struct drm_driver {/** * @prime_handle_to_fd: * -* Main PRIME export function. Should be implemented with -* drm_gem_prime_handle_to_fd() for GEM based drivers. -* -* For an in-depth discussion see :ref:`PRIME buffer sharing -* documentation <prime_buffer_sharing>`. +* PRIME export function. Only used by vmwgfx. */ int (*prime_handle_to_fd)(struct drm_device *dev,struct drm_file *file_priv,uint32_t handle,uint32_t flags,int *prime_fd);/** * @prime_fd_to_handle: * -* Main PRIME import function. Should be implemented with -* drm_gem_prime_fd_to_handle() for GEM based drivers. -* -* For an in-depth discussion see :ref:`PRIME buffer sharing -* documentation <prime_buffer_sharing>`. +* PRIME import function. Only used by vmwgfx. */ int (*prime_fd_to_handle)(struct drm_device *dev,struct drm_file *file_priv,int prime_fd,uint32_t *handle);
Signature · 1 line
2.41.0
Re: [PATCH v2 1/3] drm: Enable PRIME import/export for all drivers
Quoted 20 lines · Thomas Zimmermann
Call
drm_gem_prime_handle_to_fd()anddrm_gem_prime_fd_to_handle()by default if no PRIME import/export helpers have been set. Both functions are the default for almost all drivers.DRM drivers implement struct drm_driver.gem_prime_import_sg_table to import dma-buf objects from other drivers. Having the function
drm_gem_prime_fd_to_handle()functions set by default allows each driver to import dma-buf objects to itself, even without support for other drivers.For
drm_gem_prime_handle_to_fd()it is similar: using it by default allows each driver to export to itself, even without support for other drivers.This functionality enables userspace to share per-driver buffers across process boundaries via PRIME (e.g., wlroots requires this functionality). The patch generalizes a pattern that has previously been implemented by GEM VRAM helpers [1] to work with any driver. For example, gma500 can now run the wlroots-based sway compositor.
Quoted 8 lines
v2:
* clean up docs and TODO comments (Simon, Zack)
* clean up style indrm_getcap()Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Simon Ser <[email protected]>Acked-by Alex Deucher <[email protected]>
Thomas Zimmermann
maintainerPATCH v2 2/3 drm: Clear fd/handle callbacks in struct drm_driver
In reply to Thomas ZimmermannClear all assignments of struct drm_driver's fd/handle callbacks to drm_gem_prime_fd_to_handle() and drm_gem_prime_handle_to_fd(). These functions are called by default. Add a TODO item to convert vmwgfx to the defaults as well.
v2:
* remove TODO item (Zack)
* also update amdgpu's amdgpu_partition_driver
--- drivers/accel/ivpu/ivpu_drv.c | 2 -- drivers/accel/qaic/qaic_drv.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ---- drivers/gpu/drm/armada/armada_drv.c | 2 -- drivers/gpu/drm/drm_prime.c | 13 ++++--------- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 -- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 -- drivers/gpu/drm/i915/i915_driver.c | 2 -- drivers/gpu/drm/lima/lima_drv.c | 2 -- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 -- drivers/gpu/drm/msm/msm_drv.c | 2 -- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 -- drivers/gpu/drm/omapdrm/omap_drv.c | 2 -- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 -- drivers/gpu/drm/pl111/pl111_drv.c | 2 -- drivers/gpu/drm/qxl/qxl_drv.c | 2 -- drivers/gpu/drm/radeon/radeon_drv.c | 2 -- drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 2 -- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 -- drivers/gpu/drm/tegra/drm.c | 2 -- drivers/gpu/drm/v3d/v3d_drv.c | 2 -- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 -- drivers/gpu/drm/xen/xen_drm_front.c | 2 -- include/drm/drm_gem_dma_helper.h | 8 ++------ include/drm/drm_gem_shmem_helper.h | 4 +--- include/drm/drm_gem_vram_helper.h | 8 +++----- 26 files changed, 10 insertions(+), 68 deletions(-)
drivers/accel/ivpu/ivpu_drv.c +0 -2
@@ -373,8 +373,6 @@ static const struct drm_driver driver = { .open = ivpu_open, .postclose = ivpu_postclose, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = ivpu_gem_prime_import, .ioctls = ivpu_drm_ioctls,
drivers/accel/qaic/qaic_drv.c +0 -1
@@ -165,7 +165,6 @@ static const struct drm_driver qaic_accel_driver = { .ioctls = qaic_drm_ioctls, .num_ioctls = ARRAY_SIZE(qaic_drm_ioctls), - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = qaic_gem_prime_import, };
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -4
@@ -2850,8 +2850,6 @@ static const struct drm_driver amdgpu_kms_driver = { .show_fdinfo = amdgpu_show_fdinfo, #endif - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = amdgpu_gem_prime_import, .name = DRIVER_NAME,
@@ -2876,8 +2874,6 @@ const struct drm_driver amdgpu_partition_driver = { .fops = &amdgpu_driver_kms_fops, .release = &amdgpu_driver_release_kms, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = amdgpu_gem_prime_import, .name = DRIVER_NAME,
drivers/gpu/drm/armada/armada_drv.c +0 -2
@@ -37,8 +37,6 @@ static const struct drm_ioctl_desc armada_ioctls[] = {DEFINE_DRM_GEM_FOPS (armada_drm_fops);static const struct drm_driver armada_drm_driver = { - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = armada_gem_prime_import, .dumb_create = armada_gem_dumb_create, .major =1 ,
drivers/gpu/drm/drm_prime.c +4 -9
@@ -51,15 +51,10 @@ MODULE_IMPORT_NS(DMA_BUF);* between applications, they can't be guessed like the globally unique GEM * names. * -* Drivers that support the PRIME API implement the -* &drm_driver.prime_handle_to_fd and &drm_driver.prime_fd_to_handle operations. -* GEM based drivers must use drm_gem_prime_handle_to_fd() and -* drm_gem_prime_fd_to_handle() to implement these. For GEM based drivers the -* actual driver interfaces is provided through the &drm_gem_object_funcs.export -* and &drm_driver.gem_prime_import hooks. -* -* &dma_buf_ops implementations for GEM drivers are all individually exported -* for drivers which need to overwrite or reimplement some of them. +* Drivers that support the PRIME API implement the drm_gem_object_funcs.export +* and &drm_driver.gem_prime_import hooks. &dma_buf_ops implementations for +* drivers are all individually exported for drivers which need to overwrite +* or reimplement some of them. * * Reference Counting for GEM Drivers * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/etnaviv/etnaviv_drv.c +0 -2
@@ -481,8 +481,6 @@ static const struct drm_driver etnaviv_drm_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = etnaviv_open, .postclose = etnaviv_postclose, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table, #ifdef CONFIG_DEBUG_FS .debugfs_init = etnaviv_debugfs_init,
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -2
@@ -109,8 +109,6 @@ static const struct drm_driver exynos_drm_driver = { .open = exynos_drm_open, .postclose = exynos_drm_postclose, .dumb_create = exynos_drm_gem_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = exynos_drm_gem_prime_import, .gem_prime_import_sg_table = exynos_drm_gem_prime_import_sg_table, .ioctls = exynos_ioctls,
drivers/gpu/drm/i915/i915_driver.c +0 -2
@@ -1818,8 +1818,6 @@ static const struct drm_driver i915_drm_driver = { .postclose = i915_driver_postclose, .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo), - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = i915_gem_prime_import, .dumb_create = i915_gem_dumb_create,
drivers/gpu/drm/lima/lima_drv.c +0 -2
@@ -276,9 +276,7 @@ static const struct drm_driver lima_drm_driver = { .patchlevel = 0, .gem_create_object = lima_gem_create_object, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, };struct lima_block_reader {
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0 -2
@@ -556,8 +556,6 @@ static const struct drm_driver mtk_drm_driver = { .dumb_create = mtk_drm_gem_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = mtk_drm_gem_prime_import, .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, .fops = &mtk_drm_fops,
drivers/gpu/drm/msm/msm_drv.c +0 -2
@@ -1086,8 +1086,6 @@ static const struct drm_driver msm_driver = { .postclose = msm_postclose, .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_gem_dumb_map_offset, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,
drivers/gpu/drm/nouveau/nouveau_drm.c +0 -2
@@ -1240,8 +1240,6 @@ driver_stub = { .num_ioctls = ARRAY_SIZE(nouveau_ioctls), .fops = &nouveau_driver_fops, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table, .dumb_create = nouveau_display_dumb_create,
drivers/gpu/drm/omapdrm/omap_drv.c +0 -2
@@ -655,8 +655,6 @@ static const struct drm_driver omap_drm_driver = {#ifdef CONFIG_DEBUG_FS .debugfs_init = omap_debugfs_init, #endif - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = omap_gem_prime_import, .dumb_create = omap_gem_dumb_create, .dumb_map_offset = omap_gem_dumb_map_offset,
drivers/gpu/drm/panfrost/panfrost_drv.c +0 -2
@@ -539,8 +539,6 @@ static const struct drm_driver panfrost_drm_driver = { .minor = 2, .gem_create_object = panfrost_gem_create_object, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = panfrost_gem_prime_import_sg_table, };
drivers/gpu/drm/pl111/pl111_drv.c +0 -2
@@ -224,8 +224,6 @@ static const struct drm_driver pl111_drm_driver = { .minor = 0, .patchlevel = 0, .dumb_create = drm_gem_dma_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = pl111_gem_import_sg_table,#if defined(CONFIG_DEBUG_FS )
drivers/gpu/drm/qxl/qxl_drv.c +0 -2
@@ -290,8 +290,6 @@ static struct drm_driver qxl_driver = {#if defined(CONFIG_DEBUG_FS ) .debugfs_init = qxl_debugfs_init, #endif - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = qxl_gem_prime_import_sg_table, .fops = &qxl_fops, .ioctls = qxl_ioctls,
drivers/gpu/drm/radeon/radeon_drv.c +0 -2
@@ -604,8 +604,6 @@ static const struct drm_driver kms_driver = { .dumb_map_offset = radeon_mode_dumb_mmap, .fops = &radeon_driver_kms_fops, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, .name = DRIVER_NAME,
drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c +0 -2
@@ -605,8 +605,6 @@ DEFINE_DRM_GEM_DMA_FOPS(rcar_du_fops);static const struct drm_driver rcar_du_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .dumb_create = rcar_du_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = rcar_du_gem_prime_import_sg_table, .fops = &rcar_du_fops, .name ="rcar-du" ,
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +0 -2
@@ -224,8 +224,6 @@ DEFINE_DRM_GEM_FOPS(rockchip_drm_driver_fops);static const struct drm_driver rockchip_drm_driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_ATOMIC , .dumb_create = rockchip_gem_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, .fops = &rockchip_drm_driver_fops, .name =DRIVER_NAME ,
drivers/gpu/drm/tegra/drm.c +0 -2
@@ -887,8 +887,6 @@ static const struct drm_driver tegra_drm_driver = { .debugfs_init = tegra_debugfs_init, #endif - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = tegra_gem_prime_import, .dumb_create = tegra_bo_dumb_create,
drivers/gpu/drm/v3d/v3d_drv.c +0 -2
@@ -171,8 +171,6 @@ static const struct drm_driver v3d_drm_driver = {#endif .gem_create_object = v3d_create_object, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = v3d_prime_import_sg_table, .ioctls = v3d_drm_ioctls,
drivers/gpu/drm/virtio/virtgpu_drv.c +0 -2
@@ -186,8 +186,6 @@ static const struct drm_driver driver = {#if defined(CONFIG_DEBUG_FS ) .debugfs_init = virtio_gpu_debugfs_init, #endif - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = virtgpu_gem_prime_import, .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,
drivers/gpu/drm/xen/xen_drm_front.c +0 -2
@@ -474,8 +474,6 @@ DEFINE_DRM_GEM_FOPS(xen_drm_dev_fops);static const struct drm_driver xen_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .release = xen_drm_drv_release, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = xen_drm_front_gem_import_sg_table, .dumb_create = xen_drm_drv_dumb_create, .fops = &xen_drm_dev_fops,
include/drm/drm_gem_dma_helper.h +2 -6
@@ -166,9 +166,7 @@ drm_gem_dma_prime_import_sg_table(struct drm_device *dev,* DRM_GEM_DMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE() instead. */ #define DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE (dumb_create_func) \ - .dumb_create = (dumb_create_func), \ - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ + .dumb_create = (dumb_create_func), \ .gem_prime_import_sg_table = drm_gem_dma_prime_import_sg_table/**
@@ -203,9 +201,7 @@ drm_gem_dma_prime_import_sg_table(struct drm_device *dev,* DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE() instead. */ #define DRM_GEM_DMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE (dumb_create_func) \ - .dumb_create = dumb_create_func, \ - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ + .dumb_create = (dumb_create_func), \ .gem_prime_import_sg_table = drm_gem_dma_prime_import_sg_table_vmap/**
include/drm/drm_gem_shmem_helper.h +1 -3
@@ -290,9 +290,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,* the &drm_driver structure. */ #define DRM_GEM_SHMEM_DRIVER_OPS \ - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \ .gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, \ - .dumb_create = drm_gem_shmem_dumb_create + .dumb_create = drm_gem_shmem_dumb_create#endif /* __DRM_GEM_SHMEM_HELPER_H__ */
include/drm/drm_gem_vram_helper.h +3 -5
@@ -157,11 +157,9 @@ void drm_gem_vram_simple_display_pipe_cleanup_fb(* &struct drm_driver with default functions. */ #define DRM_GEM_VRAM_DRIVER \ - .debugfs_init = drm_vram_mm_debugfs_init, \ - .dumb_create = drm_gem_vram_driver_dumb_create, \ - .dumb_map_offset = drm_gem_ttm_dumb_map_offset, \ - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ - .prime_fd_to_handle = drm_gem_prime_fd_to_handle + .debugfs_init = drm_vram_mm_debugfs_init, \ + .dumb_create = drm_gem_vram_driver_dumb_create, \ + .dumb_map_offset = drm_gem_ttm_dumb_map_offset/* * VRAM memory manager
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v2 3/3 drm/prime: Unexport helpers for fd/handle conversion
In reply to Thomas ZimmermannUnexport drm_gem_prime_fd_to_handle() and drm_gem_prime_handle_to_fd(). Both are only used internally within the PRIME code.
v2:
* reword docs as functions are now unexported (Simon)
--- drivers/gpu/drm/drm_prime.c | 33 +++++++++++++++------------------ include/drm/drm_prime.h | 7 ------- 2 files changed, 15 insertions(+), 25 deletions(-)
drivers/gpu/drm/drm_prime.c +15 -18
@@ -278,7 +278,7 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf) }EXPORT_SYMBOL (drm_gem_dmabuf_release); -/** +/* * drm_gem_prime_fd_to_handle - PRIME import function for GEM drivers * @dev: drm_device to import into * @file_priv: drm file-private structure
@@ -292,9 +292,9 @@ EXPORT_SYMBOL(drm_gem_dmabuf_release);* * Returns 0 on success or a negative error code on failure. */ -int drm_gem_prime_fd_to_handle (struct drm_device *dev, -struct drm_file *file_priv,int prime_fd, -uint32_t *handle) +static int drm_gem_prime_fd_to_handle (struct drm_device *dev, +struct drm_file *file_priv,int prime_fd, +uint32_t *handle) {struct dma_buf *dma_buf;struct drm_gem_object *obj;
@@ -360,7 +360,6 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev,dma_buf_put (dma_buf);return ret; } -EXPORT_SYMBOL (drm_gem_prime_fd_to_handle);int drm_prime_fd_to_handle_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv)
@@ -409,7 +408,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,return dmabuf; } -/** +/* * drm_gem_prime_handle_to_fd - PRIME export function for GEM drivers * @dev: dev to export the buffer from * @file_priv: drm file-private structure
@@ -422,10 +421,10 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,* The actual exporting from GEM object to a dma-buf is done through the * &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, -uint32_t flags, -int *prime_fd) +static int drm_gem_prime_handle_to_fd (struct drm_device *dev, +struct drm_file *file_priv,uint32_t handle, +uint32_t flags, +int *prime_fd) {struct drm_gem_object *obj;int ret =0 ;
@@ -507,7 +506,6 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev,return ret; } -EXPORT_SYMBOL (drm_gem_prime_handle_to_fd);int drm_prime_handle_to_fd_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv)
@@ -868,9 +866,9 @@ EXPORT_SYMBOL(drm_prime_get_contiguous_size);* @obj: GEM object to export * @flags: flags like DRM_CLOEXEC and DRM_RDWR * -* This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers -* using the PRIME helpers. It is used as the default in -* drm_gem_prime_handle_to_fd(). +* This is the implementation of the &drm_gem_object_funcs.export functions +* for GEM drivers using the PRIME helpers. It is used as the default for +* drivers that do not set their own. */ struct dma_buf *drm_gem_prime_export (struct drm_gem_object *obj,int flags)
@@ -966,10 +964,9 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev);* @dev: drm_device to import into * @dma_buf: dma-buf object to import * -* This is the implementation of the gem_prime_import functions for GEM drivers -* using the PRIME helpers. Drivers can use this as their -* &drm_driver.gem_prime_import implementation. It is used as the default -* implementation in drm_gem_prime_fd_to_handle(). +* This is the implementation of the gem_prime_import functions for GEM +* drivers using the PRIME helpers. It is the default for drivers that do +* not set their own &drm_driver.gem_prime_import. * * Drivers must arrange to call drm_prime_gem_destroy() from their * &drm_gem_object_funcs.free hook when using this function.
include/drm/drm_prime.h +0 -7
@@ -60,19 +60,12 @@ enum dma_data_direction;struct drm_device ;struct drm_gem_object ; -struct drm_file ;/* core prime functions */ struct dma_buf *drm_gem_dmabuf_export (struct drm_device *dev,struct dma_buf_export_info *exp_info);void drm_gem_dmabuf_release (struct dma_buf *dma_buf); -int drm_gem_prime_fd_to_handle (struct drm_device *dev, -struct drm_file *file_priv,int prime_fd,uint32_t *handle); -int drm_gem_prime_handle_to_fd (struct drm_device *dev, -struct drm_file *file_priv,uint32_t handle,uint32_t flags, -int *prime_fd); -/* helper functions for exporting */ int drm_gem_map_attach (struct dma_buf *dma_buf,struct dma_buf_attachment *attach);
Signature · 1 line
2.41.0
Re: [PATCH v2 3/3] drm/prime: Unexport helpers for fd/handle conversion
Quoted 9 lines · Thomas Zimmermann
Unexport
drm_gem_prime_fd_to_handle()anddrm_gem_prime_handle_to_fd(). Both are only used internally within the PRIME code.v2:
* reword docs as functions are now unexported (Simon)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Simon Ser <[email protected]>Acked-by Alex Deucher <[email protected]>
Thomas Zimmermann
maintainerRe: [PATCH v2 3/3] drm/prime: Unexport helpers for fd/handle conversion
Am 20.06.23 um 17:55 schrieb Jeffrey Hugo:
Quoted 12 lines · Thomas Zimmermann
Quoted 9 lines
Unexport
drm_gem_prime_fd_to_handle()anddrm_gem_prime_handle_to_fd(). Both are only used internally within the PRIME code.v2:
* reword docs as functions are now unexported (Simon)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Simon Ser <[email protected]>Acked-by Alex Deucher <[email protected]>Reviewed-by Jeffrey Hugo <[email protected]>
Thanks a lot.
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)