drm/virtio: drop no_wait argument from virtio_gpu_object_reserve

All callers pass no_wait = false.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190829103301.3539-6-kraxel@redhat.com

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 3e0a53309c5bf3c61672a40e830c1b3e3bd5a8ab..d886c0e3502aa3359c687d015fd829732e643a74 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -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);
 }
 
-static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo,
-                                        bool no_wait)
+static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)
 {
        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 (r != -ERESTARTSYS) {
                        struct virtio_gpu_device *qdev =

diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index 292566146814b846f0574874071120dbb7274014..6fe6f72f64d100c7165257860ad21da84e2238c9 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -142,7 +142,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
        if (!vgdev->has_virgl_3d)
                return 0;
 
-       r = virtio_gpu_object_reserve(qobj, false);
+       r = virtio_gpu_object_reserve(qobj);
        if (r)
                return r;
 
@@ -163,7 +163,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
        if (!vgdev->has_virgl_3d)
                return;
 
-       r = virtio_gpu_object_reserve(qobj, false);
+       r = virtio_gpu_object_reserve(qobj);
        if (r)
                return;
 

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index a662394f689213c0e5e6618f6116873eb5e86c91..7f1775b9449e0a77387762606f016afb3d014dba 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -377,7 +377,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
 
        qobj = gem_to_virtio_gpu_obj(gobj);
 
-       ret = virtio_gpu_object_reserve(qobj, false);
+       ret = virtio_gpu_object_reserve(qobj);
        if (ret)
                goto out;
 
@@ -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);
 
-       ret = virtio_gpu_object_reserve(qobj, false);
+       ret = virtio_gpu_object_reserve(qobj);
        if (ret)
                goto out;