AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: maximize code sharing between .hw_fini and .suspend

Browse Source 
Thus redundant code can be dropped.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Evan Quan 2020-06-04 12:00:11 +08:00 committed by Alex Deucher
parent a35a10d975
commit e6f1eb4cbf
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
View File

@ -1376,6 +1376,26 @@ static int smu_disable_dpms(struct smu_context *smu)
return ret;
}
static int smu_smc_hw_cleanup(struct smu_context *smu)
{
struct amdgpu_device *adev = smu->adev;
int ret = 0;
smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
ret = smu_disable_thermal_alert(smu);
if (ret) {
pr_warn("Fail to stop thermal control!\n");
return ret;
}
ret = smu_disable_dpms(smu);
if (ret)
return ret;
return 0;
}
static int smu_hw_fini(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@ -1396,19 +1416,9 @@ static int smu_hw_fini(void *handle)
adev->pm.dpm_enabled = false;
smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
ret = smu_disable_thermal_alert(smu);
if (ret) {
pr_warn("Fail to stop thermal control!\n");
ret = smu_smc_hw_cleanup(smu);
if (ret)
return ret;
}
ret = smu_disable_dpms(smu);
if (ret) {
pr_warn("Fail to stop Dpms!\n");
return ret;
}
return 0;
}
@ -1445,15 +1455,7 @@ static int smu_suspend(void *handle)
adev->pm.dpm_enabled = false;
smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
ret = smu_disable_thermal_alert(smu);
if (ret) {
pr_warn("Fail to stop thermal control!\n");
return ret;
}
ret = smu_disable_dpms(smu);
ret = smu_smc_hw_cleanup(smu);
if (ret)
return ret;