Unverified Commit 9d0af12b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12515 drm/amd/display: Validate function returns 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/K3K3U7LRCCFMOXYJUOGGKJCZ6SFCA6ZI/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARYEW 
 
Link:https://gitee.com/openeuler/kernel/pulls/12515

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 1db462db 0b8bea8a

drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c

+5 −2
Original line number Diff line number Diff line
@@ -144,7 +144,9 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int coun 
		if (status == DMUB_STATUS_QUEUE_FULL) {

			/* Execute and wait for queue to become empty again. */

			dmub_srv_cmd_execute(dmub);

			dmub_srv_wait_for_idle(dmub, 100000);

			status = dmub_srv_wait_for_idle(dmub, 100000);

			if (status != DMUB_STATUS_OK)

				return false;



			/* Requeue the command. */

			status = dmub_srv_cmd_queue(dmub, &cmd_list[i]);
@@ -407,7 +409,8 @@ void dc_dmub_srv_get_visual_confirm_color_cmd(struct dc *dc, struct pipe_ctx *pi 
	union dmub_rb_cmd cmd = { 0 };

	unsigned int panel_inst = 0;



	dc_get_edp_link_panel_inst(dc, pipe_ctx->stream->link, &panel_inst);

	if (!dc_get_edp_link_panel_inst(dc, pipe_ctx->stream->link, &panel_inst))

		return;



	memset(&cmd, 0, sizeof(cmd));

drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c

+1 −2
Original line number Diff line number Diff line
@@ -1676,8 +1676,7 @@ bool perform_link_training_with_retries( 
		if (status == LINK_TRAINING_ABORT) {

			enum dc_connection_type type = dc_connection_none;



			link_detect_connection_type(link, &type);

			if (type == dc_connection_none) {

			if (link_detect_connection_type(link, &type) && type == dc_connection_none) {

				DC_LOG_HW_LINK_TRAINING("%s: Aborting training because sink unplugged\n", __func__);

				break;

			}