Commit cadfd67c authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: prevent null pointer access 



Prevent null pointer access when checking odm tree.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org>
parent 13b5ca42

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c

+7 −5
Original line number Diff line number Diff line
@@ -2120,12 +2120,12 @@ static bool dcn30_internal_validate_bw( 


		if (split[i]) {

			if (odm) {

				if (split[i] == 4 && old_pipe->next_odm_pipe->next_odm_pipe)

				if (split[i] == 4 && old_pipe->next_odm_pipe && old_pipe->next_odm_pipe->next_odm_pipe)

					old_index = old_pipe->next_odm_pipe->next_odm_pipe->pipe_idx;

				else if (old_pipe->next_odm_pipe)

					old_index = old_pipe->next_odm_pipe->pipe_idx;

			} else {

				if (split[i] == 4 && old_pipe->bottom_pipe->bottom_pipe &&

				if (split[i] == 4 && old_pipe->bottom_pipe && old_pipe->bottom_pipe->bottom_pipe &&

						old_pipe->bottom_pipe->bottom_pipe->plane_state == old_pipe->plane_state)

					old_index = old_pipe->bottom_pipe->bottom_pipe->pipe_idx;

				else if (old_pipe->bottom_pipe &&
@@ -2165,9 +2165,11 @@ static bool dcn30_internal_validate_bw( 
				goto validate_fail;

			newly_split[pipe_4to1->pipe_idx] = true;



			if (odm && old_pipe->next_odm_pipe->next_odm_pipe->next_odm_pipe)

			if (odm && old_pipe->next_odm_pipe && old_pipe->next_odm_pipe->next_odm_pipe

					&& old_pipe->next_odm_pipe->next_odm_pipe->next_odm_pipe)

				old_index = old_pipe->next_odm_pipe->next_odm_pipe->next_odm_pipe->pipe_idx;

			else if (!odm && old_pipe->bottom_pipe->bottom_pipe->bottom_pipe &&

			else if (!odm && old_pipe->bottom_pipe && old_pipe->bottom_pipe->bottom_pipe &&

					old_pipe->bottom_pipe->bottom_pipe->bottom_pipe &&

					old_pipe->bottom_pipe->bottom_pipe->bottom_pipe->plane_state == old_pipe->plane_state)

				old_index = old_pipe->bottom_pipe->bottom_pipe->bottom_pipe->pipe_idx;

			else