drm/amd/pm: fix the high voltage and temperature issue
fix the high voltage and temperature issue after the driver is unloaded on smu 13.0.0, smu 13.0.7 and smu 13.0.10 v2 - fix the code format and make sure it is used on the unload case only. Signed-off-by: Kenneth Feng <kenneth.feng@amd.com> Reviewed-by: Yang Wang <kevinyang.wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
a17f574ab4
commit
5f38ac54e6
@ -3962,6 +3962,13 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
|
||||||
|
case IP_VERSION(13, 0, 0):
|
||||||
|
case IP_VERSION(13, 0, 7):
|
||||||
|
case IP_VERSION(13, 0, 10):
|
||||||
|
r = psp_gpu_reset(adev);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
tmp = amdgpu_reset_method;
|
tmp = amdgpu_reset_method;
|
||||||
/* It should do a default reset when loading or reloading the driver,
|
/* It should do a default reset when loading or reloading the driver,
|
||||||
* regardless of the module parameter reset_method.
|
* regardless of the module parameter reset_method.
|
||||||
@ -3969,6 +3976,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
|||||||
amdgpu_reset_method = AMD_RESET_METHOD_NONE;
|
amdgpu_reset_method = AMD_RESET_METHOD_NONE;
|
||||||
r = amdgpu_asic_reset(adev);
|
r = amdgpu_asic_reset(adev);
|
||||||
amdgpu_reset_method = tmp;
|
amdgpu_reset_method = tmp;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (r) {
|
if (r) {
|
||||||
dev_err(adev->dev, "asic reset on init failed\n");
|
dev_err(adev->dev, "asic reset on init failed\n");
|
||||||
goto failed;
|
goto failed;
|
||||||
|
@ -733,7 +733,7 @@ static int smu_early_init(void *handle)
|
|||||||
smu->adev = adev;
|
smu->adev = adev;
|
||||||
smu->pm_enabled = !!amdgpu_dpm;
|
smu->pm_enabled = !!amdgpu_dpm;
|
||||||
smu->is_apu = false;
|
smu->is_apu = false;
|
||||||
smu->smu_baco.state = SMU_BACO_STATE_EXIT;
|
smu->smu_baco.state = SMU_BACO_STATE_NONE;
|
||||||
smu->smu_baco.platform_support = false;
|
smu->smu_baco.platform_support = false;
|
||||||
smu->user_dpm_profile.fan_mode = -1;
|
smu->user_dpm_profile.fan_mode = -1;
|
||||||
|
|
||||||
@ -1742,10 +1742,31 @@ static int smu_smc_hw_cleanup(struct smu_context *smu)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int smu_reset_mp1_state(struct smu_context *smu)
|
||||||
|
{
|
||||||
|
struct amdgpu_device *adev = smu->adev;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
if ((!adev->in_runpm) && (!adev->in_suspend) &&
|
||||||
|
(!amdgpu_in_reset(adev)))
|
||||||
|
switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
|
||||||
|
case IP_VERSION(13, 0, 0):
|
||||||
|
case IP_VERSION(13, 0, 7):
|
||||||
|
case IP_VERSION(13, 0, 10):
|
||||||
|
ret = smu_set_mp1_state(smu, PP_MP1_STATE_UNLOAD);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int smu_hw_fini(void *handle)
|
static int smu_hw_fini(void *handle)
|
||||||
{
|
{
|
||||||
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
||||||
struct smu_context *smu = adev->powerplay.pp_handle;
|
struct smu_context *smu = adev->powerplay.pp_handle;
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
|
if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
|
||||||
return 0;
|
return 0;
|
||||||
@ -1763,7 +1784,15 @@ static int smu_hw_fini(void *handle)
|
|||||||
|
|
||||||
adev->pm.dpm_enabled = false;
|
adev->pm.dpm_enabled = false;
|
||||||
|
|
||||||
return smu_smc_hw_cleanup(smu);
|
ret = smu_smc_hw_cleanup(smu);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
ret = smu_reset_mp1_state(smu);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void smu_late_fini(void *handle)
|
static void smu_late_fini(void *handle)
|
||||||
|
@ -419,6 +419,7 @@ enum smu_reset_mode {
|
|||||||
enum smu_baco_state {
|
enum smu_baco_state {
|
||||||
SMU_BACO_STATE_ENTER = 0,
|
SMU_BACO_STATE_ENTER = 0,
|
||||||
SMU_BACO_STATE_EXIT,
|
SMU_BACO_STATE_EXIT,
|
||||||
|
SMU_BACO_STATE_NONE,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct smu_baco_context {
|
struct smu_baco_context {
|
||||||
|
@ -299,5 +299,7 @@ int smu_v13_0_update_pcie_parameters(struct smu_context *smu,
|
|||||||
uint8_t pcie_gen_cap,
|
uint8_t pcie_gen_cap,
|
||||||
uint8_t pcie_width_cap);
|
uint8_t pcie_width_cap);
|
||||||
|
|
||||||
|
int smu_v13_0_disable_pmfw_state(struct smu_context *smu);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -2477,3 +2477,16 @@ int smu_v13_0_update_pcie_parameters(struct smu_context *smu,
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int smu_v13_0_disable_pmfw_state(struct smu_context *smu)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
struct amdgpu_device *adev = smu->adev;
|
||||||
|
|
||||||
|
WREG32_PCIE(MP1_Public | (smnMP1_FIRMWARE_FLAGS & 0xffffffff), 0);
|
||||||
|
|
||||||
|
ret = RREG32_PCIE(MP1_Public |
|
||||||
|
(smnMP1_FIRMWARE_FLAGS & 0xffffffff));
|
||||||
|
|
||||||
|
return ret == 0 ? 0 : -EINVAL;
|
||||||
|
}
|
||||||
|
@ -2602,14 +2602,20 @@ static int smu_v13_0_0_baco_enter(struct smu_context *smu)
|
|||||||
static int smu_v13_0_0_baco_exit(struct smu_context *smu)
|
static int smu_v13_0_0_baco_exit(struct smu_context *smu)
|
||||||
{
|
{
|
||||||
struct amdgpu_device *adev = smu->adev;
|
struct amdgpu_device *adev = smu->adev;
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) {
|
if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) {
|
||||||
/* Wait for PMFW handling for the Dstate change */
|
/* Wait for PMFW handling for the Dstate change */
|
||||||
usleep_range(10000, 11000);
|
usleep_range(10000, 11000);
|
||||||
return smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS);
|
ret = smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS);
|
||||||
} else {
|
} else {
|
||||||
return smu_v13_0_baco_exit(smu);
|
ret = smu_v13_0_baco_exit(smu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
adev->gfx.is_poweron = false;
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool smu_v13_0_0_is_mode1_reset_supported(struct smu_context *smu)
|
static bool smu_v13_0_0_is_mode1_reset_supported(struct smu_context *smu)
|
||||||
@ -2794,7 +2800,13 @@ static int smu_v13_0_0_set_mp1_state(struct smu_context *smu,
|
|||||||
|
|
||||||
switch (mp1_state) {
|
switch (mp1_state) {
|
||||||
case PP_MP1_STATE_UNLOAD:
|
case PP_MP1_STATE_UNLOAD:
|
||||||
ret = smu_cmn_set_mp1_state(smu, mp1_state);
|
ret = smu_cmn_send_smc_msg_with_param(smu,
|
||||||
|
SMU_MSG_PrepareMp1ForUnload,
|
||||||
|
0x55, NULL);
|
||||||
|
|
||||||
|
if (!ret && smu->smu_baco.state == SMU_BACO_STATE_EXIT)
|
||||||
|
ret = smu_v13_0_disable_pmfw_state(smu);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* Ignore others */
|
/* Ignore others */
|
||||||
|
@ -2498,7 +2498,13 @@ static int smu_v13_0_7_set_mp1_state(struct smu_context *smu,
|
|||||||
|
|
||||||
switch (mp1_state) {
|
switch (mp1_state) {
|
||||||
case PP_MP1_STATE_UNLOAD:
|
case PP_MP1_STATE_UNLOAD:
|
||||||
ret = smu_cmn_set_mp1_state(smu, mp1_state);
|
ret = smu_cmn_send_smc_msg_with_param(smu,
|
||||||
|
SMU_MSG_PrepareMp1ForUnload,
|
||||||
|
0x55, NULL);
|
||||||
|
|
||||||
|
if (!ret && smu->smu_baco.state == SMU_BACO_STATE_EXIT)
|
||||||
|
ret = smu_v13_0_disable_pmfw_state(smu);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* Ignore others */
|
/* Ignore others */
|
||||||
@ -2524,14 +2530,20 @@ static int smu_v13_0_7_baco_enter(struct smu_context *smu)
|
|||||||
static int smu_v13_0_7_baco_exit(struct smu_context *smu)
|
static int smu_v13_0_7_baco_exit(struct smu_context *smu)
|
||||||
{
|
{
|
||||||
struct amdgpu_device *adev = smu->adev;
|
struct amdgpu_device *adev = smu->adev;
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) {
|
if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) {
|
||||||
/* Wait for PMFW handling for the Dstate change */
|
/* Wait for PMFW handling for the Dstate change */
|
||||||
usleep_range(10000, 11000);
|
usleep_range(10000, 11000);
|
||||||
return smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS);
|
ret = smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS);
|
||||||
} else {
|
} else {
|
||||||
return smu_v13_0_baco_exit(smu);
|
ret = smu_v13_0_baco_exit(smu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
adev->gfx.is_poweron = false;
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool smu_v13_0_7_is_mode1_reset_supported(struct smu_context *smu)
|
static bool smu_v13_0_7_is_mode1_reset_supported(struct smu_context *smu)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user