Commit 23a0e88e authored by Gerd Hoffmann's avatar Gerd Hoffmann

drm/virtio: drop no_wait argument from virtio_gpu_object_reserve

All callers pass no_wait = false.
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarChia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190829103301.3539-6-kraxel@redhat.com
parent 191ab219
...@@ -398,12 +398,11 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo) ...@@ -398,12 +398,11 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo)
return drm_vma_node_offset_addr(&bo->tbo.base.vma_node); return drm_vma_node_offset_addr(&bo->tbo.base.vma_node);
} }
static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo, static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)
bool no_wait)
{ {
int r; int r;
r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL); r = ttm_bo_reserve(&bo->tbo, true, false, NULL);
if (unlikely(r != 0)) { if (unlikely(r != 0)) {
if (r != -ERESTARTSYS) { if (r != -ERESTARTSYS) {
struct virtio_gpu_device *qdev = struct virtio_gpu_device *qdev =
......
...@@ -142,7 +142,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, ...@@ -142,7 +142,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
if (!vgdev->has_virgl_3d) if (!vgdev->has_virgl_3d)
return 0; return 0;
r = virtio_gpu_object_reserve(qobj, false); r = virtio_gpu_object_reserve(qobj);
if (r) if (r)
return r; return r;
...@@ -163,7 +163,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj, ...@@ -163,7 +163,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
if (!vgdev->has_virgl_3d) if (!vgdev->has_virgl_3d)
return; return;
r = virtio_gpu_object_reserve(qobj, false); r = virtio_gpu_object_reserve(qobj);
if (r) if (r)
return; return;
......
...@@ -377,7 +377,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, ...@@ -377,7 +377,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
qobj = gem_to_virtio_gpu_obj(gobj); qobj = gem_to_virtio_gpu_obj(gobj);
ret = virtio_gpu_object_reserve(qobj, false); ret = virtio_gpu_object_reserve(qobj);
if (ret) if (ret)
goto out; goto out;
...@@ -427,7 +427,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data, ...@@ -427,7 +427,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
qobj = gem_to_virtio_gpu_obj(gobj); qobj = gem_to_virtio_gpu_obj(gobj);
ret = virtio_gpu_object_reserve(qobj, false); ret = virtio_gpu_object_reserve(qobj);
if (ret) if (ret)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment