From patchwork Sat Oct 22 07:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1121383wrr; Sat, 22 Oct 2022 02:28:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Tverxtjk6jJaDqgWnxWsXEqDjoFgtuV51CU1qUFglFwNgx7ix6RTjPdKSvGdtJpsm4jc9 X-Received: by 2002:a17:90a:aa8f:b0:210:bec0:bde with SMTP id l15-20020a17090aaa8f00b00210bec00bdemr17885159pjq.109.1666430904777; Sat, 22 Oct 2022 02:28:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666430904; cv=none; d=google.com; s=arc-20160816; b=fwNObcn4MDy+VumLDmH7mPLhSxl8C3aaIP9AMiXU873jx23Z1BCoTpVrsLjpJW9Vaa jPga4BAHc3Qa62MiWiaYISWZRayRPrpbb9qYBht1RaiWl4j/OZb/kF2yTiT5B+BYjvSy zWDd5Y2nXFu44ChKMKulgLCjZr2qFJ/rWl5g+ComLWWGCMSDxCoASfuSWP80Nf/9PY9m Gc6cpQdl2YblKjBONl9xj+bwQ4tm7W2TnNjhaiHxN3KV/DWq6ECUdm1fofcR2Qxut64X uyMSeYldSQDCh9mSTf99Qv5FO+6vVzEaHIl9/BTp3TXB6ltzg56T+cwsFmMSDaojFuiN Hq7g== 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=HCmJahcVlWv6D9XJvkOVU7B1N9TZHv8rjw87YsweF64=; b=rA8TWxW36lBt9U3ikav3Q/ciw9Gr3HmIzFywjy97rY8mAGPFn4MOghSUgo32V3DPQ6 TnJQ6s/YdRscyxLItVh7evlLTnAX9KnB1wtHb/h1WdbIFV3aT87noQJuZN2bY2XCCJkn ZWHYTqwZsPPOLGnqtv/igOMea9rDi5CWk6KRcM5dBls4ySgPBZ62dhjmAWHcKFaPjgya 2guI3fkdjpqFqSXetIL8Oz+F2BtGEsycfmIVGm9HBfYGBs5w500FFmILM/lv91PBJP/l 6ooEsCnk9WeEJe4YOGGeCjrjyeEQ4pn5Vxsytz7l5rGdGG4lQm6UrsKxAU/qV8kKRg86 LGaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="cz/sK5rV"; 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 z13-20020a170902cccd00b0018659ff71d2si10503635ple.62.2022.10.22.02.28.12; Sat, 22 Oct 2022 02:28:24 -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="cz/sK5rV"; 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 S233000AbiJVJHI (ORCPT + 99 others); Sat, 22 Oct 2022 05:07:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232428AbiJVJGr (ORCPT ); Sat, 22 Oct 2022 05:06:47 -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 03C71158D6E; Sat, 22 Oct 2022 01:20:31 -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 39A2FB82DF9; Sat, 22 Oct 2022 08:03:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F9F5C433C1; Sat, 22 Oct 2022 08:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425823; bh=/qVHldP64B5xa9jg2xsijaphwXXl0NsLnQSVOzxEN8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cz/sK5rVf+IRaMiroYqeXqcwJC4AdjoZjz77L/CuzdEc4tvYpxbbh7riYW19lEWoO l5Gtpb2hu1d1mUh1Fkq3aZZ97LOVPrDqeCW+cs6eq+3f/OXfamAbAmXCx5DBEwFQ5K FGV8hVSlTLn8pmVQlSOyrp09HBTxF5aJRatQINwc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Charlene Liu , Wayne Lin , Sherry Wang , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 5.19 620/717] drm/amd/display: correct hostvm flag Date: Sat, 22 Oct 2022 09:28:19 +0200 Message-Id: <20221022072525.887022856@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747379452331722557?= X-GMAIL-MSGID: =?utf-8?q?1747379452331722557?= From: Sherry Wang [ Upstream commit 796d6a37ff5ffaf9f2dc0f3f4bf9f4a1034c00de ] [Why] Hostvm should be enabled/disabled accordding to the status of riommu_active, but hostvm always be disabled on DCN31 which causes underflow [How] Set correct hostvm flag on DCN31 Reviewed-by: Charlene Liu Acked-by: Wayne Lin Signed-off-by: Sherry Wang Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c index 3d9f07d4770b..8a0de6bfc716 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c @@ -892,7 +892,7 @@ static const struct dc_debug_options debug_defaults_drv = { .enable_sw_cntl_psr = true, .apply_vendor_specific_lttpr_wa = true, .enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/ - .dml_hostvm_override = DML_HOSTVM_OVERRIDE_FALSE, + .dml_hostvm_override = DML_HOSTVM_NO_OVERRIDE, }; static const struct dc_debug_options debug_defaults_diags = {