leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/powerplay: added mutex protection on msg issuing

Browse Source 
This could avoid the possible race condition.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Evan Quan 2020-03-27 11:20:29 +08:00 committed by Alex Deucher
parent a0ec225633
commit 6b6706cdac
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/powerplay/amd_powerplay.c
View File

@ -50,6 +50,7 @@ static int amd_powerplay_create(struct amdgpu_device *adev)
hwmgr->not_vf = !amdgpu_sriov_vf(adev); hwmgr->not_vf = !amdgpu_sriov_vf(adev);
hwmgr->device = amdgpu_cgs_create_device(adev); hwmgr->device = amdgpu_cgs_create_device(adev);
mutex_init(&hwmgr->smu_lock); mutex_init(&hwmgr->smu_lock);
mutex_init(&hwmgr->msg_lock);
hwmgr->chip_family = adev->family; hwmgr->chip_family = adev->family;
hwmgr->chip_id = adev->asic_type; hwmgr->chip_id = adev->asic_type;
hwmgr->feature_mask = adev->pm.pp_feature; hwmgr->feature_mask = adev->pm.pp_feature;
@ -64,6 +65,8 @@ static void amd_powerplay_destroy(struct amdgpu_device *adev)
{ {
struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle;
mutex_destroy(&hwmgr->msg_lock);
kfree(hwmgr->hardcode_pp_table); kfree(hwmgr->hardcode_pp_table);
hwmgr->hardcode_pp_table = NULL; hwmgr->hardcode_pp_table = NULL;

1
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
View File

@ -743,6 +743,7 @@ struct pp_hwmgr {
bool pm_en; bool pm_en;
bool pp_one_vf; bool pp_one_vf;
struct mutex smu_lock; struct mutex smu_lock;
struct mutex msg_lock;
uint32_t pp_table_version; uint32_t pp_table_version;
void *device; void *device;

16
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
View File

@ -136,13 +136,19 @@ int smum_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg, uint32_t *resp)
(resp && !hwmgr->smumgr_funcs->get_argument)) (resp && !hwmgr->smumgr_funcs->get_argument))
return -EINVAL; return -EINVAL;
mutex_lock(&hwmgr->msg_lock);
ret = hwmgr->smumgr_funcs->send_msg_to_smc(hwmgr, msg); ret = hwmgr->smumgr_funcs->send_msg_to_smc(hwmgr, msg);
if (ret) if (ret) {
mutex_unlock(&hwmgr->msg_lock);
return ret; return ret;
}
if (resp) if (resp)
*resp = hwmgr->smumgr_funcs->get_argument(hwmgr); *resp = hwmgr->smumgr_funcs->get_argument(hwmgr);
mutex_unlock(&hwmgr->msg_lock);
return ret; return ret;
} }
@ -158,14 +164,20 @@ int smum_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr,
(resp && !hwmgr->smumgr_funcs->get_argument)) (resp && !hwmgr->smumgr_funcs->get_argument))
return -EINVAL; return -EINVAL;
mutex_lock(&hwmgr->msg_lock);
ret = hwmgr->smumgr_funcs->send_msg_to_smc_with_parameter( ret = hwmgr->smumgr_funcs->send_msg_to_smc_with_parameter(
hwmgr, msg, parameter); hwmgr, msg, parameter);
if (ret) if (ret) {
mutex_unlock(&hwmgr->msg_lock);
return ret; return ret;
}
if (resp) if (resp)
*resp = hwmgr->smumgr_funcs->get_argument(hwmgr); *resp = hwmgr->smumgr_funcs->get_argument(hwmgr);
mutex_unlock(&hwmgr->msg_lock);
return ret; return ret;
} }