Commit 5e335add authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher

drm/amd/display: early return when pipe_cnt is 0 in bw validation

[Why]
Unintentionally introduced behaviour change from previous refactor,
which causes clks to be 0 in no stream cases, which will cause
divide by 0.

[How]
Skip calculation of clocks when no stream. Which is the same as old
behaviour.
Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarTony Cheng <tong.cheng@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 64af142a
...@@ -2022,6 +2022,7 @@ bool dcn20_fast_validate_bw( ...@@ -2022,6 +2022,7 @@ bool dcn20_fast_validate_bw(
struct dc *dc, struct dc *dc,
struct dc_state *context, struct dc_state *context,
display_e2e_pipe_params_st *pipes, display_e2e_pipe_params_st *pipes,
int *pipe_cnt_out,
int *pipe_split_from, int *pipe_split_from,
int *vlevel_out) int *vlevel_out)
{ {
...@@ -2074,6 +2075,8 @@ bool dcn20_fast_validate_bw( ...@@ -2074,6 +2075,8 @@ bool dcn20_fast_validate_bw(
pipe_cnt = dcn20_populate_dml_pipes_from_context(dc, pipe_cnt = dcn20_populate_dml_pipes_from_context(dc,
&context->res_ctx, pipes); &context->res_ctx, pipes);
*pipe_cnt_out = pipe_cnt;
if (!pipe_cnt) { if (!pipe_cnt) {
out = true; out = true;
goto validate_out; goto validate_out;
...@@ -2434,7 +2437,10 @@ bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, ...@@ -2434,7 +2437,10 @@ bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
BW_VAL_TRACE_COUNT(); BW_VAL_TRACE_COUNT();
out = dcn20_fast_validate_bw(dc, context, pipes, pipe_split_from, &vlevel); out = dcn20_fast_validate_bw(dc, context, pipes, &pipe_cnt, pipe_split_from, &vlevel);
if (pipe_cnt == 0)
goto validate_out;
if (!out) if (!out)
goto validate_fail; goto validate_fail;
......
...@@ -120,6 +120,7 @@ bool dcn20_fast_validate_bw( ...@@ -120,6 +120,7 @@ bool dcn20_fast_validate_bw(
struct dc *dc, struct dc *dc,
struct dc_state *context, struct dc_state *context,
display_e2e_pipe_params_st *pipes, display_e2e_pipe_params_st *pipes,
int *pipe_cnt_out,
int *pipe_split_from, int *pipe_split_from,
int *vlevel_out); int *vlevel_out);
void dcn20_calculate_dlg_params( void dcn20_calculate_dlg_params(
......
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