FAILED: patch "[PATCH] drm/amd/display: Remove invalid assert for ODM + MPC case" failed to apply to 5.14-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f43a19fd0e976736d8f1b70b6fe1b6b88d6a900b Mon Sep 17 00:00:00 2001
From: Eric Bernstein <[email protected]>
Date: Mon, 26 Jul 2021 15:53:18 -0400
Subject: [PATCH] drm/amd/display: Remove invalid assert for ODM + MPC case
Reviewed-by Dmytro Laktyushkin <[email protected]>
Acked-by Anson Jacob <[email protected]>
Signed-off-by Eric Bernstein <[email protected]>
Tested-by Daniel Wheeler <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +0 -1
@@ -1788,7 +1788,6 @@ static bool dcn30_split_stream_for_mpc_or_odm( } pri_pipe->next_odm_pipe = sec_pipe; sec_pipe->prev_odm_pipe = pri_pipe; -ASSERT (sec_pipe->top_pipe ==NULL );if (!sec_pipe->top_pipe) sec_pipe->stream_res.opp = pool->opps[pipe_idx];