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

drm/virtio: move virtqueue_notify into virtio_gpu_queue_ctrl_sgs 



It becomes clear that virtio_gpu_queue_fenced_ctrl_buffer should be
responsible for setting up sgs and virtio_gpu_queue_ctrl_sgs should
be responsible for queuing sgs.

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


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

drivers/gpu/drm/virtio/virtgpu_vq.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -318,7 +318,7 @@ static struct sg_table *vmalloc_to_sgt(char *data, uint32_t size, int *sg_ents) 
	return sgt;

	return sgt;

}

}





static bool virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,

static void virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,

				      struct virtio_gpu_vbuffer *vbuf,

				      struct virtio_gpu_vbuffer *vbuf,

				      struct virtio_gpu_fence *fence,

				      struct virtio_gpu_fence *fence,

				      int elemcnt,

				      int elemcnt,
@@ -338,7 +338,7 @@ again: 




		if (fence && vbuf->objs)

		if (fence && vbuf->objs)

			virtio_gpu_array_unlock_resv(vbuf->objs);

			virtio_gpu_array_unlock_resv(vbuf->objs);

		return notify;

		return;

	}

	}





	if (vq->num_free < elemcnt) {

	if (vq->num_free < elemcnt) {
@@ -368,7 +368,12 @@ again: 




	spin_unlock(&vgdev->ctrlq.qlock);

	spin_unlock(&vgdev->ctrlq.qlock);





	return notify;

	if (notify) {

		if (vgdev->disable_notify)

			vgdev->pending_notify = true;

		else

			virtqueue_notify(vq);

	}

}

}





static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,

static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,
@@ -378,7 +383,6 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, 
	struct scatterlist *sgs[3], vcmd, vout, vresp;

	struct scatterlist *sgs[3], vcmd, vout, vresp;

	struct sg_table *sgt = NULL;

	struct sg_table *sgt = NULL;

	int elemcnt = 0, outcnt = 0, incnt = 0;

	int elemcnt = 0, outcnt = 0, incnt = 0;

	bool notify;





	/* set up vcmd */

	/* set up vcmd */

	sg_init_one(&vcmd, vbuf->buf, vbuf->size);

	sg_init_one(&vcmd, vbuf->buf, vbuf->size);
@@ -416,14 +420,8 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, 
		incnt++;

		incnt++;

	}

	}





	notify = virtio_gpu_queue_ctrl_sgs(vgdev, vbuf, fence, elemcnt, sgs,

	virtio_gpu_queue_ctrl_sgs(vgdev, vbuf, fence, elemcnt, sgs, outcnt,

					   outcnt, incnt);

				  incnt);

	if (notify) {

		if (vgdev->disable_notify)

			vgdev->pending_notify = true;

		else

			virtqueue_notify(vgdev->ctrlq.vq);

	}





	if (sgt) {

	if (sgt) {

		sg_free_table(sgt);

		sg_free_table(sgt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE