diff options
| author | Evan Quan <evan.quan@amd.com> | 2020-03-27 06:20:29 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-04-01 21:44:45 +0300 |
| commit | 6b6706cdaca344a9279fe124bf87da040f5711fb (patch) | |
| tree | e8c1ae27bdad8db082f5454af5cb323748f1b9cd | |
| parent | a0ec225633d9f681e393a1827f29f02c837deb84 (diff) | |
| download | linux-6b6706cdaca344a9279fe124bf87da040f5711fb.tar.xz | |
drm/amd/powerplay: added mutex protection on msg issuing
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>
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index c195575366a3..71b843f542d8 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -50,6 +50,7 @@ static int amd_powerplay_create(struct amdgpu_device *adev) hwmgr->not_vf = !amdgpu_sriov_vf(adev); hwmgr->device = amdgpu_cgs_create_device(adev); mutex_init(&hwmgr->smu_lock); + mutex_init(&hwmgr->msg_lock); hwmgr->chip_family = adev->family; hwmgr->chip_id = adev->asic_type; 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; + mutex_destroy(&hwmgr->msg_lock); + kfree(hwmgr->hardcode_pp_table); hwmgr->hardcode_pp_table = NULL; diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h index 2ffb666b97e6..15ed6cbdf366 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h @@ -743,6 +743,7 @@ struct pp_hwmgr { bool pm_en; bool pp_one_vf; struct mutex smu_lock; + struct mutex msg_lock; uint32_t pp_table_version; void *device; diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c index 3bb0392994ec..b6fb48066841 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c @@ -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)) return -EINVAL; + mutex_lock(&hwmgr->msg_lock); + ret = hwmgr->smumgr_funcs->send_msg_to_smc(hwmgr, msg); - if (ret) + if (ret) { + mutex_unlock(&hwmgr->msg_lock); return ret; + } if (resp) *resp = hwmgr->smumgr_funcs->get_argument(hwmgr); + mutex_unlock(&hwmgr->msg_lock); + return ret; } @@ -158,14 +164,20 @@ int smum_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr, (resp && !hwmgr->smumgr_funcs->get_argument)) return -EINVAL; + mutex_lock(&hwmgr->msg_lock); + ret = hwmgr->smumgr_funcs->send_msg_to_smc_with_parameter( hwmgr, msg, parameter); - if (ret) + if (ret) { + mutex_unlock(&hwmgr->msg_lock); return ret; + } if (resp) *resp = hwmgr->smumgr_funcs->get_argument(hwmgr); + mutex_unlock(&hwmgr->msg_lock); + return ret; } |