Эх сурвалжийг харах

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 <fziglio@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Frediano Ziglio 10 жил өмнө
parent
commit
c610c7137c

+ 4 - 4
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;
 	int ret;
 
 
 	ret = qxl_bo_reserve(surf, false);
 	ret = qxl_bo_reserve(surf, false);
-	if (ret == -EBUSY)
-		return -EBUSY;
+	if (ret)
+		return ret;
 
 
 	if (stall)
 	if (stall)
 		mutex_unlock(&qdev->surf_evict_mutex);
 		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)
 	if (stall)
 		mutex_lock(&qdev->surf_evict_mutex);
 		mutex_lock(&qdev->surf_evict_mutex);
-	if (ret == -EBUSY) {
+	if (ret) {
 		qxl_bo_unreserve(surf);
 		qxl_bo_unreserve(surf);
-		return -EBUSY;
+		return ret;
 	}
 	}
 
 
 	qxl_surface_evict_locked(qdev, surf, true);
 	qxl_surface_evict_locked(qdev, surf, true);