[Public]
With the comment in patch 1 addressed, the series is:
Reviewed-by: Guchun Chen <guchun.c...@amd.com>
Regards,
Guchun
-----Original Message-----
From: Quan, Evan <evan.q...@amd.com>
Sent: Thursday, January 20, 2022 7:52 PM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <alexander.deuc...@amd.com>; Lazar, Lijo
<lijo.la...@amd.com>; Chen, Guchun <guchun.c...@amd.com>
Subject: RE: [PATCH V2 7/7] drm/amd/pm: drop unneeded hwmgr->smu_lock
[AMD Official Use Only]
Ping for the series..
> -----Original Message-----
> From: Quan, Evan <evan.q...@amd.com>
> Sent: Monday, January 17, 2022 1:42 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <alexander.deuc...@amd.com>; Lazar, Lijo
> <lijo.la...@amd.com>; Chen, Guchun <guchun.c...@amd.com>; Quan, Evan
> <evan.q...@amd.com>
> Subject: [PATCH V2 7/7] drm/amd/pm: drop unneeded hwmgr->smu_lock
>
> As all those related APIs are already well protected by adev->pm.mutex.
>
> Signed-off-by: Evan Quan <evan.q...@amd.com>
> Change-Id: I36426791d3bbc9d84a6ae437da26a892682eb0cb
> ---
> .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 278 +++---------------
> drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 1 -
> 2 files changed, 38 insertions(+), 241 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> index 76c26ae368f9..a2da46bf3985 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> @@ -50,7 +50,6 @@ static int amd_powerplay_create(struct amdgpu_device
> *adev)
> hwmgr->adev = 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;
> @@ -178,12 +177,9 @@ static int pp_late_init(void *handle)
> struct amdgpu_device *adev = handle;
> struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle;
>
> - if (hwmgr && hwmgr->pm_en) {
> - mutex_lock(&hwmgr->smu_lock);
> + if (hwmgr && hwmgr->pm_en)
> hwmgr_handle_task(hwmgr,
> AMD_PP_TASK_COMPLETE_INIT,
> NULL);
> - mutex_unlock(&hwmgr->smu_lock);
> - }
> if (adev->pm.smu_prv_buffer_size != 0)
> pp_reserve_vram_for_smu(adev);
>
> @@ -345,11 +341,9 @@ static int pp_dpm_force_performance_level(void
> *handle,
> if (level == hwmgr->dpm_level)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> pp_dpm_en_umd_pstate(hwmgr, &level);
> hwmgr->request_dpm_level = level;
> hwmgr_handle_task(hwmgr,
> AMD_PP_TASK_READJUST_POWER_STATE, NULL);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -358,21 +352,16 @@ static enum amd_dpm_forced_level
> pp_dpm_get_performance_level(
> void *handle)
> {
> struct pp_hwmgr *hwmgr = handle;
> - enum amd_dpm_forced_level level;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - level = hwmgr->dpm_level;
> - mutex_unlock(&hwmgr->smu_lock);
> - return level;
> + return hwmgr->dpm_level;
> }
>
> static uint32_t pp_dpm_get_sclk(void *handle, bool low) {
> struct pp_hwmgr *hwmgr = handle;
> - uint32_t clk = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return 0;
> @@ -381,16 +370,12 @@ static uint32_t pp_dpm_get_sclk(void *handle,
> bool low)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return 0;
> }
> - mutex_lock(&hwmgr->smu_lock);
> - clk = hwmgr->hwmgr_func->get_sclk(hwmgr, low);
> - mutex_unlock(&hwmgr->smu_lock);
> - return clk;
> + return hwmgr->hwmgr_func->get_sclk(hwmgr, low);
> }
>
> static uint32_t pp_dpm_get_mclk(void *handle, bool low) {
> struct pp_hwmgr *hwmgr = handle;
> - uint32_t clk = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return 0;
> @@ -399,10 +384,7 @@ static uint32_t pp_dpm_get_mclk(void *handle,
> bool low)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return 0;
> }
> - mutex_lock(&hwmgr->smu_lock);
> - clk = hwmgr->hwmgr_func->get_mclk(hwmgr, low);
> - mutex_unlock(&hwmgr->smu_lock);
> - return clk;
> + return hwmgr->hwmgr_func->get_mclk(hwmgr, low);
> }
>
> static void pp_dpm_powergate_vce(void *handle, bool gate) @@ -416,9
> +398,7 @@ static void pp_dpm_powergate_vce(void *handle, bool gate)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return;
> }
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->powergate_vce(hwmgr, gate);
> - mutex_unlock(&hwmgr->smu_lock);
> }
>
> static void pp_dpm_powergate_uvd(void *handle, bool gate) @@ -432,25
> +412,18 @@ static void pp_dpm_powergate_uvd(void *handle, bool gate)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return;
> }
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->powergate_uvd(hwmgr, gate);
> - mutex_unlock(&hwmgr->smu_lock);
> }
>
> static int pp_dpm_dispatch_tasks(void *handle, enum amd_pp_task task_id,
> enum amd_pm_state_type *user_state) {
> - int ret = 0;
> struct pp_hwmgr *hwmgr = handle;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr_handle_task(hwmgr, task_id, user_state);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return hwmgr_handle_task(hwmgr, task_id, user_state);
> }
>
> static enum amd_pm_state_type pp_dpm_get_current_power_state(void
> *handle) @@ -462,8 +435,6 @@ static enum amd_pm_state_type
> pp_dpm_get_current_power_state(void *handle)
> if (!hwmgr || !hwmgr->pm_en || !hwmgr->current_ps)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> state = hwmgr->current_ps;
>
> switch (state->classification.ui_label) { @@ -483,7 +454,6 @@ static
> enum amd_pm_state_type pp_dpm_get_current_power_state(void
> *handle)
> pm_type = POWER_STATE_TYPE_DEFAULT;
> break;
> }
> - mutex_unlock(&hwmgr->smu_lock);
>
> return pm_type;
> }
> @@ -501,9 +471,7 @@ static int pp_dpm_set_fan_control_mode(void
> *handle, uint32_t mode)
> if (mode == U32_MAX)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_fan_control_mode(hwmgr, mode);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -521,16 +489,13 @@ static int pp_dpm_get_fan_control_mode(void
> *handle, uint32_t *fan_mode)
> if (!fan_mode)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> *fan_mode = hwmgr->hwmgr_func-
> >get_fan_control_mode(hwmgr);
> - mutex_unlock(&hwmgr->smu_lock);
> return 0;
> }
>
> static int pp_dpm_set_fan_speed_pwm(void *handle, uint32_t speed) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EOPNOTSUPP;
> @@ -541,16 +506,12 @@ static int pp_dpm_set_fan_speed_pwm(void
> *handle, uint32_t speed)
> if (speed == U32_MAX)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->set_fan_speed_pwm(hwmgr, speed);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->set_fan_speed_pwm(hwmgr, speed);
> }
>
> static int pp_dpm_get_fan_speed_pwm(void *handle, uint32_t *speed) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EOPNOTSUPP;
> @@ -561,16 +522,12 @@ static int pp_dpm_get_fan_speed_pwm(void
> *handle, uint32_t *speed)
> if (!speed)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->get_fan_speed_pwm(hwmgr, speed);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->get_fan_speed_pwm(hwmgr, speed);
> }
>
> static int pp_dpm_get_fan_speed_rpm(void *handle, uint32_t *rpm) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EOPNOTSUPP;
> @@ -581,16 +538,12 @@ static int pp_dpm_get_fan_speed_rpm(void
> *handle, uint32_t *rpm)
> if (!rpm)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->get_fan_speed_rpm(hwmgr, rpm);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->get_fan_speed_rpm(hwmgr, rpm);
> }
>
> static int pp_dpm_set_fan_speed_rpm(void *handle, uint32_t rpm) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EOPNOTSUPP;
> @@ -601,10 +554,7 @@ static int pp_dpm_set_fan_speed_rpm(void *handle,
> uint32_t rpm)
> if (rpm == U32_MAX)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->set_fan_speed_rpm(hwmgr, rpm);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->set_fan_speed_rpm(hwmgr, rpm);
> }
>
> static int pp_dpm_get_pp_num_states(void *handle, @@ -618,8 +568,6 @@
> static int pp_dpm_get_pp_num_states(void *handle,
> if (!hwmgr || !hwmgr->pm_en ||!hwmgr->ps)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> data->nums = hwmgr->num_ps;
>
> for (i = 0; i < hwmgr->num_ps; i++) { @@ -642,23 +590,18 @@ static
> int pp_dpm_get_pp_num_states(void *handle,
> data->states[i] =
> POWER_STATE_TYPE_DEFAULT;
> }
> }
> - mutex_unlock(&hwmgr->smu_lock);
> return 0;
> }
>
> static int pp_dpm_get_pp_table(void *handle, char **table) {
> struct pp_hwmgr *hwmgr = handle;
> - int size = 0;
>
> if (!hwmgr || !hwmgr->pm_en ||!hwmgr->soft_pp_table)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> *table = (char *)hwmgr->soft_pp_table;
> - size = hwmgr->soft_pp_table_size;
> - mutex_unlock(&hwmgr->smu_lock);
> - return size;
> + return hwmgr->soft_pp_table_size;
> }
>
> static int amd_powerplay_reset(void *handle) @@ -685,13 +628,12 @@
> static int pp_dpm_set_pp_table(void *handle, const char *buf, size_t size)
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> if (!hwmgr->hardcode_pp_table) {
> hwmgr->hardcode_pp_table = kmemdup(hwmgr-
> >soft_pp_table,
> hwmgr-
> >soft_pp_table_size,
> GFP_KERNEL);
> if (!hwmgr->hardcode_pp_table)
> - goto err;
> + return ret;
> }
>
> memcpy(hwmgr->hardcode_pp_table, buf, size); @@ -700,17
> +642,11 @@ static int pp_dpm_set_pp_table(void *handle, const char
> +*buf,
> size_t size)
>
> ret = amd_powerplay_reset(handle);
> if (ret)
> - goto err;
> + return ret;
>
> - if (hwmgr->hwmgr_func->avfs_control) {
> + if (hwmgr->hwmgr_func->avfs_control)
> ret = hwmgr->hwmgr_func->avfs_control(hwmgr, false);
> - if (ret)
> - goto err;
> - }
> - mutex_unlock(&hwmgr->smu_lock);
> - return 0;
> -err:
> - mutex_unlock(&hwmgr->smu_lock);
> +
> return ret;
> }
>
> @@ -718,7 +654,6 @@ static int pp_dpm_force_clock_level(void *handle,
> enum pp_clock_type type, uint32_t mask) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -733,17 +668,13 @@ static int pp_dpm_force_clock_level(void *handle,
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->force_clock_level(hwmgr, type, mask);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->force_clock_level(hwmgr, type,
> mask);
> }
>
> static int pp_dpm_print_clock_levels(void *handle,
> enum pp_clock_type type, char *buf) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -752,16 +683,12 @@ static int pp_dpm_print_clock_levels(void *handle,
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return 0;
> }
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->print_clock_levels(hwmgr, type, buf);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->print_clock_levels(hwmgr, type, buf);
> }
>
> static int pp_dpm_get_sclk_od(void *handle) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -770,16 +697,12 @@ static int pp_dpm_get_sclk_od(void *handle)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return 0;
> }
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->get_sclk_od(hwmgr);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->get_sclk_od(hwmgr);
> }
>
> static int pp_dpm_set_sclk_od(void *handle, uint32_t value) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -789,16 +712,12 @@ static int pp_dpm_set_sclk_od(void *handle,
> uint32_t value)
> return 0;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->set_sclk_od(hwmgr, value);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->set_sclk_od(hwmgr, value);
> }
>
> static int pp_dpm_get_mclk_od(void *handle) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -807,16 +726,12 @@ static int pp_dpm_get_mclk_od(void *handle)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return 0;
> }
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->get_mclk_od(hwmgr);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->get_mclk_od(hwmgr);
> }
>
> static int pp_dpm_set_mclk_od(void *handle, uint32_t value) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -825,17 +740,13 @@ static int pp_dpm_set_mclk_od(void *handle,
> uint32_t value)
> pr_info_ratelimited("%s was not implemented.\n", __func__);
> return 0;
> }
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->set_mclk_od(hwmgr, value);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->set_mclk_od(hwmgr, value);
> }
>
> static int pp_dpm_read_sensor(void *handle, int idx,
> void *value, int *size)
> {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en || !value)
> return -EINVAL;
> @@ -854,10 +765,7 @@ static int pp_dpm_read_sensor(void *handle, int idx,
> *((uint32_t *)value) = hwmgr-
> >thermal_controller.fanInfo.ulMaxRPM;
> return 0;
> default:
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->read_sensor(hwmgr, idx, value,
> size);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->read_sensor(hwmgr, idx,
> value, size);
> }
> }
>
> @@ -877,36 +785,28 @@ pp_dpm_get_vce_clock_state(void *handle,
> unsigned idx) static int pp_get_power_profile_mode(void *handle, char
> *buf) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret;
>
> if (!hwmgr || !hwmgr->pm_en || !hwmgr->hwmgr_func-
> >get_power_profile_mode)
> return -EOPNOTSUPP;
> if (!buf)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->get_power_profile_mode(hwmgr, buf);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->get_power_profile_mode(hwmgr,
> buf);
> }
>
> static int pp_set_power_profile_mode(void *handle, long *input,
> uint32_t
> size) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = -EOPNOTSUPP;
>
> if (!hwmgr || !hwmgr->pm_en || !hwmgr->hwmgr_func-
> >set_power_profile_mode)
> - return ret;
> + return -EOPNOTSUPP;
>
> if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL) {
> pr_debug("power profile setting is for manual dpm mode
> only.\n");
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->set_power_profile_mode(hwmgr,
> input, size);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return hwmgr->hwmgr_func->set_power_profile_mode(hwmgr,
> input, size);
> }
>
> static int pp_set_fine_grain_clk_vol(void *handle, uint32_t type,
> long *input, uint32_t size) @@ -971,8 +871,6 @@ static int
> pp_dpm_switch_power_profile(void *handle,
> if (!(type < PP_SMC_POWER_PROFILE_CUSTOM))
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> if (!en) {
> hwmgr->workload_mask &= ~(1 << hwmgr-
> >workload_prority[type]);
> index = fls(hwmgr->workload_mask);
> @@ -987,15 +885,12 @@ static int pp_dpm_switch_power_profile(void
> *handle,
>
> if (type == PP_SMC_POWER_PROFILE_COMPUTE &&
> hwmgr->hwmgr_func-
> >disable_power_features_for_compute_performance) {
> - if (hwmgr->hwmgr_func-
> >disable_power_features_for_compute_performance(hwmgr, en)) {
> - mutex_unlock(&hwmgr->smu_lock);
> + if
> +(hwmgr->hwmgr_func-
> >disable_power_features_for_compute_performance(hwmg
> +r, en))
> return -EINVAL;
> - }
> }
>
> if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL)
> hwmgr->hwmgr_func->set_power_profile_mode(hwmgr,
> &workload, 0);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1025,10 +920,8 @@ static int pp_set_power_limit(void *handle,
> uint32_t limit)
> if (limit > max_power_limit)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_power_limit(hwmgr, limit);
> hwmgr->power_limit = limit;
> - mutex_unlock(&hwmgr->smu_lock);
> return 0;
> }
>
> @@ -1045,8 +938,6 @@ static int pp_get_power_limit(void *handle,
> uint32_t *limit,
> if (power_type != PP_PWR_TYPE_SUSTAINED)
> return -EOPNOTSUPP;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> switch (pp_limit_level) {
> case PP_PWR_LIMIT_CURRENT:
> *limit = hwmgr->power_limit;
> @@ -1066,8 +957,6 @@ static int pp_get_power_limit(void *handle,
> uint32_t *limit,
> break;
> }
>
> - mutex_unlock(&hwmgr->smu_lock);
> -
> return ret;
> }
>
> @@ -1079,9 +968,7 @@ static int pp_display_configuration_change(void
> *handle,
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> phm_store_dal_configuration_data(hwmgr, display_config);
> - mutex_unlock(&hwmgr->smu_lock);
> return 0;
> }
>
> @@ -1089,15 +976,11 @@ static int pp_get_display_power_level(void
> *handle,
> struct amd_pp_simple_clock_info *output) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en ||!output)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = phm_get_dal_power_level(hwmgr, output);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return phm_get_dal_power_level(hwmgr, output);
> }
>
> static int pp_get_current_clocks(void *handle, @@ -1111,8 +994,6 @@
> static int pp_get_current_clocks(void *handle,
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> phm_get_dal_power_level(hwmgr, &simple_clocks);
>
> if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
> @@ -1125,7 +1006,6 @@ static int pp_get_current_clocks(void *handle,
>
> if (ret) {
> pr_debug("Error in phm_get_clock_info \n");
> - mutex_unlock(&hwmgr->smu_lock);
> return -EINVAL;
> }
>
> @@ -1148,14 +1028,12 @@ static int pp_get_current_clocks(void *handle,
> clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk;
> clocks->min_engine_clock_in_sr = hw_clocks.min_eng_clk;
> }
> - mutex_unlock(&hwmgr->smu_lock);
> return 0;
> }
>
> static int pp_get_clock_by_type(void *handle, enum amd_pp_clock_type
> type, struct amd_pp_clocks *clocks) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -1163,10 +1041,7 @@ static int pp_get_clock_by_type(void *handle,
> enum amd_pp_clock_type type, struc
> if (clocks == NULL)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = phm_get_clock_by_type(hwmgr, type, clocks);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return phm_get_clock_by_type(hwmgr, type, clocks);
> }
>
> static int pp_get_clock_by_type_with_latency(void *handle, @@
> -1174,15
> +1049,11 @@ static int pp_get_clock_by_type_with_latency(void *handle,
> struct pp_clock_levels_with_latency *clocks) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en ||!clocks)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = phm_get_clock_by_type_with_latency(hwmgr, type, clocks);
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return phm_get_clock_by_type_with_latency(hwmgr, type, clocks);
> }
>
> static int pp_get_clock_by_type_with_voltage(void *handle, @@
> -1190,50
> +1061,34 @@ static int pp_get_clock_by_type_with_voltage(void *handle,
> struct pp_clock_levels_with_voltage *clocks) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en ||!clocks)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> - ret = phm_get_clock_by_type_with_voltage(hwmgr, type, clocks);
> -
> - mutex_unlock(&hwmgr->smu_lock);
> - return ret;
> + return phm_get_clock_by_type_with_voltage(hwmgr, type, clocks);
> }
>
> static int pp_set_watermarks_for_clocks_ranges(void *handle,
> void *clock_ranges)
> {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en || !clock_ranges)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = phm_set_watermarks_for_clocks_ranges(hwmgr,
> - clock_ranges);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return phm_set_watermarks_for_clocks_ranges(hwmgr,
> + clock_ranges);
> }
>
> static int pp_display_clock_voltage_request(void *handle,
> struct pp_display_clock_request *clock) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en ||!clock)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = phm_display_clock_voltage_request(hwmgr, clock);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return phm_display_clock_voltage_request(hwmgr, clock);
> }
>
> static int pp_get_display_mode_validation_clocks(void *handle, @@ -
> 1247,12 +1102,9 @@ static int
> pp_get_display_mode_validation_clocks(void
> *handle,
>
> clocks->level = PP_DAL_POWERLEVEL_7;
>
> - mutex_lock(&hwmgr->smu_lock);
> -
> if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
> PHM_PlatformCaps_DynamicPatchPowerState))
> ret = phm_get_max_high_clocks(hwmgr, clocks);
>
> - mutex_unlock(&hwmgr->smu_lock);
> return ret;
> }
>
> @@ -1364,9 +1216,7 @@ static int pp_notify_smu_enable_pwe(void
> *handle)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->smus_notify_pwe(hwmgr);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1382,9 +1232,7 @@ static int pp_enable_mgpu_fan_boost(void
> *handle)
> hwmgr->hwmgr_func->enable_mgpu_fan_boost == NULL)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->enable_mgpu_fan_boost(hwmgr);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1401,9 +1249,7 @@ static int pp_set_min_deep_sleep_dcefclk(void
> *handle, uint32_t clock)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_min_deep_sleep_dcefclk(hwmgr, clock);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1420,9 +1266,7 @@ static int pp_set_hard_min_dcefclk_by_freq(void
> *handle, uint32_t clock)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_hard_min_dcefclk_by_freq(hwmgr,
> clock);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1439,9 +1283,7 @@ static int pp_set_hard_min_fclk_by_freq(void
> *handle, uint32_t clock)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_hard_min_fclk_by_freq(hwmgr, clock);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1449,16 +1291,11 @@ static int pp_set_hard_min_fclk_by_freq(void
> *handle, uint32_t clock) static int pp_set_active_display_count(void
> *handle, uint32_t count) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = phm_set_active_display_count(hwmgr, count);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return phm_set_active_display_count(hwmgr, count);
> }
>
> static int pp_get_asic_baco_capability(void *handle, bool *cap) @@
> -1473,9
> +1310,7 @@ static int pp_get_asic_baco_capability(void *handle, bool
> +*cap)
> !hwmgr->hwmgr_func->get_asic_baco_capability)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->get_asic_baco_capability(hwmgr, cap);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1490,9 +1325,7 @@ static int pp_get_asic_baco_state(void *handle,
> int
> *state)
> if (!hwmgr->pm_en || !hwmgr->hwmgr_func->get_asic_baco_state)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->get_asic_baco_state(hwmgr, (enum BACO_STATE
> *)state);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1508,9 +1341,7 @@ static int pp_set_asic_baco_state(void *handle,
> int
> state)
> !hwmgr->hwmgr_func->set_asic_baco_state)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_asic_baco_state(hwmgr, (enum
> BACO_STATE)state);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1518,7 +1349,6 @@ static int pp_set_asic_baco_state(void *handle,
> int
> state) static int pp_get_ppfeature_status(void *handle, char *buf) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en || !buf)
> return -EINVAL;
> @@ -1528,17 +1358,12 @@ static int pp_get_ppfeature_status(void
> *handle, char *buf)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->get_ppfeature_status(hwmgr, buf);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return hwmgr->hwmgr_func->get_ppfeature_status(hwmgr, buf);
> }
>
> static int pp_set_ppfeature_status(void *handle, uint64_t
> ppfeature_masks) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -1548,17 +1373,12 @@ static int pp_set_ppfeature_status(void
> *handle, uint64_t ppfeature_masks)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->set_ppfeature_status(hwmgr,
> ppfeature_masks);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return hwmgr->hwmgr_func->set_ppfeature_status(hwmgr,
> +ppfeature_masks);
> }
>
> static int pp_asic_reset_mode_2(void *handle) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -1568,17 +1388,12 @@ static int pp_asic_reset_mode_2(void *handle)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->asic_reset(hwmgr,
> SMU_ASIC_RESET_MODE_2);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return hwmgr->hwmgr_func->asic_reset(hwmgr,
> SMU_ASIC_RESET_MODE_2);
> }
>
> static int pp_smu_i2c_bus_access(void *handle, bool acquire) {
> struct pp_hwmgr *hwmgr = handle;
> - int ret = 0;
>
> if (!hwmgr || !hwmgr->pm_en)
> return -EINVAL;
> @@ -1588,11 +1403,7 @@ static int pp_smu_i2c_bus_access(void *handle,
> bool acquire)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> - ret = hwmgr->hwmgr_func->smu_i2c_bus_access(hwmgr, acquire);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return ret;
> + return hwmgr->hwmgr_func->smu_i2c_bus_access(hwmgr, acquire);
> }
>
> static int pp_set_df_cstate(void *handle, enum pp_df_cstate state) @@
> -
> 1605,9 +1416,7 @@ static int pp_set_df_cstate(void *handle, enum
> pp_df_cstate state)
> if (!hwmgr->pm_en || !hwmgr->hwmgr_func->set_df_cstate)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_df_cstate(hwmgr, state);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1622,9 +1431,7 @@ static int pp_set_xgmi_pstate(void *handle,
> uint32_t pstate)
> if (!hwmgr->pm_en || !hwmgr->hwmgr_func->set_xgmi_pstate)
> return 0;
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->set_xgmi_pstate(hwmgr, pstate);
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> @@ -1632,7 +1439,6 @@ static int pp_set_xgmi_pstate(void *handle,
> uint32_t pstate) static ssize_t pp_get_gpu_metrics(void *handle, void
> **table) {
> struct pp_hwmgr *hwmgr = handle;
> - ssize_t size;
>
> if (!hwmgr)
> return -EINVAL;
> @@ -1640,11 +1446,7 @@ static ssize_t pp_get_gpu_metrics(void *handle,
> void **table)
> if (!hwmgr->pm_en || !hwmgr->hwmgr_func->get_gpu_metrics)
> return -EOPNOTSUPP;
>
> - mutex_lock(&hwmgr->smu_lock);
> - size = hwmgr->hwmgr_func->get_gpu_metrics(hwmgr, table);
> - mutex_unlock(&hwmgr->smu_lock);
> -
> - return size;
> + return hwmgr->hwmgr_func->get_gpu_metrics(hwmgr, table);
> }
>
> static int pp_gfx_state_change_set(void *handle, uint32_t state) @@ -
> 1659,9 +1461,7 @@ static int pp_gfx_state_change_set(void *handle,
> uint32_t state)
> return -EINVAL;
> }
>
> - mutex_lock(&hwmgr->smu_lock);
> hwmgr->hwmgr_func->gfx_state_change(hwmgr, state);
> - mutex_unlock(&hwmgr->smu_lock);
> return 0;
> }
>
> @@ -1675,12 +1475,10 @@ static int pp_get_prv_buffer_details(void
> *handle, void **addr, size_t *size)
>
> *addr = NULL;
> *size = 0;
> - mutex_lock(&hwmgr->smu_lock);
> if (adev->pm.smu_prv_buffer) {
> amdgpu_bo_kmap(adev->pm.smu_prv_buffer, addr);
> *size = adev->pm.smu_prv_buffer_size;
> }
> - mutex_unlock(&hwmgr->smu_lock);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
> b/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
> index 03226baea65e..4f7f2f455301 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
> +++ b/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
> @@ -748,7 +748,6 @@ struct pp_hwmgr {
> bool not_vf;
> bool pm_en;
> bool pp_one_vf;
> - struct mutex smu_lock;
> struct mutex msg_lock;
>
> uint32_t pp_table_version;
> --
> 2.29.0
