|
[AMD Official Use Only - Internal Distribution Only]
please add a detailed description of the reason for this patch,
after finshed, the patch is
Reviewed-by: Kevin Wang <kevin1.wang@xxxxxxx>
Best Regards,
Kevin From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> on behalf of Hua Zhang <hua.zhang@xxxxxxx>
Sent: Friday, May 22, 2020 1:31 PM To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx> Cc: Zhang, Hua <Hua.Zhang@xxxxxxx> Subject: [PATCH] drm/amd/powerplay: skip i2c eeprom init/fini under sriov mode i2c eeprom init/fini is only needed under bare mental mode.
Signed-off-by: Hua Zhang <hua.zhang@xxxxxxx> --- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 8017386d3c33..a78a1f542ea9 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -1363,9 +1363,11 @@ static int smu_hw_init(void *handle) if (ret) goto failed; - ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c); - if (ret) - goto failed; + if (!amdgpu_sriov_vf(adev)) { + ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c); + if (ret) + goto failed; + } adev->pm.dpm_enabled = true; @@ -1406,9 +1408,9 @@ static int smu_hw_fini(void *handle) adev->pm.dpm_enabled = false; - smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c); - if (!amdgpu_sriov_vf(adev)){ + smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c); + ret = smu_stop_thermal_control(smu); if (ret) { pr_warn("Fail to stop thermal control!\n"); @@ -1549,9 +1551,9 @@ static int smu_suspend(void *handle) adev->pm.dpm_enabled = false; - smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c); + if (!amdgpu_sriov_vf(adev)) { + smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c); - if(!amdgpu_sriov_vf(adev)) { ret = smu_disable_dpm(smu); if (ret) return ret; @@ -1596,9 +1598,11 @@ static int smu_resume(void *handle) if (ret) goto failed; - ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c); - if (ret) - goto failed; + if (!amdgpu_sriov_vf(adev)) { + ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c); + if (ret) + goto failed; + } if (smu->is_apu) smu_set_gfx_cgpg(&adev->smu, true); -- 2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://nam11.safelinks.protection.outlook.com/?url=""> |
_______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
