Forráskód Böngészése

drm/amd/powerplay: Set higher SCLK&MCLK frequency than dpm7 in OD (v2)

Fix the issue that SCLK&MCLK can't be set higher than dpm7 when
OD is enabled in SMU7.

v2: fix warning (Alex)

Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Acked-by: Rex Zhu<rezhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Kenneth Feng 7 éve
szülő
commit
5c16f36f6f
1 módosított fájl, 5 hozzáadás és 2 törlés
  1. 5 2
      drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+ 5 - 2
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

@@ -3755,14 +3755,17 @@ static int smu7_trim_dpm_states(struct pp_hwmgr *hwmgr,
 static int smu7_generate_dpm_level_enable_mask(
 static int smu7_generate_dpm_level_enable_mask(
 		struct pp_hwmgr *hwmgr, const void *input)
 		struct pp_hwmgr *hwmgr, const void *input)
 {
 {
-	int result;
+	int result = 0;
 	const struct phm_set_power_state_input *states =
 	const struct phm_set_power_state_input *states =
 			(const struct phm_set_power_state_input *)input;
 			(const struct phm_set_power_state_input *)input;
 	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
 	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
 	const struct smu7_power_state *smu7_ps =
 	const struct smu7_power_state *smu7_ps =
 			cast_const_phw_smu7_power_state(states->pnew_state);
 			cast_const_phw_smu7_power_state(states->pnew_state);
 
 
-	result = smu7_trim_dpm_states(hwmgr, smu7_ps);
+	/*skip the trim if od is enabled*/
+	if (!hwmgr->od_enabled)
+		result = smu7_trim_dpm_states(hwmgr, smu7_ps);
+
 	if (result)
 	if (result)
 		return result;
 		return result;