Commit a3b7e65b authored by Melissa Wen's avatar Melissa Wen Committed by Alex Deucher
Browse files

drm/amd/display: Fix null check of pipe_ctx->plane_state for update_dchubp_dpp 



Similar to commit 6a057072 ("drm/amd/display: Fix null check for
pipe_ctx->plane_state in dcn20_program_pipe") that addresses a null
pointer dereference on dcn20_update_dchubp_dpp. This is the same
function hooked for update_dchubp_dpp in dcn401, with the same issue.
Fix possible null pointer deference on dcn401_program_pipe too.

Fixes: 63ab80d9 ("drm/amd/display: DML2.1 Post-Si Cleanup")
Signed-off-by: default avatarMelissa Wen <mwen@igalia.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit d8d47f73)
parent 2ddac70f

drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c

+3 −3
Original line number Diff line number Diff line
@@ -1980,9 +1980,9 @@ void dcn401_program_pipe( 
				dc->res_pool->hubbub, pipe_ctx->plane_res.hubp->inst, pipe_ctx->hubp_regs.det_size);

	}



	if (pipe_ctx->update_flags.raw ||

		(pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.raw) ||

		pipe_ctx->stream->update_flags.raw)

	if (pipe_ctx->plane_state && (pipe_ctx->update_flags.raw ||

	    pipe_ctx->plane_state->update_flags.raw ||

	    pipe_ctx->stream->update_flags.raw))

		dc->hwss.update_dchubp_dpp(dc, pipe_ctx, context);



	if (pipe_ctx->plane_state && (pipe_ctx->update_flags.bits.enable ||