[PATCH 08/24] drm/virtio: blob prep: refactor getting pages and attaching backing

[Gurchetan Singh]

Useful for upcoming blob resources.

Signed-off-by: Gurchetan Singh <gurchetansi...@chromium.org>
Acked-by: Tomeu Vizoso <tomeu.viz...@collabora.com>
---
 drivers/gpu/drm/virtio/virtgpu_object.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c 
b/drivers/gpu/drm/virtio/virtgpu_object.c
index 1359eb8f1a02..9d68f260d998 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -227,22 +227,22 @@ int virtio_gpu_object_create(struct virtio_gpu_device 
*vgdev,
                        goto err_put_objs;
        }
 
+       ret = virtio_gpu_object_shmem_init(vgdev, bo, &ents, &nents);
+       if (ret != 0) {
+               virtio_gpu_free_object(&shmem_obj->base);
+               return ret;
+       }
+
        if (params->virgl) {
                virtio_gpu_cmd_resource_create_3d(vgdev, bo, params,
                                                  objs, fence);
+               virtio_gpu_object_attach(vgdev, bo, ents, nents);
        } else {
                virtio_gpu_cmd_create_resource(vgdev, bo, params,
                                               objs, fence);
+               virtio_gpu_object_attach(vgdev, bo, ents, nents);
        }
 
-       ret = virtio_gpu_object_shmem_init(vgdev, bo, &ents, &nents);
-       if (ret != 0) {
-               virtio_gpu_free_object(&shmem_obj->base);
-               return ret;
-       }
-
-       virtio_gpu_object_attach(vgdev, bo, ents, nents);
-
        *bo_ptr = bo;
        return 0;
 
-- 
2.24.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel