diff --git a/src/freedreno/registers/adreno/a6xx.xml b/src/freedreno/registers/adreno/a6xx.xml
index eb3059dc4c4..f40e696c02c 100644
--- a/src/freedreno/registers/adreno/a6xx.xml
+++ b/src/freedreno/registers/adreno/a6xx.xml
@@ -3276,7 +3276,7 @@ by a particular renderpass/blit.
 	<array offset="0xae80" name="SP_PERFCTR_SP_SEL" stride="1" length="36" variants="A7XX-"/>
 	<!-- TODO: there are 4 more percntr select registers (0xae28-0xae2b) -->
 	<!-- TODO: there are a few unknown registers in the 0xae30-0xae52 range -->
-	<reg32 offset="0xbe22" name="SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE"/>
+	<reg32 offset="0xae52" name="SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE"/>
 
 	<!--
 	The downstream kernel calls the debug cluster of registers
@@ -3788,7 +3788,7 @@ by a particular renderpass/blit.
 	<array offset="0xbe10" name="HLSQ_PERFCTR_HLSQ_SEL" stride="1" length="6"/>
 
 	<!-- TODO: some valid registers between 0xbe20 and 0xbe33 -->
-	<reg32 offset="0xbe22" name="HLSQ_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE"/>
+	<reg32 offset="0xbe22" name="HLSQ_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE" variants="A6XX"/>
 
 	<reg32 offset="0xc000" name="SP_AHB_READ_APERTURE" variants="A7XX-"/>
 
diff --git a/src/freedreno/tests/reference/crash.log b/src/freedreno/tests/reference/crash.log
index 821f9b7c704..bc357920368 100644
--- a/src/freedreno/tests/reference/crash.log
+++ b/src/freedreno/tests/reference/crash.log
@@ -1587,7 +1587,7 @@ registers:
 	00000000	HLSQ_PERFCTR_HLSQ_SEL[0x5]+0: 00000000
 	00000000	0xbe20: 00000000
 	00000000	0xbe21: 00000000
-	00000000	SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0
+	00000000	HLSQ_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0
 	00000000	0xbe23: 00000000
 	00000000	SP_DBG_ECO_CNTL: 0
 	00000001	SP_ADDR_MODE_CNTL: ADDR_64B
@@ -1636,7 +1636,7 @@ registers:
 	deadbeef	0xae3f: deadbeef
 	deadbeef	0xae50: deadbeef
 	deadbeef	0xae51: deadbeef
-	deadbeef	0xae52: deadbeef
+	deadbeef	SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0xdeadbeef
 	00000000	TPL1_DBG_ECO_CNTL: 0
 	00000001	TPL1_ADDR_MODE_CNTL: ADDR_64B
 	00000004	TPL1_NC_MODE_CNTL: { LOWER_BIT = 2 | UPPER_BIT = 0 }
diff --git a/src/freedreno/tests/reference/crash_prefetch.log b/src/freedreno/tests/reference/crash_prefetch.log
index b0fd9c1bc56..681aa72ec8a 100644
--- a/src/freedreno/tests/reference/crash_prefetch.log
+++ b/src/freedreno/tests/reference/crash_prefetch.log
@@ -1800,7 +1800,7 @@ registers:
 	00000000	HLSQ_PERFCTR_HLSQ_SEL[0x5]+0: 00000000
 	00000000	0xbe20: 00000000
 	00000000	0xbe21: 00000000
-	00000000	SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0
+	00000000	HLSQ_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0
 	00000000	0xbe23: 00000000
 	00108000	SP_DBG_ECO_CNTL: 0x108000
 	00000001	SP_ADDR_MODE_CNTL: ADDR_64B
@@ -1849,7 +1849,7 @@ registers:
 	deadbeef	0xae3f: deadbeef
 	deadbeef	0xae50: deadbeef
 	deadbeef	0xae51: deadbeef
-	deadbeef	0xae52: deadbeef
+	deadbeef	SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0xdeadbeef
 	00108000	TPL1_DBG_ECO_CNTL: 0x108000
 	00000001	TPL1_ADDR_MODE_CNTL: ADDR_64B
 	00000002	TPL1_NC_MODE_CNTL: { LOWER_BIT = 1 | UPPER_BIT = 0 }
diff --git a/src/freedreno/tests/reference/prefetch-test.log b/src/freedreno/tests/reference/prefetch-test.log
index 55531b637dc..5bd75e6d862 100644
--- a/src/freedreno/tests/reference/prefetch-test.log
+++ b/src/freedreno/tests/reference/prefetch-test.log
@@ -2379,7 +2379,7 @@ registers:
 	00000000	HLSQ_PERFCTR_HLSQ_SEL[0x5]+0: 00000000
 	00000000	0xbe20: 00000000
 	00000000	0xbe21: 00000000
-	00000000	SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0
+	00000000	HLSQ_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0
 	00000000	0xbe23: 00000000
 	00108000	SP_DBG_ECO_CNTL: 0x108000
 	00000001	SP_ADDR_MODE_CNTL: ADDR_64B
@@ -2428,7 +2428,7 @@ registers:
 	deadbeef	0xae3f: deadbeef
 	deadbeef	0xae50: deadbeef
 	deadbeef	0xae51: deadbeef
-	deadbeef	0xae52: deadbeef
+	deadbeef	SP_CONTEXT_SWITCH_GFX_PREEMPTION_SAFE_MODE: 0xdeadbeef
 	00108000	TPL1_DBG_ECO_CNTL: 0x108000
 	00000001	TPL1_ADDR_MODE_CNTL: ADDR_64B
 	00000002	TPL1_NC_MODE_CNTL: { LOWER_BIT = 1 | UPPER_BIT = 0 }