[PATCH 12/15] 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>
Cc: David Airlie <airl...@redhat.com>
Cc: Gerd Hoffmann <kra...@redhat.com>
Cc: Gurchetan Singh <gurchetansi...@chromium.org>
Cc: Chia-I Wu <olva...@gmail.com>
Cc: virtualizat...@lists.linux.dev
---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c 
b/drivers/gpu/drm/virtio/virtgpu_plane.c
index a6f5a78f436a..e1dd38e7efe8 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -366,13 +366,13 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane 
*plane,
                return 0;
 
        obj = new_state->fb->obj[0];
-       if (obj->import_attach) {
+       if (drm_gem_is_imported(obj)) {
                ret = virtio_gpu_prepare_imported_obj(plane, new_state, obj);
                if (ret)
                        return ret;
        }
 
-       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);
@@ -409,7 +409,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);
 }
 
@@ -501,7 +501,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);
-- 
2.48.1