diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-04 10:48:28 +0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-09-06 08:23:37 +0300 |
| commit | 84f6fec42e9e66578bb63263cb5bb8407b0ca936 (patch) | |
| tree | ad3f6b30dd047154f526abf0ff0dd3736f230031 /drivers | |
| parent | f0c6cef7e7174bdb11bbf972cded48bbb33bfba4 (diff) | |
| download | linux-84f6fec42e9e66578bb63263cb5bb8407b0ca936.tar.xz | |
drm/virtio: fix command submission with objects but without fence.
Only call virtio_gpu_array_add_fence if we actually have a fence.
Fixes: da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190904074828.32502-1-kraxel@redhat.com
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_vq.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 595fa6ec2d58..7fd2851f7b97 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -339,11 +339,12 @@ again: goto again; } - if (fence) + if (fence) { virtio_gpu_fence_emit(vgdev, hdr, fence); - if (vbuf->objs) { - virtio_gpu_array_add_fence(vbuf->objs, &fence->f); - virtio_gpu_array_unlock_resv(vbuf->objs); + if (vbuf->objs) { + virtio_gpu_array_add_fence(vbuf->objs, &fence->f); + virtio_gpu_array_unlock_resv(vbuf->objs); + } } notify = virtio_gpu_queue_ctrl_buffer_locked(vgdev, vbuf); spin_unlock(&vgdev->ctrlq.qlock); |