From: David Belanger Date: Thu, 17 Aug 2023 21:28:38 +0000 (-0400) Subject: drm/amdkfd: Enable GFX12 trap handler X-Git-Tag: io_uring-6.11-20240722~49^2~25^2~414 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=782b93436afff4105c725163b26fd7dd99198baa;p=linux-2.6-block.git drm/amdkfd: Enable GFX12 trap handler Updated switch statement to use GFX12 trap handler. Signed-off-by: David Belanger Reviewed-by: Harish Kasiviswanathan Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index ab5c9e6cfd1e..7e56885f6288 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -532,10 +532,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;