Commit cc8e66e7 authored by Jiansong Chen's avatar Jiansong Chen Committed by Alex Deucher

drm/amd/pm: support runtime pptable update for sienna_cichlid etc.

This avoids smu issue when enabling runtime pptable update for
sienna_cichlid and so on. Runtime pptable udpate is needed for test
and debug purpose.
Signed-off-by: default avatarJiansong Chen <Jiansong.Chen@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 087d7641
...@@ -1126,7 +1126,7 @@ static int smu_disable_dpms(struct smu_context *smu) ...@@ -1126,7 +1126,7 @@ static int smu_disable_dpms(struct smu_context *smu)
*/ */
if (smu->uploading_custom_pp_table && if (smu->uploading_custom_pp_table &&
(adev->asic_type >= CHIP_NAVI10) && (adev->asic_type >= CHIP_NAVI10) &&
(adev->asic_type <= CHIP_NAVI12)) (adev->asic_type <= CHIP_NAVY_FLOUNDER))
return 0; return 0;
/* /*
...@@ -1211,7 +1211,9 @@ static int smu_hw_fini(void *handle) ...@@ -1211,7 +1211,9 @@ static int smu_hw_fini(void *handle)
int smu_reset(struct smu_context *smu) int smu_reset(struct smu_context *smu)
{ {
struct amdgpu_device *adev = smu->adev; struct amdgpu_device *adev = smu->adev;
int ret = 0; int ret;
amdgpu_gfx_off_ctrl(smu->adev, false);
ret = smu_hw_fini(adev); ret = smu_hw_fini(adev);
if (ret) if (ret)
...@@ -1222,8 +1224,12 @@ int smu_reset(struct smu_context *smu) ...@@ -1222,8 +1224,12 @@ int smu_reset(struct smu_context *smu)
return ret; return ret;
ret = smu_late_init(adev); ret = smu_late_init(adev);
if (ret)
return ret;
return ret; amdgpu_gfx_off_ctrl(smu->adev, true);
return 0;
} }
static int smu_suspend(void *handle) static int smu_suspend(void *handle)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment