summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2008-03-12 09:56:06 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2008-03-12 09:56:06 +0100
commitfa1d88e3b2de843f33c9d77c9d95db762a950a14 (patch)
tree230ad0a33284791b506821d8519884e437394f94
parent8a18d123f55a7fb11ce333f0b1095020918b8616 (diff)
Make sure other TTM memory types than TT is really unbound when evicted.
-rw-r--r--linux-core/drm_bo_move.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-core/drm_bo_move.c b/linux-core/drm_bo_move.c
index 30e0f43f..21673daa 100644
--- a/linux-core/drm_bo_move.c
+++ b/linux-core/drm_bo_move.c
@@ -42,7 +42,6 @@ static void drm_bo_free_old_node(struct drm_buffer_object *bo)
if (old_mem->mm_node && (old_mem->mm_node != bo->pinned_node)) {
mutex_lock(&bo->dev->struct_mutex);
drm_mm_put_block(old_mem->mm_node);
- old_mem->mm_node = NULL;
mutex_unlock(&bo->dev->struct_mutex);
}
old_mem->mm_node = NULL;
@@ -57,7 +56,7 @@ int drm_bo_move_ttm(struct drm_buffer_object *bo,
uint64_t save_proposed_flags = old_mem->proposed_flags;
int ret;
- if (old_mem->mem_type == DRM_BO_MEM_TT) {
+ if (old_mem->mem_type != DRM_BO_MEM_LOCAL) {
if (evict)
drm_ttm_evict(ttm);
else