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.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://lore.kernel.org/r/20250414131507.566072-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 87e584add04286c6d9ad1a3a56468bbc241377a3..43e755248977580e710f88e78d7679ab116c7a7e 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -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);

diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 9b4bde3fda18147575ef0aa463f9edaaa4adae65..ce49282198cbf6aa31751248f4b3f30c74494d1c 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -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);