Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa39f5f5 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Alistair Delva
Browse files

UPSTREAM: drm/virtio: params struct for virtio_gpu_cmd_create_resource_3d() 



Add 3d resource parameters to virtio_gpu_object_params struct.  With
that in place we can use it for virtio_gpu_cmd_resource_create_3d()
calls.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190318113332.10900-5-kraxel@redhat.com


(cherry picked from commit fd4d6a4277713b647885f68543b4216150540fca)
Signed-off-by: default avatarGreg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: I88e29aa79efb6455e98ea010a18dd0fe2d3725ba
parent 2d20b3c3

drivers/gpu/drm/virtio/virtgpu_drv.h

+9 −1
Original line number Original line Diff line number Diff line
@@ -58,6 +58,14 @@ struct virtio_gpu_object_params { 
	uint32_t width;

	uint32_t width;

	uint32_t height;

	uint32_t height;

	unsigned long size;

	unsigned long size;

	/* 3d */

	uint32_t target;

	uint32_t bind;

	uint32_t depth;

	uint32_t array_size;

	uint32_t last_level;

	uint32_t nr_samples;

	uint32_t flags;

};

};





struct virtio_gpu_object {

struct virtio_gpu_object {
@@ -315,7 +323,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, 
void

void

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_resource_create_3d *rc_3d);

				  struct virtio_gpu_object_params *params);

void virtio_gpu_ctrl_ack(struct virtqueue *vq);

void virtio_gpu_ctrl_ack(struct virtqueue *vq);

void virtio_gpu_cursor_ack(struct virtqueue *vq);

void virtio_gpu_cursor_ack(struct virtqueue *vq);

void virtio_gpu_fence_ack(struct virtqueue *vq);

void virtio_gpu_fence_ack(struct virtqueue *vq);

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+10 −15
Original line number Original line Diff line number Diff line
@@ -283,7 +283,6 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
	struct ttm_validate_buffer mainbuf;

	struct ttm_validate_buffer mainbuf;

	struct virtio_gpu_fence *fence = NULL;

	struct virtio_gpu_fence *fence = NULL;

	struct ww_acquire_ctx ticket;

	struct ww_acquire_ctx ticket;

	struct virtio_gpu_resource_create_3d rc_3d;

	struct virtio_gpu_object_params params = { 0 };

	struct virtio_gpu_object_params params = { 0 };





	if (vgdev->has_virgl_3d == false) {

	if (vgdev->has_virgl_3d == false) {
@@ -306,7 +305,15 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
	params.width = rc->width;

	params.width = rc->width;

	params.height = rc->height;

	params.height = rc->height;

	params.size = rc->size;

	params.size = rc->size;



	if (vgdev->has_virgl_3d) {

		params.target = rc->target;

		params.bind = rc->bind;

		params.depth = rc->depth;

		params.array_size = rc->array_size;

		params.last_level = rc->last_level;

		params.nr_samples = rc->nr_samples;

		params.flags = rc->flags;

	}

	/* allocate a single page size object */

	/* allocate a single page size object */

	if (params.size == 0)

	if (params.size == 0)

		params.size = PAGE_SIZE;

		params.size = PAGE_SIZE;
@@ -332,25 +339,13 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
			goto fail_unref;

			goto fail_unref;

		}

		}





		rc_3d.resource_id = cpu_to_le32(qobj->hw_res_handle);

		rc_3d.target = cpu_to_le32(rc->target);

		rc_3d.format = cpu_to_le32(rc->format);

		rc_3d.bind = cpu_to_le32(rc->bind);

		rc_3d.width = cpu_to_le32(rc->width);

		rc_3d.height = cpu_to_le32(rc->height);

		rc_3d.depth = cpu_to_le32(rc->depth);

		rc_3d.array_size = cpu_to_le32(rc->array_size);

		rc_3d.last_level = cpu_to_le32(rc->last_level);

		rc_3d.nr_samples = cpu_to_le32(rc->nr_samples);

		rc_3d.flags = cpu_to_le32(rc->flags);



		fence = virtio_gpu_fence_alloc(vgdev);

		fence = virtio_gpu_fence_alloc(vgdev);

		if (!fence) {

		if (!fence) {

			ret = -ENOMEM;

			ret = -ENOMEM;

			goto fail_backoff;

			goto fail_backoff;

		}

		}





		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d);

		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &params);

		ret = virtio_gpu_object_attach(vgdev, qobj, fence);

		ret = virtio_gpu_object_attach(vgdev, qobj, fence);

		if (ret) {

		if (ret) {

			dma_fence_put(&fence->f);

			dma_fence_put(&fence->f);

drivers/gpu/drm/virtio/virtgpu_vq.c

+13 −3
Original line number Original line Diff line number Diff line
@@ -828,7 +828,7 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev, 
void

void

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_resource_create_3d *rc_3d)

				  struct virtio_gpu_object_params *params)

{

{

	struct virtio_gpu_resource_create_3d *cmd_p;

	struct virtio_gpu_resource_create_3d *cmd_p;

	struct virtio_gpu_vbuffer *vbuf;

	struct virtio_gpu_vbuffer *vbuf;
@@ -836,9 +836,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, 
	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));

	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));

	memset(cmd_p, 0, sizeof(*cmd_p));

	memset(cmd_p, 0, sizeof(*cmd_p));





	*cmd_p = *rc_3d;

	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_CREATE_3D);

	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_CREATE_3D);

	cmd_p->hdr.flags = 0;

	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);

	cmd_p->format = cpu_to_le32(params->format);

	cmd_p->width = cpu_to_le32(params->width);

	cmd_p->height = cpu_to_le32(params->height);



	cmd_p->target = cpu_to_le32(params->target);

	cmd_p->bind = cpu_to_le32(params->bind);

	cmd_p->depth = cpu_to_le32(params->depth);

	cmd_p->array_size = cpu_to_le32(params->array_size);

	cmd_p->last_level = cpu_to_le32(params->last_level);

	cmd_p->nr_samples = cpu_to_le32(params->nr_samples);

	cmd_p->flags = cpu_to_le32(params->flags);





	virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);

	virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);

	bo->created = true;

	bo->created = true;