AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 15:49:17 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: fix deadlock issue for smu_force_performance_level

Browse Source 
the smu->mutex is internal lock resource in sw-smu, some functions will use
it at the same time, so it maybe will cause deadlock issue.
this patch fix this issue in smu_force_performance_level function.

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kevin Wang 2019-05-15 15:59:38 +08:00 committed by Alex Deucher
parent 3ebab625e6
commit 6f6a7bba69
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
View File

@ -370,18 +370,9 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
} }
if (is_support_sw_smu(adev)) { if (is_support_sw_smu(adev)) {
mutex_lock(&adev->pm.mutex);
if (adev->pm.dpm.thermal_active) {
count = -EINVAL;
mutex_unlock(&adev->pm.mutex);
goto fail;
}
ret = smu_force_performance_level(&adev->smu, level); ret = smu_force_performance_level(&adev->smu, level);
if (ret) if (ret)
count = -EINVAL; count = -EINVAL;
else
adev->pm.dpm.forced_level = level;
mutex_unlock(&adev->pm.mutex);
} else if (adev->powerplay.pp_funcs->force_performance_level) { } else if (adev->powerplay.pp_funcs->force_performance_level) {
mutex_lock(&adev->pm.mutex); mutex_lock(&adev->pm.mutex);
if (adev->pm.dpm.thermal_active) { if (adev->pm.dpm.thermal_active) {

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

@ -1459,12 +1459,15 @@ int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_lev
break; break;
} }
mutex_lock(&smu->mutex);
smu->adev->ip_blocks[i].version->funcs->enable_umd_pstate(smu, &level); smu->adev->ip_blocks[i].version->funcs->enable_umd_pstate(smu, &level);
ret = smu_handle_task(smu, level, ret = smu_handle_task(smu, level,
AMD_PP_TASK_READJUST_POWER_STATE); AMD_PP_TASK_READJUST_POWER_STATE);
if (ret)
return ret;
mutex_lock(&smu->mutex);
smu_dpm_ctx->dpm_level = level;
mutex_unlock(&smu->mutex); mutex_unlock(&smu->mutex);
return ret; return ret;