drm: Branch 'master'

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

New commits:
commit ba45adb2a121dae8fa408f921ef2caae86d2f78e
Author: Andrey Grodzovsky <[email protected]>
Date:   Tue Dec 11 15:10:10 2018 -0500

    amdgpu/test: Enable deadlock test for CI family (gfx7)
    
    I retested GPU recovery with  Bonaire ASIC and it works.
    
    Signed-off-by: Andrey Grodzovsky <[email protected]>

diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c
index 6bd36aaa..a6c2635d 100644
--- a/tests/amdgpu/deadlock_tests.c
+++ b/tests/amdgpu/deadlock_tests.c
@@ -124,7 +124,8 @@ CU_BOOL suite_deadlock_tests_enable(void)
 	 * by default (currently GFX8/9 dGPUS)
 	 */
 	if (device_handle->info.family_id != AMDGPU_FAMILY_VI &&
-	    device_handle->info.family_id != AMDGPU_FAMILY_AI) {
+	    device_handle->info.family_id != AMDGPU_FAMILY_AI &&
+	    device_handle->info.family_id != AMDGPU_FAMILY_CI) {
 		printf("\n\nGPU reset is not enabled for the ASIC, deadlock suite disabled\n");
 		enable = CU_FALSE;
 	}


--