Commit 060d15b1 authored by Wesley Chalmers's avatar Wesley Chalmers Committed by sanglipeng
Browse files

drm/amd/display: Fix a bug when searching for insert_above_mpcc 

stable inclusion
from stable-v5.10.195
commit 1d02ef8c8a1fd00784dd8693e143e78d89c682be
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

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



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

commit 3d028d5d upstream.

[WHY]
Currently, when insert_plane is called with insert_above_mpcc
parameter that is equal to tree->opp_list, the function returns NULL.

[HOW]
Instead, the function should insert the plane at the top of the tree.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJun Lei <jun.lei@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarWesley Chalmers <wesley.chalmers@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 avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent e0028cec

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

+3 −2
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ struct mpcc *mpc1_insert_plane( 
		/* check insert_above_mpcc exist in tree->opp_list */

		struct mpcc *temp_mpcc = tree->opp_list;



		if (temp_mpcc != insert_above_mpcc)

			while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc)

				temp_mpcc = temp_mpcc->mpcc_bot;

		if (temp_mpcc == NULL)