These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / qxl / qxl_cmd.c

diff --git a/kernel/drivers/gpu/drm/qxl/qxl_cmd.c b/kernel/drivers/gpu/drm/qxl/qxl_cmd.c
index f33251d..fdc1833 100644 (file)
--- a/kernel/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/kernel/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -248,7 +248,7 @@ int qxl_garbage_collect(struct qxl_device *qdev)
                }
        }
 
-       QXL_INFO(qdev, "%s: %lld\n", __func__, i);
+       QXL_INFO(qdev, "%s: %d\n", __func__, i);
 
        return i;
 }
@@ -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);