diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-07 04:44:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-07 04:44:57 +0300 |
| commit | 13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch) | |
| tree | 1bf30874f57c6c6b21160a10282191fcd0868055 /drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | |
| parent | 05bb520376af2c5146d3c44832c22ec3bb54d778 (diff) | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
| download | linux-13dfb3fa494361ea9a5950f27c9cd8b06d28c04f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c index 778392c73187..7c746ef1e32e 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c @@ -226,12 +226,12 @@ void dce112_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, 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->clk_mgr_shift = &disp_clk_shift; clk_mgr->clk_mgr_mask = &disp_clk_mask; |