Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp6018678pxb; Mon, 14 Feb 2022 13:15:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoMRJni8s1/iqBFRCtq01GhYTIZVA2h5WwG+uqTQ0u82SMmBL4k6a0yt3sSs6ayPmzDLP7 X-Received: by 2002:a17:90a:19de:: with SMTP id 30mr620364pjj.120.1644873346666; Mon, 14 Feb 2022 13:15:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644873346; cv=none; d=google.com; s=arc-20160816; b=owvIHOrNJnXU0D629KKBVud4EBBkoyI8vVQDauCC5qbVdop9NnLujSSLjbvVWWfdMW Rv44E8iscx6yRhwzUKbRXIeZKmTT/IFT5REyaVbXlzPArP3UBaV3AN2GfgJulTNpTAQA 9jx/ciE1UVzuIhax1ttRX7FaDguvyGx7TyaNoKS3D+MIBQ5M+k6WJmzC2TeO//ETRzlH 1qhvbVzQghFZ5U60hCys4Cp+wFkj7ShfqX/vZgmJeO9rMXgZIX8YON435zfSuhUlEfAo OOzqdbpY0UGVhVrMwGAVTY+SFWNwsX4NuTeUf0pS81d2oIvoxCfoW1n7hYRXHwBdy2eL cK7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PRRLeYen0lUnrXHvlNE8YG2YyIEqEgvLEq3jwvR2Dxw=; b=YRTD/p029V4A+DUSNDX3x7gJvHvw8OsyJtHaqnM+qSd2CAfwgtjn9YuuTytSodn1go +LxKJ0RAx2FQRakp0197aR1yh0EzhwcMW+WcDICq7r9+Sjl+6jFbWmzFxeAT7hmQ+b5k ejad7lgvTBM5oBu/yq8nYxOcE+eQsNYgYaGNwOuENOnLqLqBJYjwZaBKG2m63xRjgAy0 iyRsTsXswS84WZFNx1mixiq6X9hbwNK7cqSo5CKJ/nDVacyHuCAGYDOoLC9IcgztWZ7F IvTEP82UwufYD6rdS5AZLR9xg7iLm1saWgrDOKjXXi0QGtHxs2gO6W3In221uSR8sknS U29A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hXwf9ty7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id mr19si11921783pjb.153.2022.02.14.13.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 13:15:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hXwf9ty7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 01EDB226BC1; Mon, 14 Feb 2022 12:35:35 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345672AbiBNKGi (ORCPT + 99 others); Mon, 14 Feb 2022 05:06:38 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:54578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345741AbiBNKBx (ORCPT ); Mon, 14 Feb 2022 05:01:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8824F2019D; Mon, 14 Feb 2022 01:48:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 24CBA61296; Mon, 14 Feb 2022 09:48:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ED9AC340E9; Mon, 14 Feb 2022 09:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644832088; bh=oS2lkPCp3aLbjy4x18EkIQmiDK4N9sOMmcJlDMqhD+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hXwf9ty7D0l5Yh4l1w4m6h+1wTuZxwIBa/yFUyt3dqMCPdGh+nWKvPfpCULaG1Chh Z5M9zk9VdpWSzA/YwgxkSuMsHUn/qTnNlBylc6Vh4sA2K8LbApW6+XKA5H4SfvFpgH qaAHQC2IlH2WZ5GQg4SOJMXqOK5pyu3CsR+K+krk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harry Wentland , Alex Deucher Subject: [PATCH 5.15 076/172] drm/amdgpu/display: change pipe policy for DCN 2.0 Date: Mon, 14 Feb 2022 10:25:34 +0100 Message-Id: <20220214092509.031262694@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220214092506.354292783@linuxfoundation.org> References: <20220214092506.354292783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher commit 6e7545ddb13416fd200e0b91c0acfd0404e2e27b upstream. Fixes hangs on driver load with multiple displays on DCN 2.0 parts. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=215511 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1877 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1886 Fixes: ee2698cf79cc ("drm/amd/display: Changed pipe split policy to allow for multi-display pipe split") Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -1067,7 +1067,7 @@ static const struct dc_debug_options deb .timing_trace = false, .clock_trace = true, .disable_pplib_clock_request = true, - .pipe_split_policy = MPC_SPLIT_DYNAMIC, + .pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP, .force_single_disp_pipe_split = false, .disable_dcc = DCC_ENABLE, .vsr_support = true,