[PATCH v8 4/4] drm/virtio: wire blob ioctl creation to userptr objects

[Honglei Huang]

Integrate userptr into the blob resource creation ioctl.

- A non-zero userptr selects virtio_gpu_userptr_create()
- Reject userptr unless blob_mem is VIRTGPU_BLOB_MEM_GUEST
- Accept VIRTGPU_BLOB_FLAG_USE_READONLY and pass it through on
  the CREATE_BLOB wire
- Advertise VIRTGPU_PARAM_USERPTR

Signed-off-by: Honglei Huang <hongh...@amd.com>
---
 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c 
b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 3d8e4ccdb7..d42ca3898d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -36,7 +36,10 @@
 
 #define VIRTGPU_BLOB_FLAG_USE_MASK (VIRTGPU_BLOB_FLAG_USE_MAPPABLE | \
                                    VIRTGPU_BLOB_FLAG_USE_SHAREABLE | \
-                                   VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE)
+                                   VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE | \
+                                   VIRTGPU_BLOB_FLAG_USE_READONLY)
+
+#define VIRTGPU_BLOB_HINT_MASK DRM_VIRTGPU_BLOB_FLAG_HINT_DEFER_MAPPING
 
 /* Must be called with &virtio_gpu_fpriv.struct_mutex held. */
 static void virtio_gpu_create_context_locked(struct virtio_gpu_device *vgdev,
@@ -122,6 +125,9 @@ static int virtio_gpu_getparam_ioctl(struct drm_device 
*dev, void *data,
                        return -ENOENT;
                value = vgdev->blob_alignment;
                break;
+       case VIRTGPU_PARAM_USERPTR:
+               value = 1;
+               break;
        default:
                return -EINVAL;
        }
@@ -453,11 +459,18 @@ static int verify_blob(struct virtio_gpu_device *vgdev,
        if (rc_blob->blob_flags & ~VIRTGPU_BLOB_FLAG_USE_MASK)
                return -EINVAL;
 
+       if (rc_blob->blob_hints & ~VIRTGPU_BLOB_HINT_MASK)
+               return -EINVAL;
+
        if (rc_blob->blob_flags & VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE) {
                if (!vgdev->has_resource_assign_uuid)
                        return -EINVAL;
        }
 
+       if (rc_blob->userptr &&
+           rc_blob->blob_mem != VIRTGPU_BLOB_MEM_GUEST)
+               return -EINVAL;
+
        switch (rc_blob->blob_mem) {
        case VIRTGPU_BLOB_MEM_GUEST:
                *guest_blob = true;
@@ -495,6 +508,7 @@ static int verify_blob(struct virtio_gpu_device *vgdev,
        params->blob = true;
        params->blob_flags = rc_blob->blob_flags;
        params->blob_hints = rc_blob->blob_hints;
+       params->userptr = rc_blob->userptr;
 
        if (vgdev->has_blob_alignment &&
            !IS_ALIGNED(params->size, vgdev->blob_alignment))
@@ -518,9 +532,10 @@ static int virtio_gpu_resource_create_blob_ioctl(struct 
drm_device *dev,
        struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
        struct drm_virtgpu_resource_create_blob *rc_blob = data;
 
-       if (verify_blob(vgdev, vfpriv, &params, rc_blob,
-                       &guest_blob, &host3d_blob))
-               return -EINVAL;
+       ret = verify_blob(vgdev, vfpriv, &params, rc_blob,
+                         &guest_blob, &host3d_blob);
+       if (ret)
+               return ret;
 
        if (vgdev->has_virgl_3d)
                virtio_gpu_create_context(dev, file);
@@ -538,7 +553,9 @@ static int virtio_gpu_resource_create_blob_ioctl(struct 
drm_device *dev,
                                      vfpriv->ctx_id, NULL, NULL);
        }
 
-       if (guest_blob)
+       if (guest_blob && params.userptr)
+               ret = virtio_gpu_userptr_create(vgdev, file, &params, &bo);
+       else if (guest_blob)
                ret = virtio_gpu_object_create(vgdev, &params, &bo, NULL);
        else if (!guest_blob && host3d_blob)
                ret = virtio_gpu_vram_create(vgdev, &params, &bo);
-- 
2.34.1