summaryrefslogtreecommitdiff
path: root/linux-core/drm_bo.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-18 20:43:31 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-18 20:43:31 +0200
commitca1b15d645c74e20f638f5a09981bcf02f58caee (patch)
tree8a58a4ad1add4fa9c8aa5cb735b62e432263af83 /linux-core/drm_bo.c
parentc4fad4c96168a3dfabaa8a7e97758fefd014c8a7 (diff)
Alternative implementation of page table zeroing using zap page_range.
(Disabled for now) Fix bo_wait_idle bug. Remove stray debug message.
Diffstat (limited to 'linux-core/drm_bo.c')
-rw-r--r--linux-core/drm_bo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index d176392a..8e51985e 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1115,6 +1115,7 @@ static int drm_bo_handle_wait(drm_file_t * priv, uint32_t handle,
if (!bo) {
return -EINVAL;
}
+
mutex_lock(&bo->mutex);
ret = drm_bo_wait_unfenced(bo, no_wait, 0);
if (ret)
@@ -1124,10 +1125,11 @@ static int drm_bo_handle_wait(drm_file_t * priv, uint32_t handle,
goto out;
drm_bo_fill_rep_arg(bo, rep);
+
out:
mutex_unlock(&bo->mutex);
drm_bo_usage_deref_unlocked(bo->dev, bo);
- return 0;
+ return ret;
}
/*