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

Commit 7c9d656e authored by David Riley's avatar David Riley Committed by Kaiyi Li
Browse files

UPSTREAM: drm/virtio: Rewrite virtio_gpu_queue_ctrl_buffer using fenced version. 



Factor function in preparation to generating scatterlist prior to locking.

Signed-off-by: default avatarDavid Riley <davidriley@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190911181403.40909-2-davidriley@chromium.org


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

Bug: https://crbug.com/993452


Change-Id: I6f4348f1cd18752f55a3daefc2c83a8ce699204d
(cherry picked from commit 32d6c2c5b5227cfc6f796bbd760dab81b05f48e5)
Signed-off-by: default avatarKaiyi Li <kaiyili@google.com>
parent ec2be24a

drivers/gpu/drm/virtio/virtgpu_vq.c

+7 −12
Original line number Diff line number Diff line
@@ -299,17 +299,6 @@ static int virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev, 
	return ret;

}



static int virtio_gpu_queue_ctrl_buffer(struct virtio_gpu_device *vgdev,

					struct virtio_gpu_vbuffer *vbuf)

{

	int rc;



	spin_lock(&vgdev->ctrlq.qlock);

	rc = virtio_gpu_queue_ctrl_buffer_locked(vgdev, vbuf);

	spin_unlock(&vgdev->ctrlq.qlock);

	return rc;

}



static int virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,

					       struct virtio_gpu_vbuffer *vbuf,

					       struct virtio_gpu_ctrl_hdr *hdr,
@@ -335,13 +324,19 @@ static int virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, 
		goto again;

	}



	if (fence)

	if (hdr && fence)

		virtio_gpu_fence_emit(vgdev, hdr, fence);

	rc = virtio_gpu_queue_ctrl_buffer_locked(vgdev, vbuf);

	spin_unlock(&vgdev->ctrlq.qlock);

	return rc;

}



static int virtio_gpu_queue_ctrl_buffer(struct virtio_gpu_device *vgdev,

					struct virtio_gpu_vbuffer *vbuf)

{

	return virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, NULL, NULL);

}



static int virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,

				   struct virtio_gpu_vbuffer *vbuf)

{