[PATCH 07/14] drm/amdkfd: Enable GFX12 trap handler

Alex Deucher alexander.deucher at amd.com
Mon Apr 29 14:57:19 UTC 2024


From: David Belanger <david.belanger at amd.com>

Updated switch statement to use GFX12 trap handler.

Signed-off-by: David Belanger <david.belanger at amd.com>
Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 1e21908e972fa..093987b1e373e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -525,10 +525,9 @@ static void kfd_cwsr_init(struct kfd_dev *kfd)
 			kfd->cwsr_isa = cwsr_trap_gfx11_hex;
 			kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx11_hex);
 		} else {
-			/* GFX12_TODO: Change to gfx12 struct when available. */
-			BUILD_BUG_ON(sizeof(cwsr_trap_gfx11_hex) > PAGE_SIZE);
-			kfd->cwsr_isa = cwsr_trap_gfx11_hex;
-			kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx11_hex);
+			BUILD_BUG_ON(sizeof(cwsr_trap_gfx12_hex) > PAGE_SIZE);
+			kfd->cwsr_isa = cwsr_trap_gfx12_hex;
+			kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx12_hex);
 		}
 
 		kfd->cwsr_enabled = true;
-- 
2.44.0



More information about the amd-gfx mailing list