iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: use error label to handle exceptional case

Browse Source 
Use error label to decrease global item unref and make codes more
readable.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Huang Rui 2016-09-07 20:55:42 +08:00 committed by Alex Deucher
parent 441f90ecf5
commit e9d035eca4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@ -89,10 +89,10 @@ int amdgpu_ttm_global_init(struct amdgpu_device *adev)
global_ref->init = &amdgpu_ttm_mem_global_init; global_ref->init = &amdgpu_ttm_mem_global_init;
global_ref->release = &amdgpu_ttm_mem_global_release; global_ref->release = &amdgpu_ttm_mem_global_release;
r = drm_global_item_ref(global_ref); r = drm_global_item_ref(global_ref);
if (r != 0) { if (r) {
DRM_ERROR("Failed setting up TTM memory accounting " DRM_ERROR("Failed setting up TTM memory accounting "
"subsystem.\n"); "subsystem.\n");
return r; goto error_mem;
} }
adev->mman.bo_global_ref.mem_glob = adev->mman.bo_global_ref.mem_glob =
@ -103,26 +103,30 @@ int amdgpu_ttm_global_init(struct amdgpu_device *adev)
global_ref->init = &ttm_bo_global_init; global_ref->init = &ttm_bo_global_init;
global_ref->release = &ttm_bo_global_release; global_ref->release = &ttm_bo_global_release;
r = drm_global_item_ref(global_ref); r = drm_global_item_ref(global_ref);
if (r != 0) { if (r) {
DRM_ERROR("Failed setting up TTM BO subsystem.\n"); DRM_ERROR("Failed setting up TTM BO subsystem.\n");
drm_global_item_unref(&adev->mman.mem_global_ref); goto error_bo;
return r;
} }
ring = adev->mman.buffer_funcs_ring; ring = adev->mman.buffer_funcs_ring;
rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_KERNEL]; rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_KERNEL];
r = amd_sched_entity_init(&ring->sched, &adev->mman.entity, r = amd_sched_entity_init(&ring->sched, &adev->mman.entity,
rq, amdgpu_sched_jobs); rq, amdgpu_sched_jobs);
if (r != 0) { if (r) {
DRM_ERROR("Failed setting up TTM BO move run queue.\n"); DRM_ERROR("Failed setting up TTM BO move run queue.\n");
drm_global_item_unref(&adev->mman.mem_global_ref); goto error_entity;
drm_global_item_unref(&adev->mman.bo_global_ref.ref);
return r;
} }
adev->mman.mem_global_referenced = true; adev->mman.mem_global_referenced = true;
return 0; return 0;
error_entity:
drm_global_item_unref(&adev->mman.bo_global_ref.ref);
error_bo:
drm_global_item_unref(&adev->mman.mem_global_ref);
error_mem:
return r;
} }
static void amdgpu_ttm_global_fini(struct amdgpu_device *adev) static void amdgpu_ttm_global_fini(struct amdgpu_device *adev)