diff options
| author |   Christian König <christian.koenig@amd.com> | 2014-07-18 09:24:54 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2014-08-05 08:53:50 -0400 |
| commit | c265f24d5ca3bf2877e857b93b0246098767e6a9 (patch) | |
| tree | 12055688d45d2b4897d9637e1f7272a778f2124b /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | drm/radeon: invalidate moved BOs in the VM (v2) (diff) | |
| download | linux-dev-c265f24d5ca3bf2877e857b93b0246098767e6a9.tar.xz linux-dev-c265f24d5ca3bf2877e857b93b0246098767e6a9.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -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); * function are calling it. */ -static void radeon_bo_clear_va(struct radeon_bo *bo) -{ - struct radeon_bo_va *bo_va, *tmp; - - list_for_each_entry_safe(bo_va, tmp, &bo->va, bo_list) { - /* remove from all vm address space */ - radeon_vm_bo_rmv(bo->rdev, bo_va); - } -} - static void radeon_update_memory_usage(struct radeon_bo *bo, unsigned mem_type, int sign) { @@ -90,7 +80,7 @@ static void radeon_ttm_bo_destroy(struct ttm_buffer_object *tbo) list_del_init(&bo->list); mutex_unlock(&bo->rdev->gem.mutex); radeon_bo_clear_surface_reg(bo); - radeon_bo_clear_va(bo); + WARN_ON(!list_empty(&bo->va)); drm_gem_object_release(&bo->gem_base); kfree(bo); } |