Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp654431rdh; Sun, 24 Sep 2023 06:18:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhThACWdjUG7PKy9PUXUCOXFDCwYtsYmnCpAyeAEO+pPWiKyqBxmKvgBFVwJJSuKwu3uJr X-Received: by 2002:a05:6358:3414:b0:143:8984:4ffa with SMTP id h20-20020a056358341400b0014389844ffamr5998431rwd.26.1695561536530; Sun, 24 Sep 2023 06:18:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695561536; cv=none; d=google.com; s=arc-20160816; b=TLpVvWX4qrTU3krLHFBb9mQ2VTDjzSuVW7VWbtftmbWmXskm3OcPUWZ4aqzMi2Al95 VcG4eQIe13BJs+97VGQKd5woz9YbIy8C6sQxkCOYJzXBvlX3GfWWEDVnZyppIcBgxEXE y6W3/ccgpowqoZEVfssM3V2N6csh9dvywe3+spf4JB2C5QXigqZUGZOcQ2dYsRtKKCCb dh597ntTbcLLHZX3+j+bgvy9H9E+K96bh1IktIDkPm4Db6ENjgcDkEc1sQllOSG/5z8l wDuZEuDea4Ph45lahtxzlx49ueJAB/ESdmqoKjtFA7WFBkG0Y9rdcfaIlDzrKRHp2E5X Xf/Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/+PjhnsQmVab/Y9UxTCFo7/me8unXcdd+vkHePGpV28=; fh=7ZneVjwACTYKWP+bX8R1j2Q0FVwvtA+M8LiCIsox3NM=; b=I9SefAfT6BUf6ZhRnWZHhhh/LZkFEEjN7duzR/UxxbQUx3EWrrIUP8/VdCBd/uRu2p IWykXtb66oAGd3TjexIVxNzeHUh2aYcXhH2smGYmIZe6xZ5mJzs/H9l8imKOknTYQ7fd g5BzmSR3MS/ftQByT+eQkY+XVIzaczMLK2arvNhevO/xTiCTTZChb3ByNvKckEeoYxVo tcyqYFe3eMmr8D6zXKXRjN4efdv+wI/LSDjGWT/qeM7RO7hMgc6um/DM7niNR2reNH+T CUGMFCf3HQWFNT7CZkHY51lAcEa6Yf7V1BW7T5GeLkWBYZaafQAY392rdOB8tN3nBjhc AgXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ky9W8XDs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id l10-20020a17090a850a00b0027752ac4aefsi588625pjn.24.2023.09.24.06.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 06:18:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ky9W8XDs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B1CC380B2327; Sun, 24 Sep 2023 06:18:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230245AbjIXNSh (ORCPT + 99 others); Sun, 24 Sep 2023 09:18:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230138AbjIXNSU (ORCPT ); Sun, 24 Sep 2023 09:18:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5097A1BFB; Sun, 24 Sep 2023 06:17:15 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64386C433C8; Sun, 24 Sep 2023 13:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695561434; bh=vuLQUyedGq0x4DONjqzds8NBXv337ROtROrvDAx3/00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ky9W8XDsRcTESn7+oC0UPO87QWi6mV2nESEBfQcGVSQMzWZoYZEfdU6XmGH+Djmz/ ez3Y2XpQtOX2Nng0tpB+4+5kl1Nj6ySvleWuCT3jf0A7FPzPhqcM/AgU3YOODERY/q AxKoKmFCp/IGDccqZU4lGLWECxhQ6131ZqkUt7NpdmBAqEpxTHo6Q3VmdAAHAClqV+ xE01auskTFOiyEheunFyARMzGNMcxRIwM0KcRekK9h76fk16Rk1X0y/F3vFgqKToCN n+zzqn5cRt53W8qp7oQvfor4khrc6aJkeSc+L+9IH4PCooMj7Bh+FmGAL3GRdwPqKB ofswwaeH8Nizg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Timmy Tsai , Sasha Levin , Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, Likun.Gao@amd.com, yifan1.zhang@amd.com, kenneth.feng@amd.com, saleemkhan.jamadar@amd.com, Jane.Jian@amd.com, shane.xiao@amd.com, sunran001@208suo.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.5 29/41] drm/amdgpu/soc21: don't remap HDP registers for SR-IOV Date: Sun, 24 Sep 2023 09:15:17 -0400 Message-Id: <20230924131529.1275335-29-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230924131529.1275335-1-sashal@kernel.org> References: <20230924131529.1275335-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.5 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 24 Sep 2023 06:18:45 -0700 (PDT) From: Alex Deucher [ Upstream commit 1832403cd41ca6b19b24e9d64f79cb08d920ca44 ] This matches the behavior for soc15 and nv. Acked-by: Christian König Reviewed-by: Timmy Tsai Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c index e5e5d68a4d702..1a5ffbf884891 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -786,7 +786,7 @@ static int soc21_common_hw_init(void *handle) * for the purpose of expose those registers * to process space */ - if (adev->nbio.funcs->remap_hdp_registers) + if (adev->nbio.funcs->remap_hdp_registers && !amdgpu_sriov_vf(adev)) adev->nbio.funcs->remap_hdp_registers(adev); /* enable the doorbell aperture */ adev->nbio.funcs->enable_doorbell_aperture(adev, true); -- 2.40.1