summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grodzovsky <andrey.grodzovsky@amd.com>2017-11-14 09:02:48 -0500
committerAndrey Grodzovsky <andrey.grodzovsky@amd.com>2017-11-15 23:28:45 -0500
commit18ffe485cdfa41d48b6f2d3080cb990d28c27d57 (patch)
tree54200646226d38514f0d55d253f997b2caf8acf7
parent9ad9b7e91ee8af621bb80bb80ecd0f76eba7c51c (diff)
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[] = {
},
{
.pName = DEADLOCK_TESTS_STR,
- .pActive = always_active,
+ .pActive = suite_deadlock_tests_enable,
},
{
.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();
int suite_deadlock_tests_clean();
/**
+ * Decide if the suite is enabled by default or not.
+ */
+CU_BOOL suite_deadlock_tests_enable(void);
+
+/**
* Tests in uvd enc test suite
*/
extern 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 @@
#include "amdgpu_test.h"
#include "amdgpu_drm.h"
+#include "amdgpu_internal.h"
#include <pthread.h>
@@ -87,6 +88,24 @@ static void amdgpu_deadlock_helper(unsigned ip_type);
static void amdgpu_deadlock_gfx(void);
static void amdgpu_deadlock_compute(void);
+CU_BOOL suite_deadlock_tests_enable(void)
+{
+ if (amdgpu_device_initialize(drm_amdgpu[0], &major_version,
+ &minor_version, &device_handle))
+ return CU_FALSE;
+
+ if (amdgpu_device_deinitialize(device_handle))
+ return CU_FALSE;
+
+
+ if (device_handle->info.family_id == AMDGPU_FAMILY_AI) {
+ printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n");
+ return CU_FALSE;
+ }
+
+ return CU_TRUE;
+}
+
int suite_deadlock_tests_init(void)
{
struct amdgpu_gpu_info gpu_info = {0};