From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D78DC77B7F for ; Sat, 20 May 2023 18:21:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE18C10E10F; Sat, 20 May 2023 18:21:43 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 490BA10E10F; Sat, 20 May 2023 18:21:42 +0000 (UTC) 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 9883060B51; Sat, 20 May 2023 18:21:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11BACC4339B; Sat, 20 May 2023 18:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684606901; bh=Caj9Chv14WJIy5OSbKzEcAb/SOrNpcH0u4TKTyOodn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nHuQFJPzr0vbY4R/e1kvCF/7TUpp2fu6TI6jhAE7dQakIWpdCNe7i3qzaIrCF4q1H dygU9rfaffRfDfhDQHmOrF49DBVI0DRfbI5ZUflI4Nf8Lf05nYXUtc5s41xDEzifFB EgDunWHps/X48dDrSwuk0KKc7yHH/mZDToOYOYxMD4YSvV3R3bmKqEtrQUT8qbtUZ1 jDoFS8yj6fjJo/t/hn+SoDsRO3nxygu8m5r4N0tc3hrE5bqms8+2TA6sihXaNZaaK7 LOui5VwpENzFv0oDgbGi+v7hu0U9S4zMLlbB1rzj5J9etjfnSlFvuDk2vokq7n7m3I eSJTrMMmzsHLQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 09/14] drm/amdgpu: set gfx9 onwards APU atomics support to be true Date: Sat, 20 May 2023 14:20:37 -0400 Message-Id: <20230520182044.836702-9-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230520182044.836702-1-sashal@kernel.org> References: <20230520182044.836702-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Yifan Zhang , lijo.lazar@amd.com, dri-devel@lists.freedesktop.org, andrey.grodzovsky@amd.com, Amaranath.Somalapuram@amd.com, airlied@gmail.com, Felix Kuehling , Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, YiPeng.Chai@amd.com, mario.limonciello@amd.com, daniel@ffwll.ch, Bokun.Zhang@amd.com, Alex Deucher , Lang Yu , christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Yifan Zhang [ Upstream commit af7828fbceed4f9e503034111066a0adef3db383 ] APUs w/ gfx9 onwards doesn't reply on PCIe atomics, rather it is internal path w/ native atomic support. Set have_atomics_support to true. Signed-off-by: Yifan Zhang Reviewed-by: Lang Yu Acked-by: Felix Kuehling Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 011e4fbe27f10..646a211e1a964 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3735,6 +3735,12 @@ int amdgpu_device_init(struct amdgpu_device *adev, adev->have_atomics_support = ((struct amd_sriov_msg_pf2vf_info *) adev->virt.fw_reserve.p_pf2vf)->pcie_atomic_ops_support_flags == (PCI_EXP_DEVCAP2_ATOMIC_COMP32 | PCI_EXP_DEVCAP2_ATOMIC_COMP64); + /* APUs w/ gfx9 onwards doesn't reply on PCIe atomics, rather it is a + * internal path natively support atomics, set have_atomics_support to true. + */ + else if ((adev->flags & AMD_IS_APU) && + (adev->ip_versions[GC_HWIP][0] > IP_VERSION(9, 0, 0))) + adev->have_atomics_support = true; else adev->have_atomics_support = !pci_enable_atomic_ops_to_root(adev->pdev, -- 2.39.2