[PATCH 7/9] drm/amdgpu/powerplay/vega10: only use PrepareMp1ForUnload for mode1 reset
Alex Deucher
alexdeucher at gmail.com
Wed Jul 24 05:00:10 UTC 2019
It's not needed for BACO.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index a6066d92de78..6ca92c83d2e5 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -4732,6 +4732,7 @@ static int vega10_disable_dpm_tasks(struct pp_hwmgr *hwmgr)
static int vega10_power_off_asic(struct pp_hwmgr *hwmgr)
{
struct vega10_hwmgr *data = hwmgr->backend;
+ struct amdgpu_device *adev = hwmgr->adev;
int result;
result = vega10_disable_dpm_tasks(hwmgr);
@@ -4740,10 +4741,13 @@ static int vega10_power_off_asic(struct pp_hwmgr *hwmgr)
);
data->water_marks_bitmap &= ~(WaterMarksLoaded);
- PP_ASSERT_WITH_CODE((result = smum_send_msg_to_smc(hwmgr,
- PPSMC_MSG_PrepareMp1ForUnload)) == 0,
- "[PrepareMp1ForUnload] Failed!",
- return result);
+ if (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_MODE1) {
+ PP_ASSERT_WITH_CODE((result =
+ smum_send_msg_to_smc(hwmgr,
+ PPSMC_MSG_PrepareMp1ForUnload)) == 0,
+ "[PrepareMp1ForUnload] Failed!",
+ return result);
+ }
return result;
}
--
2.20.1
More information about the amd-gfx
mailing list