[PATCH 5/5 v5] drm/virtio: add virtio_gpu_context_type

[Gurchetan Singh]

We'll have to do something like this eventually, and this
conveys we want a Virgl context by default.

Signed-off-by: Gurchetan Singh <gurchetansi...@chromium.org>
---
 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c 
b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 2c182922ec78..c3358eedd3ab 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -33,8 +33,14 @@
 
 #include "virtgpu_drv.h"
 
+/* TODO: add more context types */
+enum virtio_gpu_context_type {
+       virtio_gpu_virgl_context,
+};
+
 static void virtio_gpu_create_context(struct drm_device *dev,
-                                     struct drm_file *file)
+                                     struct drm_file *file,
+                                     enum virtio_gpu_context_type type)
 {
        struct virtio_gpu_device *vgdev = dev->dev_private;
        struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
@@ -44,6 +50,11 @@ static void virtio_gpu_create_context(struct drm_device *dev,
        if (!vgdev->has_virgl_3d)
                return;
 
+       if (type != virtio_gpu_virgl_context) {
+               DRM_ERROR("Unsupported context type: %u\n", type);
+               return;
+       }
+
        mutex_lock(&vfpriv->context_lock);
        if (vfpriv->context_initiated)
                goto out_unlock;
@@ -98,7 +109,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device 
*dev, void *data,
 
        exbuf->fence_fd = -1;
 
-       virtio_gpu_create_context(dev, file);
+       virtio_gpu_create_context(dev, file, virtio_gpu_virgl_context);
        if (exbuf->flags & VIRTGPU_EXECBUF_FENCE_FD_IN) {
                struct dma_fence *in_fence;
 
@@ -250,7 +261,7 @@ static int virtio_gpu_resource_create_ioctl(struct 
drm_device *dev, void *data,
                        return -EINVAL;
        }
 
-       virtio_gpu_create_context(dev, file);
+       virtio_gpu_create_context(dev, file, virtio_gpu_virgl_context);
        params.format = rc->format;
        params.width = rc->width;
        params.height = rc->height;
@@ -324,7 +335,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);
+       virtio_gpu_create_context(dev, file, virtio_gpu_virgl_context);
        objs = virtio_gpu_array_from_handles(file, &args->bo_handle, 1);
        if (objs == NULL)
                return -ENOENT;
@@ -373,7 +384,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);
+               virtio_gpu_create_context(dev, file, virtio_gpu_virgl_context);
                ret = virtio_gpu_array_lock_resv(objs);
                if (ret != 0)
                        goto err_put_free;
@@ -474,7 +485,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_create_context(dev, file, virtio_gpu_virgl_context);
        virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver,
                                  &cache_ent);
        virtio_gpu_notify(vgdev);
-- 
2.25.0.265.gbab2e86ba0-goog

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