d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ttm: Fix a reversed condition and add missing locks

Browse Source 
This allows to run OpenGL applications on at least two test machines
with the Radeon driver.

Approved by:	kib@
This commit is contained in:
Jean-Sébastien Pédron 2013-08-25 15:29:23 +00:00
parent be562465c9
commit 4360c0bb20
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=254878
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/drm2/ttm/ttm_bo.c
View File

@ -145,7 +145,7 @@ ttm_bo_wait_unreserved_locked(struct ttm_buffer_object *bo, bool interruptible)
flags = 0;
wmsg = "ttbowu";
}
while (!ttm_bo_is_reserved(bo)) {
while (ttm_bo_is_reserved(bo)) {
ret = -msleep(bo, &bo->glob->lru_lock, flags, wmsg, 0);
if (ret != 0)
break;
@ -281,14 +281,15 @@ int ttm_bo_reserve(struct ttm_buffer_object *bo,
int put_count = 0;
int ret;
mtx_lock(&bo->glob->lru_lock);
ret = ttm_bo_reserve_nolru(bo, interruptible, no_wait, use_sequence,
sequence);
if (likely(ret == 0)) {
mtx_lock(&glob->lru_lock);
put_count = ttm_bo_del_from_lru(bo);
mtx_unlock(&glob->lru_lock);
ttm_bo_list_ref_sub(bo, put_count, true);
}
} else
mtx_unlock(&bo->glob->lru_lock);
return ret;
}
@ -333,13 +334,14 @@ int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
struct ttm_bo_global *glob = bo->glob;
int put_count, ret;
mtx_lock(&glob->lru_lock);
ret = ttm_bo_reserve_slowpath_nolru(bo, interruptible, sequence);
if (likely(!ret)) {
mtx_lock(&glob->lru_lock);
put_count = ttm_bo_del_from_lru(bo);
mtx_unlock(&glob->lru_lock);
ttm_bo_list_ref_sub(bo, put_count, true);
}
} else
mtx_unlock(&glob->lru_lock);
return ret;
}