Commit e19d3411 authored by Chia-I Wu's avatar Chia-I Wu Committed by Gerd Hoffmann
Browse files

drm/virtio: no need to pass virtio_gpu_ctrl_hdr 



We can get it from vbuf.

Signed-off-by: default avatarChia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200205181955.202485-5-olvaffe@gmail.com


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

drivers/gpu/drm/virtio/virtgpu_vq.c

+12 −12
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ static bool virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev, 


static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,

						struct virtio_gpu_vbuffer *vbuf,

						struct virtio_gpu_ctrl_hdr *hdr,

						struct virtio_gpu_fence *fence)

{

	struct virtqueue *vq = vgdev->ctrlq.vq;
@@ -399,8 +398,9 @@ again: 
		goto again;

	}



	if (hdr && fence) {

		virtio_gpu_fence_emit(vgdev, hdr, fence);

	if (fence) {

		virtio_gpu_fence_emit(vgdev, virtio_gpu_vbuf_ctrl_hdr(vbuf),

				      fence);

		if (vbuf->objs) {

			virtio_gpu_array_add_fence(vbuf->objs, &fence->f);

			virtio_gpu_array_unlock_resv(vbuf->objs);
@@ -439,7 +439,7 @@ void virtio_gpu_enable_notify(struct virtio_gpu_device *vgdev) 
static void virtio_gpu_queue_ctrl_buffer(struct virtio_gpu_device *vgdev,

					 struct virtio_gpu_vbuffer *vbuf)

{

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, NULL, NULL);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, NULL);

}



static void virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,
@@ -503,7 +503,7 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev, 
	cmd_p->width = cpu_to_le32(params->width);

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



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

	bo->created = true;

}
@@ -535,7 +535,7 @@ static void virtio_gpu_cmd_resource_inval_backing(struct virtio_gpu_device *vgde 
	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING);

	cmd_p->resource_id = cpu_to_le32(resource_id);



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



void virtio_gpu_cmd_set_scanout(struct virtio_gpu_device *vgdev,
@@ -610,7 +610,7 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, 
	cmd_p->r.x = cpu_to_le32(x);

	cmd_p->r.y = cpu_to_le32(y);



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



static void
@@ -633,7 +633,7 @@ virtio_gpu_cmd_resource_attach_backing(struct virtio_gpu_device *vgdev, 
	vbuf->data_buf = ents;

	vbuf->data_size = sizeof(*ents) * nents;



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



static void virtio_gpu_cmd_get_display_info_cb(struct virtio_gpu_device *vgdev,
@@ -992,7 +992,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, 
	cmd_p->nr_samples = cpu_to_le32(params->nr_samples);

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



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

	bo->created = true;

}
@@ -1025,7 +1025,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, 
	cmd_p->offset = cpu_to_le64(offset);

	cmd_p->level = cpu_to_le32(level);



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,
@@ -1051,7 +1051,7 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev, 
	cmd_p->offset = cpu_to_le64(offset);

	cmd_p->level = cpu_to_le32(level);



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,
@@ -1074,7 +1074,7 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, 
	cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);

	cmd_p->size = cpu_to_le32(data_size);



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE