From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3C76C433FE for ; Thu, 16 Sep 2021 13:09:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C98AB611C4 for ; Thu, 16 Sep 2021 13:09:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239913AbhIPNKf (ORCPT ); Thu, 16 Sep 2021 09:10:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:57918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239898AbhIPNKe (ORCPT ); Thu, 16 Sep 2021 09:10:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C861760FBF; Thu, 16 Sep 2021 13:09:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631797754; bh=J1LafoZCYivAXGGbPpmWgeQcjhqAQ5HorKXkh0uPPjs=; h=Subject:To:Cc:From:Date:From; b=oIksPeU9p1i0StrZCzf1r2NmpDizjqO/jdDx8QQ8843jqOIo1y1CBbE2KutCwmC3p VyKIVVBM3+OYwIYuhx9t9s+MPxISl/DKDcoTTb/S0HUnZ0Sb/260VpyrftG9FHzQ/i vlC/tQUXhHRWzD+V3+I0iYmGcc/5z7YksMv9fp7A= Subject: FAILED: patch "[PATCH] drm/amd/display: Remove invalid assert for ODM + MPC case" failed to apply to 5.14-stable tree To: eric.bernstein@amd.com, Anson.Jacob@amd.com, Dmytro.Laktyushkin@amd.com, alexander.deucher@amd.com, daniel.wheeler@amd.com Cc: From: Date: Thu, 16 Sep 2021 15:09:11 +0200 Message-ID: <163179775125442@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The 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 . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f43a19fd0e976736d8f1b70b6fe1b6b88d6a900b Mon Sep 17 00:00:00 2001 From: Eric Bernstein 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 Acked-by: Anson Jacob Signed-off-by: Eric Bernstein Cc: stable@vger.kernel.org Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c index 253654d605c2..28e15ebf2f43 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c @@ -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];