drm/qxl: Handle all errors in qxl_surface_evict

Only EBUSY error was handled. This could cause code to believe
reserve was successful while it failed.

Signed-off-by: Frediano Ziglio <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index f33251d67914cfcd42722ecc3b5bf2760f4256ff..3d270a4f4fd7e03e692467050e8c84dea2a9ed9a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -618,8 +618,8 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal
        int ret;
 
        ret = qxl_bo_reserve(surf, false);
-       if (ret == -EBUSY)
-               return -EBUSY;
+       if (ret)
+               return ret;
 
        if (stall)
                mutex_unlock(&qdev->surf_evict_mutex);
@@ -628,9 +628,9 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal
 
        if (stall)
                mutex_lock(&qdev->surf_evict_mutex);
-       if (ret == -EBUSY) {
+       if (ret) {
                qxl_bo_unreserve(surf);
-               return -EBUSY;
+               return ret;
        }
 
        qxl_surface_evict_locked(qdev, surf, true);