geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test/amdgpu: add proper error handling v2 

Otherwise the calling function won't notice that something is wrong.

v2: check map result as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
main
Christian König 2018-09-14 15:04:38 +02:00
parent c40bd3cbf8
commit 864d4501b9
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/amdgpu/amdgpu_test.h
View File

@ -219,17 +219,34 @@ static inline amdgpu_bo_handle gpu_mem_alloc(
r = amdgpu_bo_alloc(device_handle, &req, &buf_handle); r = amdgpu_bo_alloc(device_handle, &req, &buf_handle);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
if (r)
return NULL;
r = amdgpu_va_range_alloc(device_handle, r = amdgpu_va_range_alloc(device_handle,
amdgpu_gpu_va_range_general, amdgpu_gpu_va_range_general,
size, alignment, 0, vmc_addr, size, alignment, 0, vmc_addr,
va_handle, 0); va_handle, 0);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
if (r)
goto error_free_bo;
r = amdgpu_bo_va_op(buf_handle, 0, size, *vmc_addr, 0, AMDGPU_VA_OP_MAP); r = amdgpu_bo_va_op(buf_handle, 0, size, *vmc_addr, 0,
AMDGPU_VA_OP_MAP);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
if (r)
goto error_free_va;
return buf_handle; return buf_handle;
error_free_va:
r = amdgpu_va_range_free(*va_handle);
CU_ASSERT_EQUAL(r, 0);
error_free_bo:
r = amdgpu_bo_free(buf_handle);
CU_ASSERT_EQUAL(r, 0);
return NULL;
} }
static inline int gpu_mem_free(amdgpu_bo_handle bo, static inline int gpu_mem_free(amdgpu_bo_handle bo,
@ -239,16 +256,23 @@ static inline int gpu_mem_free(amdgpu_bo_handle bo,
{ {
int r; int r;
if (!bo)
return 0;
r = amdgpu_bo_va_op(bo, 0, size, vmc_addr, 0, AMDGPU_VA_OP_UNMAP); r = amdgpu_bo_va_op(bo, 0, size, vmc_addr, 0, AMDGPU_VA_OP_UNMAP);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
if (r)
return r;
r = amdgpu_va_range_free(va_handle); r = amdgpu_va_range_free(va_handle);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
if (r)
return r;
r = amdgpu_bo_free(bo); r = amdgpu_bo_free(bo);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
return 0; return r;
} }
static inline int static inline int