From patchwork Wed Oct 19 08:34:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp225368wrs; Wed, 19 Oct 2022 02:42:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7nLAstykHUbg2KoctYhqcUDpoYjoj1kpmCEwRlPZTwbFBTgLviE0IpXSvqdiZUXofTUbgd X-Received: by 2002:aa7:c509:0:b0:458:cb1f:b9e1 with SMTP id o9-20020aa7c509000000b00458cb1fb9e1mr6521230edq.369.1666172579438; Wed, 19 Oct 2022 02:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172579; cv=none; d=google.com; s=arc-20160816; b=xVst0mHcGmENvi+SN+DF//GDHe5qkEiAyDbun5p+DW4uRTUTqiPweJ35wQ1j1Uu1Xi xpF12dG6IQJEnUS2WpVvG7S3QCeDIAWKUDlu+Rz9WZ9o8mMxzHuYIVKseptQI34KD6Kd rsi1ycxv5uP4e25RmM6kevg7buUWTENXWyj1sbmEgY42f+JaWiPvcUmyQZJdrRz71o7n re8slbD2y6dOiMuojSndKYFiVlSKHGqBW719wouS4r85T+1aRvW/BexU2W7Ba0MzKKu7 QITvt8HiL9LS8ssIGbJwZiROkLuZtN1ooWxGz4NsJ0cow9VZIjc0vL9mS34qYuvUYHtt IOHQ== 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=Vp+fXyxDtt38GpLqeePToHZfPmDsPSrrTa4w7nYQuec=; b=cYJqJSsbGWiuA2noVpNX9sJa9g4QS1xy4TlEKT8yAjf8YFrkTv3hoddcwrNGsSHUhC wRDnc82PKOF6Aucd94E9ZgGnCPEfynwDun/4pR+pCe7Y/p88d9zQUaI8/GlSMlAt8uMJ SCxHUyb6ZcWZL0ZpYj4L73O8h4R5qPflXhTV+Fo1+i8S0CtLkmthR8AmgAV50MEKSpJo p+/m+wxb9Ep0CFw04M6B7UrUhGA/uiHZzrkLIkGya0uM1H3fROXj+4+8hmpyzBdmkeuW k4P0I+DpA/ruRaDtYxIJI5Gf7BJrfAcg+nthEZtT/Cmp6OPgZ3Z8XpvGVolPsV4CDR5r 1/og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=puHbRf9V; 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 nc1-20020a1709071c0100b007820f6b65c6si14953230ejc.469.2022.10.19.02.42.32; Wed, 19 Oct 2022 02:42:59 -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=puHbRf9V; 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 S233639AbiJSJbO (ORCPT + 99 others); Wed, 19 Oct 2022 05:31:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229979AbiJSJ1f (ORCPT ); Wed, 19 Oct 2022 05:27:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0191EE8C41; Wed, 19 Oct 2022 02:12: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 dfw.source.kernel.org (Postfix) with ESMTPS id 77FB061803; Wed, 19 Oct 2022 09:11:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88200C433D7; Wed, 19 Oct 2022 09:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170703; bh=mX24O1vGgImFyw9AlQ1u4BG7+ZHlcMrj6aWT8XAWarE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=puHbRf9Vrhtb1K1EHUhP+zLBx1GOwtLquqfRVo0FF9yPedRb25V6HZa1vXb9t8483 IgBWM+0MzA0DNqO9cEoKnG1JSxDA22TR+OWhQumjZStmRFehmKVKgbbHRsaNHvgdby lynbFnGimAE3swvVVCT3c0vvpXUwZ+Fa/lHcFIDM= 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 6.0 756/862] drm/amd/display: correct hostvm flag Date: Wed, 19 Oct 2022 10:34:03 +0200 Message-Id: <20221019083323.316707365@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?1747108578961564296?= X-GMAIL-MSGID: =?utf-8?q?1747108578961564296?= 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 aedff18aff56..2e5a21856eee 100644 --- 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 debug_defaults_drv = { .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_OVERRIDE_FALSE, + .dml_hostvm_override = DML_HOSTVM_NO_OVERRIDE, }; static const struct dc_debug_options debug_defaults_diags = {