aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Grodzovsky2017-11-14 08:02:48 -0600
committerAndrey Grodzovsky2017-11-15 22:28:45 -0600
commit18ffe485cdfa41d48b6f2d3080cb990d28c27d57 (patch)
tree54200646226d38514f0d55d253f997b2caf8acf7
parent9ad9b7e91ee8af621bb80bb80ecd0f76eba7c51c (diff)
downloadexternal-libgbm-18ffe485cdfa41d48b6f2d3080cb990d28c27d57.tar.gz
external-libgbm-18ffe485cdfa41d48b6f2d3080cb990d28c27d57.tar.xz
external-libgbm-18ffe485cdfa41d48b6f2d3080cb990d28c27d57.zip
amdgpu: Disable deadlock test suite for Vega 10
The test stalls the CP, until RCA is done the test is disabled to not disrupt regression testing. Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
-rw-r--r--tests/amdgpu/amdgpu_test.c2
-rw-r--r--tests/amdgpu/amdgpu_test.h5
-rw-r--r--tests/amdgpu/deadlock_tests.c19
3 files changed, 25 insertions, 1 deletions
diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c
index 91010dcc..ee64152e 100644
--- a/tests/amdgpu/amdgpu_test.c
+++ b/tests/amdgpu/amdgpu_test.c
@@ -162,7 +162,7 @@ static Suites_Active_Status suites_active_stat[] = {
162 }, 162 },
163 { 163 {
164 .pName = DEADLOCK_TESTS_STR, 164 .pName = DEADLOCK_TESTS_STR,
165 .pActive = always_active, 165 .pActive = suite_deadlock_tests_enable,
166 }, 166 },
167 { 167 {
168 .pName = VM_TESTS_STR, 168 .pName = VM_TESTS_STR,
diff --git a/tests/amdgpu/amdgpu_test.h b/tests/amdgpu/amdgpu_test.h
index dd236edc..414fcb81 100644
--- a/tests/amdgpu/amdgpu_test.h
+++ b/tests/amdgpu/amdgpu_test.h
@@ -160,6 +160,11 @@ int suite_deadlock_tests_init();
160int suite_deadlock_tests_clean(); 160int suite_deadlock_tests_clean();
161 161
162/** 162/**
163 * Decide if the suite is enabled by default or not.
164 */
165CU_BOOL suite_deadlock_tests_enable(void);
166
167/**
163 * Tests in uvd enc test suite 168 * Tests in uvd enc test suite
164 */ 169 */
165extern CU_TestInfo deadlock_tests[]; 170extern CU_TestInfo deadlock_tests[];
diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c
index f5c4552a..84f4debe 100644
--- a/tests/amdgpu/deadlock_tests.c
+++ b/tests/amdgpu/deadlock_tests.c
@@ -36,6 +36,7 @@
36 36
37#include "amdgpu_test.h" 37#include "amdgpu_test.h"
38#include "amdgpu_drm.h" 38#include "amdgpu_drm.h"
39#include "amdgpu_internal.h"
39 40
40#include <pthread.h> 41#include <pthread.h>
41 42
@@ -87,6 +88,24 @@ static void amdgpu_deadlock_helper(unsigned ip_type);
87static void amdgpu_deadlock_gfx(void); 88static void amdgpu_deadlock_gfx(void);
88static void amdgpu_deadlock_compute(void); 89static void amdgpu_deadlock_compute(void);
89 90
91CU_BOOL suite_deadlock_tests_enable(void)
92{
93 if (amdgpu_device_initialize(drm_amdgpu[0], &major_version,
94 &minor_version, &device_handle))
95 return CU_FALSE;
96
97 if (amdgpu_device_deinitialize(device_handle))
98 return CU_FALSE;
99
100
101 if (device_handle->info.family_id == AMDGPU_FAMILY_AI) {
102 printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n");
103 return CU_FALSE;
104 }
105
106 return CU_TRUE;
107}
108
90int suite_deadlock_tests_init(void) 109int suite_deadlock_tests_init(void)
91{ 110{
92 struct amdgpu_gpu_info gpu_info = {0}; 111 struct amdgpu_gpu_info gpu_info = {0};