From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Date: Fri, 2 Aug 2019 20:48:08 +0000 (-0400)
Subject: drm/amdgpu: Fix GPU reset crash regression.
X-Git-Tag: v5.4-rc1~106^2~17^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5507c7e06076d874923aa958ddb8829e3cfc573;p=thirdparty%2Flinux.git

drm/amdgpu: Fix GPU reset crash regression.

amdgpu_ip_block.status.hw for GMC wasn't set to
false on suspend during GPU reset and so on resume gmc_v9_0_resume
wasn't called.
Caused by 'drm/amdgpu: fix double ucode load by PSP(v3)'

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 192f753407a9f..e7537e1c4fdf2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2274,6 +2274,8 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
 				}
 			}
 		}
+
+		adev->ip_blocks[i].status.hw = false;
 	}
 
 	return 0;