drm: Branch 'master'

 tests/amdgpu/deadlock_tests.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cc472c5bb30262defe07d9fb1ef0fe6a020b2ea9
Author: Likun Gao <[email protected]>
Date:   Tue Aug 14 19:10:10 2018 +0800

    amdgpu: Disable deadlock test suite for RV
    
    disable deadlock test suite for RV
    
    Reviewed-by: Alex Deucher <[email protected]>
    Reviewed-by: Huang Rui <[email protected]>
    Signed-off-by: Likun Gao <[email protected]>
    Signed-off-by: Alex Deucher <[email protected]>

diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c
index 1eb5761a..304482d7 100644
--- a/tests/amdgpu/deadlock_tests.c
+++ b/tests/amdgpu/deadlock_tests.c
@@ -93,7 +93,8 @@ CU_BOOL suite_deadlock_tests_enable(void)
 		return CU_FALSE;
 
 	if (device_handle->info.family_id == AMDGPU_FAMILY_AI ||
-	    device_handle->info.family_id == AMDGPU_FAMILY_SI) {
+	    device_handle->info.family_id == AMDGPU_FAMILY_SI ||
+	    device_handle->info.family_id == AMDGPU_FAMILY_RV) {
 		printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n");
 		enable = CU_FALSE;
 	}

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--