AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-27 18:41:56 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: use work queue to perform throttling logging

Browse Source 
As IO operations(access to SMU internals) and possible sleep are
involved in throttling logging. Workqueue can handle them well.
Otherwise we may hit "scheduling while atomic" error.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Nirmoy Das <nirmoy.das@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-03 11:45:49 +08:00 committed by Alex Deucher
parent 9b1a6a581e
commit 6961750f12
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1034,6 +1034,14 @@ static int smu_smc_table_sw_fini(struct smu_context *smu)
return 0;
}
static void smu_throttling_logging_work_fn(struct work_struct *work)
{
struct smu_context *smu = container_of(work, struct smu_context,
throttling_logging_work);
smu_log_thermal_throttling(smu);
}
static int smu_sw_init(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@ -1055,6 +1063,7 @@ static int smu_sw_init(void *handle)
mutex_init(&smu->metrics_lock);
mutex_init(&smu->message_lock);
INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);
smu->watermarks_bitmap = 0;
smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
@ -1372,6 +1381,8 @@ static int smu_smc_hw_cleanup(struct smu_context *smu)
smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);
cancel_work_sync(&smu->throttling_logging_work);
ret = smu_disable_thermal_alert(smu);
if (ret) {
pr_warn("Fail to stop thermal control!\n");

2
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
View File

@ -411,6 +411,8 @@ struct smu_context
bool uploading_custom_pp_table;
bool dc_controlled_by_gpio;
struct work_struct throttling_logging_work;
};
struct i2c_adapter;

2
drivers/gpu/drm/amd/powerplay/smu_v11_0.c
View File

@ -1605,7 +1605,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,
return 0;
if (__ratelimit(&adev->throttling_logging_rs))
smu_log_thermal_throttling(smu);
schedule_work(&smu->throttling_logging_work);
break;
}