[PATCH 1/2] drm/virtio: Test for imported buffers with drm_gem_is_imported()

[Thomas Zimmermann]

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 <tzimmerm...@suse.de>
---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 8 ++++----
 drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c 
b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 87e584add042..43e755248977 100644
--- 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 9b4bde3fda18..ce49282198cb 100644
--- 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);
-- 
2.49.0