drm: Branch 'master'

 tests/amdgpu/deadlock_tests.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 0be850441f24c55cf5a2f1ce3b33457add685b96
Author: Andrey Grodzovsky <[email protected]>
Date:   Fri Nov 2 12:11:49 2018 -0400

    amdgpu/test: Disable deadlock tests for all non gfx8/9 ASICs.
    
    Since only for those ASICs gpu reset is enabled by deafult.
    Also update disable message and fix identation .
    
    Signed-off-by: Andrey Grodzovsky <[email protected]>
    Reviewed-by: Alex Deucher <[email protected]>

diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c
index 04600a7e..6bd36aaa 100644
--- a/tests/amdgpu/deadlock_tests.c
+++ b/tests/amdgpu/deadlock_tests.c
@@ -119,11 +119,13 @@ CU_BOOL suite_deadlock_tests_enable(void)
 					     &minor_version, &device_handle))
 		return CU_FALSE;
 
-	if (device_handle->info.family_id == AMDGPU_FAMILY_SI ||
-			device_handle->info.family_id == AMDGPU_FAMILY_CZ ||
-			device_handle->info.family_id == AMDGPU_FAMILY_RV ||
-			device_handle->info.family_id == AMDGPU_FAMILY_KV) {
-		printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n");
+	/*
+	 * Only enable for ASICs supporting GPU reset and for which it's enabled
+	 * by default (currently GFX8/9 dGPUS)
+	 */
+	if (device_handle->info.family_id != AMDGPU_FAMILY_VI &&
+	    device_handle->info.family_id != AMDGPU_FAMILY_AI) {
+		printf("\n\nGPU reset is not enabled for the ASIC, deadlock suite disabled\n");
 		enable = CU_FALSE;
 	}
 


--