From: jsg <jsg@openbsd.org>
Date: Wed, 18 Aug 2021 09:54:44 +0000 (+0000)
Subject: drm/amd/display: Remove invalid assert for ODM + MPC case
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b056220c57b521f5a83601c0f2834b47009a8d39;p=openbsd

drm/amd/display: Remove invalid assert for ODM + MPC case

From Eric Bernstein
ae311a7418f13be375c29ec4178baa51cd9101ba in linux 5.10.y/5.10.60
c90f6263f58a28c3d97b83679d6fd693b33dfd4e in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c
index 8465cae180d..e5f4f93317c 100644
--- a/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c
@@ -1875,7 +1875,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);
 
 		sec_pipe->stream_res.opp = pool->opps[pipe_idx];
 		if (sec_pipe->stream->timing.flags.DSC == 1) {