Commit 948fd66c authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Refine pp_dpm_force_clock_level functions 



Only when user set manual performance mode, driver
enable pp_dpm_force_clock_level.
so check the mode in pp_dpm_force_clock_level,
and delete the same logic in callback functions.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6fa3ef3a

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

+1 −3
Original line number Diff line number Diff line
@@ -6639,9 +6639,7 @@ static int ci_dpm_force_clock_level(void *handle, 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct ci_power_info *pi = ci_get_pi(adev);



	if (adev->pm.dpm.forced_level & (AMD_DPM_FORCED_LEVEL_AUTO |

				AMD_DPM_FORCED_LEVEL_LOW |

				AMD_DPM_FORCED_LEVEL_HIGH))

	if (adev->pm.dpm.forced_level != AMD_DPM_FORCED_LEVEL_MANUAL)

		return -EINVAL;



	switch (type) {

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+4 −1
Original line number Diff line number Diff line
@@ -839,7 +839,10 @@ static int pp_dpm_force_clock_level(void *handle, 
		return 0;

	}

	mutex_lock(&pp_handle->pp_lock);

	hwmgr->hwmgr_func->force_clock_level(hwmgr, type, mask);

	if (hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL)

		ret = hwmgr->hwmgr_func->force_clock_level(hwmgr, type, mask);

	else

		ret = -EINVAL;

	mutex_unlock(&pp_handle->pp_lock);

	return ret;

}

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c

+0 −3
Original line number Diff line number Diff line
@@ -1558,9 +1558,6 @@ static int cz_get_dal_power_level(struct pp_hwmgr *hwmgr, 
static int cz_force_clock_level(struct pp_hwmgr *hwmgr,

		enum pp_clock_type type, uint32_t mask)

{

	if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL)

		return -EINVAL;



	switch (type) {

	case PP_SCLK:

		smum_send_msg_to_smc_with_parameter(hwmgr,

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+0 −5
Original line number Diff line number Diff line
@@ -4296,11 +4296,6 @@ static int smu7_force_clock_level(struct pp_hwmgr *hwmgr, 
{

	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);



	if (hwmgr->request_dpm_level & (AMD_DPM_FORCED_LEVEL_AUTO |

					AMD_DPM_FORCED_LEVEL_LOW |

					AMD_DPM_FORCED_LEVEL_HIGH))

		return -EINVAL;



	switch (type) {

	case PP_SCLK:

		if (!data->sclk_dpm_key_disabled)

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+0 −5
Original line number Diff line number Diff line
@@ -4500,11 +4500,6 @@ static int vega10_force_clock_level(struct pp_hwmgr *hwmgr, 
{

	struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr->backend);



	if (hwmgr->request_dpm_level & (AMD_DPM_FORCED_LEVEL_AUTO |

				AMD_DPM_FORCED_LEVEL_LOW |

				AMD_DPM_FORCED_LEVEL_HIGH))

		return -EINVAL;



	switch (type) {

	case PP_SCLK:

		data->smc_state_table.gfx_boot_level = mask ? (ffs(mask) - 1) : 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE