diff options
| author | David Riley <davidriley@chromium.org> | 2019-09-11 11:14:02 -0700 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-12 09:49:24 +0200 |
| commit | 32d6c2c5b5227cfc6f796bbd760dab81b05f48e5 (patch) | |
| tree | 485db562d8b22c1c898af7e2032bb41fe78f55a3 | |
| parent | 07583467c256ed1acacb204a96d69beacb34b7f6 (diff) | |
drm/virtio: Rewrite virtio_gpu_queue_ctrl_buffer using fenced version.
Factor function in preparation to generating scatterlist prior to locking.
Signed-off-by: David Riley <davidriley@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190911181403.40909-2-davidriley@chromium.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_vq.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 7fd2851f7b97..5a64c776138d 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -302,18 +302,6 @@ retry: return notify; } -static void virtio_gpu_queue_ctrl_buffer(struct virtio_gpu_device *vgdev, - struct virtio_gpu_vbuffer *vbuf) -{ - bool notify; - - spin_lock(&vgdev->ctrlq.qlock); - notify = virtio_gpu_queue_ctrl_buffer_locked(vgdev, vbuf); - spin_unlock(&vgdev->ctrlq.qlock); - if (notify) - virtqueue_notify(vgdev->ctrlq.vq); -} - static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, struct virtio_gpu_vbuffer *vbuf, struct virtio_gpu_ctrl_hdr *hdr, @@ -339,7 +327,7 @@ again: goto again; } - if (fence) { + if (hdr && fence) { virtio_gpu_fence_emit(vgdev, hdr, fence); if (vbuf->objs) { virtio_gpu_array_add_fence(vbuf->objs, &fence->f); @@ -352,6 +340,12 @@ again: virtqueue_notify(vgdev->ctrlq.vq); } +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); +} + static void virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev, struct virtio_gpu_vbuffer *vbuf) { |