[PATCH 4/4] drm/virtio: enqueue virtio_gpu_create_context after first 3D ioctl

[Gurchetan Singh]

With virtio_gpu_notify(..), the create context command now is batched
with the first 3D hypercall.

Signed-off-by: Gurchetan Singh <gurchetansi...@chromium.org>
---
 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +++++
 drivers/gpu/drm/virtio/virtgpu_kms.c   | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c 
b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 858ee153fb18..32f9af4bcb3a 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -95,6 +95,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device 
*dev, void *data,
 
        exbuf->fence_fd = -1;
 
+       virtio_gpu_create_context(dev, file);
        if (exbuf->flags & VIRTGPU_EXECBUF_FENCE_FD_IN) {
                struct dma_fence *in_fence;
 
@@ -246,6 +247,7 @@ static int virtio_gpu_resource_create_ioctl(struct 
drm_device *dev, void *data,
                        return -EINVAL;
        }
 
+       virtio_gpu_create_context(dev, file);
        params.format = rc->format;
        params.width = rc->width;
        params.height = rc->height;
@@ -319,6 +321,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct 
drm_device *dev,
        if (vgdev->has_virgl_3d == false)
                return -ENOSYS;
 
+       virtio_gpu_create_context(dev, file);
        objs = virtio_gpu_array_from_handles(file, &args->bo_handle, 1);
        if (objs == NULL)
                return -ENOENT;
@@ -367,6 +370,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct 
drm_device *dev, void *data,
                         args->box.w, args->box.h, args->box.x, args->box.y,
                         objs, NULL);
        } else {
+               virtio_gpu_create_context(dev, file);
                ret = virtio_gpu_array_lock_resv(objs);
                if (ret != 0)
                        goto err_put_free;
@@ -467,6 +471,7 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev,
        spin_unlock(&vgdev->display_info_lock);
 
        /* not in cache - need to talk to hw */
+       virtio_gpu_create_context(dev, file);
        virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver,
                                  &cache_ent);
        virtio_gpu_notify(vgdev);
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c 
b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 64fe5fcbedfd..277c76de8e9c 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -274,7 +274,6 @@ int virtio_gpu_driver_open(struct drm_device *dev, struct 
drm_file *file)
        vfpriv->ctx_id = id;
        atomic_set(&vfpriv->context_initiated, 0);
        file->driver_priv = vfpriv;
-       virtio_gpu_create_context(dev, file);
 
        return 0;
 }
-- 
2.25.0.225.g125e21ebc7-goog

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