From: Tony Cheng <[email protected]> Add an inst member to struct clk_mgr and set it to 0 in the DCN401, DCN42, DCN42B and DCN60 construct paths, since clk_mgr is a singleton on all of them.
No functional change; the field has no readers yet. Reviewed-by: Jun Lei <[email protected]> Reviewed-by: Alex Hung <[email protected]> Signed-off-by: Tony Cheng <[email protected]> Signed-off-by: George Zhang <[email protected]> --- .../gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 1 + .../gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 7 ++++--- .../gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c | 3 ++- .../gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c index 6d791a5d9776..120f9dd691f3 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c @@ -1632,6 +1632,7 @@ struct clk_mgr_internal *dcn401_clk_mgr_construct( clk_mgr = &clk_mgr401->base; clk_mgr->base.ctx = ctx; + clk_mgr->base.inst = 0; clk_mgr->base.funcs = &dcn401_funcs; clk_mgr->regs = &clk_mgr_regs_dcn401; clk_mgr->clk_mgr_shift = &clk_mgr_shift_dcn401; diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c index c62be9f25dae..405145889ba2 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c @@ -392,7 +392,7 @@ void dcn42_notify_cstate_disable(struct clk_mgr *clk_mgr_base, bool disable) struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base); bool target_allow = !disable; - DC_LOGGER_INIT(clk_mgr_base->ctx->logger); +DC_LOGGER_INIT(clk_mgr_base->ctx->logger); /* Idempotent: only send when the cached vote actually changes. */ if (clk_mgr_base->clks.cstate_allow == target_allow) @@ -619,7 +619,7 @@ void dcn42_init_clocks(struct clk_mgr *clk_mgr_base) struct clk_mgr_internal *clk_mgr_int = TO_CLK_MGR_INTERNAL(clk_mgr_base); struct clk_mgr_dcn42 *clk_mgr = TO_CLK_MGR_DCN42(clk_mgr_int); - DC_LOGGER_INIT(clk_mgr_base->ctx->logger); +DC_LOGGER_INIT(clk_mgr_base->ctx->logger); (void)dc_logger; init_clk_states(clk_mgr_base); @@ -814,7 +814,7 @@ void dcn42_set_low_power_state(struct clk_mgr *clk_mgr_base) void dcn42_exit_low_power_state(struct clk_mgr *clk_mgr_base) { - (void)clk_mgr_base; +(void)clk_mgr_base; } @@ -1115,6 +1115,7 @@ void dcn42_clk_mgr_construct( struct dccg *dccg) { clk_mgr->base.base.ctx = ctx; + clk_mgr->base.base.inst = 0; clk_mgr->base.base.funcs = &dcn42_funcs; clk_mgr->base.regs = &clk_mgr_regs_dcn42; clk_mgr->base.clk_mgr_shift = &clk_mgr_shift_dcn42; diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c index 003ed4f60f97..d500a3210eed 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c @@ -228,7 +228,7 @@ void dcn42b_init_clocks(struct clk_mgr *clk_mgr_base) struct clk_mgr_internal *clk_mgr_int = TO_CLK_MGR_INTERNAL(clk_mgr_base); struct clk_mgr_dcn42 *clk_mgr = TO_CLK_MGR_DCN42B(clk_mgr_int); - DC_LOGGER_INIT(clk_mgr_base->ctx->logger); +DC_LOGGER_INIT(clk_mgr_base->ctx->logger); (void)dc_logger; init_clk_states(clk_mgr_base); @@ -619,6 +619,7 @@ void dcn42b_clk_mgr_construct( struct dccg *dccg) { clk_mgr->base.base.ctx = ctx; + clk_mgr->base.base.inst = 0; clk_mgr->base.base.funcs = &dcn42b_funcs; clk_mgr->base.regs = &clk_mgr_regs_dcn42b; clk_mgr->base.clk_mgr_shift = &clk_mgr_shift_dcn42b; diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c index 138afa7afc86..47b112f84330 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c @@ -1709,6 +1709,7 @@ struct clk_mgr_internal *dcn60_clk_mgr_construct( clk_mgr = &clk_mgr60->base; clk_mgr->base.ctx = ctx; + clk_mgr->base.inst = 0; clk_mgr->base.funcs = &dcn60_funcs; clk_mgr->regs = &clk_mgr_regs_dcn60; clk_mgr->clk_mgr_shift = &clk_mgr_shift_dcn60; diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h b/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h index 614beb5924fd..5b06659423d5 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h @@ -433,6 +433,7 @@ struct clk_mgr_funcs { struct clk_mgr { struct dc_context *ctx; struct clk_mgr_funcs *funcs; + int inst; struct dc_clocks clks; bool psr_allow_active_cache; bool force_smu_not_present; -- 2.55.0
