Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp58054pxb; Tue, 12 Apr 2022 16:44:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuj1xzLlc+uTeBJdoj/lvxOMRQwKBhoGzXCXdqzDrjsoC5vFTfbEjHGPYoGMxmMmcFUTXP X-Received: by 2002:a17:90a:4581:b0:1bc:d215:8722 with SMTP id v1-20020a17090a458100b001bcd2158722mr7529720pjg.149.1649807068121; Tue, 12 Apr 2022 16:44:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649807068; cv=none; d=google.com; s=arc-20160816; b=VAguDmWz6++JInWcpOGKXhTDv0Z7Jc3d5bM8GA/EifyGv2F/8b3gFzqNsE+uCFkMcB EaAeVb0R7JAz5LAr9DVvo7bRorT2+VXIOEmiVH2mcqd2IdWeQ1HFByFZ86JiovuXcm/H hRY340DKt167EChkSTIfqbkZWyLOefad111YWPE0XF2BeAV4z4C0Sevq46ye16FPJU5B PDXcuJGamiuX009sGpDzTZafCp6KcPMrV+SJoiZHLhHwqa96SdOn3nZjAJV/g5eaFY5j Zsl/ChQjcAo6RkgL5jeHPraUq26BE7UonpyV3W4t0vXlpV23X+P1hABlEixSGxIpJvOf gFNA== 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=T0RMOd6bXEDtgfJbIac39ytNEK6WdYJmxr/iaQM96gc=; b=gQ5udUxf0rBo0iM1gu7l1QG4S6pXjcYqVxQiZBlR4Abr8DP+dqHu2/9a/GntLqaOi8 Q1ynAvAELzbz690uDb+jnaWOT7UDoWwgZRDD7M6TRfwD6s3JJoDdmnRh1tCNaX3IA2pU G2pjz+IAK56j/Ok+dMKi/XZg+SUFKputqYwZ5fn9zrNfi4pZ54E5wORjLDumA4IE77ME S03VP56M3iqVk9mO8JFoDPH+4uH/+IRNT9q2571Hy0/eukGeiR5KQb27eHVaTSlv7EDK DgdCe5q+m5T89Av/vsqaxwLbu+W1EO2enS0WrcKXGTKUcShC4lkh0B0kavmx77L5G43D eaZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GVuE2r5K; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id n10-20020a170902d2ca00b00153b2d16431si14506334plc.57.2022.04.12.16.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:44:28 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GVuE2r5K; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 319431CC43E; Tue, 12 Apr 2022 14:36:33 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1387217AbiDLJGJ (ORCPT + 99 others); Tue, 12 Apr 2022 05:06:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359241AbiDLHmw (ORCPT ); Tue, 12 Apr 2022 03:42:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 566422A268; Tue, 12 Apr 2022 00:21:06 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 16542B81B62; Tue, 12 Apr 2022 07:21:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C961C385A5; Tue, 12 Apr 2022 07:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649748063; bh=LveDTNz49FYcxLOtDFHSOrot2rhbCYmOg4T9rw6dpMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GVuE2r5KsUbeHJ4RT/lu9VHo4h6zxLR0EEVvri5IsU9rSkYE4mDzGp0St86SUMa1A WwH/Heqw6vBV4fLw+duv5bXcpYr6DlzGoDF37IXeiIAsusAX8cb3bs8aPEIk3jXkm8 vI/gscOZvfRe8WXv331GaTY561uOcHw1FKOO8w+0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Marty , Alex Deucher Subject: [PATCH 5.17 306/343] drm/amdgpu/display: change pipe policy for DCN 2.1 Date: Tue, 12 Apr 2022 08:32:04 +0200 Message-Id: <20220412063000.156159554@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@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: Benjamin Marty commit 879791ad8bf3dc5453061cad74776a617b6e3319 upstream. Fixes crash on MST Hub disconnect. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1849 Fixes: ee2698cf79cc ("drm/amd/display: Changed pipe split policy to allow for multi-display pipe split") Signed-off-by: Benjamin Marty Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -873,7 +873,7 @@ static const struct dc_debug_options deb .clock_trace = true, .disable_pplib_clock_request = true, .min_disp_clk_khz = 100000, - .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,