qxl/ttm: drop the unusued no wait flag to reserve function

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-5-airlied@gmail.com

diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 798f9dd7ad753eeb5f9ded56cd1fd208ebfd4ea5..54e3c3a97440763fdd35bc9ba7d08abfd6d49f0f 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -588,7 +588,7 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal
 {
        int ret;
 
-       ret = qxl_bo_reserve(surf, false);
+       ret = qxl_bo_reserve(surf);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 8f605d5cc149fc566e070d1760cd0ff93b3fb7a2..5cea6eea72abb2ff947faf9b359962969baf5c11 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -322,7 +322,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,
 
        qobj = gem_to_qxl_bo(gobj);
 
-       ret = qxl_bo_reserve(qobj, false);
+       ret = qxl_bo_reserve(qobj);
        if (ret)
                goto out;
 

diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index 80e7a17aaddde00b2f2bd67080008ae2571cdda5..f838b6d689aad58850eb7446a48f86f4515bb1b0 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -284,7 +284,7 @@ int qxl_bo_pin(struct qxl_bo *bo)
 {
        int r;
 
-       r = qxl_bo_reserve(bo, false);
+       r = qxl_bo_reserve(bo);
        if (r)
                return r;
 
@@ -302,7 +302,7 @@ int qxl_bo_unpin(struct qxl_bo *bo)
 {
        int r;
 
-       r = qxl_bo_reserve(bo, false);
+       r = qxl_bo_reserve(bo);
        if (r)
                return r;
 

diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h
index 21fa81048f4f3e76427615f2a29e65734534e400..6b434e5ef795a910d68bd6d7bfa2af48510d5b0a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_object.h
+++ b/drivers/gpu/drm/qxl/qxl_object.h
@@ -27,11 +27,11 @@
 
 #include "qxl_drv.h"
 
-static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait)
+static inline int qxl_bo_reserve(struct qxl_bo *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 drm_device *ddev = bo->tbo.base.dev;