From: Alex Deucher Date: Thu, 26 Feb 2026 16:18:29 +0000 (-0500) Subject: drm/amdkfd: fix CWSR trap handler X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=911e2c0525e38133c849ee683830fdc63b4ee44d;p=thirdparty%2Fkernel%2Fstable.git drm/amdkfd: fix CWSR trap handler Fix up what looks like a bad merge. Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm index 456db8199899..d38ff404277b 100644 --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm @@ -134,9 +134,6 @@ var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SHIFT = 12 var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SIZE = 6 #endif -var TTMP11_SCHED_MODE_SHIFT = 26 -var TTMP11_SCHED_MODE_SIZE = 2 -var TTMP11_SCHED_MODE_MASK = 0xC000000 var TTMP11_DEBUG_TRAP_ENABLED_SHIFT = 23 var TTMP11_DEBUG_TRAP_ENABLED_MASK = 0x800000 var TTMP11_FIRST_REPLAY_SHIFT = 22