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>
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 4900e4958decbd45b70046f03f15b4966e35946e..b7e594c2bfb431e2c4f192de5f046ffbf3a87a75 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -730,6 +730,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;