drm/amd/display: fix odm combine pipe reset (f25f06b6) · Commits · 戴 / test

We fail to reset the second odm combine pipe. This change fixes odm pointer management. Signed-off-by:

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -1293,9 +1293,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 {
		@@ -1727,8 +1727,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;
		}
		}