diff options
| author | Evan Quan <evan.quan@amd.com> | 2020-05-29 14:38:53 -0400 |
|---|---|---|
| committer | Yang Xiong <Yang.Xiong@amd.com> | 2020-06-05 17:25:37 +0800 |
| commit | 872196613edef86541748d53db08e1241e608651 (patch) | |
| tree | 6bd3806e61ee0be9380005ed62608d3e2adc9127 | |
| parent | 362def1eb8a43c8ffefbae487d06cb5a6fcc1e15 (diff) | |
drm/amd/powerplay: let PMFW to handle the features disablement on BACO in V2
For Sienna_Cichlid, PMFW will handle the features disablement on BACO in. No
need to have driver stepped in.
V2: limit this for baco really
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 5956cce4cf33..78ab0d46eddd 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -1534,6 +1534,11 @@ static int smu_suspend(void *handle) struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct smu_context *smu = &adev->smu; int ret; + bool use_baco = !smu->is_apu && + ((adev->in_gpu_reset && + (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) || + (adev->in_runpm && amdgpu_asic_supports_baco(adev))); + if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev)) return 0; @@ -1551,15 +1556,22 @@ static int smu_suspend(void *handle) return ret; } - ret = smu_disable_dpm(smu); - if (ret) - return ret; + /* + * For Sienna_Cichlid, PMFW will handle the features disablement properly + * on BACO in. Driver involvement is unnecessary. + */ + if ((adev->asic_type != CHIP_SIENNA_CICHLID) || !use_baco) { + ret = smu_disable_dpm(smu); + if (ret) + return ret; + + if (adev->asic_type >= CHIP_NAVI10 && + adev->gfx.rlc.funcs->stop) + adev->gfx.rlc.funcs->stop(adev); + } smu->watermarks_bitmap &= ~(WATERMARKS_LOADED); - if (adev->asic_type >= CHIP_NAVI10 && - adev->gfx.rlc.funcs->stop) - adev->gfx.rlc.funcs->stop(adev); if (smu->is_apu) smu_set_gfx_cgpg(&adev->smu, false); |