drm/virtio: move the check for vqs_ready earlier

When vqs_ready is false, vq should be considered invalid and we
should not check vq->num_free.  After this change, a fenced command
queued before the vqs are ready will have fence id 0 and will be
considered done.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200205181955.202485-9-olvaffe@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 2db35f32dfbeaf1a629a77def5e626b570874a5d..aa25e8781404ed6c1c282287cc2a658c225ac229 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -333,6 +333,14 @@ static bool virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,
 again:
        spin_lock(&vgdev->ctrlq.qlock);
 
+       if (!vgdev->vqs_ready) {
+               spin_unlock(&vgdev->ctrlq.qlock);
+
+               if (fence && vbuf->objs)
+                       virtio_gpu_array_unlock_resv(vbuf->objs);
+               return notify;
+       }
+
        if (vq->num_free < elemcnt) {
                spin_unlock(&vgdev->ctrlq.qlock);
                wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= elemcnt);
@@ -351,11 +359,6 @@ again:
                }
        }
 
-       if (!vgdev->vqs_ready) {
-               spin_unlock(&vgdev->ctrlq.qlock);
-               return notify;
-       }
-
        ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC);
        WARN_ON(ret);