Unverified Commit 1f04362c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14026 drm/amd/display: Pass non-null to dcn20_validate_apply_pipe_split_flags 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tirui Yin <yintirui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AJMOT6ZIJNNSOB7WGLVO3C5JOHKFBAKB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRD1 
 
Link:https://gitee.com/openeuler/kernel/pulls/14026

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a2c7a5a5 34fb46be

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+2 −1
Original line number Diff line number Diff line
@@ -2026,6 +2026,7 @@ bool dcn20_fast_validate_bw( 
{

	bool out = false;

	int split[MAX_PIPES] = { 0 };

	bool merge[MAX_PIPES] = { false };

	int pipe_cnt, i, pipe_idx, vlevel;



	ASSERT(pipes);
@@ -2050,7 +2051,7 @@ bool dcn20_fast_validate_bw( 
	if (vlevel > context->bw_ctx.dml.soc.num_states)

		goto validate_fail;



	vlevel = dcn20_validate_apply_pipe_split_flags(dc, context, vlevel, split, NULL);

	vlevel = dcn20_validate_apply_pipe_split_flags(dc, context, vlevel, split, merge);



	/*initialize pipe_just_split_from to invalid idx*/

	for (i = 0; i < MAX_PIPES; i++)

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c

+2 −1
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ bool dcn21_fast_validate_bw(struct dc *dc, 
{

	bool out = false;

	int split[MAX_PIPES] = { 0 };

	bool merge[MAX_PIPES] = { false };

	int pipe_cnt, i, pipe_idx, vlevel;



	ASSERT(pipes);
@@ -842,7 +843,7 @@ bool dcn21_fast_validate_bw(struct dc *dc, 
			goto validate_fail;

	}



	vlevel = dcn20_validate_apply_pipe_split_flags(dc, context, vlevel, split, NULL);

	vlevel = dcn20_validate_apply_pipe_split_flags(dc, context, vlevel, split, merge);



	for (i = 0, pipe_idx = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];