From patchwork Wed Oct 19 08:35:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5383 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp302846wrs; Wed, 19 Oct 2022 05:39:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5gaSlN+ruB2vt+vL/t3w/tfFt0dR8yVbXv30v3s8nNjN/x4OaLZpPrDEF2D4wC+LdLliIx X-Received: by 2002:a17:902:6944:b0:181:898b:6440 with SMTP id k4-20020a170902694400b00181898b6440mr8633804plt.78.1666183186083; Wed, 19 Oct 2022 05:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666183186; cv=none; d=google.com; s=arc-20160816; b=nBZFsPml4hFKOpvNwz2XRXwQzRAELW5yhoIFi/jdIG+3Do+FeDYkZ5YEt5mCHZkyEl F1GP48IkfSKdbt09prm6XpPqLV2FosB6lSkEvV6Fmeqvq0VCtCzkEQXENp5OJA7WLge/ uEnxoyLKFsILBxsiwPYIpw2z1AyMAZkdjcBKFVm4HxS3xCiybotXdqaZdwsNz5SVD4mM oegPSPh6/Qd0er2sIhXGXNcLNhholSKm32ojX+1A0JkB7NvMBhf1oCR/KpBhCPyHtdht lPE0oaSq1aWUclN8CO4nJdX+/C0aDYOk6hXNN0c/MfIFsEknrs8MygP7wPgwSS5OvQGF E0Xw== 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=T8z6BcK6tQLQooD5JueFe3k9CfK5MfH9SE83lRrSjto=; b=QlCXuxKVifzK2QD0rSIaUR1LLTm2h3D7q0bEqw7L6SpFjHeh8X5fbUglr1TCV6W/S9 yeitieC8kBnjrEZpZkVGd3rkA/y8fK7J1dFOo3p2OMi/3QOPSjBSRjR3RLZNcMaum2HQ Yxv94sBbLDmjqylpWEDNi98erMe4mVxT5E1UpYqs7cZzMFi2STRqUl5o1ifuXBI7sqfw juajAoPaCIQIqYoq8c7OYB20jxWn6vHIEVFrD+95FdhkNvwjLp4gu7b8D9UEFYslUa5y lLlCmvBbV4yulFJDP2MryNxG3Rr3pUbUFJeLhgP62lJnswd30UDQZwm0sbQFaNnQ/waK zM1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D8bhC0PO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n10-20020a1709026a8a00b00172ec19cb96si16791080plk.436.2022.10.19.05.39.26; Wed, 19 Oct 2022 05:39:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D8bhC0PO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233142AbiJSMdc (ORCPT + 99 others); Wed, 19 Oct 2022 08:33:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231489AbiJSMdO (ORCPT ); Wed, 19 Oct 2022 08:33:14 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E3511781CB; Wed, 19 Oct 2022 05:12:05 -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 sin.source.kernel.org (Postfix) with ESMTPS id AF02BCE217C; Wed, 19 Oct 2022 09:16:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B05B1C433D6; Wed, 19 Oct 2022 09:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170993; bh=9hn852ZhM0EfVIh1DYObpQhwk4metOXndls0I/VbDLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D8bhC0POKDhJ9dC9gNSPCOB68ypQXcgpDimi7myfkrxm6h/qVAYozCpAFHOXxyrNn vcIRss6bSFwdy/jyA97Fkm4z7o0uxEkYURq5G8+5I7IZslvnLYk5waCvnDsJaeRE5v 72Lr7QOlNdz2cfDWIZePBfSckoyk0bfowk72iN7A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sherry Wang , Hamza Mahfooz , Aric Cyr , Alex Deucher Subject: [PATCH 6.0 853/862] Revert "drm/amd/display: correct hostvm flag" Date: Wed, 19 Oct 2022 10:35:40 +0200 Message-Id: <20221019083327.553350539@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747119700486661206?= X-GMAIL-MSGID: =?utf-8?q?1747119700486661206?= From: Aric Cyr commit 96ab3cb3b0f862308a03046d01d66c7b4154846b upstream. This reverts commit 796d6a37ff5ffaf9f2dc0f3f4bf9f4a1034c00de. 4K144 resolution isn't available on DCN31. Reviewed-by: Sherry Wang Acked-by: Hamza Mahfooz Signed-off-by: Aric Cyr Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c @@ -891,7 +891,7 @@ static const struct dc_debug_options deb .optimize_edp_link_rate = true, .enable_sw_cntl_psr = true, .enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/ - .dml_hostvm_override = DML_HOSTVM_NO_OVERRIDE, + .dml_hostvm_override = DML_HOSTVM_OVERRIDE_FALSE, }; static const struct dc_debug_options debug_defaults_diags = {