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

tests/amdgpu: minor fix for dispatch/draw test 

1. clear cmd buffer
2. make amdgpu_memcpy_dispatch_test static
3. tab/space fix

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Flora Cui <flora.cui@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
main
Cui, Flora 2019-03-20 02:46:56 +00:00 committed by Alex Deucher
parent 852a9d20ad
commit a85b31c973
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/amdgpu/basic_tests.c
View File

@ -2177,6 +2177,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle,
&bo_cmd, (void **)&ptr_cmd, &bo_cmd, (void **)&ptr_cmd,
&mc_address_cmd, &va_cmd); &mc_address_cmd, &va_cmd);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
memset(ptr_cmd, 0, bo_cmd_size);
r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096, r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096,
AMDGPU_GEM_DOMAIN_VRAM, 0, AMDGPU_GEM_DOMAIN_VRAM, 0,
@ -2283,7 +2284,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle,
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
} }
void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle,
uint32_t ip_type, uint32_t ip_type,
uint32_t ring) uint32_t ring)
{ {
@ -2313,6 +2314,7 @@ void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle,
&bo_cmd, (void **)&ptr_cmd, &bo_cmd, (void **)&ptr_cmd,
&mc_address_cmd, &va_cmd); &mc_address_cmd, &va_cmd);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
memset(ptr_cmd, 0, bo_cmd_size);
r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096, r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096,
AMDGPU_GEM_DOMAIN_VRAM, 0, AMDGPU_GEM_DOMAIN_VRAM, 0,
@ -2800,6 +2802,7 @@ void amdgpu_memset_draw(amdgpu_device_handle device_handle,
&bo_cmd, (void **)&ptr_cmd, &bo_cmd, (void **)&ptr_cmd,
&mc_address_cmd, &va_cmd); &mc_address_cmd, &va_cmd);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
memset(ptr_cmd, 0, bo_cmd_size);
r = amdgpu_bo_alloc_and_map(device_handle, bo_dst_size, 4096, r = amdgpu_bo_alloc_and_map(device_handle, bo_dst_size, 4096,
AMDGPU_GEM_DOMAIN_VRAM, 0, AMDGPU_GEM_DOMAIN_VRAM, 0,
@ -2952,6 +2955,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle,
&bo_cmd, (void **)&ptr_cmd, &bo_cmd, (void **)&ptr_cmd,
&mc_address_cmd, &va_cmd); &mc_address_cmd, &va_cmd);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
memset(ptr_cmd, 0, bo_cmd_size);
r = amdgpu_bo_alloc_and_map(device_handle, bo_size, 4096, r = amdgpu_bo_alloc_and_map(device_handle, bo_size, 4096,
AMDGPU_GEM_DOMAIN_VRAM, 0, AMDGPU_GEM_DOMAIN_VRAM, 0,