aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Grodzovsky2018-01-25 12:00:54 -0600
committerAndrey Grodzovsky2018-01-26 06:45:34 -0600
commit5e239f3e3d18e13e6ffa3128407d37b3c7582593 (patch)
tree1bf47b014c5ec1230398b0fdf501abc887255e5e
parent5df936718df62a8d1f696ff0f5fe7984aa35150b (diff)
downloadexternal-libgbm-5e239f3e3d18e13e6ffa3128407d37b3c7582593.tar.gz
external-libgbm-5e239f3e3d18e13e6ffa3128407d37b3c7582593.tar.xz
external-libgbm-5e239f3e3d18e13e6ffa3128407d37b3c7582593.zip
amdgpu: Update deadlock test to not assert on ECANCELED
Kernel will abort jobs for guilty (causing GPU hang) context with -ECANCELED don't assert if that the case. Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Acked-by: Christian K├Ânig <christian.koenig@amd.com>
-rw-r--r--tests/amdgpu/deadlock_tests.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c
index cd34cdf6..9a428858 100644
--- a/tests/amdgpu/deadlock_tests.c
+++ b/tests/amdgpu/deadlock_tests.c
@@ -230,7 +230,7 @@ static void amdgpu_deadlock_helper(unsigned ip_type)
230 230
231 for (i = 0; i < 200; i++) { 231 for (i = 0; i < 200; i++) {
232 r = amdgpu_cs_submit(context_handle, 0,&ibs_request, 1); 232 r = amdgpu_cs_submit(context_handle, 0,&ibs_request, 1);
233 CU_ASSERT_EQUAL(r, 0); 233 CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1);
234 234
235 } 235 }
236 236
@@ -243,7 +243,7 @@ static void amdgpu_deadlock_helper(unsigned ip_type)
243 243
244 r = amdgpu_cs_query_fence_status(&fence_status, 244 r = amdgpu_cs_query_fence_status(&fence_status,
245 AMDGPU_TIMEOUT_INFINITE,0, &expired); 245 AMDGPU_TIMEOUT_INFINITE,0, &expired);
246 CU_ASSERT_EQUAL(r, 0); 246 CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1);
247 247
248 r = amdgpu_bo_list_destroy(bo_list); 248 r = amdgpu_bo_list_destroy(bo_list);
249 CU_ASSERT_EQUAL(r, 0); 249 CU_ASSERT_EQUAL(r, 0);