Commit c8920972 authored Jun 20, 2023 by Taimur Hassan Committed by Greg Kroah-Hartman Aug 30, 2023

drm/amd/display: check TG is non-null before checking if enabled



[ Upstream commit 5a25cefc0920088bb9afafeb80ad3dcd84fe278b ]

[Why & How]
If there is no TG allocation we can dereference a NULL pointer when
checking if the TG is enabled.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Alan Liu <haoping.liu@amd.com>
Signed-off-by: Taimur Hassan <syed.hassan@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7d4174a9

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2902,7 +2902,8 @@ static void dcn10_wait_for_mpcc_disconnect(
		if (pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst]) {
		struct hubp *hubp = get_hubp_by_inst(res_pool, mpcc_inst);

		if (pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg))
		if (pipe_ctx->stream_res.tg &&
		pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg))
		res_pool->mpc->funcs->wait_for_idle(res_pool->mpc, mpcc_inst);
		pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst] = false;
		hubp->funcs->set_blank(hubp, true);