redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/qxl: Handle all errors in qxl_surface_evict

Browse source 
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>
This commit is contained in:
Frediano Ziglio 2015-06-03 12:09:13 +01:00 committed by Dave Airlie
parent fe2af53bae
commit c610c7137c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/qxl/qxl_cmd.c
View file

@ -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);