Commit 1e2554f4 authored by Gurchetan Singh's avatar Gurchetan Singh Committed by Gerd Hoffmann
Browse files

drm/virtio: implement blob resources: refactor UUID code somewhat 



For upcoming blob resources, userspace can specify that the
resource will be used for cross-device sharing. This is mainly
for exportable blobs that will only shared with the virtgpu
display but not across devices.

Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Acked-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200924003214.662-15-gurchetansingh@chromium.org


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 0b0f1afe

drivers/gpu/drm/virtio/virtgpu_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -432,6 +432,8 @@ bool virtio_gpu_is_shmem(struct virtio_gpu_object *bo); 
int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev,

			       uint32_t *resid);

/* virtgpu_prime.c */

int virtio_gpu_resource_assign_uuid(struct virtio_gpu_device *vgdev,

				    struct virtio_gpu_object *bo);

struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj,

					 int flags);

struct drm_gem_object *virtgpu_gem_prime_import(struct drm_device *dev,

drivers/gpu/drm/virtio/virtgpu_prime.c

+29 −13
Original line number Diff line number Diff line
@@ -59,6 +59,24 @@ const struct virtio_dma_buf_ops virtgpu_dmabuf_ops = { 
	.get_uuid = virtgpu_virtio_get_uuid,

};



int virtio_gpu_resource_assign_uuid(struct virtio_gpu_device *vgdev,

				    struct virtio_gpu_object *bo)

{

	int ret;

	struct virtio_gpu_object_array *objs;



	objs = virtio_gpu_array_alloc(1);

	if (!objs)

		return -ENOMEM;



	virtio_gpu_array_add_obj(objs, &bo->base.base);

	ret = virtio_gpu_cmd_resource_assign_uuid(vgdev, objs);

	if (ret)

		return ret;



	return 0;

}



struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj,

					 int flags)

{
@@ -66,23 +84,21 @@ struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, 
	struct drm_device *dev = obj->dev;

	struct virtio_gpu_device *vgdev = dev->dev_private;

	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);

	struct virtio_gpu_object_array *objs;

	int ret = 0;

	bool blob = bo->host3d_blob || bo->guest_blob;

	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);



	if (!blob) {

		if (vgdev->has_resource_assign_uuid) {

		objs = virtio_gpu_array_alloc(1);

		if (!objs)

			return ERR_PTR(-ENOMEM);

		virtio_gpu_array_add_obj(objs, &bo->base.base);



		ret = virtio_gpu_cmd_resource_assign_uuid(vgdev, objs);

			ret = virtio_gpu_resource_assign_uuid(vgdev, bo);

			if (ret)

				return ERR_PTR(ret);



			virtio_gpu_notify(vgdev);

		} else {

			bo->uuid_state = STATE_ERR;

		}

	}



	exp_info.ops = &virtgpu_dmabuf_ops.ops;

	exp_info.size = obj->size;