Commit 7f6964c5 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher

drm/amd/display: Copy max_clks_by_state after dce_clk_mgr_construct

[Why]
For DCE110, DCE112 and DCE120 the max_clks_by_state for the clk_mgr are
copied from their respective table before the call to
dce_clk_mgr_construct, but then dce_clk_mgr_construct overwrites
these with the dce80_max_clks_by_state.

[How]
Copy these after we call dce_clk_mgr_construct so we're using the
right tables.
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarDavid Francis <David.Francis@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 492d9ec2
...@@ -262,12 +262,12 @@ void dce110_clk_mgr_construct( ...@@ -262,12 +262,12 @@ void dce110_clk_mgr_construct(
struct dc_context *ctx, struct dc_context *ctx,
struct clk_mgr_internal *clk_mgr) struct clk_mgr_internal *clk_mgr)
{ {
dce_clk_mgr_construct(ctx, clk_mgr);
memcpy(clk_mgr->max_clks_by_state, memcpy(clk_mgr->max_clks_by_state,
dce110_max_clks_by_state, dce110_max_clks_by_state,
sizeof(dce110_max_clks_by_state)); sizeof(dce110_max_clks_by_state));
dce_clk_mgr_construct(ctx, clk_mgr);
clk_mgr->regs = &disp_clk_regs; clk_mgr->regs = &disp_clk_regs;
clk_mgr->clk_mgr_shift = &disp_clk_shift; clk_mgr->clk_mgr_shift = &disp_clk_shift;
clk_mgr->clk_mgr_mask = &disp_clk_mask; clk_mgr->clk_mgr_mask = &disp_clk_mask;
......
...@@ -226,12 +226,12 @@ void dce112_clk_mgr_construct( ...@@ -226,12 +226,12 @@ void dce112_clk_mgr_construct(
struct dc_context *ctx, struct dc_context *ctx,
struct clk_mgr_internal *clk_mgr) struct clk_mgr_internal *clk_mgr)
{ {
dce_clk_mgr_construct(ctx, clk_mgr);
memcpy(clk_mgr->max_clks_by_state, memcpy(clk_mgr->max_clks_by_state,
dce112_max_clks_by_state, dce112_max_clks_by_state,
sizeof(dce112_max_clks_by_state)); sizeof(dce112_max_clks_by_state));
dce_clk_mgr_construct(ctx, clk_mgr);
clk_mgr->regs = &disp_clk_regs; clk_mgr->regs = &disp_clk_regs;
clk_mgr->clk_mgr_shift = &disp_clk_shift; clk_mgr->clk_mgr_shift = &disp_clk_shift;
clk_mgr->clk_mgr_mask = &disp_clk_mask; clk_mgr->clk_mgr_mask = &disp_clk_mask;
......
...@@ -127,12 +127,12 @@ static struct clk_mgr_funcs dce120_funcs = { ...@@ -127,12 +127,12 @@ static struct clk_mgr_funcs dce120_funcs = {
void dce120_clk_mgr_construct(struct dc_context *ctx, struct clk_mgr_internal *clk_mgr) void dce120_clk_mgr_construct(struct dc_context *ctx, struct clk_mgr_internal *clk_mgr)
{ {
dce_clk_mgr_construct(ctx, clk_mgr);
memcpy(clk_mgr->max_clks_by_state, memcpy(clk_mgr->max_clks_by_state,
dce120_max_clks_by_state, dce120_max_clks_by_state,
sizeof(dce120_max_clks_by_state)); sizeof(dce120_max_clks_by_state));
dce_clk_mgr_construct(ctx, clk_mgr);
clk_mgr->base.dprefclk_khz = 600000; clk_mgr->base.dprefclk_khz = 600000;
clk_mgr->base.funcs = &dce120_funcs; clk_mgr->base.funcs = &dce120_funcs;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment