Commit aefb6ed3 authored by Josip Pavic's avatar Josip Pavic Committed by Jialin Zhang
Browse files

drm/amd/display: Avoid MPC infinite loop 

stable inclusion
from stable-v5.10.141
commit 828b2a5399aa46a44b7be2615240016d7883fa0b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I685FC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=828b2a5399aa46a44b7be2615240016d7883fa0b



--------------------------------

[ Upstream commit 8de297dc ]

[why]
In some cases MPC tree bottom pipe ends up point to itself.  This causes
iterating from top to bottom to hang the system in an infinite loop.

[how]
When looping to next MPC bottom pipe, check that the pointer is not same
as current to avoid infinite loop.

Reviewed-by: default avatarJosip Pavic <Josip.Pavic@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAric Cyr <aric.cyr@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent a12e69f4

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,12 @@ struct mpcc *mpc1_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id) 
	while (tmp_mpcc != NULL) {

	while (tmp_mpcc != NULL) {

		if (tmp_mpcc->dpp_id == dpp_id)

		if (tmp_mpcc->dpp_id == dpp_id)

			return tmp_mpcc;

			return tmp_mpcc;



		/* avoid circular linked list */

		ASSERT(tmp_mpcc != tmp_mpcc->mpcc_bot);

		if (tmp_mpcc == tmp_mpcc->mpcc_bot)

			break;



		tmp_mpcc = tmp_mpcc->mpcc_bot;

		tmp_mpcc = tmp_mpcc->mpcc_bot;

	}

	}

	return NULL;

	return NULL;

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -533,6 +533,12 @@ struct mpcc *mpc2_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id) 
	while (tmp_mpcc != NULL) {

	while (tmp_mpcc != NULL) {

		if (tmp_mpcc->dpp_id == 0xf || tmp_mpcc->dpp_id == dpp_id)

		if (tmp_mpcc->dpp_id == 0xf || tmp_mpcc->dpp_id == dpp_id)

			return tmp_mpcc;

			return tmp_mpcc;



		/* avoid circular linked list */

		ASSERT(tmp_mpcc != tmp_mpcc->mpcc_bot);

		if (tmp_mpcc == tmp_mpcc->mpcc_bot)

			break;



		tmp_mpcc = tmp_mpcc->mpcc_bot;

		tmp_mpcc = tmp_mpcc->mpcc_bot;

	}

	}

	return NULL;

	return NULL;