Commit b206011b authored Sep 18, 2023 by Samson Tam Committed by Alex Deucher Oct 04, 2023

drm/amd/display: apply edge-case DISPCLK WDIVIDER changes to master OTG pipes only



[Why]
The edge-case DISPCLK WDIVIDER changes call stream_enc functions.
But with MPC pipes, downstream pipes have null stream_enc and will
 cause crash.

[How]
Only call stream_enc functions for pipes that are OTG master.

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Samson Tam <samson.tam@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 134b8c5d

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr, struct
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)
		@@ -188,7 +188,7 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr, struct
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ static void dcn32_update_clocks_update_dentist(
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)
		@@ -401,7 +401,7 @@ static void dcn32_update_clocks_update_dentist(
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)