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 026E6C369B8 for ; Mon, 14 Apr 2025 13:26:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EEBC210E5B1; Mon, 14 Apr 2025 13:26:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="dC9pCLHE"; dkim-atps=neutral Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6EE7F10E5AE; Mon, 14 Apr 2025 13:26:38 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 3F16743D97; Mon, 14 Apr 2025 13:26:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6ABBCC4CEE2; Mon, 14 Apr 2025 13:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744637198; bh=YeSZBQwpzzR8hUTOOoinsaNOw85bh8mrv3KK45BX5BI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dC9pCLHEusy96A4zHAuzVw6++C/ZFbEhKnK8+u6Ss2nijav2WJOBlT7dZZoU0IBjr EV1DC/Qtc2CcvFbn0UzIiGTkTEJRYrm5gs2kO5qMg5DgIQcizMLFX5YEnpzF1fmw19 G40y4/vV79Eig5gD57EBTUCL2ZhBTMqV+mJl6r5zh+C2SDHi0wm1I8g7x5u4dJSOCi uvqkOxEyDS8rkIjM5oeB8A0rED3goFA/hHN5KWDjGH4V7p7sYnVssPr3LFRN1848zI uysnl5AoydcP7iCdknOsOa6GioEPigKsTICEeF1p/q5hgaw2v1gaTKUKmVPZTmJezF 93U0Dd7krIfcQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Emily Deng , Jonathan Kim , Alex Deucher , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.14 13/34] drm/amdkfd: sriov doesn't support per queue reset Date: Mon, 14 Apr 2025 09:25:49 -0400 Message-Id: <20250414132610.677644-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414132610.677644-1-sashal@kernel.org> References: <20250414132610.677644-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.2 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: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Emily Deng [ Upstream commit ba6d8f878d6180d4d0ed0574479fc1e232928184 ] Disable per queue reset for sriov. Signed-off-by: Emily Deng Reviewed-by: Jonathan Kim Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index ceb9fb475ef13..62a9a9ccf9bb6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -2000,7 +2000,8 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev) dev->node_props.capability |= HSA_CAP_TRAP_DEBUG_PRECISE_MEMORY_OPERATIONS_SUPPORTED; - dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED; + if (!amdgpu_sriov_vf(dev->gpu->adev)) + dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED; } else { dev->node_props.debug_prop |= HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 | HSA_DBG_WATCH_ADDR_MASK_HI_BIT; -- 2.39.5