提交 3f6d7435 编写于 作者: H Hersen Wu 提交者: Alex Deucher

drm/amd/display: DAL3 RV get DPREFCLK SpreadspectrumInfo from smu_info

Signed-off-by: NHersen Wu <hersenxs.wu@amd.com>
Reviewed-by: NCharlene Liu <Charlene.Liu@amd.com>
Acked-by: NHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 7f5c22d1
...@@ -1136,6 +1136,7 @@ static enum bp_result get_ss_info_v4_2( ...@@ -1136,6 +1136,7 @@ static enum bp_result get_ss_info_v4_2(
{ {
enum bp_result result = BP_RESULT_OK; enum bp_result result = BP_RESULT_OK;
struct atom_display_controller_info_v4_2 *disp_cntl_tbl = NULL; struct atom_display_controller_info_v4_2 *disp_cntl_tbl = NULL;
struct atom_smu_info_v3_1 *smu_info = NULL;
if (!ss_info) if (!ss_info)
return BP_RESULT_BADINPUT; return BP_RESULT_BADINPUT;
...@@ -1143,11 +1144,18 @@ static enum bp_result get_ss_info_v4_2( ...@@ -1143,11 +1144,18 @@ static enum bp_result get_ss_info_v4_2(
if (!DATA_TABLES(dce_info)) if (!DATA_TABLES(dce_info))
return BP_RESULT_BADBIOSTABLE; return BP_RESULT_BADBIOSTABLE;
if (!DATA_TABLES(smu_info))
return BP_RESULT_BADBIOSTABLE;
disp_cntl_tbl = GET_IMAGE(struct atom_display_controller_info_v4_2, disp_cntl_tbl = GET_IMAGE(struct atom_display_controller_info_v4_2,
DATA_TABLES(dce_info)); DATA_TABLES(dce_info));
if (!disp_cntl_tbl) if (!disp_cntl_tbl)
return BP_RESULT_BADBIOSTABLE; return BP_RESULT_BADBIOSTABLE;
smu_info = GET_IMAGE(struct atom_smu_info_v3_1, DATA_TABLES(smu_info));
if (!smu_info)
return BP_RESULT_BADBIOSTABLE;
ss_info->type.STEP_AND_DELAY_INFO = false; ss_info->type.STEP_AND_DELAY_INFO = false;
ss_info->spread_percentage_divider = 1000; ss_info->spread_percentage_divider = 1000;
/* BIOS no longer uses target clock. Always enable for now */ /* BIOS no longer uses target clock. Always enable for now */
...@@ -1173,10 +1181,10 @@ static enum bp_result get_ss_info_v4_2( ...@@ -1173,10 +1181,10 @@ static enum bp_result get_ss_info_v4_2(
/* TODO LVDS not support anymore? */ /* TODO LVDS not support anymore? */
case AS_SIGNAL_TYPE_DISPLAY_PORT: case AS_SIGNAL_TYPE_DISPLAY_PORT:
ss_info->spread_spectrum_percentage = ss_info->spread_spectrum_percentage =
disp_cntl_tbl->dp_ss_percentage; smu_info->gpuclk_ss_percentage;
ss_info->spread_spectrum_range = ss_info->spread_spectrum_range =
disp_cntl_tbl->dp_ss_rate_10hz * 10; smu_info->gpuclk_ss_rate_10hz * 10;
if (disp_cntl_tbl->dp_ss_mode & ATOM_SS_CENTRE_SPREAD_MODE) if (smu_info->gpuclk_ss_mode & ATOM_SS_CENTRE_SPREAD_MODE)
ss_info->type.CENTER_MODE = true; ss_info->type.CENTER_MODE = true;
break; break;
case AS_SIGNAL_TYPE_GPU_PLL: case AS_SIGNAL_TYPE_GPU_PLL:
......
...@@ -246,6 +246,33 @@ static int dce_clocks_get_dp_ref_freq(struct display_clock *clk) ...@@ -246,6 +246,33 @@ static int dce_clocks_get_dp_ref_freq(struct display_clock *clk)
return dp_ref_clk_khz; return dp_ref_clk_khz;
} }
/* TODO: This is DCN DPREFCLK: it could be program by DENTIST by VBIOS
* or CLK0_CLK11 by SMU. For DCE120, it is wlays 600Mhz. Will re-visit
* clock implementation
*/
static int dce_clocks_get_dp_ref_freq_wrkaround(struct display_clock *clk)
{
struct dce_disp_clk *clk_dce = TO_DCE_CLOCKS(clk);
int dp_ref_clk_khz = 600000;
if (clk_dce->ss_on_dprefclk && clk_dce->dprefclk_ss_divider != 0) {
struct fixed32_32 ss_percentage = dal_fixed32_32_div_int(
dal_fixed32_32_from_fraction(
clk_dce->dprefclk_ss_percentage,
clk_dce->dprefclk_ss_divider), 200);
struct fixed32_32 adj_dp_ref_clk_khz;
ss_percentage = dal_fixed32_32_sub(dal_fixed32_32_one,
ss_percentage);
adj_dp_ref_clk_khz =
dal_fixed32_32_mul_int(
ss_percentage,
dp_ref_clk_khz);
dp_ref_clk_khz = dal_fixed32_32_floor(adj_dp_ref_clk_khz);
}
return dp_ref_clk_khz;
}
static enum dm_pp_clocks_state dce_get_required_clocks_state( static enum dm_pp_clocks_state dce_get_required_clocks_state(
struct display_clock *clk, struct display_clock *clk,
struct state_dependent_clocks *req_clocks) struct state_dependent_clocks *req_clocks)
...@@ -605,7 +632,7 @@ static bool dce_apply_clock_voltage_request( ...@@ -605,7 +632,7 @@ static bool dce_apply_clock_voltage_request(
static const struct display_clock_funcs dce120_funcs = { static const struct display_clock_funcs dce120_funcs = {
.get_dp_ref_clk_frequency = dce_clocks_get_dp_ref_freq, .get_dp_ref_clk_frequency = dce_clocks_get_dp_ref_freq_wrkaround,
.apply_clock_voltage_request = dce_apply_clock_voltage_request, .apply_clock_voltage_request = dce_apply_clock_voltage_request,
.set_clock = dce112_set_clock .set_clock = dce112_set_clock
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册