Commit 83e09d5b authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: correct Vega20 dpm level related settings 



Correct the settings for auto mode and skip the unnecessary
settings for dcefclk and fclk.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 23b7f6c4

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

+54 −6
Original line number Diff line number Diff line
@@ -2353,12 +2353,16 @@ static int vega20_force_dpm_highest(struct pp_hwmgr *hwmgr) 
		data->dpm_table.soc_table.dpm_state.soft_max_level =

		data->dpm_table.soc_table.dpm_levels[soft_level].value;



	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);

	ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |

						 FEATURE_DPM_UCLK_MASK |

						 FEATURE_DPM_SOCCLK_MASK);

	PP_ASSERT_WITH_CODE(!ret,

			"Failed to upload boot level to highest!",

			return ret);



	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);

	ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |

						 FEATURE_DPM_UCLK_MASK |

						 FEATURE_DPM_SOCCLK_MASK);

	PP_ASSERT_WITH_CODE(!ret,

			"Failed to upload dpm max level to highest!",

			return ret);
@@ -2391,12 +2395,16 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr) 
		data->dpm_table.soc_table.dpm_state.soft_max_level =

		data->dpm_table.soc_table.dpm_levels[soft_level].value;



	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);

	ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |

						 FEATURE_DPM_UCLK_MASK |

						 FEATURE_DPM_SOCCLK_MASK);

	PP_ASSERT_WITH_CODE(!ret,

			"Failed to upload boot level to highest!",

			return ret);



	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);

	ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |

						 FEATURE_DPM_UCLK_MASK |

						 FEATURE_DPM_SOCCLK_MASK);

	PP_ASSERT_WITH_CODE(!ret,

			"Failed to upload dpm max level to highest!",

			return ret);
@@ -2407,14 +2415,54 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr) 


static int vega20_unforce_dpm_levels(struct pp_hwmgr *hwmgr)

{

	struct vega20_hwmgr *data =

			(struct vega20_hwmgr *)(hwmgr->backend);

	uint32_t soft_min_level, soft_max_level;

	int ret = 0;



	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);

	/* gfxclk soft min/max settings */

	soft_min_level =

		vega20_find_lowest_dpm_level(&(data->dpm_table.gfx_table));

	soft_max_level =

		vega20_find_highest_dpm_level(&(data->dpm_table.gfx_table));



	data->dpm_table.gfx_table.dpm_state.soft_min_level =

		data->dpm_table.gfx_table.dpm_levels[soft_min_level].value;

	data->dpm_table.gfx_table.dpm_state.soft_max_level =

		data->dpm_table.gfx_table.dpm_levels[soft_max_level].value;



	/* uclk soft min/max settings */

	soft_min_level =

		vega20_find_lowest_dpm_level(&(data->dpm_table.mem_table));

	soft_max_level =

		vega20_find_highest_dpm_level(&(data->dpm_table.mem_table));



	data->dpm_table.mem_table.dpm_state.soft_min_level =

		data->dpm_table.mem_table.dpm_levels[soft_min_level].value;

	data->dpm_table.mem_table.dpm_state.soft_max_level =

		data->dpm_table.mem_table.dpm_levels[soft_max_level].value;



	/* socclk soft min/max settings */

	soft_min_level =

		vega20_find_lowest_dpm_level(&(data->dpm_table.soc_table));

	soft_max_level =

		vega20_find_highest_dpm_level(&(data->dpm_table.soc_table));



	data->dpm_table.soc_table.dpm_state.soft_min_level =

		data->dpm_table.soc_table.dpm_levels[soft_min_level].value;

	data->dpm_table.soc_table.dpm_state.soft_max_level =

		data->dpm_table.soc_table.dpm_levels[soft_max_level].value;



	ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |

						 FEATURE_DPM_UCLK_MASK |

						 FEATURE_DPM_SOCCLK_MASK);

	PP_ASSERT_WITH_CODE(!ret,

			"Failed to upload DPM Bootup Levels!",

			return ret);



	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);

	ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |

						 FEATURE_DPM_UCLK_MASK |

						 FEATURE_DPM_SOCCLK_MASK);

	PP_ASSERT_WITH_CODE(!ret,

			"Failed to upload DPM Max Levels!",

			return ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE