summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-10-22 19:09:36 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-10-22 19:09:36 +0200
commit824330d0e652e0bab1851437f120c7e76feee832 (patch)
treec314eaf46fce163495eca5dc2cb5477df689558d
parent919c886b2b7728768720aac93e0f6fd1acb8b2df (diff)
Don't clobber the unfenced list with DONT_FENCE operations.
-rw-r--r--linux-core/drm_bo.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index e6eb6320..9598e353 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1299,10 +1299,7 @@ int drm_bo_move_buffer(struct drm_buffer_object * bo, uint32_t new_mem_flags,
mutex_lock(&bm->evict_mutex);
mutex_lock(&dev->struct_mutex);
- list_del(&bo->lru);
- list_add_tail(&bo->lru, &bm->unfenced);
- DRM_FLAG_MASKED(bo->priv_flags, _DRM_BO_FLAG_UNFENCED,
- _DRM_BO_FLAG_UNFENCED);
+ list_del_init(&bo->lru);
mutex_unlock(&dev->struct_mutex);
/*
@@ -1322,10 +1319,6 @@ int drm_bo_move_buffer(struct drm_buffer_object * bo, uint32_t new_mem_flags,
drm_mm_put_block(mem.mm_node);
mem.mm_node = NULL;
}
- DRM_FLAG_MASKED(bo->priv_flags, 0, _DRM_BO_FLAG_UNFENCED);
- DRM_WAKEUP(&bo->event_queue);
- list_del(&bo->lru);
- drm_bo_add_to_lru(bo);
mutex_unlock(&dev->struct_mutex);
}