Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp804626pxb; Tue, 12 Apr 2022 13:57:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/TFa0KpuOG8m3MxNV5AIEbyuZeC3i9nXxqQ9tf1wOZmCQpwmrd1Dk+CrzKS/euutWuwKE X-Received: by 2002:a17:902:8496:b0:156:a95d:69c7 with SMTP id c22-20020a170902849600b00156a95d69c7mr39430162plo.131.1649797023188; Tue, 12 Apr 2022 13:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649797023; cv=none; d=google.com; s=arc-20160816; b=Cdv+AEkrv9TtO10QyNnfOHL+UELX1vNetma3iK9QRwGBYlP+utWt1M4X9yAacgZurU g6TgiOxZ4Hj92uA8utmlmENzrzyOGtp1dAbsmJoQQ6eBwpFW5//M234SHLXJb1hi7C9k d+U3K2Vy1KCYt3T1QsHf3cS+O53YSc5O4TRYbvwZUvGZ5mN+JAnWTLSIblQAblQI6qIk s6u50Av+LyOCkOdoKzyiXeFRUmo8HXXtVdSoncNyrz0XRS0TpK2EemvqtvNfY925tIlI Fh1YhjlwX99xjAfKC8G/LbyVXLSv9VI9cP5Q9LTUxWQP+igMPwoDVV6NoOKBJcsC/m+O nKoQ== 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=Qrw1/UoNgxHHuda4EiuEtaUY42GZUTKDNreMQaxGV5U=; b=uaOBQJMWIPtc5p2NmL+ykG2k4LY5vn0y4gat+7EX3M6Q1tIospVAiYVMnKXUaz4fR+ s31gmTm2YLve35AVmrjrquB8IJkHaAewM5RUZYSZqUjJk/I7geHKWx3cc9i9VXb+mdnQ UP4TX4FFMwi+LOG3+0Swqz8AfdWMLLAnBoi+UA7tVAme1RcN6a1wjCNplJ/+7AseUUU1 /zV3tMDoVAzx1/xyfXRrZp2+NUS0lqFjI/KYYGz3QxWEAM5RVKVimMY3RoZ8akmldiwP vMf24Y+mMnuwwIaJh1SnjPscARYGhY9zCHTijXAhks8cETKH4to2dN3xfCgp0dZdiufE C8iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SCIsJ5DL; 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 4-20020aa79204000000b005056d85e53dsi11807426pfo.163.2022.04.12.13.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 13:57:03 -0700 (PDT) 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=SCIsJ5DL; 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 CCFD2483A0; Tue, 12 Apr 2022 13:20:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354925AbiDLIGY (ORCPT + 99 others); Tue, 12 Apr 2022 04:06:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354054AbiDLH0B (ORCPT ); Tue, 12 Apr 2022 03:26:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3D5A16589; Tue, 12 Apr 2022 00:05:27 -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 545E4B81B51; Tue, 12 Apr 2022 07:05:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4A34C385A6; Tue, 12 Apr 2022 07:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747125; bh=K13Fcmd4pjZ4VFRVTHDJAb+fVTQ92rUnm6te9GXG10M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SCIsJ5DLuh0C4DEhD0uZNHq0xXDIvSaqNSEvnkZakognbi8eag2r5BtLoB6+S5vEZ Ivf0NZWS1yzTjbzPamWPDzu20+mwuvjGZOZFqyxmmDcFdWZHAFPb3gCIsYJdOlklb8 jGriCBcw86qrY0SSIqOB/jPnrRMZruvS+M7VLKeg= 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.16 253/285] drm/amdgpu/display: change pipe policy for DCN 2.1 Date: Tue, 12 Apr 2022 08:31:50 +0200 Message-Id: <20220412062950.962957758@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@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 @@ -874,7 +874,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,