Commit e1b522bf authored Aug 24, 2017 by Yongqiang Sun Committed by Alex Deucher Sep 26, 2017

drm/amd/display: work around for 8k sleep crash



Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 1cf49dea

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -581,6 +581,7 @@ static void split_stream_across_pipes(
		secondary_pipe->plane_res.ipp = pool->ipps[secondary_pipe->pipe_idx];
		secondary_pipe->plane_res.xfm = pool->transforms[secondary_pipe->pipe_idx];
		if (primary_pipe->bottom_pipe) {
		ASSERT(primary_pipe->bottom_pipe != secondary_pipe);
		secondary_pipe->bottom_pipe = primary_pipe->bottom_pipe;
		secondary_pipe->bottom_pipe->top_pipe = secondary_pipe;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2358,7 +2358,7 @@ static void program_all_pipe_in_tree(
		verify_allow_pstate_change_high(dc->hwseq);
		}

		if (pipe_ctx->bottom_pipe != NULL)
		if (pipe_ctx->bottom_pipe != NULL && pipe_ctx->bottom_pipe != pipe_ctx)
		program_all_pipe_in_tree(dc, pipe_ctx->bottom_pipe, context);
		}