[PATCH] drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions

[PATCH] drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions

[Peter Colberg]

TTMP11_SCHED_MODE_* are only used if RELAXED_SCHEDULING_IN_TRAP is defined.

Fixes: bbcad5a8896b ("drm/amdkfd: gfx12.1 trap handler support for expert scheduling mode")
Signed-off-by: Peter Colberg <pcolberg@redhat.com>
---
 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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 456db81998993803a25b32653ad75d529e35931c..3c976a4aac739669a39aebeb97bb35dfaa1af2f2 100644
--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm
+++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm
@@ -112,12 +112,6 @@ var BARRIER_STATE_MEMBER_OFFSET			= 4
 var BARRIER_STATE_MEMBER_SIZE			= 7
 var BARRIER_STATE_VALID_OFFSET			= 0
 
-#if RELAXED_SCHEDULING_IN_TRAP
-var TTMP11_SCHED_MODE_SHIFT			= 26
-var TTMP11_SCHED_MODE_SIZE			= 2
-var TTMP11_SCHED_MODE_MASK			= 0xC000000
-#endif
-
 var NAMED_BARRIERS_SR_OFFSET_FROM_HWREG		= 0x80
 var S_BARRIER_INIT_MEMBERCNT_MASK		= 0x7F0000
 var S_BARRIER_INIT_MEMBERCNT_SHIFT		= 0x10
@@ -134,9 +128,11 @@ var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SHIFT	= 12
 var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SIZE	= 6
 #endif
 
+#if RELAXED_SCHEDULING_IN_TRAP
 var TTMP11_SCHED_MODE_SHIFT			= 26
 var TTMP11_SCHED_MODE_SIZE			= 2
 var TTMP11_SCHED_MODE_MASK			= 0xC000000
+#endif
 var TTMP11_DEBUG_TRAP_ENABLED_SHIFT		= 23
 var TTMP11_DEBUG_TRAP_ENABLED_MASK		= 0x800000
 var TTMP11_FIRST_REPLAY_SHIFT			= 22

---
base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f
change-id: 20260224-drm-amdkfd-ttmp11-sched-mode-a7a722d96df1

Best regards,
-- 
Peter Colberg <pcolberg@redhat.com>

Claude review: drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions

[Claude Code Review Bot]

Overall Series Review

Subject: drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions
Author: Peter Colberg <pcolberg@redhat.com>
Patches: 1
Reviewed: 2026-02-27T14:54:14.464602

---

This is a single, straightforward cleanup patch. The original commit `bbcad5a8896b` introduced duplicate definitions of `TTMP11_SCHED_MODE_SHIFT`, `TTMP11_SCHED_MODE_SIZE`, and `TTMP11_SCHED_MODE_MASK` in `cwsr_trap_handler_gfx12.asm`. One copy was inside an `#if RELAXED_SCHEDULING_IN_TRAP` guard, the other was unconditional. Since all uses of these variables are within `#if RELAXED_SCHEDULING_IN_TRAP` blocks, the unconditional copy was unnecessary and the guarded copy was redundant.

The patch removes the first (guarded) copy and adds `#if RELAXED_SCHEDULING_IN_TRAP` / `#endif` guards around the second (previously unconditional) copy. This keeps the definitions grouped with the other `TTMP11_*` variables, which is the better location.

**Verdict: Looks good.** Clean, minimal, and correct.

---
Generated by Claude Code Patch Reviewer

Claude review: drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions

[Claude Code Review Bot]

Patch Review

**Correctness:** The patch is correct. The three variables (`TTMP11_SCHED_MODE_SHIFT`, `TTMP11_SCHED_MODE_SIZE`, `TTMP11_SCHED_MODE_MASK`) had two identical definitions. All four usage sites (lines 241-243, 329-330, 1379) are within `#if RELAXED_SCHEDULING_IN_TRAP` guards, so wrapping the single remaining definition in the same guard is correct.

**Location choice:** The surviving definition at line 131-135 (post-patch) is well-placed alongside the other `TTMP11_*` field definitions (`TTMP11_DEBUG_TRAP_ENABLED_*`, `TTMP11_FIRST_REPLAY_*`, etc.) starting at line 136, which is a better grouping than the removed location near the `BARRIER_STATE_*` variables.

**Minor nit:** The `#endif` on line 135 is immediately followed by `var TTMP11_DEBUG_TRAP_ENABLED_SHIFT` on line 136 with no blank line separating them:

```asm
#if RELAXED_SCHEDULING_IN_TRAP
var TTMP11_SCHED_MODE_SHIFT			= 26
var TTMP11_SCHED_MODE_SIZE			= 2
var TTMP11_SCHED_MODE_MASK			= 0xC000000
#endif
var TTMP11_DEBUG_TRAP_ENABLED_SHIFT		= 23
```

This matches the style of the `#if HAVE_BANKED_VGPRS` block just above (lines 126-129), so it's consistent. No issue.

**Reviewed-by consideration:** This is a safe cleanup with no functional change. The Fixes tag referencing `bbcad5a8896b` is appropriate since that commit introduced the duplication.

---
Generated by Claude Code Patch Reviewer