Skip to content

L
linux
Commit 72dc6bf1 authored by Dillon Varone's avatar Dillon Varone Committed by Alex Deucher
Browse files
Options

drm/amd/display: Remove hardmax usage for dcn401 

[WHY&HOW]
Hardmax message will be retired for dcn4, so this removes it.
Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Signed-off-by: default avatarDillon Varone <dillon.varone@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fb910658
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c
View file @ 72dc6bf1
...@@ -931,12 +931,12 @@ static void dcn401_execute_block_sequence(struct clk_mgr *clk_mgr_base, unsigned ...@@ -931,12 +931,12 @@ static void dcn401_execute_block_sequence(struct clk_mgr *clk_mgr_base, unsigned
static unsigned int dcn401_build_update_bandwidth_clocks_sequence( static unsigned int dcn401_build_update_bandwidth_clocks_sequence(
struct clk_mgr *clk_mgr_base, struct clk_mgr *clk_mgr_base,
struct dc_state *context, struct dc_state *context,
struct dc_clocks *new_clocks,
bool safe_to_lower) bool safe_to_lower)
{ {
struct clk_mgr_internal *clk_mgr_internal = TO_CLK_MGR_INTERNAL(clk_mgr_base); struct clk_mgr_internal *clk_mgr_internal = TO_CLK_MGR_INTERNAL(clk_mgr_base);
struct dcn401_clk_mgr *clk_mgr401 = TO_DCN401_CLK_MGR(clk_mgr_internal); struct dcn401_clk_mgr *clk_mgr401 = TO_DCN401_CLK_MGR(clk_mgr_internal);
struct dc *dc = clk_mgr_base->ctx->dc; struct dc *dc = clk_mgr_base->ctx->dc;
struct dc_clocks *new_clocks = &context->bw_ctx.bw.dcn.clk;
struct dcn401_clk_mgr_block_sequence *block_sequence = clk_mgr401->block_sequence; struct dcn401_clk_mgr_block_sequence *block_sequence = clk_mgr401->block_sequence;
bool enter_display_off = false; bool enter_display_off = false;
bool update_active_fclk = false; bool update_active_fclk = false;
...@@ -1218,13 +1218,13 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence( ...@@ -1218,13 +1218,13 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence(
static unsigned int dcn401_build_update_display_clocks_sequence( static unsigned int dcn401_build_update_display_clocks_sequence(
struct clk_mgr *clk_mgr_base, struct clk_mgr *clk_mgr_base,
struct dc_state *context, struct dc_state *context,
struct dc_clocks *new_clocks,
bool safe_to_lower) bool safe_to_lower)
{ {
struct clk_mgr_internal *clk_mgr_internal = TO_CLK_MGR_INTERNAL(clk_mgr_base); struct clk_mgr_internal *clk_mgr_internal = TO_CLK_MGR_INTERNAL(clk_mgr_base);
struct dcn401_clk_mgr *clk_mgr401 = TO_DCN401_CLK_MGR(clk_mgr_internal); struct dcn401_clk_mgr *clk_mgr401 = TO_DCN401_CLK_MGR(clk_mgr_internal);
struct dc *dc = clk_mgr_base->ctx->dc; struct dc *dc = clk_mgr_base->ctx->dc;
struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu; struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu;
struct dc_clocks *new_clocks = &context->bw_ctx.bw.dcn.clk;
struct dcn401_clk_mgr_block_sequence *block_sequence = clk_mgr401->block_sequence; struct dcn401_clk_mgr_block_sequence *block_sequence = clk_mgr401->block_sequence;
bool force_reset = false; bool force_reset = false;
bool update_dispclk = false; bool update_dispclk = false;
...@@ -1375,6 +1375,7 @@ static void dcn401_update_clocks(struct clk_mgr *clk_mgr_base, ...@@ -1375,6 +1375,7 @@ static void dcn401_update_clocks(struct clk_mgr *clk_mgr_base,
/* build bandwidth related clocks update sequence */ /* build bandwidth related clocks update sequence */
num_steps = dcn401_build_update_bandwidth_clocks_sequence(clk_mgr_base, num_steps = dcn401_build_update_bandwidth_clocks_sequence(clk_mgr_base,
context, context,
&context->bw_ctx.bw.dcn.clk,
safe_to_lower); safe_to_lower);
/* execute sequence */ /* execute sequence */
...@@ -1383,6 +1384,7 @@ static void dcn401_update_clocks(struct clk_mgr *clk_mgr_base, ...@@ -1383,6 +1384,7 @@ static void dcn401_update_clocks(struct clk_mgr *clk_mgr_base,
/* build display related clocks update sequence */ /* build display related clocks update sequence */
num_steps = dcn401_build_update_display_clocks_sequence(clk_mgr_base, num_steps = dcn401_build_update_display_clocks_sequence(clk_mgr_base,
context, context,
&context->bw_ctx.bw.dcn.clk,
safe_to_lower); safe_to_lower);
/* execute sequence */ /* execute sequence */
...@@ -1474,33 +1476,34 @@ static void dcn401_notify_wm_ranges(struct clk_mgr *clk_mgr_base) ...@@ -1474,33 +1476,34 @@ static void dcn401_notify_wm_ranges(struct clk_mgr *clk_mgr_base)
static void dcn401_set_hard_min_memclk(struct clk_mgr *clk_mgr_base, bool current_mode) static void dcn401_set_hard_min_memclk(struct clk_mgr *clk_mgr_base, bool current_mode)
{ {
struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base); struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base);
const struct dc *dc = clk_mgr->base.ctx->dc;
struct dc_state *context = dc->current_state;
struct dc_clocks new_clocks;
int num_steps;
if (!clk_mgr->smu_present || !dcn401_is_ppclk_dpm_enabled(clk_mgr, PPCLK_UCLK)) if (!clk_mgr->smu_present || !dcn401_is_ppclk_dpm_enabled(clk_mgr, PPCLK_UCLK))
return; return;
/* build clock update */
memcpy(&new_clocks, &clk_mgr_base->clks, sizeof(struct dc_clocks));
if (current_mode) { if (current_mode) {
if (clk_mgr_base->clks.p_state_change_support) new_clocks.dramclk_khz = context->bw_ctx.bw.dcn.clk.dramclk_khz;
dcn401_smu_set_hard_min_by_freq(clk_mgr, PPCLK_UCLK, new_clocks.idle_dramclk_khz = context->bw_ctx.bw.dcn.clk.idle_dramclk_khz;
khz_to_mhz_ceil(clk_mgr_base->clks.dramclk_khz)); new_clocks.p_state_change_support = context->bw_ctx.bw.dcn.clk.p_state_change_support;
else
dcn401_smu_set_hard_min_by_freq(clk_mgr, PPCLK_UCLK,
clk_mgr_base->bw_params->max_memclk_mhz);
} else { } else {
dcn401_smu_set_hard_min_by_freq(clk_mgr, PPCLK_UCLK, new_clocks.dramclk_khz = clk_mgr_base->bw_params->clk_table.entries[0].memclk_mhz * 1000;
clk_mgr_base->bw_params->clk_table.entries[0].memclk_mhz); new_clocks.idle_dramclk_khz = new_clocks.dramclk_khz;
new_clocks.p_state_change_support = true;
} }
}
/* Set max memclk to highest DPM value */ num_steps = dcn401_build_update_bandwidth_clocks_sequence(clk_mgr_base,
static void dcn401_set_hard_max_memclk(struct clk_mgr *clk_mgr_base) context,
{ &new_clocks,
struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base); true);
if (!clk_mgr->smu_present || !dcn401_is_ppclk_dpm_enabled(clk_mgr, PPCLK_UCLK))
return;
dcn30_smu_set_hard_max_by_freq(clk_mgr, PPCLK_UCLK, /* execute sequence */
clk_mgr_base->bw_params->max_memclk_mhz); dcn401_execute_block_sequence(clk_mgr_base, num_steps);
} }
/* Get current memclk states, update bounding box */ /* Get current memclk states, update bounding box */
...@@ -1631,7 +1634,6 @@ static struct clk_mgr_funcs dcn401_funcs = { ...@@ -1631,7 +1634,6 @@ static struct clk_mgr_funcs dcn401_funcs = {
.init_clocks = dcn401_init_clocks, .init_clocks = dcn401_init_clocks,
.notify_wm_ranges = dcn401_notify_wm_ranges, .notify_wm_ranges = dcn401_notify_wm_ranges,
.set_hard_min_memclk = dcn401_set_hard_min_memclk, .set_hard_min_memclk = dcn401_set_hard_min_memclk,
.set_hard_max_memclk = dcn401_set_hard_max_memclk,
.get_memclk_states_from_smu = dcn401_get_memclk_states_from_smu, .get_memclk_states_from_smu = dcn401_get_memclk_states_from_smu,
.are_clock_states_equal = dcn401_are_clock_states_equal, .are_clock_states_equal = dcn401_are_clock_states_equal,
.enable_pme_wa = dcn401_enable_pme_wa, .enable_pme_wa = dcn401_enable_pme_wa,
......
drivers/gpu/drm/amd/display/dc/core/dc.c
View file @ 72dc6bf1
...@@ -5462,9 +5462,10 @@ static void blank_and_force_memclk(struct dc *dc, bool apply, unsigned int memcl ...@@ -5462,9 +5462,10 @@ static void blank_and_force_memclk(struct dc *dc, bool apply, unsigned int memcl
hubp->funcs->set_blank_regs(hubp, true); hubp->funcs->set_blank_regs(hubp, true);
} }
} }
if (dc->clk_mgr->funcs->set_max_memclk)
dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, memclk_mhz); dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, memclk_mhz);
dc->clk_mgr->funcs->set_min_memclk(dc->clk_mgr, memclk_mhz); if (dc->clk_mgr->funcs->set_min_memclk)
dc->clk_mgr->funcs->set_min_memclk(dc->clk_mgr, memclk_mhz);
for (i = 0; i < dc->res_pool->pipe_count; i++) { for (i = 0; i < dc->res_pool->pipe_count; i++) {
pipe = &context->res_ctx.pipe_ctx[i]; pipe = &context->res_ctx.pipe_ctx[i];
...@@ -5513,7 +5514,7 @@ void dc_enable_dcmode_clk_limit(struct dc *dc, bool enable) ...@@ -5513,7 +5514,7 @@ void dc_enable_dcmode_clk_limit(struct dc *dc, bool enable)
if (enable && !dc->clk_mgr->dc_mode_softmax_enabled) { if (enable && !dc->clk_mgr->dc_mode_softmax_enabled) {
if (p_state_change_support) { if (p_state_change_support) {
if (funcMin <= softMax) if (funcMin <= softMax && dc->clk_mgr->funcs->set_max_memclk)
dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, softMax); dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, softMax);
// else: No-Op // else: No-Op
} else { } else {
...@@ -5523,7 +5524,7 @@ void dc_enable_dcmode_clk_limit(struct dc *dc, bool enable) ...@@ -5523,7 +5524,7 @@ void dc_enable_dcmode_clk_limit(struct dc *dc, bool enable)
} }
} else if (!enable && dc->clk_mgr->dc_mode_softmax_enabled) { } else if (!enable && dc->clk_mgr->dc_mode_softmax_enabled) {
if (p_state_change_support) { if (p_state_change_support) {
if (funcMin <= softMax) if (funcMin <= softMax && dc->clk_mgr->funcs->set_max_memclk)
dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, maxDPM); dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, maxDPM);
// else: No-Op // else: No-Op
} else { } else {
......
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
View file @ 72dc6bf1
...@@ -416,9 +416,6 @@ void dcn401_init_hw(struct dc *dc) ...@@ -416,9 +416,6 @@ void dcn401_init_hw(struct dc *dc)
if (dc->clk_mgr->funcs->notify_wm_ranges) if (dc->clk_mgr->funcs->notify_wm_ranges)
dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr); dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr);
if (dc->clk_mgr->funcs->set_hard_max_memclk && !dc->clk_mgr->dc_mode_softmax_enabled)
dc->clk_mgr->funcs->set_hard_max_memclk(dc->clk_mgr);
if (dc->res_pool->hubbub->funcs->force_pstate_change_control) if (dc->res_pool->hubbub->funcs->force_pstate_change_control)
dc->res_pool->hubbub->funcs->force_pstate_change_control( dc->res_pool->hubbub->funcs->force_pstate_change_control(
dc->res_pool->hubbub, false, false); dc->res_pool->hubbub, false, false);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7