hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Chia-I Wu 2020-02-05 10:19:52 -08:00 committed by Gerd Hoffmann
parent 6ebe8661eb
commit c900b2a45c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/virtio/virtgpu_vq.c
View File

@ -333,6 +333,14 @@ static bool virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,
again: again:
spin_lock(&vgdev->ctrlq.qlock); 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) { if (vq->num_free < elemcnt) {
spin_unlock(&vgdev->ctrlq.qlock); spin_unlock(&vgdev->ctrlq.qlock);
wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= elemcnt); 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); ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC);
WARN_ON(ret); WARN_ON(ret);