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 AB6BBCD8C85 for ; Fri, 5 Jun 2026 22:31:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48E33112C39; Fri, 5 Jun 2026 22:31:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="Q2oxXfLN"; dkim-atps=neutral Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012051.outbound.protection.outlook.com [52.101.53.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8698410E560 for ; Fri, 5 Jun 2026 22:31:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h+70LS1+AqqNRPbGWejFQyOW6dr7YxezzFUONBliWDQHO2FWwQF1IURbB9PxM4lS06mhWHWAqKa6bpFel0ZzgupDqofx4Z+seRVDFidxic8X20cVDJViFlSdydo+xjiiat6d6LZv8yOfplqclZhfMRePGW+pKgMWfWeeet1/W4qPa+jXmBT5GNI7DnuQy8M+gR522c7Sg9st8yhwwpECbl6KqMqi8a3igf30go2R1m3P/aol4WjVPsKl//D/QXaK8BqdWzyq3KFSTvLj28BEKmtJih06aOIVBpG88B9RcrOzeT6cOEK8LH8aJ2/jBXrYKeyr0IYzHjVkrtXNfkwgMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bRHUZ1wPFzWJKu8FDfyMb9IGJGdsOxKe/EK4LqmaVDQ=; b=AeVNSkOWXisiKACGO4Rmq7oZUHLt8/KW3i75uHfPIS20Pfb8pO7bvIPBjMtV7zfCY5uQjZ2gOxS1iwyaehh1TpTJvlRajecrYzu8wZq+qLEpOLWZO9r/Ry9Qusdfh80tn9OPZ2/PysoKWUeT3oVrISI2H0wGQwFgzrFdQsAbGkT4i03+PJO/eNmmBQwjTeDRORem1Rz+MBT9SFqFgVVbfVWxZ3Dk9Ek2kIwAeJiTy2EFll6AqDq9esH5TatUY1KneAObc6ojWqTkASpyzqkLyzqTI8LIxpZ6238KC1aO7mNDwEQ/MWwq3xUSskEzpCiih3Di4v34Xk8q+hl2L4cR8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bRHUZ1wPFzWJKu8FDfyMb9IGJGdsOxKe/EK4LqmaVDQ=; b=Q2oxXfLNHbUQd1V/pq+DJ6xe4e5RFalS2K5hPitBFF3co+A0+Rfonp//KfJpNWxkkIeNEDy3FkhA+R6I6/G0TOzvyURpcxv01i1m+h8kfDJBiirjHONDQadl7bIuDUgN691zIEFwB5LXcSM+suOmLiIMvzltYjgRcNR3PRj6N98= Received: from PH8P221CA0052.NAMP221.PROD.OUTLOOK.COM (2603:10b6:510:346::16) by BY5PR12MB4113.namprd12.prod.outlook.com (2603:10b6:a03:207::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.15; Fri, 5 Jun 2026 22:30:56 +0000 Received: from CY4PEPF0000EDD6.namprd03.prod.outlook.com (2603:10b6:510:346:cafe::16) by PH8P221CA0052.outlook.office365.com (2603:10b6:510:346::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.9 via Frontend Transport; Fri, 5 Jun 2026 22:30:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EDD6.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Fri, 5 Jun 2026 22:30:55 +0000 Received: from amberlin-dev.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 5 Jun 2026 17:30:54 -0500 From: Amber Lin To: , , CC: Amber Lin Subject: [PATCH] drm/amdkfd: Add gfx11 queue/pipe reset support to topology Date: Fri, 5 Jun 2026 18:30:37 -0400 Message-ID: <20260605223037.3767958-1-Amber.Lin@amd.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD6:EE_|BY5PR12MB4113:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bf1f6a1-289c-4d71-deef-08dec3521c02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700016|6133799003|18002099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: 72n3mLO9UvNV875G4/jzmnPT1XgPoRlApNaKLTx6y3nvtdclTSpWGFOVWYRlyl7U85YicGy/vjttvi55NXfpZlYykhaTiPlvis7nIRfNm/pMt+6XBSvM5RqUpNXS/V1F8Jpk+BRPsEdhAdpk7h1vR8vslJo5oObMEqqAFDZyxJfVOB6rdEkNe7EMl9I+ZS+6mnRKY0NVQguEcmEqzDQrPLU0BhwGmrg8O4RnViR/+ZD3MjYC26dECYh6kRKL2S8oJQSwVNmdq7lJ5hors6w+WRscp9qJTy924rsGRemlhmLzRUKNns8VaMcd2yabjiVBkuWnjTK/nGCAf4RoknzdVUm5rcNSHutHjrbTiW9WljleEz1amhDIRRwrp1D+fDOc4s3xDPyIZ7xDRS/m+YqBp3CuqN04VrVKl04ucE8L6WnRdayh5Taj8WTVJaSMZWW3+3c0ymGOVK364LlE9gbSk/jrXPtKJqrhLG4g6MQlcjSo4yD4xKlRYhafhFOJ3GcOLfCFemMDk6lYUwR8UMZ4iarHN1VL4WeoR/IHNcIdv4IFrZ275/0ch8TSIbX3gb+oNghNaSkw5QXgYGSw/Sfd2bICh7bsRSeyb8l2dLcWhe9FluwON3eqSIDWsMoPa7hF0Le70Wt6FVAjEhumfmVWsEPQcLYANiCG3cOSG/XD2gITtQozaGhwfsZkIIVCMV26o0jbThiZ3b8AOI5AZn+h+vvw8mno1wV27rJxcU30p/8= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(376014)(36860700016)(6133799003)(18002099003)(11063799006)(56012099006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NgK8nxE+TLlAzsNNltCwGIBdIOrvQvECJS3YCZ5tE1/xDK2L/eXsv3R/mgmLMcViZ/5LF+ph9zVCA8UyxYYLHaA511ZXVXvldaO7LZISqH+fK2K6x43stssW4A52QIOaLn5GkCV2IRsite+1NokXmIifXkGDU+M2VK1b+3uI8POJFfoH8tXqUypa2Qei/O7HeWeu20z3BJm/FjyYLBdgFHp5ivmJxYl6Tw7FpaqN62uILy19jKqJEQcxm2ERVCjNogsk5RqIhgZjf72nWGPc5+MnC6yrdqzRRhYWf2tzxQSsFcc2y0yVZW0JhxM28txKNGRgWpFYShfF7No/aE7WksRAL71F6AhqdYJeVwFsFOJI0EOX4vXdCa82HNo7cNuxo4pH49r0iw9QafoHrVIJE0OxAJHiGS4ybgw2EdIE47h71DYFVQpjdbaAj61DLgHC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2026 22:30:55.7005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9bf1f6a1-289c-4d71-deef-08dec3521c02 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EDD6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4113 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" Add gfx11 queue/pipe reset support to KFD topology Signed-off-by: Amber Lin --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index 9adc852e5c2d..3a8bd3eaf12b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -210,6 +210,7 @@ enum cache_policy { }; #define KFD_GC_VERSION(dev) (amdgpu_ip_version((dev)->adev, GC_HWIP, 0)) +#define KFD_GC_VERSION_MAJ(dev) ((KFD_GC_VERSION(dev) >> 24)) #define KFD_IS_SOC15(dev) ((KFD_GC_VERSION(dev)) >= (IP_VERSION(9, 0, 1))) #define KFD_SUPPORT_XNACK_PER_PROCESS(dev)\ ((KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 2)) || \ diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index 0ff793a17857..6c3734db38ea 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -2024,6 +2024,9 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev) dev->node_props.capability |= HSA_CAP_TRAP_DEBUG_PRECISE_ALU_OPERATIONS_SUPPORTED; + if (KFD_GC_VERSION_MAJ(dev->gpu) == 11) + dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED; + if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 1, 0)) { dev->node_props.capability |= HSA_CAP_TRAP_DEBUG_PRECISE_MEMORY_OPERATIONS_SUPPORTED; -- 2.43.0