diff options
author | Christian König <christian.koenig@amd.com> | 2014-07-18 03:24:54 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-08-05 08:53:50 -0400 |
commit | c265f24d5ca3bf2877e857b93b0246098767e6a9 (patch) | |
tree | 12055688d45d2b4897d9637e1f7272a778f2124b | |
parent | e31ad969bbbf0271b537d88f886c2ba3a7ee7059 (diff) |
drm/radeon: remove radeon_bo_clear_va
Won't work anyway, instead WARN_ON if the VA list isn't
empty when we free the BO.
Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index a00cf17a0510..78b74c88d145 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
@@ -46,16 +46,6 @@ static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); | |||
46 | * function are calling it. | 46 | * function are calling it. |
47 | */ | 47 | */ |
48 | 48 | ||
49 | static void radeon_bo_clear_va(struct radeon_bo *bo) | ||
50 | { | ||
51 | struct radeon_bo_va *bo_va, *tmp; | ||
52 | |||
53 | list_for_each_entry_safe(bo_va, tmp, &bo->va, bo_list) { | ||
54 | /* remove from all vm address space */ | ||
55 | radeon_vm_bo_rmv(bo->rdev, bo_va); | ||
56 | } | ||
57 | } | ||
58 | |||
59 | static void radeon_update_memory_usage(struct radeon_bo *bo, | 49 | static void radeon_update_memory_usage(struct radeon_bo *bo, |
60 | unsigned mem_type, int sign) | 50 | unsigned mem_type, int sign) |
61 | { | 51 | { |
@@ -90,7 +80,7 @@ static void radeon_ttm_bo_destroy(struct ttm_buffer_object *tbo) | |||
90 | list_del_init(&bo->list); | 80 | list_del_init(&bo->list); |
91 | mutex_unlock(&bo->rdev->gem.mutex); | 81 | mutex_unlock(&bo->rdev->gem.mutex); |
92 | radeon_bo_clear_surface_reg(bo); | 82 | radeon_bo_clear_surface_reg(bo); |
93 | radeon_bo_clear_va(bo); | 83 | WARN_ON(!list_empty(&bo->va)); |
94 | drm_gem_object_release(&bo->gem_base); | 84 | drm_gem_object_release(&bo->gem_base); |
95 | kfree(bo); | 85 | kfree(bo); |
96 | } | 86 | } |