Commit 98a6dd90 authored by Christian König's avatar Christian König Committed by Sumit Semwal

drm/ttm: fix ttm_bo_wait

reservation_object_wait_timeout_rcu() should enable signaling even with a
zero timeout, but ttm_bo_wait() can also be called from atomic context and
then it is not a good idea to do this.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
  [sumits: fix checkpatch warnings]
Link: http://patchwork.freedesktop.org/patch/msgid/1478553376-18575-3-git-send-email-alexander.deucher@amd.com
parent 698c0f7f
...@@ -1611,7 +1611,14 @@ EXPORT_SYMBOL(ttm_bo_unmap_virtual); ...@@ -1611,7 +1611,14 @@ EXPORT_SYMBOL(ttm_bo_unmap_virtual);
int ttm_bo_wait(struct ttm_buffer_object *bo, int ttm_bo_wait(struct ttm_buffer_object *bo,
bool interruptible, bool no_wait) bool interruptible, bool no_wait)
{ {
long timeout = no_wait ? 0 : 15 * HZ; long timeout = 15 * HZ;
if (no_wait) {
if (reservation_object_test_signaled_rcu(bo->resv, true))
return 0;
else
return -EBUSY;
}
timeout = reservation_object_wait_timeout_rcu(bo->resv, true, timeout = reservation_object_wait_timeout_rcu(bo->resv, true,
interruptible, timeout); interruptible, timeout);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment