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

[Honglei Huang]

Integrate userptr into the blob resource creation ioctl.

- Include VIRTGPU_BLOB_FLAG_USE_USERPTR and
  VIRTGPU_BLOB_FLAG_USERPTR_RDONLY in VIRTGPU_BLOB_FLAG_USE_MASK
- Require userptr if and only if USE_USERPTR is set
- Reject USERPTR unless blob_mem is VIRTGPU_BLOB_MEM_GUEST
- Pass the userspace address into the internal create params
- Call virtio_gpu_userptr_create() for userptr blob requests

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

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c 
b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 3d8e4ccdb7..6d38483f5f 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -36,7 +36,9 @@
 
 #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_USERPTR | \
+                                   VIRTGPU_BLOB_FLAG_USERPTR_RDONLY)
 
 /* Must be called with &virtio_gpu_fpriv.struct_mutex held. */
 static void virtio_gpu_create_context_locked(struct virtio_gpu_device *vgdev,
@@ -458,6 +460,17 @@ static int verify_blob(struct virtio_gpu_device *vgdev,
                        return -EINVAL;
        }
 
+       if (rc_blob->blob_flags & VIRTGPU_BLOB_FLAG_USE_USERPTR) {
+               if (!rc_blob->userptr)
+                       return -EINVAL;
+       } else {
+               if (rc_blob->userptr)
+                       return -EINVAL;
+
+               if (rc_blob->blob_flags & VIRTGPU_BLOB_FLAG_USERPTR_RDONLY)
+                       return -EINVAL;
+       }
+
        switch (rc_blob->blob_mem) {
        case VIRTGPU_BLOB_MEM_GUEST:
                *guest_blob = true;
@@ -472,6 +485,11 @@ static int verify_blob(struct virtio_gpu_device *vgdev,
                return -EINVAL;
        }
 
+       /* Userptr is only defined for pure guest backing. */
+       if ((rc_blob->blob_flags & VIRTGPU_BLOB_FLAG_USE_USERPTR) &&
+           rc_blob->blob_mem != VIRTGPU_BLOB_MEM_GUEST)
+               return -EINVAL;
+
        if (*host3d_blob) {
                if (!vgdev->has_virgl_3d)
                        return -EINVAL;
@@ -495,6 +513,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))
@@ -538,8 +557,10 @@ 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_object_create(vgdev, &params, &bo, NULL);
+       else if (guest_blob && params.userptr)
+               ret = virtio_gpu_userptr_create(vgdev, file, &params, &bo);
        else if (!guest_blob && host3d_blob)
                ret = virtio_gpu_vram_create(vgdev, &params, &bo);
        else
-- 
2.34.1