|
|
@@ -71,7 +71,7 @@ static long qxl_fence_wait(struct fence *fence, bool intr, signed long timeout)
|
|
|
retry:
|
|
|
sc++;
|
|
|
|
|
|
- if (fence_is_signaled_locked(fence))
|
|
|
+ if (fence_is_signaled(fence))
|
|
|
goto signaled;
|
|
|
|
|
|
qxl_io_notify_oom(qdev);
|
|
|
@@ -80,11 +80,11 @@ static long qxl_fence_wait(struct fence *fence, bool intr, signed long timeout)
|
|
|
if (!qxl_queue_garbage_collect(qdev, true))
|
|
|
break;
|
|
|
|
|
|
- if (fence_is_signaled_locked(fence))
|
|
|
+ if (fence_is_signaled(fence))
|
|
|
goto signaled;
|
|
|
}
|
|
|
|
|
|
- if (fence_is_signaled_locked(fence))
|
|
|
+ if (fence_is_signaled(fence))
|
|
|
goto signaled;
|
|
|
|
|
|
if (have_drawable_releases || sc < 4) {
|
|
|
@@ -457,8 +457,6 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release)
|
|
|
glob = bo->glob;
|
|
|
|
|
|
spin_lock(&glob->lru_lock);
|
|
|
- /* acquire release_lock to protect bo->resv->fence and its contents */
|
|
|
- spin_lock(&qdev->release_lock);
|
|
|
|
|
|
list_for_each_entry(entry, &release->bos, head) {
|
|
|
bo = entry->bo;
|
|
|
@@ -468,7 +466,6 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release)
|
|
|
ttm_bo_add_to_lru(bo);
|
|
|
__ttm_bo_unreserve(bo);
|
|
|
}
|
|
|
- spin_unlock(&qdev->release_lock);
|
|
|
spin_unlock(&glob->lru_lock);
|
|
|
ww_acquire_fini(&release->ticket);
|
|
|
}
|