drm/virtio: Avoid struct drm_gem_object.import_attach
Subsystems (4)
Thomas Zimmermann
maintainercover drm/virtio: Avoid struct drm_gem_object.import_attach
Avoid the use of struct drm_gem_object.import_attach to get the object's dma-buf or test for an imported buffer. The import_attach field in struct drm_gem_object is an artifact of the import process, but should not be used otherwise.
The helper drm_gem_is_imported() tests if a GEM object's buffer has been imported into the driver. The corresponding dma-buf is referenced by the object itself. Both cases avoid import_attach.
Thomas Zimmermann (2):
drm/virtio: Test for imported buffers with drm_gem_is_imported() drm/virtio: Use dma_buf from GEM object instance
drivers/gpu/drm/virtio/virtgpu_plane.c | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_prime.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-)
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH 1/2 drm/virtio: Test for imported buffers with drm_gem_is_imported()
Instead of testing import_attach for imported GEM buffers, invoke drm_gem_is_imported() to do the test. The helper tests the dma_buf itself while import_attach is just an artifact of the import. Prepares to make import_attach optional.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +4 -4
@@ -366,7 +366,7 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane *plane,return 0 ; obj = new_state->fb->obj[0 ]; -if (bo->dumb || obj->import_attach) { +if (bo->dumb ||drm_gem_is_imported (obj)) { vgplane_st->fence =virtio_gpu_fence_alloc (vgdev, vgdev->fence_drv.context,0 );
@@ -374,7 +374,7 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane *plane,return -ENOMEM ; } -if (obj->import_attach) { +if (drm_gem_is_imported (obj)) { ret =virtio_gpu_prepare_imported_obj (plane, new_state, obj);if (ret) goto err_fence;
@@ -417,7 +417,7 @@ static void virtio_gpu_plane_cleanup_fb(struct drm_plane *plane, } obj = state->fb->obj[0 ]; -if (obj->import_attach) +if (drm_gem_is_imported (obj))virtio_gpu_cleanup_imported_obj (obj); }
@@ -509,7 +509,7 @@ static int virtio_drm_get_scanout_buffer(struct drm_plane *plane, bo =gem_to_virtio_gpu_obj (plane->state->fb->obj[0 ]);/* Only support mapped shmem bo */ -if (virtio_gpu_is_vram (bo) || bo->base.base.import_attach || !bo->base.vaddr) +if (virtio_gpu_is_vram (bo) ||drm_gem_is_imported (&bo->base.base) || !bo->base.vaddr)return -ENODEV ;iosys_map_set_vaddr (&sb->map[0 ], bo->base.vaddr);
drivers/gpu/drm/virtio/virtgpu_prime.c +1 -1
@@ -206,7 +206,7 @@ static void virtgpu_dma_buf_free_obj(struct drm_gem_object *obj)struct virtio_gpu_device *vgdev = obj->dev->dev_private;struct dma_buf_attachment *attach = obj->import_attach; -if (attach) { +if (drm_gem_is_imported (obj)) {struct dma_buf *dmabuf = attach->dmabuf;dma_resv_lock (dmabuf->resv,NULL );
Signature · 1 line
2.49.0
Re: [PATCH 1/2] drm/virtio: Test for imported buffers with drm_gem_is_imported()
Quoted 10 lines · Thomas Zimmermann
Instead of testing
import_attachfor imported GEM buffers, invokedrm_gem_is_imported()to do the test. The helper tests thedma_bufitself whileimport_attachis just an artifact of the import. Prepares to makeimport_attachoptional.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_plane.c | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Signature · 2 lines
Best regards, Dmitry
Thomas Zimmermann
maintainerPATCH 2/2 drm/virtio: Use dma_buf from GEM object instance
In reply to Thomas ZimmermannAvoid dereferencing struct drm_gem_object.import_attach for the imported dma-buf. The dma_buf field in the GEM object instance refers to the same buffer. Prepares to make import_attach optional.
--- drivers/gpu/drm/virtio/virtgpu_prime.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +2 -3
@@ -204,16 +204,15 @@ static void virtgpu_dma_buf_free_obj(struct drm_gem_object *obj) {struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj);struct virtio_gpu_device *vgdev = obj->dev->dev_private; -struct dma_buf_attachment *attach = obj->import_attach;if (drm_gem_is_imported (obj)) { -struct dma_buf *dmabuf = attach->dmabuf; +struct dma_buf *dmabuf = obj->dma_buf;dma_resv_lock (dmabuf->resv,NULL );virtgpu_dma_buf_unmap (bo);dma_resv_unlock (dmabuf->resv); -dma_buf_detach (dmabuf, attach); +dma_buf_detach (dmabuf, obj->import_attach);dma_buf_put (dmabuf); }
Signature · 1 line
2.49.0
Re: [PATCH 2/2] drm/virtio: Use dma_buf from GEM object instance
Quoted 22 lines · Thomas Zimmermann
Avoid dereferencing struct drm_gem_object.import_attach for the imported dma-buf. The
dma_buffield in the GEM object instance refers to the same buffer. Prepares to makeimport_attachoptional.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_prime.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/virtio/virtgpu_prime.c +1
-2@@ -204,16 +204,15 @@ static void virtgpu_dma_buf_free_obj(struct drm_gem_object *obj) {struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj);struct virtio_gpu_device *vgdev = obj->dev->dev_private; -struct dma_buf_attachment *attach = obj->import_attach;if (drm_gem_is_imported (obj)) { -struct dma_buf *dmabuf = attach->dmabuf; +struct dma_buf *dmabuf = obj->dma_buf;
drivers/gpu/drm/virtio/virtgpu_prime.c static void virtgpu_dma_buf_free_obj(struct drm_gem_object *obj) · line 218
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_prime.c +1
-1dma_resv_lock (dmabuf->resv,NULL );virtgpu_dma_buf_unmap (bo);dma_resv_unlock (dmabuf->resv); -dma_buf_detach (dmabuf, attach); +dma_buf_detach (dmabuf, obj->import_attach);dma_buf_put (dmabuf); }
Signature · 2 lines
Best regards, Dmitry
Quoted 9 lines · Thomas Zimmermann
Avoid the use of struct drm_gem_object.import_attach to get the object's dma-buf or test for an imported buffer. The
import_attachfield in structdrm_gem_objectis an artifact of the import process, but should not be used otherwise.The helper
drm_gem_is_imported()tests if a GEM object's buffer has been imported into the driver. The corresponding dma-buf is referenced by the object itself. Both cases avoidimport_attach.
Quoted 8 lines
Thomas Zimmermann (2):
drm/virtio: Test for imported buffers withdrm_gem_is_imported()drm/virtio: Usedma_buffrom GEM object instancedrivers/gpu/drm/virtio/virtgpu_plane.c | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_prime.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-)
Applied to misc-next, thanks!
Signature · 2 lines
Best regards, Dmitry