diff options
-rw-r--r-- | tests/amdgpu/amdgpu_test.c | 1 | ||||
-rw-r--r-- | tests/amdgpu/basic_tests.c | 4 | ||||
-rw-r--r-- | tests/amdgpu/cs_tests.c | 2 | ||||
-rw-r--r-- | tests/amdgpu/deadlock_tests.c | 3 | ||||
-rw-r--r-- | tests/amdgpu/uvd_enc_tests.c | 5 | ||||
-rw-r--r-- | tests/amdgpu/vcn_tests.c | 2 | ||||
-rw-r--r-- | tests/amdgpu/vm_tests.c | 4 |
7 files changed, 7 insertions, 14 deletions
diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c index cbeb1ee8..4f766aaf 100644 --- a/tests/amdgpu/amdgpu_test.c +++ b/tests/amdgpu/amdgpu_test.c | |||
@@ -243,7 +243,6 @@ static const char options[] = "hlrps:t:b:d:f"; | |||
243 | static int amdgpu_open_devices(int open_render_node) | 243 | static int amdgpu_open_devices(int open_render_node) |
244 | { | 244 | { |
245 | drmDevicePtr devices[MAX_CARDS_SUPPORTED]; | 245 | drmDevicePtr devices[MAX_CARDS_SUPPORTED]; |
246 | int ret; | ||
247 | int i; | 246 | int i; |
248 | int drm_node; | 247 | int drm_node; |
249 | int amd_index = 0; | 248 | int amd_index = 0; |
diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c index 6ee0aa3b..354b0157 100644 --- a/tests/amdgpu/basic_tests.c +++ b/tests/amdgpu/basic_tests.c | |||
@@ -681,7 +681,7 @@ static void amdgpu_command_submission_compute_nop(void) | |||
681 | struct amdgpu_cs_fence fence_status; | 681 | struct amdgpu_cs_fence fence_status; |
682 | uint32_t *ptr; | 682 | uint32_t *ptr; |
683 | uint32_t expired; | 683 | uint32_t expired; |
684 | int i, r, instance; | 684 | int r, instance; |
685 | amdgpu_bo_list_handle bo_list; | 685 | amdgpu_bo_list_handle bo_list; |
686 | amdgpu_va_handle va_handle; | 686 | amdgpu_va_handle va_handle; |
687 | struct drm_amdgpu_info_hw_ip info; | 687 | struct drm_amdgpu_info_hw_ip info; |
@@ -1473,7 +1473,7 @@ static void amdgpu_sync_dependency_test(void) | |||
1473 | struct amdgpu_cs_ib_info ib_info; | 1473 | struct amdgpu_cs_ib_info ib_info; |
1474 | struct amdgpu_cs_fence fence_status; | 1474 | struct amdgpu_cs_fence fence_status; |
1475 | uint32_t expired; | 1475 | uint32_t expired; |
1476 | int i, j, r, instance; | 1476 | int i, j, r; |
1477 | amdgpu_bo_list_handle bo_list; | 1477 | amdgpu_bo_list_handle bo_list; |
1478 | amdgpu_va_handle va_handle; | 1478 | amdgpu_va_handle va_handle; |
1479 | static uint32_t *ptr; | 1479 | static uint32_t *ptr; |
diff --git a/tests/amdgpu/cs_tests.c b/tests/amdgpu/cs_tests.c index 4880b74f..a5361cd5 100644 --- a/tests/amdgpu/cs_tests.c +++ b/tests/amdgpu/cs_tests.c | |||
@@ -273,7 +273,7 @@ static void amdgpu_cs_uvd_create(void) | |||
273 | 273 | ||
274 | static void amdgpu_cs_uvd_decode(void) | 274 | static void amdgpu_cs_uvd_decode(void) |
275 | { | 275 | { |
276 | const unsigned dpb_size = 15923584, ctx_size = 5287680, dt_size = 737280; | 276 | const unsigned dpb_size = 15923584, dt_size = 737280; |
277 | uint64_t msg_addr, fb_addr, bs_addr, dpb_addr, ctx_addr, dt_addr, it_addr; | 277 | uint64_t msg_addr, fb_addr, bs_addr, dpb_addr, ctx_addr, dt_addr, it_addr; |
278 | struct amdgpu_bo_alloc_request req = {0}; | 278 | struct amdgpu_bo_alloc_request req = {0}; |
279 | amdgpu_bo_handle buf_handle; | 279 | amdgpu_bo_handle buf_handle; |
diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c index aaeea871..96c99c96 100644 --- a/tests/amdgpu/deadlock_tests.c +++ b/tests/amdgpu/deadlock_tests.c | |||
@@ -110,7 +110,6 @@ CU_BOOL suite_deadlock_tests_enable(void) | |||
110 | 110 | ||
111 | int suite_deadlock_tests_init(void) | 111 | int suite_deadlock_tests_init(void) |
112 | { | 112 | { |
113 | struct amdgpu_gpu_info gpu_info = {0}; | ||
114 | int r; | 113 | int r; |
115 | 114 | ||
116 | r = amdgpu_device_initialize(drm_amdgpu[0], &major_version, | 115 | r = amdgpu_device_initialize(drm_amdgpu[0], &major_version, |
@@ -177,7 +176,7 @@ static void amdgpu_deadlock_helper(unsigned ip_type) | |||
177 | struct amdgpu_cs_ib_info ib_info; | 176 | struct amdgpu_cs_ib_info ib_info; |
178 | struct amdgpu_cs_fence fence_status; | 177 | struct amdgpu_cs_fence fence_status; |
179 | uint32_t expired; | 178 | uint32_t expired; |
180 | int i, r, instance; | 179 | int i, r; |
181 | amdgpu_bo_list_handle bo_list; | 180 | amdgpu_bo_list_handle bo_list; |
182 | amdgpu_va_handle va_handle; | 181 | amdgpu_va_handle va_handle; |
183 | 182 | ||
diff --git a/tests/amdgpu/uvd_enc_tests.c b/tests/amdgpu/uvd_enc_tests.c index bed8494a..0377c1a5 100644 --- a/tests/amdgpu/uvd_enc_tests.c +++ b/tests/amdgpu/uvd_enc_tests.c | |||
@@ -247,8 +247,6 @@ static void free_resource(struct amdgpu_uvd_enc_bo *uvd_enc_bo) | |||
247 | 247 | ||
248 | static void amdgpu_cs_uvd_enc_create(void) | 248 | static void amdgpu_cs_uvd_enc_create(void) |
249 | { | 249 | { |
250 | int len, r; | ||
251 | |||
252 | enc.width = 160; | 250 | enc.width = 160; |
253 | enc.height = 128; | 251 | enc.height = 128; |
254 | 252 | ||
@@ -263,7 +261,7 @@ static void check_result(struct amdgpu_uvd_enc *enc) | |||
263 | uint64_t sum; | 261 | uint64_t sum; |
264 | uint32_t s = 175602; | 262 | uint32_t s = 175602; |
265 | uint32_t *ptr, size; | 263 | uint32_t *ptr, size; |
266 | int i, j, r; | 264 | int j, r; |
267 | 265 | ||
268 | r = amdgpu_bo_cpu_map(enc->fb.handle, (void **)&enc->fb.ptr); | 266 | r = amdgpu_bo_cpu_map(enc->fb.handle, (void **)&enc->fb.ptr); |
269 | CU_ASSERT_EQUAL(r, 0); | 267 | CU_ASSERT_EQUAL(r, 0); |
@@ -470,7 +468,6 @@ static void amdgpu_cs_uvd_enc_encode(void) | |||
470 | 468 | ||
471 | static void amdgpu_cs_uvd_enc_destroy(void) | 469 | static void amdgpu_cs_uvd_enc_destroy(void) |
472 | { | 470 | { |
473 | struct amdgpu_uvd_enc_bo sw_ctx; | ||
474 | int len, r; | 471 | int len, r; |
475 | 472 | ||
476 | num_resources = 0; | 473 | num_resources = 0; |
diff --git a/tests/amdgpu/vcn_tests.c b/tests/amdgpu/vcn_tests.c index 9224bc37..2eb8c434 100644 --- a/tests/amdgpu/vcn_tests.c +++ b/tests/amdgpu/vcn_tests.c | |||
@@ -283,7 +283,7 @@ static void amdgpu_cs_vcn_dec_create(void) | |||
283 | 283 | ||
284 | static void amdgpu_cs_vcn_dec_decode(void) | 284 | static void amdgpu_cs_vcn_dec_decode(void) |
285 | { | 285 | { |
286 | const unsigned dpb_size = 15923584, ctx_size = 5287680, dt_size = 737280; | 286 | const unsigned dpb_size = 15923584, dt_size = 737280; |
287 | uint64_t msg_addr, fb_addr, bs_addr, dpb_addr, ctx_addr, dt_addr, it_addr, sum; | 287 | uint64_t msg_addr, fb_addr, bs_addr, dpb_addr, ctx_addr, dt_addr, it_addr, sum; |
288 | struct amdgpu_vcn_bo dec_buf; | 288 | struct amdgpu_vcn_bo dec_buf; |
289 | int size, len, i, r; | 289 | int size, len, i, r; |
diff --git a/tests/amdgpu/vm_tests.c b/tests/amdgpu/vm_tests.c index 4b0121ff..7b6dc5d6 100644 --- a/tests/amdgpu/vm_tests.c +++ b/tests/amdgpu/vm_tests.c | |||
@@ -55,7 +55,6 @@ CU_BOOL suite_vm_tests_enable(void) | |||
55 | 55 | ||
56 | int suite_vm_tests_init(void) | 56 | int suite_vm_tests_init(void) |
57 | { | 57 | { |
58 | struct amdgpu_gpu_info gpu_info = {0}; | ||
59 | int r; | 58 | int r; |
60 | 59 | ||
61 | r = amdgpu_device_initialize(drm_amdgpu[0], &major_version, | 60 | r = amdgpu_device_initialize(drm_amdgpu[0], &major_version, |
@@ -98,10 +97,9 @@ static void amdgpu_vmid_reserve_test(void) | |||
98 | struct amdgpu_cs_ib_info ib_info; | 97 | struct amdgpu_cs_ib_info ib_info; |
99 | struct amdgpu_cs_fence fence_status; | 98 | struct amdgpu_cs_fence fence_status; |
100 | uint32_t expired, flags; | 99 | uint32_t expired, flags; |
101 | int i, r, instance; | 100 | int i, r; |
102 | amdgpu_bo_list_handle bo_list; | 101 | amdgpu_bo_list_handle bo_list; |
103 | amdgpu_va_handle va_handle; | 102 | amdgpu_va_handle va_handle; |
104 | union drm_amdgpu_vm vm; | ||
105 | static uint32_t *ptr; | 103 | static uint32_t *ptr; |
106 | 104 | ||
107 | r = amdgpu_cs_ctx_create(device_handle, &context_handle); | 105 | r = amdgpu_cs_ctx_create(device_handle, &context_handle); |