From: Alex Deucher Date: Tue, 21 Jul 2020 19:31:52 +0000 (-0400) Subject: drm/amdgpu/smu11: drop code chuck that got accidently re-added X-Git-Tag: v5.15~2586^2~30^2~419 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff203e35384ec5cb30f8fa16f0312e532d74d993;p=platform%2Fkernel%2Flinux-starfive.git drm/amdgpu/smu11: drop code chuck that got accidently re-added Seems to be due to a bad merge. Code was originally added in commit 5aaa8fff3aa950 ("drm/amd/powerplay: unload mp1 for Arcturus RAS baco reset") but later removed in commit 7f70443fd83407 ("drm/amdgpu: set mp1 state before reload"). but is back again. Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c index a7336556..829c159 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c @@ -1638,12 +1638,6 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) if (ret) goto out; - if (ras && ras->supported) { - ret = smu_send_smc_msg(smu, SMU_MSG_PrepareMp1ForUnload, NULL); - if (ret) - goto out; - } - /* clear vbios scratch 6 and 7 for coming asic reinit */ WREG32(adev->bios_scratch_reg_offset + 6, 0); WREG32(adev->bios_scratch_reg_offset + 7, 0);