Make sure other TTM memory types than TT is really unbound when evicted.

main
Thomas Hellstrom 2008-03-12 09:56:06 +01:00
parent 8a18d123f5
commit fa1d88e3b2
1 changed files with 1 additions and 2 deletions

View File

@ -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)) { if (old_mem->mm_node && (old_mem->mm_node != bo->pinned_node)) {
mutex_lock(&bo->dev->struct_mutex); mutex_lock(&bo->dev->struct_mutex);
drm_mm_put_block(old_mem->mm_node); drm_mm_put_block(old_mem->mm_node);
old_mem->mm_node = NULL;
mutex_unlock(&bo->dev->struct_mutex); mutex_unlock(&bo->dev->struct_mutex);
} }
old_mem->mm_node = NULL; 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; uint64_t save_proposed_flags = old_mem->proposed_flags;
int ret; int ret;
if (old_mem->mem_type == DRM_BO_MEM_TT) { if (old_mem->mem_type != DRM_BO_MEM_LOCAL) {
if (evict) if (evict)
drm_ttm_evict(ttm); drm_ttm_evict(ttm);
else else