Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0d8a590 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Greg Kroah-Hartman
Browse files

drm/amd/display: fix odm combine pipe reset 



[ Upstream commit f25f06b67ba237b76092a6fc522b1a94e84bfa85 ]

We fail to reset the second odm combine pipe. This change fixes
odm pointer management.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a897f54e

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

+2 −4
Original line number Diff line number Diff line
@@ -1399,9 +1399,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 ||

				(!pipe_ctx->top_pipe->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->top_pipe = NULL;

				pipe_ctx->plane_state = NULL;

				pipe_ctx->bottom_pipe = NULL;

			} else {
@@ -1803,8 +1803,6 @@ enum dc_status dc_remove_stream_from_ctx( 
				dc->res_pool->funcs->remove_stream_from_ctx(dc, new_ctx, stream);



			memset(del_pipe, 0, sizeof(*del_pipe));



			break;

		}

	}