1 files changed, 0 insertions, 7 deletions

diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index eb89653a7a17..97823644d347 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -620,17 +620,10 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal
         if (ret == -EBUSY)
                 return -EBUSY;
 
-        if (surf->fence.num_active_releases > 0 && stall == false) {
-                qxl_bo_unreserve(surf);
-                return -EBUSY;
-        }
-
         if (stall)
                 mutex_unlock(&qdev->surf_evict_mutex);
 
-        spin_lock(&surf->tbo.bdev->fence_lock);
         ret = ttm_bo_wait(&surf->tbo, true, true, !stall);
-        spin_unlock(&surf->tbo.bdev->fence_lock);
 
         if (stall)
                 mutex_lock(&qdev->surf_evict_mutex);