Commit 897b4d1a authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/virtio: implement blob resources: resource create blob ioctl 



Implement resource create blob as specified.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200924003214.662-18-gurchetansingh@chromium.org


Co-developed-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
parent 4429b5de

drivers/gpu/drm/virtio/virtgpu_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ struct virtio_gpu_fpriv { 
	struct mutex context_lock;

};



/* virtgpu_ioctl.c */

#define DRM_VIRTIO_NUM_IOCTLS 10

/* virtio_ioctl.c */

#define DRM_VIRTIO_NUM_IOCTLS 11

extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS];

void virtio_gpu_create_context(struct drm_device *dev, struct drm_file *file);

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+136 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 


#include "virtgpu_drv.h"



#define VIRTGPU_BLOB_FLAG_USE_MASK (VIRTGPU_BLOB_FLAG_USE_MAPPABLE | \

				    VIRTGPU_BLOB_FLAG_USE_SHAREABLE | \

				    VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE)



void virtio_gpu_create_context(struct drm_device *dev, struct drm_file *file)

{

	struct virtio_gpu_device *vgdev = dev->dev_private;
@@ -521,6 +525,134 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, 
	return 0;

}



static int verify_blob(struct virtio_gpu_device *vgdev,

		       struct virtio_gpu_fpriv *vfpriv,

		       struct virtio_gpu_object_params *params,

		       struct drm_virtgpu_resource_create_blob *rc_blob,

		       bool *guest_blob, bool *host3d_blob)

{

	if (!vgdev->has_resource_blob)

		return -EINVAL;



	if ((rc_blob->blob_flags & ~VIRTGPU_BLOB_FLAG_USE_MASK) ||

	    !rc_blob->blob_flags)

		return -EINVAL;



	if (rc_blob->blob_flags & VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE) {

		if (!vgdev->has_resource_assign_uuid)

			return -EINVAL;

	}



	switch (rc_blob->blob_mem) {

	case VIRTGPU_BLOB_MEM_GUEST:

		*guest_blob = true;

		break;

	case VIRTGPU_BLOB_MEM_HOST3D_GUEST:

		*guest_blob = true;

		fallthrough;

	case VIRTGPU_BLOB_MEM_HOST3D:

		*host3d_blob = true;

		break;

	default:

		return -EINVAL;

	}



	if (*host3d_blob) {

		if (!vgdev->has_virgl_3d)

			return -EINVAL;



		/* Must be dword aligned. */

		if (rc_blob->cmd_size % 4 != 0)

			return -EINVAL;



		params->ctx_id = vfpriv->ctx_id;

		params->blob_id = rc_blob->blob_id;

	} else {

		if (rc_blob->blob_id != 0)

			return -EINVAL;



		if (rc_blob->cmd_size != 0)

			return -EINVAL;

	}



	params->blob_mem = rc_blob->blob_mem;

	params->size = rc_blob->size;

	params->blob = true;

	params->blob_flags = rc_blob->blob_flags;

	return 0;

}



static int virtio_gpu_resource_create_blob(struct drm_device *dev,

					   void *data, struct drm_file *file)

{

	int ret = 0;

	uint32_t handle = 0;

	bool guest_blob = false;

	bool host3d_blob = false;

	struct drm_gem_object *obj;

	struct virtio_gpu_object *bo;

	struct virtio_gpu_object_params params = { 0 };

	struct virtio_gpu_device *vgdev = dev->dev_private;

	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;



	if (vgdev->has_virgl_3d)

		virtio_gpu_create_context(dev, file);



	if (rc_blob->cmd_size) {

		void *buf;



		buf = memdup_user(u64_to_user_ptr(rc_blob->cmd),

				  rc_blob->cmd_size);



		if (IS_ERR(buf))

			return PTR_ERR(buf);



		virtio_gpu_cmd_submit(vgdev, buf, rc_blob->cmd_size,

				      vfpriv->ctx_id, NULL, NULL);

	}



	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);

	else

		return -EINVAL;



	if (ret < 0)

		return ret;



	bo->guest_blob = guest_blob;

	bo->host3d_blob = host3d_blob;

	bo->blob_mem = rc_blob->blob_mem;

	bo->blob_flags = rc_blob->blob_flags;



	obj = &bo->base.base;

	if (params.blob_flags & VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE) {

		ret = virtio_gpu_resource_assign_uuid(vgdev, bo);

		if (ret) {

			drm_gem_object_release(obj);

			return ret;

		}

	}



	ret = drm_gem_handle_create(file, obj, &handle);

	if (ret) {

		drm_gem_object_release(obj);

		return ret;

	}

	drm_gem_object_put(obj);



	rc_blob->res_handle = bo->hw_res_handle;

	rc_blob->bo_handle = handle;



	return 0;

}



struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS] = {

	DRM_IOCTL_DEF_DRV(VIRTGPU_MAP, virtio_gpu_map_ioctl,

			  DRM_RENDER_ALLOW),
@@ -553,4 +685,8 @@ struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS] = { 


	DRM_IOCTL_DEF_DRV(VIRTGPU_GET_CAPS, virtio_gpu_get_caps_ioctl,

			  DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_CREATE_BLOB,

			  virtio_gpu_resource_create_blob,

			  DRM_RENDER_ALLOW),

};

drivers/gpu/drm/virtio/virtgpu_object.c

+4 −1
Original line number Diff line number Diff line
@@ -246,7 +246,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, 
		return ret;

	}



	if (params->virgl) {

	if (params->blob) {

		virtio_gpu_cmd_resource_create_blob(vgdev, bo, params,

						    ents, nents);

	} else if (params->virgl) {

		virtio_gpu_cmd_resource_create_3d(vgdev, bo, params,

						  objs, fence);

		virtio_gpu_object_attach(vgdev, bo, ents, nents);

drivers/gpu/drm/virtio/virtgpu_vram.c

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ int virtio_gpu_vram_create(struct virtio_gpu_device *vgdev, 
		return ret;

	}



	virtio_gpu_cmd_resource_create_blob(vgdev, &vram->base, params, NULL,

					    0);

	if (params->blob_flags & VIRTGPU_BLOB_FLAG_USE_MAPPABLE) {

		ret = virtio_gpu_vram_map(&vram->base);

		if (ret) {