summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2008-04-14 13:52:33 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2008-04-14 13:52:33 +0200
commit1ad1bd5bd95db71500edfcea8b46421d7f3cdb15 (patch)
treede25b0fcff0f763666991ca2e3c4158bf47deeb9 /linux-core
parentc5955c652302d66719984cb5a218cb590c74ad42 (diff)
Fix buffer object map wait error.
Add some branch prediction hints.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_bo.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 6f287532..88b2ee66 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1225,11 +1225,13 @@ static int drm_buffer_object_map(struct drm_file *file_priv, uint32_t handle,
bo->priv_flags &= ~_DRM_BO_FLAG_UNLOCKED;
ret = drm_bo_wait(bo, 0, 1, no_wait, 1);
+ if (unlikely(ret))
+ goto out;
if (bo->mem.flags & DRM_BO_FLAG_CACHED_MAPPED)
drm_bo_evict_cached(bo);
- } while (bo->priv_flags & _DRM_BO_FLAG_UNLOCKED);
+ } while (unlikely(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED));
atomic_inc(&bo->mapped);
mutex_lock(&dev->struct_mutex);
@@ -1242,6 +1244,7 @@ static int drm_buffer_object_map(struct drm_file *file_priv, uint32_t handle,
} else
drm_bo_fill_rep_arg(bo, rep);
+ out:
mutex_unlock(&bo->mutex);
drm_bo_usage_deref_unlocked(&bo);
@@ -1610,7 +1613,7 @@ int drm_bo_do_validate(struct drm_buffer_object *bo,
if (ret)
goto out;
- } while(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED);
+ } while(unlikely(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED));
ret = drm_buffer_object_validate(bo,
fence_class,