Commit 70611b1b authored Mar 07, 2019 by Dmytro Laktyushkin Committed by Greg Kroah-Hartman May 31, 2019

drm/amd/display: fix releasing planes when exiting odm



[ Upstream commit bc2193992b00488f5734613ac95b78ef2d2803ab ]

Releasing planes should not release the 2nd odm pipe right away,
this change leaves us with 2 pipes with null planes and same stream
when planes are released during odm.

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 988dab7f

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1401,7 +1401,9 @@ bool dc_remove_plane_from_context(
		* For head pipe detach surfaces from pipe for tail
		* pipe just zero it out
		*/
		if (!pipe_ctx->top_pipe) {
		if (!pipe_ctx->top_pipe \|\|
		(!pipe_ctx->top_pipe->top_pipe &&
		pipe_ctx->top_pipe->stream_res.opp != pipe_ctx->stream_res.opp)) {
		pipe_ctx->plane_state = NULL;
		pipe_ctx->bottom_pipe = NULL;
		} else {