From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 17 May 2019 14:21:13 +0000 (-0500)
Subject: drm/amdgpu/soc15: skip reset on init
X-Git-Tag: v5.3-rc1~81^2~25^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d55f33da541324c7f41156dd6d045b8b450de230;p=thirdparty%2Fkernel%2Fstable.git

drm/amdgpu/soc15: skip reset on init

Not necessary on soc15 and breaks driver reload on server cards.

Acked-by: Amber Lin <Amber.Lin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 32dc5a1282490..78bd4fc07babc 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -761,6 +761,11 @@ static bool soc15_need_reset_on_init(struct amdgpu_device *adev)
 {
 	u32 sol_reg;
 
+	/* Just return false for soc15 GPUs.  Reset does not seem to
+	 * be necessary.
+	 */
+	return false;
+
 	if (adev->flags & AMD_IS_APU)
 		return false;