diff --git a/src/freedreno/decode/crashdec.c b/src/freedreno/decode/crashdec.c
index 041bcc80c0f..7ed327a9ad2 100644
--- a/src/freedreno/decode/crashdec.c
+++ b/src/freedreno/decode/crashdec.c
@@ -33,6 +33,8 @@ static uint64_t fault_iova;
 static bool has_fault_iova;
 static int lookback = 20;
 
+static unsigned gmu_offset = 0;
+
 struct cffdec_options options = {
    .draw_filter = -1,
 };
@@ -691,7 +693,7 @@ decode_gmu_registers(void)
       reg_buf.regs[reg_buf.count].value = value;
       reg_buf.count++;
 
-      if (regacc_push(&r, offset / 4, value)) {
+      if (regacc_push(&r, (offset / 4) + gmu_offset, value)) {
          printf("\t%08"PRIx64"\t", r.value);
          dump_register(&r);
       }
@@ -1100,11 +1102,21 @@ decode(void)
    while ((line = popline())) {
       printf("%s", line);
       if (startswith(line, "kernel:")) {
+         unsigned major, minor;
          char *release = NULL;
 
          parseline(line, "kernel: %ms", &release);
          strncpy((char *)snapshot_linux.release, release, sizeof(snapshot_linux.release) - 1);
          free(release);
+
+         /* Extract the kernel version.  The offset of GMU regs was
+          * shifted in v6.19 as gen8 support was added.  For backwards
+          * compatibility with earlier kernels, we need to add an
+          * offset.
+          */
+         parseline(line, "kernel: %u.%u", &major, &minor);
+         if ((major < 6) || ((major == 6) && (minor < 19)))
+            gmu_offset = 0x1a800;
       } else if (startswith(line, "time:")) {
          double time;
 
diff --git a/src/freedreno/registers/adreno/a6xx_gmu.xml b/src/freedreno/registers/adreno/a6xx_gmu.xml
index 5e66d14f82e..c4e00b1263c 100644
--- a/src/freedreno/registers/adreno/a6xx_gmu.xml
+++ b/src/freedreno/registers/adreno/a6xx_gmu.xml
@@ -40,56 +40,62 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
 		<bitfield name="IRQ_MASK_BIT" pos="0" />
 	</bitset>
 
-	<reg32 offset="0x80" name="GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL"/>
-	<reg32 offset="0x81" name="GMU_GX_SPTPRAC_POWER_CONTROL"/>
-	<reg32 offset="0xc00" name="GMU_CM3_ITCM_START"/>
-	<reg32 offset="0x1c00" name="GMU_CM3_DTCM_START"/>
-	<reg32 offset="0x23f0" name="GMU_NMI_CONTROL_STATUS"/>
-	<reg32 offset="0x23f8" name="GMU_BOOT_SLUMBER_OPTION"/>
-	<reg32 offset="0x23f9" name="GMU_GX_VOTE_IDX"/>
-	<reg32 offset="0x23fa" name="GMU_MX_VOTE_IDX"/>
-	<reg32 offset="0x23fc" name="GMU_DCVS_ACK_OPTION"/>
-	<reg32 offset="0x23fd" name="GMU_DCVS_PERF_SETTING"/>
-	<reg32 offset="0x23fe" name="GMU_DCVS_BW_SETTING"/>
-	<reg32 offset="0x23ff" name="GMU_DCVS_RETURN"/>
-	<reg32 offset="0x2bf8" name="GMU_CORE_FW_VERSION">
+	<reg32 offset="0x1a880" name="GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL"/>
+	<reg32 offset="0x1a881" name="GMU_GX_SPTPRAC_POWER_CONTROL"/>
+	<reg32 offset="0x1b400" name="GMU_CM3_ITCM_START"/>
+	<reg32 offset="0x1c400" name="GMU_CM3_DTCM_START"/>
+	<reg32 offset="0x1cbf0" name="GMU_NMI_CONTROL_STATUS"/>
+	<reg32 offset="0x1cbf8" name="GMU_BOOT_SLUMBER_OPTION"/>
+	<reg32 offset="0x1cbf9" name="GMU_GX_VOTE_IDX"/>
+	<reg32 offset="0x1cbfa" name="GMU_MX_VOTE_IDX"/>
+	<reg32 offset="0x1cbfc" name="GMU_DCVS_ACK_OPTION"/>
+	<reg32 offset="0x1cbfd" name="GMU_DCVS_PERF_SETTING"/>
+	<reg32 offset="0x1cbfe" name="GMU_DCVS_BW_SETTING"/>
+	<reg32 offset="0x1cbff" name="GMU_DCVS_RETURN"/>
+	<reg32 offset="0x1d3f8" name="GMU_CORE_FW_VERSION">
 		<bitfield name="MAJOR" low="28" high="31"/>
 		<bitfield name="MINOR" low="16" high="27"/>
 		<bitfield name="STEP" low="0" high="15"/>
 	</reg32>
-	<reg32 offset="0x4c00" name="GMU_ICACHE_CONFIG"/>
-	<reg32 offset="0x4c01" name="GMU_DCACHE_CONFIG"/>
-	<reg32 offset="0x4c0f" name="GMU_SYS_BUS_CONFIG"/>
-	<reg32 offset="0x5000" name="GMU_CM3_SYSRESET"/>
-	<reg32 offset="0x5001" name="GMU_CM3_BOOT_CONFIG"/>
-	<reg32 offset="0x501a" name="GMU_CM3_FW_BUSY"/>
-	<reg32 offset="0x501c" name="GMU_CM3_FW_INIT_RESULT"/>
-	<reg32 offset="0x502d" name="GMU_CM3_CFG"/>
-	<reg32 offset="0x5040" name="GMU_CX_GMU_POWER_COUNTER_ENABLE"/>
-	<reg32 offset="0x5041" name="GMU_CX_GMU_POWER_COUNTER_SELECT_0"/>
-	<reg32 offset="0x5042" name="GMU_CX_GMU_POWER_COUNTER_SELECT_1"/>
-	<reg32 offset="0x5044" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_0_L"/>
-	<reg32 offset="0x5045" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_0_H"/>
-	<reg32 offset="0x5046" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_1_L"/>
-	<reg32 offset="0x5047" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_1_H"/>
-	<reg32 offset="0x5048" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_2_L"/>
-	<reg32 offset="0x5049" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_2_H"/>
-	<reg32 offset="0x504a" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_3_L"/>
-	<reg32 offset="0x504b" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_3_H"/>
-	<reg32 offset="0x504c" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_4_L"/>
-	<reg32 offset="0x504d" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_4_H"/>
-	<reg32 offset="0x504e" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_5_L"/>
-	<reg32 offset="0x504f" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H"/>
-	<reg32 offset="0x50c0" name="GMU_PWR_COL_INTER_FRAME_CTRL">
+	<reg32 offset="0x1f400" name="GMU_ICACHE_CONFIG"/>
+	<reg32 offset="0x1f401" name="GMU_DCACHE_CONFIG"/>
+	<reg32 offset="0x1f40f" name="GMU_SYS_BUS_CONFIG"/>
+	<reg32 offset="0x1f50b" name="GMU_MRC_GBIF_QOS_CTRL"/>
+	<reg32 offset="0x1f800" name="GMU_CM3_SYSRESET"/>
+	<reg32 offset="0x1f801" name="GMU_CM3_BOOT_CONFIG"/>
+	<reg32 offset="0x1f81a" name="GMU_CM3_FW_BUSY"/>
+	<reg32 offset="0x1f81c" name="GMU_CM3_FW_INIT_RESULT"/>
+	<reg32 offset="0x1f82d" name="GMU_CM3_CFG"/>
+	<reg32 offset="0x1f840" name="GMU_CX_GMU_POWER_COUNTER_ENABLE"/>
+	<reg32 offset="0x1fc10" name="GMU_CX_GMU_POWER_COUNTER_ENABLE" variants="A8XX"/>
+	<reg32 offset="0x1f841" name="GMU_CX_GMU_POWER_COUNTER_SELECT_0"/>
+	<reg32 offset="0x1f842" name="GMU_CX_GMU_POWER_COUNTER_SELECT_1"/>
+	<reg32 offset="0x1fc40" name="GMU_CX_GMU_POWER_COUNTER_SELECT_XOCLK_0" variants="A8XX-"/>
+	<reg32 offset="0x1fc41" name="GMU_CX_GMU_POWER_COUNTER_SELECT_XOCLK_1" variants="A8XX-"/>
+	<reg32 offset="0x1f844" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_0_L"/>
+	<reg32 offset="0x1fca0" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_0_L" variants="A8XX-"/>
+	<reg32 offset="0x1f845" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_0_H"/>
+	<reg32 offset="0x1fca1" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_0_H" variants="A8XX-"/>
+	<reg32 offset="0x1f846" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_1_L"/>
+	<reg32 offset="0x1f847" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_1_H"/>
+	<reg32 offset="0x1f848" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_2_L"/>
+	<reg32 offset="0x1f849" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_2_H"/>
+	<reg32 offset="0x1f84a" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_3_L"/>
+	<reg32 offset="0x1f84b" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_3_H"/>
+	<reg32 offset="0x1f84c" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_4_L"/>
+	<reg32 offset="0x1f84d" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_4_H"/>
+	<reg32 offset="0x1f84e" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_5_L"/>
+	<reg32 offset="0x1f84f" name="GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H"/>
+	<reg32 offset="0x1f8c0" name="GMU_PWR_COL_INTER_FRAME_CTRL">
 		<bitfield name="IFPC_ENABLE" pos="0" type="boolean"/>
 		<bitfield name="HM_POWER_COLLAPSE_ENABLE" pos="1" type="boolean"/>
 		<bitfield name="SPTPRAC_POWER_CONTROL_ENABLE" pos="2" type="boolean"/>
 		<bitfield name="NUM_PASS_SKIPS" low="10" high="13"/>
 		<bitfield name="MIN_PASS_LENGTH" low="14" high="31"/>
 	</reg32>
-	<reg32 offset="0x50c1" name="GMU_PWR_COL_INTER_FRAME_HYST"/>
-	<reg32 offset="0x50c2" name="GMU_PWR_COL_SPTPRAC_HYST"/>
-	<reg32 offset="0x50d0" name="GMU_SPTPRAC_PWR_CLK_STATUS">
+	<reg32 offset="0x1f8c1" name="GMU_PWR_COL_INTER_FRAME_HYST"/>
+	<reg32 offset="0x1f8c2" name="GMU_PWR_COL_SPTPRAC_HYST"/>
+	<reg32 offset="0x1f8d0" name="GMU_SPTPRAC_PWR_CLK_STATUS" variants="A6XX">
 		<bitfield name="SPTPRAC_GDSC_POWERING_OFF" pos="0" type="boolean"/>
 		<bitfield name="SPTPRAC_GDSC_POWERING_ON" pos="1" type="boolean"/>
 		<bitfield name="SPTPRAC_GDSC_POWER_OFF" pos="2" type="boolean"/>
@@ -99,15 +105,19 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
 		<bitfield name="GX_HM_GDSC_POWER_OFF" pos="6" type="boolean"/>
 		<bitfield name="GX_HM_CLK_OFF" pos="7" type="boolean"/>
 	</reg32>
-	<reg32 offset="0x50d0" name="GMU_SPTPRAC_PWR_CLK_STATUS" variants="A7XX">
+	<reg32 offset="0x1f8d0" name="GMU_SPTPRAC_PWR_CLK_STATUS" variants="A7XX">
 		<bitfield name="GX_HM_GDSC_POWER_OFF" pos="0" type="boolean"/>
 		<bitfield name="GX_HM_CLK_OFF" pos="1" type="boolean"/>
 	</reg32>
-	<reg32 offset="0x50e4" name="GMU_GPU_NAP_CTRL">
+	<reg32 offset="0x1f7e8" name="GMU_PWR_CLK_STATUS" variants="A8XX-">
+		<bitfield name="GX_HM_GDSC_POWER_OFF" pos="0" type="boolean"/>
+		<bitfield name="GX_HM_CLK_OFF" pos="1" type="boolean"/>
+	</reg32>
+	<reg32 offset="0x1f8e4" name="GMU_GPU_NAP_CTRL">
 		<bitfield name="HW_NAP_ENABLE" pos="0"/>
 		<bitfield name="SID" low="4" high="8"/>
 	</reg32>
-	<reg32 offset="0x50e8" name="GMU_RPMH_CTRL">
+	<reg32 offset="0x1f8e8" name="GMU_RPMH_CTRL">
 		<bitfield name="RPMH_INTERFACE_ENABLE" pos="0" type="boolean"/>
 		<bitfield name="LLC_VOTE_ENABLE" pos="4" type="boolean"/>
 		<bitfield name="DDR_VOTE_ENABLE" pos="8" type="boolean"/>
@@ -119,71 +129,84 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
 		<bitfield name="CX_MIN_VOTE_ENABLE" pos="14" type="boolean"/>
 		<bitfield name="GFX_MIN_VOTE_ENABLE" pos="15" type="boolean"/>
 	</reg32>
-	<reg32 offset="0x50e9" name="GMU_RPMH_HYST_CTRL"/>
-	<reg32 offset="0x50ec" name="GPU_GMU_CX_GMU_RPMH_POWER_STATE"/>
-	<reg32 offset="0x50f0" name="GPU_GMU_CX_GMU_CX_FAL_INTF"/>
-	<reg32 offset="0x50f1" name="GPU_GMU_CX_GMU_CX_FALNEXT_INTF"/>
-	<reg32 offset="0x5100" name="GPU_GMU_CX_GMU_PWR_COL_CP_MSG"/>
-	<reg32 offset="0x5101" name="GPU_GMU_CX_GMU_PWR_COL_CP_RESP"/>
-	<reg32 offset="0x51f0" name="GMU_BOOT_KMD_LM_HANDSHAKE"/>
-	<reg32 offset="0x5157" name="GMU_LLM_GLM_SLEEP_CTRL"/>
-	<reg32 offset="0x5158" name="GMU_LLM_GLM_SLEEP_STATUS"/>
-	<reg32 offset="0x5088" name="GMU_ALWAYS_ON_COUNTER_L"/>
-	<reg32 offset="0x5089" name="GMU_ALWAYS_ON_COUNTER_H"/>
-	<reg32 offset="0x50c3" name="GMU_GMU_PWR_COL_KEEPALIVE"/>
-	<reg32 offset="0x50c4" name="GMU_PWR_COL_PREEMPT_KEEPALIVE"/>
-	<reg32 offset="0x5180" name="GMU_HFI_CTRL_STATUS"/>
-	<reg32 offset="0x5181" name="GMU_HFI_VERSION_INFO"/>
-	<reg32 offset="0x5182" name="GMU_HFI_SFR_ADDR"/>
-	<reg32 offset="0x5183" name="GMU_HFI_MMAP_ADDR"/>
-	<reg32 offset="0x5184" name="GMU_HFI_QTBL_INFO"/>
-	<reg32 offset="0x5185" name="GMU_HFI_QTBL_ADDR"/>
-	<reg32 offset="0x5186" name="GMU_HFI_CTRL_INIT"/>
-	<reg32 offset="0x5190" name="GMU_GMU2HOST_INTR_SET"/>
-	<reg32 offset="0x5191" name="GMU_GMU2HOST_INTR_CLR"/>
-	<reg32 offset="0x5192" name="GMU_GMU2HOST_INTR_INFO">
+	<reg32 offset="0x1f8e9" name="GMU_RPMH_HYST_CTRL"/>
+	<reg32 offset="0x1f8ec" name="GPU_GMU_CX_GMU_RPMH_POWER_STATE" variants="A6XX"/>
+	<reg32 offset="0x1f7e9" name="GPU_GMU_CX_GMU_RPMH_POWER_STATE" variants="A8XX-"/>
+	<reg32 offset="0x1f8f0" name="GPU_GMU_CX_GMU_CX_FAL_INTF" variants="A6XX"/>
+	<reg32 offset="0x1f7ec" name="GPU_GMU_CX_GMU_CX_FAL_INTF" variants="A8XX-"/>
+	<reg32 offset="0x1f8f1" name="GPU_GMU_CX_GMU_CX_FALNEXT_INTF" variants="A6XX"/>
+	<reg32 offset="0x1f7ed" name="GPU_GMU_CX_GMU_CX_FALNEXT_INTF" variants="A8XX-"/>
+	<reg32 offset="0x1f900" name="GPU_GMU_CX_GMU_PWR_COL_CP_MSG"/>
+	<reg32 offset="0x1f901" name="GPU_GMU_CX_GMU_PWR_COL_CP_RESP"/>
+	<reg32 offset="0x1f9f0" name="GMU_BOOT_KMD_LM_HANDSHAKE"/>
+	<reg32 offset="0x1f957" name="GMU_LLM_GLM_SLEEP_CTRL"/>
+	<reg32 offset="0x1f958" name="GMU_LLM_GLM_SLEEP_STATUS"/>
+	<reg32 offset="0x1f888" name="GMU_ALWAYS_ON_COUNTER_L"/>
+	<reg32 offset="0x1f889" name="GMU_ALWAYS_ON_COUNTER_H"/>
+	<reg32 offset="0x1f8c3" name="GMU_GMU_PWR_COL_KEEPALIVE" variants="A6XX-A7XX"/>
+	<reg32 offset="0x1f7e4" name="GMU_GMU_PWR_COL_KEEPALIVE" variants="A8XX-"/>
+	<reg32 offset="0x1f8c4" name="GMU_PWR_COL_PREEMPT_KEEPALIVE" variants="A6XX-A7XX"/>
+	<reg32 offset="0x1f7e5" name="GMU_PWR_COL_PREEMPT_KEEPALIVE" variants="A8XX-"/>
+	<reg32 offset="0x1f980" name="GMU_HFI_CTRL_STATUS"/>
+	<reg32 offset="0x1f981" name="GMU_HFI_VERSION_INFO"/>
+	<reg32 offset="0x1f982" name="GMU_HFI_SFR_ADDR"/>
+	<reg32 offset="0x1f983" name="GMU_HFI_MMAP_ADDR"/>
+	<reg32 offset="0x1f984" name="GMU_HFI_QTBL_INFO"/>
+	<reg32 offset="0x1f985" name="GMU_HFI_QTBL_ADDR"/>
+	<reg32 offset="0x1f986" name="GMU_HFI_CTRL_INIT"/>
+	<reg32 offset="0x1f990" name="GMU_GMU2HOST_INTR_SET"/>
+	<reg32 offset="0x1f991" name="GMU_GMU2HOST_INTR_CLR"/>
+	<reg32 offset="0x1f992" name="GMU_GMU2HOST_INTR_INFO">
 		<bitfield name="MSGQ" pos="0" type="boolean"/>
 		<bitfield name="CM3_FAULT" pos="23" type="boolean"/>
 	</reg32>
-	<reg32 offset="0x5193" name="GMU_GMU2HOST_INTR_MASK"/>
-	<reg32 offset="0x5194" name="GMU_HOST2GMU_INTR_SET"/>
-	<reg32 offset="0x5195" name="GMU_HOST2GMU_INTR_CLR"/>
-	<reg32 offset="0x5196" name="GMU_HOST2GMU_INTR_RAW_INFO"/>
-	<reg32 offset="0x5197" name="GMU_HOST2GMU_INTR_EN_0"/>
-	<reg32 offset="0x5198" name="GMU_HOST2GMU_INTR_EN_1"/>
-	<reg32 offset="0x5199" name="GMU_HOST2GMU_INTR_EN_2"/>
-	<reg32 offset="0x519a" name="GMU_HOST2GMU_INTR_EN_3"/>
-	<reg32 offset="0x519b" name="GMU_HOST2GMU_INTR_INFO_0"/>
-	<reg32 offset="0x519c" name="GMU_HOST2GMU_INTR_INFO_1"/>
-	<reg32 offset="0x519d" name="GMU_HOST2GMU_INTR_INFO_2"/>
-	<reg32 offset="0x519e" name="GMU_HOST2GMU_INTR_INFO_3"/>
-	<reg32 offset="0x51c5" name="GMU_GENERAL_0"/>
-	<reg32 offset="0x51c6" name="GMU_GENERAL_1"/>
-	<reg32 offset="0x51cb" name="GMU_GENERAL_6"/>
-	<reg32 offset="0x51cc" name="GMU_GENERAL_7"/>
-	<reg32 offset="0x51cd" name="GMU_GENERAL_8" variants="A7XX"/>
-	<reg32 offset="0x51ce" name="GMU_GENERAL_9" variants="A7XX"/>
-	<reg32 offset="0x51cf" name="GMU_GENERAL_10" variants="A7XX"/>
-	<reg32 offset="0x515d" name="GMU_ISENSE_CTRL"/>
-	<reg32 offset="0x8920" name="GPU_CS_ENABLE_REG"/>
-	<reg32 offset="0x515d" name="GPU_GMU_CX_GMU_ISENSE_CTRL"/>
-	<reg32 offset="0x8578" name="GPU_CS_AMP_CALIBRATION_CONTROL3"/>
-	<reg32 offset="0x8558" name="GPU_CS_AMP_CALIBRATION_CONTROL2"/>
-	<reg32 offset="0x8580" name="GPU_CS_A_SENSOR_CTRL_0"/>
-	<reg32 offset="0x27ada" name="GPU_CS_A_SENSOR_CTRL_2"/>
-	<reg32 offset="0x881a" name="GPU_CS_SENSOR_GENERAL_STATUS"/>
-	<reg32 offset="0x8957" name="GPU_CS_AMP_CALIBRATION_CONTROL1"/>
-	<reg32 offset="0x881a" name="GPU_CS_SENSOR_GENERAL_STATUS"/>
-	<reg32 offset="0x881d" name="GPU_CS_AMP_CALIBRATION_STATUS1_0"/>
-	<reg32 offset="0x881f" name="GPU_CS_AMP_CALIBRATION_STATUS1_2"/>
-	<reg32 offset="0x8821" name="GPU_CS_AMP_CALIBRATION_STATUS1_4"/>
-	<reg32 offset="0x8965" name="GPU_CS_AMP_CALIBRATION_DONE"/>
-	<reg32 offset="0x896d" name="GPU_CS_AMP_PERIOD_CTRL"/>
-	<reg32 offset="0x8965" name="GPU_CS_AMP_CALIBRATION_DONE"/>
-	<reg32 offset="0x514d" name="GPU_GMU_CX_GMU_PWR_THRESHOLD"/>
-	<reg32 offset="0x9303" name="GMU_AO_INTERRUPT_EN"/>
-	<reg32 offset="0x9304" name="GMU_AO_HOST_INTERRUPT_CLR"/>
-	<reg32 offset="0x9305" name="GMU_AO_HOST_INTERRUPT_STATUS">
+	<reg32 offset="0x1f993" name="GMU_GMU2HOST_INTR_MASK"/>
+	<reg32 offset="0x1f994" name="GMU_HOST2GMU_INTR_SET"/>
+	<reg32 offset="0x1f995" name="GMU_HOST2GMU_INTR_CLR"/>
+	<reg32 offset="0x1f996" name="GMU_HOST2GMU_INTR_RAW_INFO"/>
+	<reg32 offset="0x1f997" name="GMU_HOST2GMU_INTR_EN_0"/>
+	<reg32 offset="0x1f998" name="GMU_HOST2GMU_INTR_EN_1"/>
+	<reg32 offset="0x1f999" name="GMU_HOST2GMU_INTR_EN_2"/>
+	<reg32 offset="0x1f99a" name="GMU_HOST2GMU_INTR_EN_3"/>
+	<reg32 offset="0x1f99b" name="GMU_HOST2GMU_INTR_INFO_0"/>
+	<reg32 offset="0x1f99c" name="GMU_HOST2GMU_INTR_INFO_1"/>
+	<reg32 offset="0x1f99d" name="GMU_HOST2GMU_INTR_INFO_2"/>
+	<reg32 offset="0x1f99e" name="GMU_HOST2GMU_INTR_INFO_3"/>
+	<reg32 offset="0x1f9c5" name="GMU_GENERAL_0"/>
+	<reg32 offset="0x1f9c6" name="GMU_GENERAL_1"/>
+	<reg32 offset="0x1f9cb" name="GMU_GENERAL_6"/>
+	<reg32 offset="0x1f9cc" name="GMU_GENERAL_7"/>
+	<reg32 offset="0x1f9cd" name="GMU_GENERAL_8" variants="A7XX"/>
+	<reg32 offset="0x1f9ce" name="GMU_GENERAL_9" variants="A7XX"/>
+	<reg32 offset="0x1f9cf" name="GMU_GENERAL_10" variants="A7XX"/>
+	<reg32 offset="0x1f9c0" name="GMU_GENERAL_0" variants="A8XX"/>
+	<reg32 offset="0x1f9c1" name="GMU_GENERAL_1" variants="A8XX"/>
+	<reg32 offset="0x1f9c6" name="GMU_GENERAL_6" variants="A8XX"/>
+	<reg32 offset="0x1f9c7" name="GMU_GENERAL_7" variants="A8XX"/>
+	<reg32 offset="0x1f9c8" name="GMU_GENERAL_8" variants="A8XX"/>
+	<reg32 offset="0x1f9c9" name="GMU_GENERAL_9" variants="A8XX"/>
+	<reg32 offset="0x1f9ca" name="GMU_GENERAL_10" variants="A8XX"/>
+	<reg32 offset="0x1f9cb" name="GMU_GENERAL_11" variants="A8XX"/>
+	<reg32 offset="0x1f95d" name="GMU_ISENSE_CTRL"/>
+	<reg32 offset="0x23120" name="GPU_CS_ENABLE_REG"/>
+	<reg32 offset="0x1f95d" name="GPU_GMU_CX_GMU_ISENSE_CTRL"/>
+	<reg32 offset="0x22d78" name="GPU_CS_AMP_CALIBRATION_CONTROL3"/>
+	<reg32 offset="0x22d58" name="GPU_CS_AMP_CALIBRATION_CONTROL2"/>
+	<reg32 offset="0x22d80" name="GPU_CS_A_SENSOR_CTRL_0"/>
+	<reg32 offset="0x422da" name="GPU_CS_A_SENSOR_CTRL_2"/>
+	<reg32 offset="0x2301a" name="GPU_CS_SENSOR_GENERAL_STATUS"/>
+	<reg32 offset="0x23157" name="GPU_CS_AMP_CALIBRATION_CONTROL1"/>
+	<reg32 offset="0x2301a" name="GPU_CS_SENSOR_GENERAL_STATUS"/>
+	<reg32 offset="0x2301d" name="GPU_CS_AMP_CALIBRATION_STATUS1_0"/>
+	<reg32 offset="0x2301f" name="GPU_CS_AMP_CALIBRATION_STATUS1_2"/>
+	<reg32 offset="0x23021" name="GPU_CS_AMP_CALIBRATION_STATUS1_4"/>
+	<reg32 offset="0x23165" name="GPU_CS_AMP_CALIBRATION_DONE"/>
+	<reg32 offset="0x2316d" name="GPU_CS_AMP_PERIOD_CTRL"/>
+	<reg32 offset="0x23165" name="GPU_CS_AMP_CALIBRATION_DONE"/>
+	<reg32 offset="0x1f94d" name="GPU_GMU_CX_GMU_PWR_THRESHOLD"/>
+	<reg32 offset="0x23b03" name="GMU_AO_INTERRUPT_EN"/>
+	<reg32 offset="0x23b04" name="GMU_AO_HOST_INTERRUPT_CLR"/>
+	<reg32 offset="0x23b05" name="GMU_AO_HOST_INTERRUPT_STATUS">
 		<bitfield name="WDOG_BITE" pos="0" type="boolean"/>
 		<bitfield name="RSCC_COMP" pos="1" type="boolean"/>
 		<bitfield name="VDROOP" pos="2" type="boolean"/>
@@ -191,27 +214,27 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
 		<bitfield name="DBD_WAKEUP" pos="4" type="boolean"/>
 		<bitfield name="HOST_AHB_BUS_ERROR" pos="5" type="boolean"/>
 	</reg32>
-	<reg32 offset="0x9306" name="GMU_AO_HOST_INTERRUPT_MASK"/>
-	<reg32 offset="0x9309" name="GPU_GMU_AO_GMU_CGC_MODE_CNTL"/>
-	<reg32 offset="0x930a" name="GPU_GMU_AO_GMU_CGC_DELAY_CNTL"/>
-	<reg32 offset="0x930b" name="GPU_GMU_AO_GMU_CGC_HYST_CNTL"/>
-	<reg32 offset="0x930c" name="GPU_GMU_AO_GPU_CX_BUSY_STATUS">
+	<reg32 offset="0x23b06" name="GMU_AO_HOST_INTERRUPT_MASK"/>
+	<reg32 offset="0x23b09" name="GPU_GMU_AO_GMU_CGC_MODE_CNTL"/>
+	<reg32 offset="0x23b0a" name="GPU_GMU_AO_GMU_CGC_DELAY_CNTL"/>
+	<reg32 offset="0x23b0b" name="GPU_GMU_AO_GMU_CGC_HYST_CNTL"/>
+	<reg32 offset="0x23b0c" name="GPU_GMU_AO_GPU_CX_BUSY_STATUS">
 		<bitfield name = "GPUBUSYIGNAHB" pos="23" type="boolean"/>
 	</reg32>
-	<reg32 offset="0x930d" name="GPU_GMU_AO_GPU_CX_BUSY_STATUS2"/>
-	<reg32 offset="0x930e" name="GPU_GMU_AO_GPU_CX_BUSY_MASK"/>
-	<reg32 offset="0x9310" name="GMU_AO_AHB_FENCE_CTRL"/>
-	<reg32 offset="0x9313" name="GMU_AHB_FENCE_STATUS"/>
-	<reg32 offset="0x9314" name="GMU_AHB_FENCE_STATUS_CLR"/>
-	<reg32 offset="0x9315" name="GMU_RBBM_INT_UNMASKED_STATUS"/>
-	<reg32 offset="0x9316" name="GMU_AO_SPARE_CNTL"/>
-	<reg32 offset="0x9307" name="GMU_RSCC_CONTROL_REQ"/>
-	<reg32 offset="0x9308" name="GMU_RSCC_CONTROL_ACK"/>
-	<reg32 offset="0x9311" name="GMU_AHB_FENCE_RANGE_0"/>
-	<reg32 offset="0x9312" name="GMU_AHB_FENCE_RANGE_1"/>
-	<reg32 offset="0x9c03" name="GPU_CC_GX_GDSCR"/>
-	<reg32 offset="0x9d42" name="GPU_CC_GX_DOMAIN_MISC"/>
-	<reg32 offset="0xc001" name="GPU_CPR_FSM_CTL"/>
+	<reg32 offset="0x23b0d" name="GPU_GMU_AO_GPU_CX_BUSY_STATUS2"/>
+	<reg32 offset="0x23b0e" name="GPU_GMU_AO_GPU_CX_BUSY_MASK"/>
+	<reg32 offset="0x23b10" name="GMU_AO_AHB_FENCE_CTRL"/>
+	<reg32 offset="0x23b13" name="GMU_AHB_FENCE_STATUS"/>
+	<reg32 offset="0x23b14" name="GMU_AHB_FENCE_STATUS_CLR"/>
+	<reg32 offset="0x23b15" name="GMU_RBBM_INT_UNMASKED_STATUS"/>
+	<reg32 offset="0x23b16" name="GMU_AO_SPARE_CNTL"/>
+	<reg32 offset="0x23b07" name="GMU_RSCC_CONTROL_REQ"/>
+	<reg32 offset="0x23b08" name="GMU_RSCC_CONTROL_ACK"/>
+	<reg32 offset="0x23b11" name="GMU_AHB_FENCE_RANGE_0"/>
+	<reg32 offset="0x23b12" name="GMU_AHB_FENCE_RANGE_1"/>
+	<reg32 offset="0x24403" name="GPU_CC_GX_GDSCR"/>
+	<reg32 offset="0x24542" name="GPU_CC_GX_DOMAIN_MISC"/>
+	<reg32 offset="0x26801" name="GPU_CPR_FSM_CTL"/>
 
 	<!-- starts at offset 0x8c00 on most gpus -->
 	<reg32 offset="0x0004" name="GPU_RSCC_RSC_STATUS0_DRV0"/>
diff --git a/src/freedreno/tests/reference/crash.log b/src/freedreno/tests/reference/crash.log
index 754cb5f02e0..3eb01ae95a5 100644
--- a/src/freedreno/tests/reference/crash.log
+++ b/src/freedreno/tests/reference/crash.log
@@ -1658,58 +1658,58 @@ registers:
 registers-gmu:
 	00000001	GMU_ICACHE_CONFIG: 0x1
 	00000001	GMU_DCACHE_CONFIG: 0x1
-	00000000	0x4c02: 00000000
-	00000000	0x4c03: 00000000
-	00000000	0x4c04: 00000000
-	00000000	0x4c05: 00000000
-	00000000	0x4c06: 00000000
-	00000000	0x4c07: 00000000
-	00000000	0x4c10: 00000000
-	00000000	0x4c11: 00000000
-	00000000	0x4c12: 00000000
-	00000004	0x4d00: 00000004
-	00000000	0x4d07: 00000000
-	00000000	0x4d08: 00000000
-	00000000	0x4d09: 00000000
-	00000000	0x4d0a: 00000000
+	00000000	0x1f402: 00000000
+	00000000	0x1f403: 00000000
+	00000000	0x1f404: 00000000
+	00000000	0x1f405: 00000000
+	00000000	0x1f406: 00000000
+	00000000	0x1f407: 00000000
+	00000000	0x1f410: 00000000
+	00000000	0x1f411: 00000000
+	00000000	0x1f412: 00000000
+	00000004	0x1f500: 00000004
+	00000000	0x1f507: 00000000
+	00000000	0x1f508: 00000000
+	00000000	0x1f509: 00000000
+	00000000	0x1f50a: 00000000
 	00000000	GMU_CM3_SYSRESET: 0
 	00000002	GMU_CM3_BOOT_CONFIG: 0x2
-	00000000	0x5002: 00000000
-	ffffffff	0x5003: ffffffff
-	ffffffff	0x5004: ffffffff
-	0003c07f	0x5007: 0003c07f
-	00000000	0x5008: 00000000
-	00001404	0x500b: 00001404
-	00000000	0x500c: 00000000
-	0003bfe0	0x500f: 0003bfe0
-	00000000	0x5010: 00000000
-	00000000	0x5011: 00000000
-	00000000	0x5012: 00000000
-	00000003	0x5013: 00000003
-	00000000	0x5014: 00000000
-	001f0003	0x5015: 001f0003
-	00927c00	0x5016: 00927c00
-	01b77400	0x5017: 01b77400
-	00000000	0x5018: 00000000
-	00000000	0x5019: 00000000
+	00000000	0x1f802: 00000000
+	ffffffff	0x1f803: ffffffff
+	ffffffff	0x1f804: ffffffff
+	0003c07f	0x1f807: 0003c07f
+	00000000	0x1f808: 00000000
+	00001404	0x1f80b: 00001404
+	00000000	0x1f80c: 00000000
+	0003bfe0	0x1f80f: 0003bfe0
+	00000000	0x1f810: 00000000
+	00000000	0x1f811: 00000000
+	00000000	0x1f812: 00000000
+	00000003	0x1f813: 00000003
+	00000000	0x1f814: 00000000
+	001f0003	0x1f815: 001f0003
+	00927c00	0x1f816: 00927c00
+	01b77400	0x1f817: 01b77400
+	00000000	0x1f818: 00000000
+	00000000	0x1f819: 00000000
 	00000001	GMU_CM3_FW_BUSY: 0x1
-	00000000	0x501b: 00000000
+	00000000	0x1f81b: 00000000
 	babeface	GMU_CM3_FW_INIT_RESULT: 0xbabeface
-	00000000	0x5024: 00000000
-	00000000	0x5025: 00000000
-	00000000	0x5026: 00000000
-	80ffffff	0x5027: 80ffffff
-	00000000	0x5028: 00000000
-	00000000	0x5029: 00000000
-	00000000	0x502a: 00000000
+	00000000	0x1f824: 00000000
+	00000000	0x1f825: 00000000
+	00000000	0x1f826: 00000000
+	80ffffff	0x1f827: 80ffffff
+	00000000	0x1f828: 00000000
+	00000000	0x1f829: 00000000
+	00000000	0x1f82a: 00000000
 	00004052	GMU_CM3_CFG: 0x4052
-	01000148	0x502e: 01000148
-	00000000	0x502f: 00000000
-	0002a000	0x5030: 0002a000
+	01000148	0x1f82e: 01000148
+	00000000	0x1f82f: 00000000
+	0002a000	0x1f830: 0002a000
 	00000001	GMU_CX_GMU_POWER_COUNTER_ENABLE: 0x1
 	00000020	GMU_CX_GMU_POWER_COUNTER_SELECT_0: 0x20
 	00000000	GMU_CX_GMU_POWER_COUNTER_SELECT_1: 0
-	00000000	0x5043: 00000000
+	00000000	0x1f843: 00000000
 	0014da28	GMU_CX_GMU_POWER_COUNTER_XOCLK_0_L: 0x14da28
 	00000000	GMU_CX_GMU_POWER_COUNTER_XOCLK_0_H: 0
 	002239e6	GMU_CX_GMU_POWER_COUNTER_XOCLK_1_L: 0x2239e6
@@ -1722,28 +1722,28 @@ registers-gmu:
 	00000000	GMU_CX_GMU_POWER_COUNTER_XOCLK_4_H: 0
 	00223a2f	GMU_CX_GMU_POWER_COUNTER_XOCLK_5_L: 0x223a2f
 	00000000	GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H: 0
-	00000000	0x5050: 00000000
-	00000000	0x5051: 00000000
-	00000000	0x5052: 00000000
-	00000000	0x5053: 00000000
-	00000000	0x5087: 00000000
+	00000000	0x1f850: 00000000
+	00000000	0x1f851: 00000000
+	00000000	0x1f852: 00000000
+	00000000	0x1f853: 00000000
+	00000000	0x1f887: 00000000
 	0022e30b	GMU_ALWAYS_ON_COUNTER_L: 0x22e30b
 	00000000	GMU_ALWAYS_ON_COUNTER_H: 0
-	00000000	0x50a0: 00000000
-	00000000	0x50a1: 00000000
-	00000000	0x50a2: 00000000
-	00000000	0x50a4: 00000000
-	00000000	0x50a5: 00000000
-	00000000	0x50a6: 00000000
-	00000000	0x50a7: 00000000
-	00000000	0x50a8: 00000000
-	00000000	0x50a9: 00000000
-	00000000	0x50aa: 00000000
-	00000000	0x50ab: 00000000
-	00000000	0x50ac: 00000000
-	00000000	0x50ad: 00000000
-	00000000	0x50ae: 00000000
-	00000000	0x50af: 00000000
+	00000000	0x1f8a0: 00000000
+	00000000	0x1f8a1: 00000000
+	00000000	0x1f8a2: 00000000
+	00000000	0x1f8a4: 00000000
+	00000000	0x1f8a5: 00000000
+	00000000	0x1f8a6: 00000000
+	00000000	0x1f8a7: 00000000
+	00000000	0x1f8a8: 00000000
+	00000000	0x1f8a9: 00000000
+	00000000	0x1f8aa: 00000000
+	00000000	0x1f8ab: 00000000
+	00000000	0x1f8ac: 00000000
+	00000000	0x1f8ad: 00000000
+	00000000	0x1f8ae: 00000000
+	00000000	0x1f8af: 00000000
 	09c40400	GMU_PWR_COL_INTER_FRAME_CTRL: { NUM_PASS_SKIPS = 0x1 | MIN_PASS_LENGTH = 0x2710 }
 	000a2710	GMU_PWR_COL_INTER_FRAME_HYST: 0xa2710
 	000a2710	GMU_PWR_COL_SPTPRAC_HYST: 0xa2710
@@ -1752,29 +1752,29 @@ registers-gmu:
 	000001f0	GMU_GPU_NAP_CTRL: { SID = 0x1f }
 	00000f11	GMU_RPMH_CTRL: { RPMH_INTERFACE_ENABLE | LLC_VOTE_ENABLE | DDR_VOTE_ENABLE | MX_VOTE_ENABLE | CX_VOTE_ENABLE | GFX_VOTE_ENABLE }
 	00000000	GMU_RPMH_HYST_CTRL: 0
-	00000000	0x50ea: 00000000
-	00000000	0x50eb: 00000000
+	00000000	0x1f8ea: 00000000
+	00000000	0x1f8eb: 00000000
 	00000000	GPU_GMU_CX_GMU_RPMH_POWER_STATE: 0
 	60009000	GPU_GMU_CX_GMU_PWR_COL_CP_MSG: 0x60009000
 	00000000	GPU_GMU_CX_GMU_PWR_COL_CP_RESP: 0
-	001f0000	0x5102: 001f0000
-	e8765432	0x5103: e8765432
-	00000000	0x5140: 00000000
-	00000000	0x5142: 00000000
-	00000000	0x5143: 00000000
-	00000000	0x5144: 00000000
-	00000000	0x514c: 00000000
+	001f0000	0x1f902: 001f0000
+	e8765432	0x1f903: e8765432
+	00000000	0x1f940: 00000000
+	00000000	0x1f942: 00000000
+	00000000	0x1f943: 00000000
+	00000000	0x1f944: 00000000
+	00000000	0x1f94c: 00000000
 	00000000	GPU_GMU_CX_GMU_PWR_THRESHOLD: 0
-	00000000	0x514f: 00000000
-	0000ffff	0x5150: 0000ffff
-	00000000	0x5151: 00000000
-	00000000	0x5154: 00000000
+	00000000	0x1f94f: 00000000
+	0000ffff	0x1f950: 0000ffff
+	00000000	0x1f951: 00000000
+	00000000	0x1f954: 00000000
 	00000000	GMU_LLM_GLM_SLEEP_CTRL: 0
 	00000002	GMU_LLM_GLM_SLEEP_STATUS: 0x2
 	00000000	GMU_ISENSE_CTRL: 0
-	00000008	0x5162: 00000008
-	00000000	0x5164: 00000000
-	00000005	0x5165: 00000005
+	00000008	0x1f962: 00000008
+	00000000	0x1f964: 00000000
+	00000005	0x1f965: 00000005
 	00000001	GMU_HFI_CTRL_STATUS: 0x1
 	00000000	GMU_HFI_VERSION_INFO: 0
 	06030200	GMU_HFI_SFR_ADDR: 0x6030200
@@ -1797,286 +1797,286 @@ registers-gmu:
 	00000000	GMU_HOST2GMU_INTR_INFO_1: 0
 	00000000	GMU_HOST2GMU_INTR_INFO_2: 0
 	00000000	GMU_HOST2GMU_INTR_INFO_3: 0
-	10010000	0x51c0: 10010000
+	10010000	0x1f9c0: 10010000
 	babeface	GMU_GENERAL_0: 0xbabeface
 	00000000	GMU_GENERAL_1: 0
-	00000000	0x51c7: 00000000
-	00000000	0x51c8: 00000000
-	60005018	0x51c9: 60005018
-	60005048	0x51ca: 60005048
+	00000000	0x1f9c7: 00000000
+	00000000	0x1f9c8: 00000000
+	60005018	0x1f9c9: 60005018
+	60005048	0x1f9ca: 60005048
 	00000000	GMU_GENERAL_6: 0
 	00000001	GMU_GENERAL_7: 0x1
-	00000000	0x51e0: 00000000
-	00000000	0x51e1: 00000000
-	0000000a	0x51e2: 0000000a
+	00000000	0x1f9e0: 00000000
+	00000000	0x1f9e1: 00000000
+	0000000a	0x1f9e2: 0000000a
 	00000000	GMU_BOOT_KMD_LM_HANDSHAKE: 0
-	00000000	0x5200: 00000000
-	00000000	0x5201: 00000000
-	00000000	0x8c8c: 00000000
-	00000000	0x8d01: 00000000
-	00000013	0x8d02: 00000013
-	0000000f	0x8f40: 0000000f
-	00000000	0x8f41: 00000000
-	00000000	0x8f42: 00000000
-	00000007	0x8f44: 00000007
-	00000000	0x8f45: 00000000
-	00000001	0x8f46: 00000001
-	00000000	0x8f47: 00000000
-	00010108	0x8f4c: 00010108
-	00050000	0x8f4d: 00050000
-	40000000	0x8f4e: 40000000
-	00000000	0x8f4f: 00000000
-	00000000	0x8f50: 00000000
-	00010108	0x8f51: 00010108
-	0005005c	0x8f52: 0005005c
-	40000000	0x8f53: 40000000
-	00000000	0x8f54: 00000000
-	00000000	0x8f55: 00000000
-	00010108	0x8f56: 00010108
-	0005000c	0x8f57: 0005000c
-	40000000	0x8f58: 40000000
-	00000000	0x8f59: 00000000
-	00000000	0x8f5a: 00000000
-	00010108	0x8f5b: 00010108
-	00050000	0x8f5c: 00050000
-	00000000	0x8f5d: 00000000
-	00000000	0x8f5e: 00000000
-	00000000	0x8f5f: 00000000
-	00010108	0x8f60: 00010108
-	00050000	0x8f61: 00050000
-	00000000	0x8f62: 00000000
-	00000000	0x8f63: 00000000
-	00000000	0x8f64: 00000000
-	00010108	0x8f65: 00010108
-	00050000	0x8f66: 00050000
-	00000000	0x8f67: 00000000
-	00000000	0x8f68: 00000000
-	00000000	0x8f69: 00000000
-	00010108	0x8f6a: 00010108
-	00050000	0x8f6b: 00050000
-	00000000	0x8f6c: 00000000
-	00000000	0x8f6d: 00000000
-	00000000	0x8f6e: 00000000
-	00010108	0x8f6f: 00010108
-	00050000	0x8f70: 00050000
-	00000000	0x8f71: 00000000
-	00000000	0x8f72: 00000000
-	00000000	0x8f73: 00000000
-	00010108	0x8f74: 00010108
-	00000000	0x8f75: 00000000
-	00000000	0x8f76: 00000000
-	00000000	0x8f77: 00000000
-	00000000	0x8f78: 00000000
-	00010108	0x8f79: 00010108
-	00000000	0x8f7a: 00000000
-	00000000	0x8f7b: 00000000
-	00000000	0x8f7c: 00000000
-	00000000	0x8f7d: 00000000
-	00010108	0x8f7e: 00010108
-	00000000	0x8f7f: 00000000
-	00000000	0x8f80: 00000000
-	00000000	0x8f81: 00000000
-	00000000	0x8f82: 00000000
-	00010108	0x8f83: 00010108
-	00000000	0x8f84: 00000000
-	00000000	0x8f85: 00000000
-	00000000	0x8f86: 00000000
-	00000000	0x8f87: 00000000
-	00000005	0x8fec: 00000005
-	00000000	0x8fed: 00000000
-	00000001	0x8fee: 00000001
-	00000000	0x8fef: 00000000
-	00010108	0x8ff4: 00010108
-	00050034	0x8ff5: 00050034
-	40000000	0x8ff6: 40000000
-	00000000	0x8ff7: 00000000
-	00000000	0x8ff8: 00000000
-	00010108	0x8ff9: 00010108
-	0005007c	0x8ffa: 0005007c
-	00000000	0x8ffb: 00000000
-	00000000	0x8ffc: 00000000
-	00000000	0x8ffd: 00000000
-	00010108	0x8ffe: 00010108
-	0005004c	0x8fff: 0005004c
-	40000000	0x9000: 40000000
-	00000000	0x9001: 00000000
-	00000000	0x9002: 00000000
-	00010108	0x9003: 00010108
-	00050000	0x9004: 00050000
-	00000000	0x9005: 00000000
-	00000000	0x9006: 00000000
-	00000000	0x9007: 00000000
-	00010108	0x9008: 00010108
-	00050000	0x9009: 00050000
-	00000000	0x900a: 00000000
-	00000000	0x900b: 00000000
-	00000000	0x900c: 00000000
-	00010108	0x900d: 00010108
-	00050000	0x900e: 00050000
-	00000000	0x900f: 00000000
-	00000000	0x9010: 00000000
-	00000000	0x9011: 00000000
-	00010108	0x9012: 00010108
-	00030050	0x9013: 00030050
-	00000000	0x9014: 00000000
-	00000000	0x9015: 00000000
-	00000000	0x9016: 00000000
-	00010108	0x9017: 00010108
-	00030010	0x9018: 00030010
-	00000000	0x9019: 00000000
-	00000000	0x901a: 00000000
-	00000000	0x901b: 00000000
-	00010108	0x901c: 00010108
-	00030000	0x901d: 00030000
-	00000000	0x901e: 00000000
-	00000000	0x901f: 00000000
-	00000000	0x9020: 00000000
-	00010108	0x9021: 00010108
-	00000000	0x9022: 00000000
-	00000000	0x9023: 00000000
-	00000000	0x9024: 00000000
-	00000000	0x9025: 00000000
-	00010108	0x9026: 00010108
-	00000000	0x9027: 00000000
-	00000000	0x9028: 00000000
-	00000000	0x9029: 00000000
-	00000000	0x902a: 00000000
-	00010108	0x902b: 00010108
-	00000000	0x902c: 00000000
-	00000000	0x902d: 00000000
-	00000000	0x902e: 00000000
-	00000000	0x902f: 00000000
-	00000007	0x9094: 00000007
-	00000000	0x9095: 00000000
-	00000001	0x9096: 00000001
-	00000000	0x9097: 00000000
-	00010108	0x909c: 00010108
-	00050000	0x909d: 00050000
-	00000000	0x909e: 00000000
-	00000000	0x909f: 00000000
-	00000000	0x90a0: 00000000
-	00010108	0x90a1: 00010108
-	0005005c	0x90a2: 0005005c
-	00000000	0x90a3: 00000000
-	00000000	0x90a4: 00000000
-	00000000	0x90a5: 00000000
-	00010108	0x90a6: 00010108
-	0005000c	0x90a7: 0005000c
-	00000000	0x90a8: 00000000
-	00000000	0x90a9: 00000000
-	00000000	0x90aa: 00000000
-	00010108	0x90ab: 00010108
-	00050000	0x90ac: 00050000
-	00000000	0x90ad: 00000000
-	00000000	0x90ae: 00000000
-	00000000	0x90af: 00000000
-	00010108	0x90b0: 00010108
-	00050000	0x90b1: 00050000
-	00000000	0x90b2: 00000000
-	00000000	0x90b3: 00000000
-	00000000	0x90b4: 00000000
-	00010108	0x90b5: 00010108
-	00050000	0x90b6: 00050000
-	00000000	0x90b7: 00000000
-	00000000	0x90b8: 00000000
-	00000000	0x90b9: 00000000
-	00010108	0x90ba: 00010108
-	00050000	0x90bb: 00050000
-	00000000	0x90bc: 00000000
-	00000000	0x90bd: 00000000
-	00000000	0x90be: 00000000
-	00010108	0x90bf: 00010108
-	00050000	0x90c0: 00050000
-	00000000	0x90c1: 00000000
-	00000000	0x90c2: 00000000
-	00000000	0x90c3: 00000000
-	00010108	0x90c4: 00010108
-	00000000	0x90c5: 00000000
-	00000000	0x90c6: 00000000
-	00000000	0x90c7: 00000000
-	00000000	0x90c8: 00000000
-	00010108	0x90c9: 00010108
-	00000000	0x90ca: 00000000
-	00000000	0x90cb: 00000000
-	00000000	0x90cc: 00000000
-	00000000	0x90cd: 00000000
-	00010108	0x90ce: 00010108
-	00000000	0x90cf: 00000000
-	00000000	0x90d0: 00000000
-	00000000	0x90d1: 00000000
-	00000000	0x90d2: 00000000
-	00010108	0x90d3: 00010108
-	00000000	0x90d4: 00000000
-	00000000	0x90d5: 00000000
-	00000000	0x90d6: 00000000
-	00000000	0x90d7: 00000000
-	00000005	0x913c: 00000005
-	01010000	0x913d: 01010000
-	00000001	0x913e: 00000001
-	000000c0	0x913f: 000000c0
-	00010108	0x9144: 00010108
-	00050034	0x9145: 00050034
-	60000001	0x9146: 60000001
-	00000000	0x9147: 00000000
-	00000000	0x9148: 00000000
-	00010108	0x9149: 00010108
-	0005007c	0x914a: 0005007c
-	20000001	0x914b: 20000001
-	00000000	0x914c: 00000000
-	00000000	0x914d: 00000000
-	00010108	0x914e: 00010108
-	0005004c	0x914f: 0005004c
-	60000001	0x9150: 60000001
-	00000000	0x9151: 00000000
-	00000000	0x9152: 00000000
-	00010108	0x9153: 00010108
-	00050000	0x9154: 00050000
-	00000000	0x9155: 00000000
-	00000000	0x9156: 00000000
-	00000000	0x9157: 00000000
-	00010108	0x9158: 00010108
-	00050000	0x9159: 00050000
-	00000000	0x915a: 00000000
-	00000000	0x915b: 00000000
-	00000000	0x915c: 00000000
-	00010108	0x915d: 00010108
-	00050000	0x915e: 00050000
-	00000000	0x915f: 00000000
-	00000000	0x9160: 00000000
-	00000000	0x9161: 00000000
-	00010108	0x9162: 00010108
-	00030050	0x9163: 00030050
-	00000009	0x9164: 00000009
-	00010101	0x9165: 00010101
-	00000000	0x9166: 00000000
-	00010108	0x9167: 00010108
-	00030010	0x9168: 00030010
-	00000004	0x9169: 00000004
-	00010101	0x916a: 00010101
-	00000000	0x916b: 00000000
-	00010108	0x916c: 00010108
-	00030000	0x916d: 00030000
-	00000004	0x916e: 00000004
-	00000000	0x916f: 00000000
-	00000000	0x9170: 00000000
-	00010108	0x9171: 00010108
-	00000000	0x9172: 00000000
-	00000000	0x9173: 00000000
-	00000000	0x9174: 00000000
-	00000000	0x9175: 00000000
-	00010108	0x9176: 00010108
-	00000000	0x9177: 00000000
-	00000000	0x9178: 00000000
-	00000000	0x9179: 00000000
-	00000000	0x917a: 00000000
-	00010108	0x917b: 00010108
-	00000000	0x917c: 00000000
-	00000000	0x917d: 00000000
-	00000000	0x917e: 00000000
-	00000000	0x917f: 00000000
-	00000000	0x9300: 00000000
-	00000000	0x9301: 00000000
-	00000000	0x9302: 00000000
+	00000000	0x1fa00: 00000000
+	00000000	0x1fa01: 00000000
+	00000000	0x2348c: 00000000
+	00000000	0x23501: 00000000
+	00000013	0x23502: 00000013
+	0000000f	0x23740: 0000000f
+	00000000	0x23741: 00000000
+	00000000	0x23742: 00000000
+	00000007	0x23744: 00000007
+	00000000	0x23745: 00000000
+	00000001	0x23746: 00000001
+	00000000	0x23747: 00000000
+	00010108	0x2374c: 00010108
+	00050000	0x2374d: 00050000
+	40000000	0x2374e: 40000000
+	00000000	0x2374f: 00000000
+	00000000	0x23750: 00000000
+	00010108	0x23751: 00010108
+	0005005c	0x23752: 0005005c
+	40000000	0x23753: 40000000
+	00000000	0x23754: 00000000
+	00000000	0x23755: 00000000
+	00010108	0x23756: 00010108
+	0005000c	0x23757: 0005000c
+	40000000	0x23758: 40000000
+	00000000	0x23759: 00000000
+	00000000	0x2375a: 00000000
+	00010108	0x2375b: 00010108
+	00050000	0x2375c: 00050000
+	00000000	0x2375d: 00000000
+	00000000	0x2375e: 00000000
+	00000000	0x2375f: 00000000
+	00010108	0x23760: 00010108
+	00050000	0x23761: 00050000
+	00000000	0x23762: 00000000
+	00000000	0x23763: 00000000
+	00000000	0x23764: 00000000
+	00010108	0x23765: 00010108
+	00050000	0x23766: 00050000
+	00000000	0x23767: 00000000
+	00000000	0x23768: 00000000
+	00000000	0x23769: 00000000
+	00010108	0x2376a: 00010108
+	00050000	0x2376b: 00050000
+	00000000	0x2376c: 00000000
+	00000000	0x2376d: 00000000
+	00000000	0x2376e: 00000000
+	00010108	0x2376f: 00010108
+	00050000	0x23770: 00050000
+	00000000	0x23771: 00000000
+	00000000	0x23772: 00000000
+	00000000	0x23773: 00000000
+	00010108	0x23774: 00010108
+	00000000	0x23775: 00000000
+	00000000	0x23776: 00000000
+	00000000	0x23777: 00000000
+	00000000	0x23778: 00000000
+	00010108	0x23779: 00010108
+	00000000	0x2377a: 00000000
+	00000000	0x2377b: 00000000
+	00000000	0x2377c: 00000000
+	00000000	0x2377d: 00000000
+	00010108	0x2377e: 00010108
+	00000000	0x2377f: 00000000
+	00000000	0x23780: 00000000
+	00000000	0x23781: 00000000
+	00000000	0x23782: 00000000
+	00010108	0x23783: 00010108
+	00000000	0x23784: 00000000
+	00000000	0x23785: 00000000
+	00000000	0x23786: 00000000
+	00000000	0x23787: 00000000
+	00000005	0x237ec: 00000005
+	00000000	0x237ed: 00000000
+	00000001	0x237ee: 00000001
+	00000000	0x237ef: 00000000
+	00010108	0x237f4: 00010108
+	00050034	0x237f5: 00050034
+	40000000	0x237f6: 40000000
+	00000000	0x237f7: 00000000
+	00000000	0x237f8: 00000000
+	00010108	0x237f9: 00010108
+	0005007c	0x237fa: 0005007c
+	00000000	0x237fb: 00000000
+	00000000	0x237fc: 00000000
+	00000000	0x237fd: 00000000
+	00010108	0x237fe: 00010108
+	0005004c	0x237ff: 0005004c
+	40000000	0x23800: 40000000
+	00000000	0x23801: 00000000
+	00000000	0x23802: 00000000
+	00010108	0x23803: 00010108
+	00050000	0x23804: 00050000
+	00000000	0x23805: 00000000
+	00000000	0x23806: 00000000
+	00000000	0x23807: 00000000
+	00010108	0x23808: 00010108
+	00050000	0x23809: 00050000
+	00000000	0x2380a: 00000000
+	00000000	0x2380b: 00000000
+	00000000	0x2380c: 00000000
+	00010108	0x2380d: 00010108
+	00050000	0x2380e: 00050000
+	00000000	0x2380f: 00000000
+	00000000	0x23810: 00000000
+	00000000	0x23811: 00000000
+	00010108	0x23812: 00010108
+	00030050	0x23813: 00030050
+	00000000	0x23814: 00000000
+	00000000	0x23815: 00000000
+	00000000	0x23816: 00000000
+	00010108	0x23817: 00010108
+	00030010	0x23818: 00030010
+	00000000	0x23819: 00000000
+	00000000	0x2381a: 00000000
+	00000000	0x2381b: 00000000
+	00010108	0x2381c: 00010108
+	00030000	0x2381d: 00030000
+	00000000	0x2381e: 00000000
+	00000000	0x2381f: 00000000
+	00000000	0x23820: 00000000
+	00010108	0x23821: 00010108
+	00000000	0x23822: 00000000
+	00000000	0x23823: 00000000
+	00000000	0x23824: 00000000
+	00000000	0x23825: 00000000
+	00010108	0x23826: 00010108
+	00000000	0x23827: 00000000
+	00000000	0x23828: 00000000
+	00000000	0x23829: 00000000
+	00000000	0x2382a: 00000000
+	00010108	0x2382b: 00010108
+	00000000	0x2382c: 00000000
+	00000000	0x2382d: 00000000
+	00000000	0x2382e: 00000000
+	00000000	0x2382f: 00000000
+	00000007	0x23894: 00000007
+	00000000	0x23895: 00000000
+	00000001	0x23896: 00000001
+	00000000	0x23897: 00000000
+	00010108	0x2389c: 00010108
+	00050000	0x2389d: 00050000
+	00000000	0x2389e: 00000000
+	00000000	0x2389f: 00000000
+	00000000	0x238a0: 00000000
+	00010108	0x238a1: 00010108
+	0005005c	0x238a2: 0005005c
+	00000000	0x238a3: 00000000
+	00000000	0x238a4: 00000000
+	00000000	0x238a5: 00000000
+	00010108	0x238a6: 00010108
+	0005000c	0x238a7: 0005000c
+	00000000	0x238a8: 00000000
+	00000000	0x238a9: 00000000
+	00000000	0x238aa: 00000000
+	00010108	0x238ab: 00010108
+	00050000	0x238ac: 00050000
+	00000000	0x238ad: 00000000
+	00000000	0x238ae: 00000000
+	00000000	0x238af: 00000000
+	00010108	0x238b0: 00010108
+	00050000	0x238b1: 00050000
+	00000000	0x238b2: 00000000
+	00000000	0x238b3: 00000000
+	00000000	0x238b4: 00000000
+	00010108	0x238b5: 00010108
+	00050000	0x238b6: 00050000
+	00000000	0x238b7: 00000000
+	00000000	0x238b8: 00000000
+	00000000	0x238b9: 00000000
+	00010108	0x238ba: 00010108
+	00050000	0x238bb: 00050000
+	00000000	0x238bc: 00000000
+	00000000	0x238bd: 00000000
+	00000000	0x238be: 00000000
+	00010108	0x238bf: 00010108
+	00050000	0x238c0: 00050000
+	00000000	0x238c1: 00000000
+	00000000	0x238c2: 00000000
+	00000000	0x238c3: 00000000
+	00010108	0x238c4: 00010108
+	00000000	0x238c5: 00000000
+	00000000	0x238c6: 00000000
+	00000000	0x238c7: 00000000
+	00000000	0x238c8: 00000000
+	00010108	0x238c9: 00010108
+	00000000	0x238ca: 00000000
+	00000000	0x238cb: 00000000
+	00000000	0x238cc: 00000000
+	00000000	0x238cd: 00000000
+	00010108	0x238ce: 00010108
+	00000000	0x238cf: 00000000
+	00000000	0x238d0: 00000000
+	00000000	0x238d1: 00000000
+	00000000	0x238d2: 00000000
+	00010108	0x238d3: 00010108
+	00000000	0x238d4: 00000000
+	00000000	0x238d5: 00000000
+	00000000	0x238d6: 00000000
+	00000000	0x238d7: 00000000
+	00000005	0x2393c: 00000005
+	01010000	0x2393d: 01010000
+	00000001	0x2393e: 00000001
+	000000c0	0x2393f: 000000c0
+	00010108	0x23944: 00010108
+	00050034	0x23945: 00050034
+	60000001	0x23946: 60000001
+	00000000	0x23947: 00000000
+	00000000	0x23948: 00000000
+	00010108	0x23949: 00010108
+	0005007c	0x2394a: 0005007c
+	20000001	0x2394b: 20000001
+	00000000	0x2394c: 00000000
+	00000000	0x2394d: 00000000
+	00010108	0x2394e: 00010108
+	0005004c	0x2394f: 0005004c
+	60000001	0x23950: 60000001
+	00000000	0x23951: 00000000
+	00000000	0x23952: 00000000
+	00010108	0x23953: 00010108
+	00050000	0x23954: 00050000
+	00000000	0x23955: 00000000
+	00000000	0x23956: 00000000
+	00000000	0x23957: 00000000
+	00010108	0x23958: 00010108
+	00050000	0x23959: 00050000
+	00000000	0x2395a: 00000000
+	00000000	0x2395b: 00000000
+	00000000	0x2395c: 00000000
+	00010108	0x2395d: 00010108
+	00050000	0x2395e: 00050000
+	00000000	0x2395f: 00000000
+	00000000	0x23960: 00000000
+	00000000	0x23961: 00000000
+	00010108	0x23962: 00010108
+	00030050	0x23963: 00030050
+	00000009	0x23964: 00000009
+	00010101	0x23965: 00010101
+	00000000	0x23966: 00000000
+	00010108	0x23967: 00010108
+	00030010	0x23968: 00030010
+	00000004	0x23969: 00000004
+	00010101	0x2396a: 00010101
+	00000000	0x2396b: 00000000
+	00010108	0x2396c: 00010108
+	00030000	0x2396d: 00030000
+	00000004	0x2396e: 00000004
+	00000000	0x2396f: 00000000
+	00000000	0x23970: 00000000
+	00010108	0x23971: 00010108
+	00000000	0x23972: 00000000
+	00000000	0x23973: 00000000
+	00000000	0x23974: 00000000
+	00000000	0x23975: 00000000
+	00010108	0x23976: 00010108
+	00000000	0x23977: 00000000
+	00000000	0x23978: 00000000
+	00000000	0x23979: 00000000
+	00000000	0x2397a: 00000000
+	00010108	0x2397b: 00010108
+	00000000	0x2397c: 00000000
+	00000000	0x2397d: 00000000
+	00000000	0x2397e: 00000000
+	00000000	0x2397f: 00000000
+	00000000	0x23b00: 00000000
+	00000000	0x23b01: 00000000
+	00000000	0x23b02: 00000000
 	00000000	GMU_AO_INTERRUPT_EN: 0
 	00000000	GMU_AO_HOST_INTERRUPT_CLR: 0
 	00000000	GMU_AO_HOST_INTERRUPT_STATUS: { 0 }
@@ -2089,7 +2089,7 @@ registers-gmu:
 	71800004	GPU_GMU_AO_GPU_CX_BUSY_STATUS: { GPUBUSYIGNAHB | 0x71000004 }
 	00000092	GPU_GMU_AO_GPU_CX_BUSY_STATUS2: 0x92
 	ff000000	GPU_GMU_AO_GPU_CX_BUSY_MASK: 0xff000000
-	00000000	0x930f: 00000000
+	00000000	0x23b0f: 00000000
 	00000000	GMU_AO_AHB_FENCE_CTRL: 0
 	802800a0	GMU_AHB_FENCE_RANGE_0: 0x802800a0
 	00000000	GMU_AHB_FENCE_RANGE_1: 0
@@ -2097,260 +2097,260 @@ registers-gmu:
 	00000000	GMU_AHB_FENCE_STATUS_CLR: 0
 	00000001	GMU_RBBM_INT_UNMASKED_STATUS: 0x1
 	00000000	GMU_AO_SPARE_CNTL: 0
-	00000000	0x9400: 00000000
-	d1000005	0x9800: d1000005
-	00000049	0x9801: 00000049
-	00000000	0x9802: 00000000
-	00000007	0x9803: 00000007
-	00004804	0x9804: 00004804
-	20485699	0x9805: 20485699
-	00002067	0x9806: 00002067
-	40000000	0x9807: 40000000
-	00000000	0x9808: 00000000
-	00000000	0x9809: 00000000
-	00000000	0x980a: 00000000
-	00000001	0x980b: 00000001
-	00000007	0x980c: 00000007
-	00000000	0x980d: 00000000
-	0000f555	0x980e: 0000f555
-	00000000	0x980f: 00000000
-	00000000	0x9810: 00000000
-	00000000	0x9811: 00000000
-	00000000	0x9812: 00000000
-	00800004	0x9840: 00800004
-	0000001a	0x9841: 0000001a
-	00000000	0x9842: 00000000
-	00000001	0x9843: 00000001
-	00004805	0x9844: 00004805
-	20485699	0x9845: 20485699
-	00002067	0x9846: 00002067
-	40000000	0x9847: 40000000
-	00000000	0x9848: 00000000
-	00000000	0x9849: 00000000
-	00000000	0x984a: 00000000
-	00000000	0x984b: 00000000
-	00000001	0x984c: 00000001
-	00000000	0x984d: 00000000
-	00000aab	0x984e: 00000aab
-	00000000	0x984f: 00000000
-	00000000	0x9850: 00000000
-	00000000	0x9851: 00000000
-	00000000	0x9852: 00000000
-	00000000	0x9c00: 00000000
-	00000000	0x9c01: 00000000
-	00000000	0x9c02: 00000000
+	00000000	0x23c00: 00000000
+	d1000005	0x24000: d1000005
+	00000049	0x24001: 00000049
+	00000000	0x24002: 00000000
+	00000007	0x24003: 00000007
+	00004804	0x24004: 00004804
+	20485699	0x24005: 20485699
+	00002067	0x24006: 00002067
+	40000000	0x24007: 40000000
+	00000000	0x24008: 00000000
+	00000000	0x24009: 00000000
+	00000000	0x2400a: 00000000
+	00000001	0x2400b: 00000001
+	00000007	0x2400c: 00000007
+	00000000	0x2400d: 00000000
+	0000f555	0x2400e: 0000f555
+	00000000	0x2400f: 00000000
+	00000000	0x24010: 00000000
+	00000000	0x24011: 00000000
+	00000000	0x24012: 00000000
+	00800004	0x24040: 00800004
+	0000001a	0x24041: 0000001a
+	00000000	0x24042: 00000000
+	00000001	0x24043: 00000001
+	00004805	0x24044: 00004805
+	20485699	0x24045: 20485699
+	00002067	0x24046: 00002067
+	40000000	0x24047: 40000000
+	00000000	0x24048: 00000000
+	00000000	0x24049: 00000000
+	00000000	0x2404a: 00000000
+	00000000	0x2404b: 00000000
+	00000001	0x2404c: 00000001
+	00000000	0x2404d: 00000000
+	00000aab	0x2404e: 00000aab
+	00000000	0x2404f: 00000000
+	00000000	0x24050: 00000000
+	00000000	0x24051: 00000000
+	00000000	0x24052: 00000000
+	00000000	0x24400: 00000000
+	00000000	0x24401: 00000000
+	00000000	0x24402: 00000000
 	f8222800	GPU_CC_GX_GDSCR: 0xf8222800
-	00070400	0x9c04: 00070400
-	00000002	0x9c07: 00000002
-	00000101	0x9c08: 00000101
-	00800000	0x9c09: 00800000
-	00015011	0x9c0a: 00015011
-	00000000	0x9c0b: 00000000
-	00004221	0x9c15: 00004221
-	80000000	0x9c16: 80000000
-	80000000	0x9c17: 80000000
-	00000001	0x9c18: 00000001
-	80000000	0x9c19: 80000000
-	00000000	0x9c1a: 00000000
-	f8282000	0x9c1b: f8282000
-	00070400	0x9c1c: 00070400
-	00000001	0x9c1e: 00000001
-	00000000	0x9c1f: 00000000
-	80000000	0x9c20: 80000000
-	80000000	0x9c21: 80000000
-	80000000	0x9c22: 80000000
-	00000000	0x9c23: 00000000
-	00000000	0x9c24: 00000000
-	80000000	0x9c25: 80000000
-	00004ff1	0x9c26: 00004ff1
-	00000001	0x9c27: 00000001
-	00000000	0x9c28: 00000000
-	00000000	0x9c29: 00000000
-	00000000	0x9c2a: 00000000
-	00000000	0x9c2b: 00000000
-	00000000	0x9c2c: 00000000
-	00000000	0x9c2d: 00000000
-	00000001	0x9c3c: 00000001
-	00000000	0x9c3d: 00000000
-	00000001	0x9c3f: 00000001
-	80000000	0x9c40: 80000000
-	00000001	0x9c42: 00000001
-	80000000	0x9c43: 80000000
-	00000000	0x9c44: 00000000
-	00000003	0x9c45: 00000003
-	00000001	0x9c46: 00000001
-	00000000	0x9c47: 00000000
-	00000000	0x9c48: 00000000
-	00000602	0x9c49: 00000602
-	00000000	0x9c58: 00000000
-	00000001	0x9c59: 00000001
-	00000001	0x9c5a: 00000001
-	00000000	0x9d40: 00000000
-	00000000	0x9d41: 00000000
+	00070400	0x24404: 00070400
+	00000002	0x24407: 00000002
+	00000101	0x24408: 00000101
+	00800000	0x24409: 00800000
+	00015011	0x2440a: 00015011
+	00000000	0x2440b: 00000000
+	00004221	0x24415: 00004221
+	80000000	0x24416: 80000000
+	80000000	0x24417: 80000000
+	00000001	0x24418: 00000001
+	80000000	0x24419: 80000000
+	00000000	0x2441a: 00000000
+	f8282000	0x2441b: f8282000
+	00070400	0x2441c: 00070400
+	00000001	0x2441e: 00000001
+	00000000	0x2441f: 00000000
+	80000000	0x24420: 80000000
+	80000000	0x24421: 80000000
+	80000000	0x24422: 80000000
+	00000000	0x24423: 00000000
+	00000000	0x24424: 00000000
+	80000000	0x24425: 80000000
+	00004ff1	0x24426: 00004ff1
+	00000001	0x24427: 00000001
+	00000000	0x24428: 00000000
+	00000000	0x24429: 00000000
+	00000000	0x2442a: 00000000
+	00000000	0x2442b: 00000000
+	00000000	0x2442c: 00000000
+	00000000	0x2442d: 00000000
+	00000001	0x2443c: 00000001
+	00000000	0x2443d: 00000000
+	00000001	0x2443f: 00000001
+	80000000	0x24440: 80000000
+	00000001	0x24442: 00000001
+	80000000	0x24443: 80000000
+	00000000	0x24444: 00000000
+	00000003	0x24445: 00000003
+	00000001	0x24446: 00000001
+	00000000	0x24447: 00000000
+	00000000	0x24448: 00000000
+	00000602	0x24449: 00000602
+	00000000	0x24458: 00000000
+	00000001	0x24459: 00000001
+	00000001	0x2445a: 00000001
+	00000000	0x24540: 00000000
+	00000000	0x24541: 00000000
 	003c0000	GPU_CC_GX_DOMAIN_MISC: 0x3c0000
-	00000000	0x9d43: 00000000
-	00000001	0x9d44: 00000001
-	0000003f	0x9d45: 0000003f
-	00000000	0x9d46: 00000000
-	0000003f	0x9d47: 0000003f
-	00000000	0x9d48: 00000000
-	0000003f	0x9d49: 0000003f
-	00000000	0x9d4a: 00000000
-	000001ff	0x9d4b: 000001ff
-	000001ff	0x9d4c: 000001ff
-	00000000	0x9d4d: 00000000
-	00000001	0x9d4e: 00000001
-	00000000	0x9d4f: 00000000
-	80001fe0	0x9d50: 80001fe0
-	00000000	0x9d51: 00000000
-	00000000	0x9d52: 00000000
-	00000001	0x9d53: 00000001
-	00000000	0x9d54: 00000000
-	00000001	0x9d55: 00000001
-	00000000	0x9d56: 00000000
-	00000003	0x9d57: 00000003
-	00000003	0x9d58: 00000003
-	00000000	0x9d59: 00000000
-	00000000	0x9d5a: 00000000
-	00000000	0x9d5b: 00000000
-	00000000	0x9d5c: 00000000
-	00000000	0x9d5d: 00000000
-	40000001	0x9d5e: 40000001
-	00000000	0xa000: 00000000
-	80000001	0xa001: 80000001
-	00000000	0xa002: 00000000
-	00000000	0xa400: 00000000
-	80000001	0xa401: 80000001
-	00000000	0xa402: 00000000
-	00000000	0xac00: 00000000
-	80000001	0xac01: 80000001
-	00000000	0xac02: 00000000
-	00000000	0xb000: 00000000
-	80000001	0xb001: 80000001
-	00000000	0xb002: 00000000
-	00000000	0xb400: 00000000
-	80000001	0xb401: 80000001
-	00000000	0xb402: 00000000
-	00000000	0xb800: 00000000
-	00000000	0xb801: 00000000
-	00000000	0xb802: 00000000
-	10010000	0xbc00: 10010000
-	00000000	0xbc01: 00000000
-	00000000	0xbc02: 00000000
-	00000000	0xbc03: 00000000
-	00000000	0xbc04: 00000000
-	00000000	0xbc05: 00000000
-	00000000	0xbc06: 00000000
-	00000000	0xbc07: 00000000
-	00000000	0xbc08: 00000000
-	00000000	0xbc09: 00000000
-	00000000	0xbc0a: 00000000
-	00000000	0xbc0b: 00000000
-	02c3da78	0xbc0c: 02c3da78
-	00000000	0xbc0d: 00000000
-	037d2002	0xbc0e: 037d2002
-	00000000	0xbc0f: 00000000
-	00000000	0xbc10: 00000000
-	00000001	0xbc11: 00000001
-	00000000	0xbc12: 00000000
-	00000000	0xbc13: 00000000
-	00000000	0xbc14: 00000000
-	00000000	0xbc15: 00000000
-	00000000	0xbc16: 00000000
-	00000000	0xbc20: 00000000
-	00000000	0xbc21: 00000000
-	00000800	0xbc22: 00000800
-	00000000	0xbc23: 00000000
-	00000000	0xbc24: 00000000
-	00000000	0xbc25: 00000000
-	10010000	0xbc26: 10010000
-	00000000	0xbc27: 00000000
-	00000000	0: 00000000
-	00000000	0x10: 00000000
-	00000000	0x11: 00000000
-	00000000	0x12: 00000000
-	00000000	0x13: 00000000
-	00000000	0x16: 00000000
-	00000000	0x18: 00000000
-	00000000	0x19: 00000000
-	00000000	0x1a: 00000000
-	00000000	0x1b: 00000000
-	00000000	0x1e: 00000000
-	00000000	0x20: 00000000
-	00000000	0x21: 00000000
-	00000000	0x22: 00000000
-	00000000	0x23: 00000000
-	00000000	0x26: 00000000
-	00000000	0x28: 00000000
-	00000000	0x29: 00000000
-	00000000	0x2a: 00000000
-	00000000	0x2b: 00000000
-	00000000	0x2e: 00000000
-	00000000	0x30: 00000000
-	00000000	0x31: 00000000
-	00000000	0x32: 00000000
-	00000000	0x33: 00000000
-	00000000	0x36: 00000000
-	00000000	0x38: 00000000
-	00000000	0x39: 00000000
-	00000000	0x3a: 00000000
-	00000000	0x3b: 00000000
-	00000000	0x3e: 00000000
-	00000000	0x40: 00000000
-	00000000	0x41: 00000000
-	00000000	0x42: 00000000
-	00000000	0x43: 00000000
-	00000000	0x46: 00000000
+	00000000	0x24543: 00000000
+	00000001	0x24544: 00000001
+	0000003f	0x24545: 0000003f
+	00000000	0x24546: 00000000
+	0000003f	0x24547: 0000003f
+	00000000	0x24548: 00000000
+	0000003f	0x24549: 0000003f
+	00000000	0x2454a: 00000000
+	000001ff	0x2454b: 000001ff
+	000001ff	0x2454c: 000001ff
+	00000000	0x2454d: 00000000
+	00000001	0x2454e: 00000001
+	00000000	0x2454f: 00000000
+	80001fe0	0x24550: 80001fe0
+	00000000	0x24551: 00000000
+	00000000	0x24552: 00000000
+	00000001	0x24553: 00000001
+	00000000	0x24554: 00000000
+	00000001	0x24555: 00000001
+	00000000	0x24556: 00000000
+	00000003	0x24557: 00000003
+	00000003	0x24558: 00000003
+	00000000	0x24559: 00000000
+	00000000	0x2455a: 00000000
+	00000000	0x2455b: 00000000
+	00000000	0x2455c: 00000000
+	00000000	0x2455d: 00000000
+	40000001	0x2455e: 40000001
+	00000000	0x24800: 00000000
+	80000001	0x24801: 80000001
+	00000000	0x24802: 00000000
+	00000000	0x24c00: 00000000
+	80000001	0x24c01: 80000001
+	00000000	0x24c02: 00000000
+	00000000	0x25400: 00000000
+	80000001	0x25401: 80000001
+	00000000	0x25402: 00000000
+	00000000	0x25800: 00000000
+	80000001	0x25801: 80000001
+	00000000	0x25802: 00000000
+	00000000	0x25c00: 00000000
+	80000001	0x25c01: 80000001
+	00000000	0x25c02: 00000000
+	00000000	0x26000: 00000000
+	00000000	0x26001: 00000000
+	00000000	0x26002: 00000000
+	10010000	0x26400: 10010000
+	00000000	0x26401: 00000000
+	00000000	0x26402: 00000000
+	00000000	0x26403: 00000000
+	00000000	0x26404: 00000000
+	00000000	0x26405: 00000000
+	00000000	0x26406: 00000000
+	00000000	0x26407: 00000000
+	00000000	0x26408: 00000000
+	00000000	0x26409: 00000000
+	00000000	0x2640a: 00000000
+	00000000	0x2640b: 00000000
+	02c3da78	0x2640c: 02c3da78
+	00000000	0x2640d: 00000000
+	037d2002	0x2640e: 037d2002
+	00000000	0x2640f: 00000000
+	00000000	0x26410: 00000000
+	00000001	0x26411: 00000001
+	00000000	0x26412: 00000000
+	00000000	0x26413: 00000000
+	00000000	0x26414: 00000000
+	00000000	0x26415: 00000000
+	00000000	0x26416: 00000000
+	00000000	0x26420: 00000000
+	00000000	0x26421: 00000000
+	00000800	0x26422: 00000800
+	00000000	0x26423: 00000000
+	00000000	0x26424: 00000000
+	00000000	0x26425: 00000000
+	10010000	0x26426: 10010000
+	00000000	0x26427: 00000000
+	00000000	0x1a800: 00000000
+	00000000	0x1a810: 00000000
+	00000000	0x1a811: 00000000
+	00000000	0x1a812: 00000000
+	00000000	0x1a813: 00000000
+	00000000	0x1a816: 00000000
+	00000000	0x1a818: 00000000
+	00000000	0x1a819: 00000000
+	00000000	0x1a81a: 00000000
+	00000000	0x1a81b: 00000000
+	00000000	0x1a81e: 00000000
+	00000000	0x1a820: 00000000
+	00000000	0x1a821: 00000000
+	00000000	0x1a822: 00000000
+	00000000	0x1a823: 00000000
+	00000000	0x1a826: 00000000
+	00000000	0x1a828: 00000000
+	00000000	0x1a829: 00000000
+	00000000	0x1a82a: 00000000
+	00000000	0x1a82b: 00000000
+	00000000	0x1a82e: 00000000
+	00000000	0x1a830: 00000000
+	00000000	0x1a831: 00000000
+	00000000	0x1a832: 00000000
+	00000000	0x1a833: 00000000
+	00000000	0x1a836: 00000000
+	00000000	0x1a838: 00000000
+	00000000	0x1a839: 00000000
+	00000000	0x1a83a: 00000000
+	00000000	0x1a83b: 00000000
+	00000000	0x1a83e: 00000000
+	00000000	0x1a840: 00000000
+	00000000	0x1a841: 00000000
+	00000000	0x1a842: 00000000
+	00000000	0x1a843: 00000000
+	00000000	0x1a846: 00000000
 	00008ff1	GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL: 0x8ff1
 	00778000	GMU_GX_SPTPRAC_POWER_CONTROL: 0x778000
-	00000020	RSCC_TIMESTAMP_UNIT0_TIMESTAMP_L_DRV0: 0x20
-	00000044	RSCC_TIMESTAMP_UNIT0_TIMESTAMP_H_DRV0: 0x44
-	00000044	0x84: 00000044
-	00000000	RSCC_OVERRIDE_START_ADDR: 0
-	00000000	RSCC_SEQ_BUSY_DRV0: 0
-	00000000	0x102: 00000000
-	00000000	0x103: 00000000
-	00000000	0x104: 00000000
-	00000000	0x105: 00000000
-	00000000	0x106: 00000000
-	00000000	0x107: 00000000
-	00000000	0x108: 00000000
-	00000000	0x109: 00000000
-	00000000	0x10a: 00000000
-	00000000	0x10b: 00000000
-	00000000	0x10c: 00000000
-	00000000	0x10d: 00000000
-	00000000	0x10e: 00000000
-	00000000	0x10f: 00000000
-	00000000	0x110: 00000000
-	00000000	0x111: 00000000
-	00000000	0x112: 00000000
-	00000000	0x113: 00000000
-	00000000	0x114: 00000000
-	00000000	0x115: 00000000
-	00000000	0x116: 00000000
-	00000000	0x117: 00000000
-	00000000	0x118: 00000000
-	00000000	0x119: 00000000
-	00000000	0x11a: 00000000
-	00000000	0x11b: 00000000
-	00000000	0x11c: 00000000
-	00000000	0x11d: 00000000
-	00000000	0x11e: 00000000
-	00000000	0x11f: 00000000
-	00000000	0x120: 00000000
-	00000000	0x121: 00000000
-	00000000	0x122: 00000000
-	00000000	0x123: 00000000
-	00000000	0x124: 00000000
-	00000000	0x125: 00000000
-	00000000	0x126: 00000000
-	00000000	0x127: 00000000
-	00000000	0x128: 00000000
-	00000000	0x129: 00000000
-	00000000	0x12a: 00000000
-	00000000	0x12b: 00000000
-	00000000	0x140: 00000000
+	00000020	0x1a882: 00000020
+	00000044	0x1a883: 00000044
+	00000044	0x1a884: 00000044
+	00000000	0x1a900: 00000000
+	00000000	0x1a901: 00000000
+	00000000	0x1a902: 00000000
+	00000000	0x1a903: 00000000
+	00000000	0x1a904: 00000000
+	00000000	0x1a905: 00000000
+	00000000	0x1a906: 00000000
+	00000000	0x1a907: 00000000
+	00000000	0x1a908: 00000000
+	00000000	0x1a909: 00000000
+	00000000	0x1a90a: 00000000
+	00000000	0x1a90b: 00000000
+	00000000	0x1a90c: 00000000
+	00000000	0x1a90d: 00000000
+	00000000	0x1a90e: 00000000
+	00000000	0x1a90f: 00000000
+	00000000	0x1a910: 00000000
+	00000000	0x1a911: 00000000
+	00000000	0x1a912: 00000000
+	00000000	0x1a913: 00000000
+	00000000	0x1a914: 00000000
+	00000000	0x1a915: 00000000
+	00000000	0x1a916: 00000000
+	00000000	0x1a917: 00000000
+	00000000	0x1a918: 00000000
+	00000000	0x1a919: 00000000
+	00000000	0x1a91a: 00000000
+	00000000	0x1a91b: 00000000
+	00000000	0x1a91c: 00000000
+	00000000	0x1a91d: 00000000
+	00000000	0x1a91e: 00000000
+	00000000	0x1a91f: 00000000
+	00000000	0x1a920: 00000000
+	00000000	0x1a921: 00000000
+	00000000	0x1a922: 00000000
+	00000000	0x1a923: 00000000
+	00000000	0x1a924: 00000000
+	00000000	0x1a925: 00000000
+	00000000	0x1a926: 00000000
+	00000000	0x1a927: 00000000
+	00000000	0x1a928: 00000000
+	00000000	0x1a929: 00000000
+	00000000	0x1a92a: 00000000
+	00000000	0x1a92b: 00000000
+	00000000	0x1a940: 00000000
 indexed-registers:
   - regs-name: CP_SQE_STAT
     dwords: 51
diff --git a/src/freedreno/tests/reference/crash_prefetch.log b/src/freedreno/tests/reference/crash_prefetch.log
index 8e7f3a21758..3fff16e683e 100644
--- a/src/freedreno/tests/reference/crash_prefetch.log
+++ b/src/freedreno/tests/reference/crash_prefetch.log
@@ -1871,58 +1871,58 @@ registers:
 registers-gmu:
 	00000000	GMU_ICACHE_CONFIG: 0
 	00000000	GMU_DCACHE_CONFIG: 0
-	00000000	0x4c02: 00000000
-	00000000	0x4c03: 00000000
-	00000000	0x4c04: 00000000
-	00000000	0x4c05: 00000000
-	00000000	0x4c06: 00000000
-	00000000	0x4c07: 00000000
-	00000000	0x4c10: 00000000
-	00000000	0x4c11: 00000000
-	00000000	0x4c12: 00000000
-	00000000	0x4d00: 00000000
-	00000000	0x4d07: 00000000
-	00000000	0x4d08: 00000000
-	00000000	0x4d09: 00000000
-	00000000	0x4d0a: 00000000
+	00000000	0x1f402: 00000000
+	00000000	0x1f403: 00000000
+	00000000	0x1f404: 00000000
+	00000000	0x1f405: 00000000
+	00000000	0x1f406: 00000000
+	00000000	0x1f407: 00000000
+	00000000	0x1f410: 00000000
+	00000000	0x1f411: 00000000
+	00000000	0x1f412: 00000000
+	00000000	0x1f500: 00000000
+	00000000	0x1f507: 00000000
+	00000000	0x1f508: 00000000
+	00000000	0x1f509: 00000000
+	00000000	0x1f50a: 00000000
 	00000000	GMU_CM3_SYSRESET: 0
 	00000002	GMU_CM3_BOOT_CONFIG: 0x2
-	00000000	0x5002: 00000000
-	ffffffff	0x5003: ffffffff
-	ffffffff	0x5004: ffffffff
-	0003c07f	0x5007: 0003c07f
-	00000000	0x5008: 00000000
-	00001404	0x500b: 00001404
-	00000000	0x500c: 00000000
-	0003bfe0	0x500f: 0003bfe0
-	00000000	0x5010: 00000000
-	00000000	0x5011: 00000000
-	00000000	0x5012: 00000000
-	00000003	0x5013: 00000003
-	00000000	0x5014: 00000000
-	001f0003	0x5015: 001f0003
-	00927c00	0x5016: 00927c00
-	01b77400	0x5017: 01b77400
-	00000000	0x5018: 00000000
-	00000000	0x5019: 00000000
+	00000000	0x1f802: 00000000
+	ffffffff	0x1f803: ffffffff
+	ffffffff	0x1f804: ffffffff
+	0003c07f	0x1f807: 0003c07f
+	00000000	0x1f808: 00000000
+	00001404	0x1f80b: 00001404
+	00000000	0x1f80c: 00000000
+	0003bfe0	0x1f80f: 0003bfe0
+	00000000	0x1f810: 00000000
+	00000000	0x1f811: 00000000
+	00000000	0x1f812: 00000000
+	00000003	0x1f813: 00000003
+	00000000	0x1f814: 00000000
+	001f0003	0x1f815: 001f0003
+	00927c00	0x1f816: 00927c00
+	01b77400	0x1f817: 01b77400
+	00000000	0x1f818: 00000000
+	00000000	0x1f819: 00000000
 	00000001	GMU_CM3_FW_BUSY: 0x1
-	00000000	0x501b: 00000000
+	00000000	0x1f81b: 00000000
 	babeface	GMU_CM3_FW_INIT_RESULT: 0xbabeface
-	00000000	0x5024: 00000000
-	00000000	0x5025: 00000000
-	00000000	0x5026: 00000000
-	80ffffff	0x5027: 80ffffff
-	00000000	0x5028: 00000000
-	00000000	0x5029: 00000000
-	00000000	0x502a: 00000000
+	00000000	0x1f824: 00000000
+	00000000	0x1f825: 00000000
+	00000000	0x1f826: 00000000
+	80ffffff	0x1f827: 80ffffff
+	00000000	0x1f828: 00000000
+	00000000	0x1f829: 00000000
+	00000000	0x1f82a: 00000000
 	00000052	GMU_CM3_CFG: 0x52
-	01000148	0x502e: 01000148
-	00000000	0x502f: 00000000
-	0002a000	0x5030: 0002a000
+	01000148	0x1f82e: 01000148
+	00000000	0x1f82f: 00000000
+	0002a000	0x1f830: 0002a000
 	00000001	GMU_CX_GMU_POWER_COUNTER_ENABLE: 0x1
 	00000020	GMU_CX_GMU_POWER_COUNTER_SELECT_0: 0x20
 	00000000	GMU_CX_GMU_POWER_COUNTER_SELECT_1: 0
-	00000000	0x5043: 00000000
+	00000000	0x1f843: 00000000
 	001d9df6	GMU_CX_GMU_POWER_COUNTER_XOCLK_0_L: 0x1d9df6
 	00000000	GMU_CX_GMU_POWER_COUNTER_XOCLK_0_H: 0
 	001df73f	GMU_CX_GMU_POWER_COUNTER_XOCLK_1_L: 0x1df73f
@@ -1935,28 +1935,28 @@ registers-gmu:
 	00000000	GMU_CX_GMU_POWER_COUNTER_XOCLK_4_H: 0
 	001df785	GMU_CX_GMU_POWER_COUNTER_XOCLK_5_L: 0x1df785
 	00000000	GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H: 0
-	00000000	0x5050: 00000000
-	00000000	0x5051: 00000000
-	00000000	0x5052: 00000000
-	00000000	0x5053: 00000000
-	00000000	0x5087: 00000000
+	00000000	0x1f850: 00000000
+	00000000	0x1f851: 00000000
+	00000000	0x1f852: 00000000
+	00000000	0x1f853: 00000000
+	00000000	0x1f887: 00000000
 	001e27d0	GMU_ALWAYS_ON_COUNTER_L: 0x1e27d0
 	00000000	GMU_ALWAYS_ON_COUNTER_H: 0
-	00000000	0x50a0: 00000000
-	00000000	0x50a1: 00000000
-	00000000	0x50a2: 00000000
-	00000000	0x50a4: 00000000
-	00000000	0x50a5: 00000000
-	00000000	0x50a6: 00000000
-	00000000	0x50a7: 00000000
-	00000000	0x50a8: 00000000
-	00000000	0x50a9: 00000000
-	00000000	0x50aa: 00000000
-	00000000	0x50ab: 00000000
-	00000000	0x50ac: 00000000
-	00000000	0x50ad: 00000000
-	00000000	0x50ae: 00000000
-	00000000	0x50af: 00000000
+	00000000	0x1f8a0: 00000000
+	00000000	0x1f8a1: 00000000
+	00000000	0x1f8a2: 00000000
+	00000000	0x1f8a4: 00000000
+	00000000	0x1f8a5: 00000000
+	00000000	0x1f8a6: 00000000
+	00000000	0x1f8a7: 00000000
+	00000000	0x1f8a8: 00000000
+	00000000	0x1f8a9: 00000000
+	00000000	0x1f8aa: 00000000
+	00000000	0x1f8ab: 00000000
+	00000000	0x1f8ac: 00000000
+	00000000	0x1f8ad: 00000000
+	00000000	0x1f8ae: 00000000
+	00000000	0x1f8af: 00000000
 	09c40400	GMU_PWR_COL_INTER_FRAME_CTRL: { NUM_PASS_SKIPS = 0x1 | MIN_PASS_LENGTH = 0x2710 }
 	000a2710	GMU_PWR_COL_INTER_FRAME_HYST: 0xa2710
 	000a2710	GMU_PWR_COL_SPTPRAC_HYST: 0xa2710
@@ -1965,29 +1965,29 @@ registers-gmu:
 	000001f0	GMU_GPU_NAP_CTRL: { SID = 0x1f }
 	00000f11	GMU_RPMH_CTRL: { RPMH_INTERFACE_ENABLE | LLC_VOTE_ENABLE | DDR_VOTE_ENABLE | MX_VOTE_ENABLE | CX_VOTE_ENABLE | GFX_VOTE_ENABLE }
 	00000000	GMU_RPMH_HYST_CTRL: 0
-	00000000	0x50ea: 00000000
-	00000000	0x50eb: 00000000
+	00000000	0x1f8ea: 00000000
+	00000000	0x1f8eb: 00000000
 	00000000	GPU_GMU_CX_GMU_RPMH_POWER_STATE: 0
 	60009000	GPU_GMU_CX_GMU_PWR_COL_CP_MSG: 0x60009000
 	00000000	GPU_GMU_CX_GMU_PWR_COL_CP_RESP: 0
-	001f0000	0x5102: 001f0000
-	e8765432	0x5103: e8765432
-	00000000	0x5140: 00000000
-	00000000	0x5142: 00000000
-	00000000	0x5143: 00000000
-	00000000	0x5144: 00000000
-	00000000	0x514c: 00000000
+	001f0000	0x1f902: 001f0000
+	e8765432	0x1f903: e8765432
+	00000000	0x1f940: 00000000
+	00000000	0x1f942: 00000000
+	00000000	0x1f943: 00000000
+	00000000	0x1f944: 00000000
+	00000000	0x1f94c: 00000000
 	00000000	GPU_GMU_CX_GMU_PWR_THRESHOLD: 0
-	00000000	0x514f: 00000000
-	00000000	0x5150: 00000000
-	00000000	0x5151: 00000000
-	00000000	0x5154: 00000000
+	00000000	0x1f94f: 00000000
+	00000000	0x1f950: 00000000
+	00000000	0x1f951: 00000000
+	00000000	0x1f954: 00000000
 	00000000	GMU_LLM_GLM_SLEEP_CTRL: 0
 	00000000	GMU_LLM_GLM_SLEEP_STATUS: 0
 	00000000	GMU_ISENSE_CTRL: 0
-	00000008	0x5162: 00000008
-	00000000	0x5164: 00000000
-	00000005	0x5165: 00000005
+	00000008	0x1f962: 00000008
+	00000000	0x1f964: 00000000
+	00000005	0x1f965: 00000005
 	00000001	GMU_HFI_CTRL_STATUS: 0x1
 	00000000	GMU_HFI_VERSION_INFO: 0
 	06018000	GMU_HFI_SFR_ADDR: 0x6018000
@@ -2010,24 +2010,24 @@ registers-gmu:
 	00000000	GMU_HOST2GMU_INTR_INFO_1: 0
 	00000000	GMU_HOST2GMU_INTR_INFO_2: 0
 	00000000	GMU_HOST2GMU_INTR_INFO_3: 0
-	10010000	0x51c0: 10010000
+	10010000	0x1f9c0: 10010000
 	babeface	GMU_GENERAL_0: 0xbabeface
 	00000000	GMU_GENERAL_1: 0
-	00000000	0x51c7: 00000000
-	00000000	0x51c8: 00000000
-	60005018	0x51c9: 60005018
-	60005048	0x51ca: 60005048
+	00000000	0x1f9c7: 00000000
+	00000000	0x1f9c8: 00000000
+	60005018	0x1f9c9: 60005018
+	60005048	0x1f9ca: 60005048
 	00000000	GMU_GENERAL_6: 0
 	00000001	GMU_GENERAL_7: 0x1
-	00000000	0x51e0: 00000000
-	00000000	0x51e1: 00000000
-	0000000a	0x51e2: 0000000a
+	00000000	0x1f9e0: 00000000
+	00000000	0x1f9e1: 00000000
+	0000000a	0x1f9e2: 0000000a
 	00000000	GMU_BOOT_KMD_LM_HANDSHAKE: 0
-	00000000	0x5200: 00000000
-	00000000	0x5201: 00000000
-	00000000	0x9300: 00000000
-	00000000	0x9301: 00000000
-	00000000	0x9302: 00000000
+	00000000	0x1fa00: 00000000
+	00000000	0x1fa01: 00000000
+	00000000	0x23b00: 00000000
+	00000000	0x23b01: 00000000
+	00000000	0x23b02: 00000000
 	00000000	GMU_AO_INTERRUPT_EN: 0
 	00000000	GMU_AO_HOST_INTERRUPT_CLR: 0
 	00000000	GMU_AO_HOST_INTERRUPT_STATUS: { 0 }
@@ -2040,7 +2040,7 @@ registers-gmu:
 	71d315a4	GPU_GMU_AO_GPU_CX_BUSY_STATUS: { GPUBUSYIGNAHB | 0x715315a4 }
 	00000092	GPU_GMU_AO_GPU_CX_BUSY_STATUS2: 0x92
 	ff000000	GPU_GMU_AO_GPU_CX_BUSY_MASK: 0xff000000
-	00000000	0x930f: 00000000
+	00000000	0x23b0f: 00000000
 	00000000	GMU_AO_AHB_FENCE_CTRL: 0
 	802800a0	GMU_AHB_FENCE_RANGE_0: 0x802800a0
 	00000000	GMU_AHB_FENCE_RANGE_1: 0
@@ -2048,522 +2048,522 @@ registers-gmu:
 	00000000	GMU_AHB_FENCE_STATUS_CLR: 0
 	00000001	GMU_RBBM_INT_UNMASKED_STATUS: 0x1
 	00000000	GMU_AO_SPARE_CNTL: 0
-	00000000	0x9400: 00000000
-	d1000005	0x9800: d1000005
-	00000053	0x9801: 00000053
-	00000000	0x9802: 00000000
-	00000007	0x9803: 00000007
-	00004804	0x9804: 00004804
-	20485699	0x9805: 20485699
-	00002067	0x9806: 00002067
-	40000000	0x9807: 40000000
-	00000000	0x9808: 00000000
-	00000000	0x9809: 00000000
-	00000000	0x980a: 00000000
-	00000001	0x980b: 00000001
-	00000007	0x980c: 00000007
-	00000000	0x980d: 00000000
-	00005555	0x980e: 00005555
-	00000000	0x980f: 00000000
-	00000000	0x9810: 00000000
-	00000000	0x9811: 00000000
-	00000000	0x9812: 00000000
-	00800004	0x9840: 00800004
-	00000012	0x9841: 00000012
-	00000000	0x9842: 00000000
-	00000001	0x9843: 00000001
-	00004805	0x9844: 00004805
-	20485699	0x9845: 20485699
-	00002067	0x9846: 00002067
-	40000000	0x9847: 40000000
-	40000000	0x9848: 40000000
-	00000000	0x9849: 00000000
-	00000000	0x984a: 00000000
-	00000000	0x984b: 00000000
-	00000001	0x984c: 00000001
-	00000000	0x984d: 00000000
-	0000c000	0x984e: 0000c000
-	00000000	0x984f: 00000000
-	00000000	0x9850: 00000000
-	00000000	0x9851: 00000000
-	00000000	0x9852: 00000000
-	00000000	0x9c00: 00000000
-	00000000	0x9c01: 00000000
-	00000000	0x9c02: 00000000
+	00000000	0x23c00: 00000000
+	d1000005	0x24000: d1000005
+	00000053	0x24001: 00000053
+	00000000	0x24002: 00000000
+	00000007	0x24003: 00000007
+	00004804	0x24004: 00004804
+	20485699	0x24005: 20485699
+	00002067	0x24006: 00002067
+	40000000	0x24007: 40000000
+	00000000	0x24008: 00000000
+	00000000	0x24009: 00000000
+	00000000	0x2400a: 00000000
+	00000001	0x2400b: 00000001
+	00000007	0x2400c: 00000007
+	00000000	0x2400d: 00000000
+	00005555	0x2400e: 00005555
+	00000000	0x2400f: 00000000
+	00000000	0x24010: 00000000
+	00000000	0x24011: 00000000
+	00000000	0x24012: 00000000
+	00800004	0x24040: 00800004
+	00000012	0x24041: 00000012
+	00000000	0x24042: 00000000
+	00000001	0x24043: 00000001
+	00004805	0x24044: 00004805
+	20485699	0x24045: 20485699
+	00002067	0x24046: 00002067
+	40000000	0x24047: 40000000
+	40000000	0x24048: 40000000
+	00000000	0x24049: 00000000
+	00000000	0x2404a: 00000000
+	00000000	0x2404b: 00000000
+	00000001	0x2404c: 00000001
+	00000000	0x2404d: 00000000
+	0000c000	0x2404e: 0000c000
+	00000000	0x2404f: 00000000
+	00000000	0x24050: 00000000
+	00000000	0x24051: 00000000
+	00000000	0x24052: 00000000
+	00000000	0x24400: 00000000
+	00000000	0x24401: 00000000
+	00000000	0x24402: 00000000
 	f8222800	GPU_CC_GX_GDSCR: 0xf8222800
-	00070400	0x9c04: 00070400
-	00000002	0x9c07: 00000002
-	00000101	0x9c08: 00000101
-	00800000	0x9c09: 00800000
-	00015011	0x9c0a: 00015011
-	00000000	0x9c0b: 00000000
-	00004221	0x9c15: 00004221
-	80000000	0x9c16: 80000000
-	80000000	0x9c17: 80000000
-	00000001	0x9c18: 00000001
-	80000000	0x9c19: 80000000
-	00000000	0x9c1a: 00000000
-	f8282000	0x9c1b: f8282000
-	00070400	0x9c1c: 00070400
-	00000001	0x9c1e: 00000001
-	00000000	0x9c1f: 00000000
-	80000000	0x9c20: 80000000
-	80000000	0x9c21: 80000000
-	80000000	0x9c22: 80000000
-	00000000	0x9c23: 00000000
-	00000000	0x9c24: 00000000
-	80000000	0x9c25: 80000000
-	00004ff1	0x9c26: 00004ff1
-	00000001	0x9c27: 00000001
-	00000000	0x9c28: 00000000
-	00000000	0x9c29: 00000000
-	00000000	0x9c2a: 00000000
-	00000000	0x9c2b: 00000000
-	00000000	0x9c2c: 00000000
-	00000000	0x9c2d: 00000000
-	00000001	0x9c3c: 00000001
-	00000000	0x9c3d: 00000000
-	00000001	0x9c3f: 00000001
-	80000000	0x9c40: 80000000
-	00000001	0x9c42: 00000001
-	80000000	0x9c43: 80000000
-	00000000	0x9c44: 00000000
-	00000003	0x9c45: 00000003
-	00000001	0x9c46: 00000001
-	00000000	0x9c47: 00000000
-	00000000	0x9c48: 00000000
-	00000602	0x9c49: 00000602
-	00000000	0x9c58: 00000000
-	00000001	0x9c59: 00000001
-	00000001	0x9c5a: 00000001
-	00000000	0x9d40: 00000000
-	00000000	0x9d41: 00000000
+	00070400	0x24404: 00070400
+	00000002	0x24407: 00000002
+	00000101	0x24408: 00000101
+	00800000	0x24409: 00800000
+	00015011	0x2440a: 00015011
+	00000000	0x2440b: 00000000
+	00004221	0x24415: 00004221
+	80000000	0x24416: 80000000
+	80000000	0x24417: 80000000
+	00000001	0x24418: 00000001
+	80000000	0x24419: 80000000
+	00000000	0x2441a: 00000000
+	f8282000	0x2441b: f8282000
+	00070400	0x2441c: 00070400
+	00000001	0x2441e: 00000001
+	00000000	0x2441f: 00000000
+	80000000	0x24420: 80000000
+	80000000	0x24421: 80000000
+	80000000	0x24422: 80000000
+	00000000	0x24423: 00000000
+	00000000	0x24424: 00000000
+	80000000	0x24425: 80000000
+	00004ff1	0x24426: 00004ff1
+	00000001	0x24427: 00000001
+	00000000	0x24428: 00000000
+	00000000	0x24429: 00000000
+	00000000	0x2442a: 00000000
+	00000000	0x2442b: 00000000
+	00000000	0x2442c: 00000000
+	00000000	0x2442d: 00000000
+	00000001	0x2443c: 00000001
+	00000000	0x2443d: 00000000
+	00000001	0x2443f: 00000001
+	80000000	0x24440: 80000000
+	00000001	0x24442: 00000001
+	80000000	0x24443: 80000000
+	00000000	0x24444: 00000000
+	00000003	0x24445: 00000003
+	00000001	0x24446: 00000001
+	00000000	0x24447: 00000000
+	00000000	0x24448: 00000000
+	00000602	0x24449: 00000602
+	00000000	0x24458: 00000000
+	00000001	0x24459: 00000001
+	00000001	0x2445a: 00000001
+	00000000	0x24540: 00000000
+	00000000	0x24541: 00000000
 	003c0000	GPU_CC_GX_DOMAIN_MISC: 0x3c0000
-	00000000	0x9d43: 00000000
-	00000001	0x9d44: 00000001
-	0000003f	0x9d45: 0000003f
-	00000000	0x9d46: 00000000
-	0000003f	0x9d47: 0000003f
-	00000000	0x9d48: 00000000
-	0000003f	0x9d49: 0000003f
-	00000000	0x9d4a: 00000000
-	000001ff	0x9d4b: 000001ff
-	000001ff	0x9d4c: 000001ff
-	00000000	0x9d4d: 00000000
-	00000001	0x9d4e: 00000001
-	00000000	0x9d4f: 00000000
-	80001fe0	0x9d50: 80001fe0
-	00000000	0x9d51: 00000000
-	00000000	0x9d52: 00000000
-	00000001	0x9d53: 00000001
-	00000000	0x9d54: 00000000
-	00000001	0x9d55: 00000001
-	00000000	0x9d56: 00000000
-	00000003	0x9d57: 00000003
-	00000003	0x9d58: 00000003
-	00000000	0x9d59: 00000000
-	00000000	0x9d5a: 00000000
-	00000000	0x9d5b: 00000000
-	00000000	0x9d5c: 00000000
-	00000000	0x9d5d: 00000000
-	40000001	0x9d5e: 40000001
-	00000000	0xa000: 00000000
-	80000001	0xa001: 80000001
-	00000000	0xa002: 00000000
-	00000000	0xa400: 00000000
-	80000001	0xa401: 80000001
-	00000000	0xa402: 00000000
-	00000000	0xac00: 00000000
-	80000001	0xac01: 80000001
-	00000000	0xac02: 00000000
-	00000000	0xb000: 00000000
-	80000001	0xb001: 80000001
-	00000000	0xb002: 00000000
-	00000000	0xb400: 00000000
-	80000001	0xb401: 80000001
-	00000000	0xb402: 00000000
-	00000000	0xb800: 00000000
-	00000000	0xb801: 00000000
-	00000000	0xb802: 00000000
-	10010000	0xbc00: 10010000
-	00000000	0xbc01: 00000000
-	00000000	0xbc02: 00000000
-	00000000	0xbc03: 00000000
-	00000000	0xbc04: 00000000
-	00000000	0xbc05: 00000000
-	00000000	0xbc06: 00000000
-	00000000	0xbc07: 00000000
-	00000000	0xbc08: 00000000
-	00000000	0xbc09: 00000000
-	00000000	0xbc0a: 00000000
-	00000000	0xbc0b: 00000000
-	02c3da78	0xbc0c: 02c3da78
-	00000000	0xbc0d: 00000000
-	037d2002	0xbc0e: 037d2002
-	00000000	0xbc0f: 00000000
-	00000000	0xbc10: 00000000
-	00000001	0xbc11: 00000001
-	00000000	0xbc12: 00000000
-	00000000	0xbc13: 00000000
-	00000000	0xbc14: 00000000
-	00000000	0xbc15: 00000000
-	00000000	0xbc16: 00000000
-	00000000	0xbc20: 00000000
-	00000000	0xbc21: 00000000
-	00000800	0xbc22: 00000800
-	00000002	0xbc23: 00000002
-	00000000	0xbc24: 00000000
-	00000000	0xbc25: 00000000
-	10010000	0xbc26: 10010000
-	00000000	0xbc27: 00000000
-	00000000	RSCC_TIMESTAMP_UNIT1_OUTPUT_DRV0: 0
-	00000000	RSCC_SEQ_BUSY_DRV0: 0
-	00000013	0x102: 00000013
-	0000000f	0x340: 0000000f
-	00000000	0x341: 00000000
-	00000000	0x342: 00000000
-	00000001	0x344: 00000001
-	00000000	0x345: 00000000
-	00000001	RSCC_TCS0_DRV0_STATUS: 0x1
-	00000000	0x347: 00000000
-	00010108	0x34c: 00010108
-	00050000	0x34d: 00050000
-	40000000	0x34e: 40000000
-	00000000	0x34f: 00000000
-	00000000	0x350: 00000000
-	00010108	0x351: 00010108
-	0005003c	0x352: 0005003c
-	40000000	0x353: 40000000
-	00000000	0x354: 00000000
-	00000000	0x355: 00000000
-	00010108	0x356: 00010108
-	0005000c	0x357: 0005000c
-	40000000	0x358: 40000000
-	00000000	0x359: 00000000
-	00000000	0x35a: 00000000
-	00010108	0x35b: 00010108
-	00050000	0x35c: 00050000
-	00000000	0x35d: 00000000
-	00000000	0x35e: 00000000
-	00000000	0x35f: 00000000
-	00010108	0x360: 00010108
-	00050000	0x361: 00050000
-	00000000	0x362: 00000000
-	00000000	0x363: 00000000
-	00000000	0x364: 00000000
-	00010108	0x365: 00010108
-	00050000	0x366: 00050000
-	00000000	0x367: 00000000
-	00000000	0x368: 00000000
-	00000000	0x369: 00000000
-	00010108	0x36a: 00010108
-	00050000	0x36b: 00050000
-	00000000	0x36c: 00000000
-	00000000	0x36d: 00000000
-	00000000	0x36e: 00000000
-	00010108	0x36f: 00010108
-	00050000	0x370: 00050000
-	00000000	0x371: 00000000
-	00000000	0x372: 00000000
-	00000000	0x373: 00000000
-	00010108	0x374: 00010108
-	00000000	0x375: 00000000
-	00000000	0x376: 00000000
-	00000000	0x377: 00000000
-	00000000	0x378: 00000000
-	00010108	0x379: 00010108
-	00000000	0x37a: 00000000
-	00000000	0x37b: 00000000
-	00000000	0x37c: 00000000
-	00000000	0x37d: 00000000
-	00010108	0x37e: 00010108
-	00000000	0x37f: 00000000
-	00000000	0x380: 00000000
-	00000000	0x381: 00000000
-	00000000	0x382: 00000000
-	00010108	0x383: 00010108
-	00000000	0x384: 00000000
-	00000000	0x385: 00000000
-	00000000	0x386: 00000000
-	00000000	0x387: 00000000
-	00000001	0x3ec: 00000001
-	00000000	0x3ed: 00000000
-	00000001	RSCC_TCS1_DRV0_STATUS: 0x1
-	00000000	0x3ef: 00000000
-	00010108	0x3f4: 00010108
-	0005007c	0x3f5: 0005007c
-	40000000	0x3f6: 40000000
-	00000000	0x3f7: 00000000
-	00000000	0x3f8: 00000000
-	00010108	0x3f9: 00010108
-	00050000	0x3fa: 00050000
-	00000000	0x3fb: 00000000
-	00000000	0x3fc: 00000000
-	00000000	0x3fd: 00000000
-	00010108	0x3fe: 00010108
-	00050000	0x3ff: 00050000
-	00000000	0x400: 00000000
-	00000000	0x401: 00000000
-	00000000	0x402: 00000000
-	00010108	0x403: 00010108
-	00050000	0x404: 00050000
-	00000000	0x405: 00000000
-	00000000	0x406: 00000000
-	00000000	0x407: 00000000
-	00010108	0x408: 00010108
-	00050000	0x409: 00050000
-	00000000	0x40a: 00000000
-	00000000	0x40b: 00000000
-	00000000	0x40c: 00000000
-	00010108	0x40d: 00010108
-	00050000	0x40e: 00050000
-	00000000	0x40f: 00000000
-	00000000	0x410: 00000000
-	00000000	0x411: 00000000
-	00010108	0x412: 00010108
-	00030050	0x413: 00030050
-	00000000	0x414: 00000000
-	00000000	0x415: 00000000
-	00000000	0x416: 00000000
-	00010108	0x417: 00010108
-	00030010	0x418: 00030010
-	00000000	0x419: 00000000
-	00000000	0x41a: 00000000
-	00000000	0x41b: 00000000
-	00010108	0x41c: 00010108
-	00030000	0x41d: 00030000
-	00000000	0x41e: 00000000
-	00000000	0x41f: 00000000
-	00000000	0x420: 00000000
-	00010108	0x421: 00010108
-	00000000	0x422: 00000000
-	00000000	0x423: 00000000
-	00000000	0x424: 00000000
-	00000000	0x425: 00000000
-	00010108	0x426: 00010108
-	00000000	0x427: 00000000
-	00000000	0x428: 00000000
-	00000000	0x429: 00000000
-	00000000	0x42a: 00000000
-	00010108	0x42b: 00010108
-	00000000	0x42c: 00000000
-	00000000	0x42d: 00000000
-	00000000	0x42e: 00000000
-	00000000	0x42f: 00000000
-	00000001	0x494: 00000001
-	00000000	0x495: 00000000
-	00000001	RSCC_TCS2_DRV0_STATUS: 0x1
-	00000000	0x497: 00000000
-	00010108	0x49c: 00010108
-	00050000	0x49d: 00050000
-	00000000	0x49e: 00000000
-	00000000	0x49f: 00000000
-	00000000	0x4a0: 00000000
-	00010108	0x4a1: 00010108
-	0005003c	0x4a2: 0005003c
-	00000000	0x4a3: 00000000
-	00000000	0x4a4: 00000000
-	00000000	0x4a5: 00000000
-	00010108	0x4a6: 00010108
-	0005000c	0x4a7: 0005000c
-	00000000	0x4a8: 00000000
-	00000000	0x4a9: 00000000
-	00000000	0x4aa: 00000000
-	00010108	0x4ab: 00010108
-	00050000	0x4ac: 00050000
-	00000000	0x4ad: 00000000
-	00000000	0x4ae: 00000000
-	00000000	0x4af: 00000000
-	00010108	0x4b0: 00010108
-	00050000	0x4b1: 00050000
-	00000000	0x4b2: 00000000
-	00000000	0x4b3: 00000000
-	00000000	0x4b4: 00000000
-	00010108	0x4b5: 00010108
-	00050000	0x4b6: 00050000
-	00000000	0x4b7: 00000000
-	00000000	0x4b8: 00000000
-	00000000	0x4b9: 00000000
-	00010108	0x4ba: 00010108
-	00050000	0x4bb: 00050000
-	00000000	0x4bc: 00000000
-	00000000	0x4bd: 00000000
-	00000000	0x4be: 00000000
-	00010108	0x4bf: 00010108
-	00050000	0x4c0: 00050000
-	00000000	0x4c1: 00000000
-	00000000	0x4c2: 00000000
-	00000000	0x4c3: 00000000
-	00010108	0x4c4: 00010108
-	00000000	0x4c5: 00000000
-	00000000	0x4c6: 00000000
-	00000000	0x4c7: 00000000
-	00000000	0x4c8: 00000000
-	00010108	0x4c9: 00010108
-	00000000	0x4ca: 00000000
-	00000000	0x4cb: 00000000
-	00000000	0x4cc: 00000000
-	00000000	0x4cd: 00000000
-	00010108	0x4ce: 00010108
-	00000000	0x4cf: 00000000
-	00000000	0x4d0: 00000000
-	00000000	0x4d1: 00000000
-	00000000	0x4d2: 00000000
-	00010108	0x4d3: 00010108
-	00000000	0x4d4: 00000000
-	00000000	0x4d5: 00000000
-	00000000	0x4d6: 00000000
-	00000000	0x4d7: 00000000
-	00000001	0x53c: 00000001
-	01010000	0x53d: 01010000
-	00000001	RSCC_TCS3_DRV0_STATUS: 0x1
-	000000c0	0x53f: 000000c0
-	00010108	0x544: 00010108
-	0005007c	0x545: 0005007c
-	60000001	0x546: 60000001
-	00000000	0x547: 00000000
-	00000000	0x548: 00000000
-	00010108	0x549: 00010108
-	00050000	0x54a: 00050000
-	00000000	0x54b: 00000000
-	00000000	0x54c: 00000000
-	00000000	0x54d: 00000000
-	00010108	0x54e: 00010108
-	00050000	0x54f: 00050000
-	00000000	0x550: 00000000
-	00000000	0x551: 00000000
-	00000000	0x552: 00000000
-	00010108	0x553: 00010108
-	00050000	0x554: 00050000
-	00000000	0x555: 00000000
-	00000000	0x556: 00000000
-	00000000	0x557: 00000000
-	00010108	0x558: 00010108
-	00050000	0x559: 00050000
-	00000000	0x55a: 00000000
-	00000000	0x55b: 00000000
-	00000000	0x55c: 00000000
-	00010108	0x55d: 00010108
-	00050000	0x55e: 00050000
-	00000000	0x55f: 00000000
-	00000000	0x560: 00000000
-	00000000	0x561: 00000000
-	00010108	0x562: 00010108
-	00030050	0x563: 00030050
-	00000007	0x564: 00000007
-	00010101	0x565: 00010101
-	00000000	0x566: 00000000
-	00010108	0x567: 00010108
-	00030010	0x568: 00030010
-	00000003	0x569: 00000003
-	00010101	0x56a: 00010101
-	00000000	0x56b: 00000000
-	00010108	0x56c: 00010108
-	00030000	0x56d: 00030000
-	00000000	0x56e: 00000000
-	00000000	0x56f: 00000000
-	00000000	0x570: 00000000
-	00010108	0x571: 00010108
-	00000000	0x572: 00000000
-	00000000	0x573: 00000000
-	00000000	0x574: 00000000
-	00000000	0x575: 00000000
-	00010108	0x576: 00010108
-	00000000	0x577: 00000000
-	00000000	0x578: 00000000
-	00000000	0x579: 00000000
-	00000000	0x57a: 00000000
-	00010108	0x57b: 00010108
-	00000000	0x57c: 00000000
-	00000000	0x57d: 00000000
-	00000000	0x57e: 00000000
-	00000000	0x57f: 00000000
-	00000000	0: 00000000
-	00000000	0x10: 00000000
-	00000000	0x11: 00000000
-	00000000	0x12: 00000000
-	00000000	0x13: 00000000
-	00000000	0x16: 00000000
-	00000000	0x18: 00000000
-	00000000	0x19: 00000000
-	00000000	0x1a: 00000000
-	00000000	0x1b: 00000000
-	00000000	0x1e: 00000000
-	00000000	0x20: 00000000
-	00000000	0x21: 00000000
-	00000000	0x22: 00000000
-	00000000	0x23: 00000000
-	00000000	0x26: 00000000
-	00000000	0x28: 00000000
-	00000000	0x29: 00000000
-	00000000	0x2a: 00000000
-	00000000	0x2b: 00000000
-	00000000	0x2e: 00000000
-	00000000	0x30: 00000000
-	00000000	0x31: 00000000
-	00000000	0x32: 00000000
-	00000000	0x33: 00000000
-	00000000	0x36: 00000000
-	00000000	0x38: 00000000
-	00000000	0x39: 00000000
-	00000000	0x3a: 00000000
-	00000000	0x3b: 00000000
-	00000000	0x3e: 00000000
-	00000000	0x40: 00000000
-	00000000	0x41: 00000000
-	00000000	0x42: 00000000
-	00000000	0x43: 00000000
-	00000000	0x46: 00000000
+	00000000	0x24543: 00000000
+	00000001	0x24544: 00000001
+	0000003f	0x24545: 0000003f
+	00000000	0x24546: 00000000
+	0000003f	0x24547: 0000003f
+	00000000	0x24548: 00000000
+	0000003f	0x24549: 0000003f
+	00000000	0x2454a: 00000000
+	000001ff	0x2454b: 000001ff
+	000001ff	0x2454c: 000001ff
+	00000000	0x2454d: 00000000
+	00000001	0x2454e: 00000001
+	00000000	0x2454f: 00000000
+	80001fe0	0x24550: 80001fe0
+	00000000	0x24551: 00000000
+	00000000	0x24552: 00000000
+	00000001	0x24553: 00000001
+	00000000	0x24554: 00000000
+	00000001	0x24555: 00000001
+	00000000	0x24556: 00000000
+	00000003	0x24557: 00000003
+	00000003	0x24558: 00000003
+	00000000	0x24559: 00000000
+	00000000	0x2455a: 00000000
+	00000000	0x2455b: 00000000
+	00000000	0x2455c: 00000000
+	00000000	0x2455d: 00000000
+	40000001	0x2455e: 40000001
+	00000000	0x24800: 00000000
+	80000001	0x24801: 80000001
+	00000000	0x24802: 00000000
+	00000000	0x24c00: 00000000
+	80000001	0x24c01: 80000001
+	00000000	0x24c02: 00000000
+	00000000	0x25400: 00000000
+	80000001	0x25401: 80000001
+	00000000	0x25402: 00000000
+	00000000	0x25800: 00000000
+	80000001	0x25801: 80000001
+	00000000	0x25802: 00000000
+	00000000	0x25c00: 00000000
+	80000001	0x25c01: 80000001
+	00000000	0x25c02: 00000000
+	00000000	0x26000: 00000000
+	00000000	0x26001: 00000000
+	00000000	0x26002: 00000000
+	10010000	0x26400: 10010000
+	00000000	0x26401: 00000000
+	00000000	0x26402: 00000000
+	00000000	0x26403: 00000000
+	00000000	0x26404: 00000000
+	00000000	0x26405: 00000000
+	00000000	0x26406: 00000000
+	00000000	0x26407: 00000000
+	00000000	0x26408: 00000000
+	00000000	0x26409: 00000000
+	00000000	0x2640a: 00000000
+	00000000	0x2640b: 00000000
+	02c3da78	0x2640c: 02c3da78
+	00000000	0x2640d: 00000000
+	037d2002	0x2640e: 037d2002
+	00000000	0x2640f: 00000000
+	00000000	0x26410: 00000000
+	00000001	0x26411: 00000001
+	00000000	0x26412: 00000000
+	00000000	0x26413: 00000000
+	00000000	0x26414: 00000000
+	00000000	0x26415: 00000000
+	00000000	0x26416: 00000000
+	00000000	0x26420: 00000000
+	00000000	0x26421: 00000000
+	00000800	0x26422: 00000800
+	00000002	0x26423: 00000002
+	00000000	0x26424: 00000000
+	00000000	0x26425: 00000000
+	10010000	0x26426: 10010000
+	00000000	0x26427: 00000000
+	00000000	0x1a88c: 00000000
+	00000000	0x1a901: 00000000
+	00000013	0x1a902: 00000013
+	0000000f	0x1ab40: 0000000f
+	00000000	0x1ab41: 00000000
+	00000000	0x1ab42: 00000000
+	00000001	0x1ab44: 00000001
+	00000000	0x1ab45: 00000000
+	00000001	0x1ab46: 00000001
+	00000000	0x1ab47: 00000000
+	00010108	0x1ab4c: 00010108
+	00050000	0x1ab4d: 00050000
+	40000000	0x1ab4e: 40000000
+	00000000	0x1ab4f: 00000000
+	00000000	0x1ab50: 00000000
+	00010108	0x1ab51: 00010108
+	0005003c	0x1ab52: 0005003c
+	40000000	0x1ab53: 40000000
+	00000000	0x1ab54: 00000000
+	00000000	0x1ab55: 00000000
+	00010108	0x1ab56: 00010108
+	0005000c	0x1ab57: 0005000c
+	40000000	0x1ab58: 40000000
+	00000000	0x1ab59: 00000000
+	00000000	0x1ab5a: 00000000
+	00010108	0x1ab5b: 00010108
+	00050000	0x1ab5c: 00050000
+	00000000	0x1ab5d: 00000000
+	00000000	0x1ab5e: 00000000
+	00000000	0x1ab5f: 00000000
+	00010108	0x1ab60: 00010108
+	00050000	0x1ab61: 00050000
+	00000000	0x1ab62: 00000000
+	00000000	0x1ab63: 00000000
+	00000000	0x1ab64: 00000000
+	00010108	0x1ab65: 00010108
+	00050000	0x1ab66: 00050000
+	00000000	0x1ab67: 00000000
+	00000000	0x1ab68: 00000000
+	00000000	0x1ab69: 00000000
+	00010108	0x1ab6a: 00010108
+	00050000	0x1ab6b: 00050000
+	00000000	0x1ab6c: 00000000
+	00000000	0x1ab6d: 00000000
+	00000000	0x1ab6e: 00000000
+	00010108	0x1ab6f: 00010108
+	00050000	0x1ab70: 00050000
+	00000000	0x1ab71: 00000000
+	00000000	0x1ab72: 00000000
+	00000000	0x1ab73: 00000000
+	00010108	0x1ab74: 00010108
+	00000000	0x1ab75: 00000000
+	00000000	0x1ab76: 00000000
+	00000000	0x1ab77: 00000000
+	00000000	0x1ab78: 00000000
+	00010108	0x1ab79: 00010108
+	00000000	0x1ab7a: 00000000
+	00000000	0x1ab7b: 00000000
+	00000000	0x1ab7c: 00000000
+	00000000	0x1ab7d: 00000000
+	00010108	0x1ab7e: 00010108
+	00000000	0x1ab7f: 00000000
+	00000000	0x1ab80: 00000000
+	00000000	0x1ab81: 00000000
+	00000000	0x1ab82: 00000000
+	00010108	0x1ab83: 00010108
+	00000000	0x1ab84: 00000000
+	00000000	0x1ab85: 00000000
+	00000000	0x1ab86: 00000000
+	00000000	0x1ab87: 00000000
+	00000001	0x1abec: 00000001
+	00000000	0x1abed: 00000000
+	00000001	0x1abee: 00000001
+	00000000	0x1abef: 00000000
+	00010108	0x1abf4: 00010108
+	0005007c	0x1abf5: 0005007c
+	40000000	0x1abf6: 40000000
+	00000000	0x1abf7: 00000000
+	00000000	0x1abf8: 00000000
+	00010108	0x1abf9: 00010108
+	00050000	0x1abfa: 00050000
+	00000000	0x1abfb: 00000000
+	00000000	0x1abfc: 00000000
+	00000000	0x1abfd: 00000000
+	00010108	0x1abfe: 00010108
+	00050000	0x1abff: 00050000
+	00000000	0x1ac00: 00000000
+	00000000	0x1ac01: 00000000
+	00000000	0x1ac02: 00000000
+	00010108	0x1ac03: 00010108
+	00050000	0x1ac04: 00050000
+	00000000	0x1ac05: 00000000
+	00000000	0x1ac06: 00000000
+	00000000	0x1ac07: 00000000
+	00010108	0x1ac08: 00010108
+	00050000	0x1ac09: 00050000
+	00000000	0x1ac0a: 00000000
+	00000000	0x1ac0b: 00000000
+	00000000	0x1ac0c: 00000000
+	00010108	0x1ac0d: 00010108
+	00050000	0x1ac0e: 00050000
+	00000000	0x1ac0f: 00000000
+	00000000	0x1ac10: 00000000
+	00000000	0x1ac11: 00000000
+	00010108	0x1ac12: 00010108
+	00030050	0x1ac13: 00030050
+	00000000	0x1ac14: 00000000
+	00000000	0x1ac15: 00000000
+	00000000	0x1ac16: 00000000
+	00010108	0x1ac17: 00010108
+	00030010	0x1ac18: 00030010
+	00000000	0x1ac19: 00000000
+	00000000	0x1ac1a: 00000000
+	00000000	0x1ac1b: 00000000
+	00010108	0x1ac1c: 00010108
+	00030000	0x1ac1d: 00030000
+	00000000	0x1ac1e: 00000000
+	00000000	0x1ac1f: 00000000
+	00000000	0x1ac20: 00000000
+	00010108	0x1ac21: 00010108
+	00000000	0x1ac22: 00000000
+	00000000	0x1ac23: 00000000
+	00000000	0x1ac24: 00000000
+	00000000	0x1ac25: 00000000
+	00010108	0x1ac26: 00010108
+	00000000	0x1ac27: 00000000
+	00000000	0x1ac28: 00000000
+	00000000	0x1ac29: 00000000
+	00000000	0x1ac2a: 00000000
+	00010108	0x1ac2b: 00010108
+	00000000	0x1ac2c: 00000000
+	00000000	0x1ac2d: 00000000
+	00000000	0x1ac2e: 00000000
+	00000000	0x1ac2f: 00000000
+	00000001	0x1ac94: 00000001
+	00000000	0x1ac95: 00000000
+	00000001	0x1ac96: 00000001
+	00000000	0x1ac97: 00000000
+	00010108	0x1ac9c: 00010108
+	00050000	0x1ac9d: 00050000
+	00000000	0x1ac9e: 00000000
+	00000000	0x1ac9f: 00000000
+	00000000	0x1aca0: 00000000
+	00010108	0x1aca1: 00010108
+	0005003c	0x1aca2: 0005003c
+	00000000	0x1aca3: 00000000
+	00000000	0x1aca4: 00000000
+	00000000	0x1aca5: 00000000
+	00010108	0x1aca6: 00010108
+	0005000c	0x1aca7: 0005000c
+	00000000	0x1aca8: 00000000
+	00000000	0x1aca9: 00000000
+	00000000	0x1acaa: 00000000
+	00010108	0x1acab: 00010108
+	00050000	0x1acac: 00050000
+	00000000	0x1acad: 00000000
+	00000000	0x1acae: 00000000
+	00000000	0x1acaf: 00000000
+	00010108	0x1acb0: 00010108
+	00050000	0x1acb1: 00050000
+	00000000	0x1acb2: 00000000
+	00000000	0x1acb3: 00000000
+	00000000	0x1acb4: 00000000
+	00010108	0x1acb5: 00010108
+	00050000	0x1acb6: 00050000
+	00000000	0x1acb7: 00000000
+	00000000	0x1acb8: 00000000
+	00000000	0x1acb9: 00000000
+	00010108	0x1acba: 00010108
+	00050000	0x1acbb: 00050000
+	00000000	0x1acbc: 00000000
+	00000000	0x1acbd: 00000000
+	00000000	0x1acbe: 00000000
+	00010108	0x1acbf: 00010108
+	00050000	0x1acc0: 00050000
+	00000000	0x1acc1: 00000000
+	00000000	0x1acc2: 00000000
+	00000000	0x1acc3: 00000000
+	00010108	0x1acc4: 00010108
+	00000000	0x1acc5: 00000000
+	00000000	0x1acc6: 00000000
+	00000000	0x1acc7: 00000000
+	00000000	0x1acc8: 00000000
+	00010108	0x1acc9: 00010108
+	00000000	0x1acca: 00000000
+	00000000	0x1accb: 00000000
+	00000000	0x1accc: 00000000
+	00000000	0x1accd: 00000000
+	00010108	0x1acce: 00010108
+	00000000	0x1accf: 00000000
+	00000000	0x1acd0: 00000000
+	00000000	0x1acd1: 00000000
+	00000000	0x1acd2: 00000000
+	00010108	0x1acd3: 00010108
+	00000000	0x1acd4: 00000000
+	00000000	0x1acd5: 00000000
+	00000000	0x1acd6: 00000000
+	00000000	0x1acd7: 00000000
+	00000001	0x1ad3c: 00000001
+	01010000	0x1ad3d: 01010000
+	00000001	0x1ad3e: 00000001
+	000000c0	0x1ad3f: 000000c0
+	00010108	0x1ad44: 00010108
+	0005007c	0x1ad45: 0005007c
+	60000001	0x1ad46: 60000001
+	00000000	0x1ad47: 00000000
+	00000000	0x1ad48: 00000000
+	00010108	0x1ad49: 00010108
+	00050000	0x1ad4a: 00050000
+	00000000	0x1ad4b: 00000000
+	00000000	0x1ad4c: 00000000
+	00000000	0x1ad4d: 00000000
+	00010108	0x1ad4e: 00010108
+	00050000	0x1ad4f: 00050000
+	00000000	0x1ad50: 00000000
+	00000000	0x1ad51: 00000000
+	00000000	0x1ad52: 00000000
+	00010108	0x1ad53: 00010108
+	00050000	0x1ad54: 00050000
+	00000000	0x1ad55: 00000000
+	00000000	0x1ad56: 00000000
+	00000000	0x1ad57: 00000000
+	00010108	0x1ad58: 00010108
+	00050000	0x1ad59: 00050000
+	00000000	0x1ad5a: 00000000
+	00000000	0x1ad5b: 00000000
+	00000000	0x1ad5c: 00000000
+	00010108	0x1ad5d: 00010108
+	00050000	0x1ad5e: 00050000
+	00000000	0x1ad5f: 00000000
+	00000000	0x1ad60: 00000000
+	00000000	0x1ad61: 00000000
+	00010108	0x1ad62: 00010108
+	00030050	0x1ad63: 00030050
+	00000007	0x1ad64: 00000007
+	00010101	0x1ad65: 00010101
+	00000000	0x1ad66: 00000000
+	00010108	0x1ad67: 00010108
+	00030010	0x1ad68: 00030010
+	00000003	0x1ad69: 00000003
+	00010101	0x1ad6a: 00010101
+	00000000	0x1ad6b: 00000000
+	00010108	0x1ad6c: 00010108
+	00030000	0x1ad6d: 00030000
+	00000000	0x1ad6e: 00000000
+	00000000	0x1ad6f: 00000000
+	00000000	0x1ad70: 00000000
+	00010108	0x1ad71: 00010108
+	00000000	0x1ad72: 00000000
+	00000000	0x1ad73: 00000000
+	00000000	0x1ad74: 00000000
+	00000000	0x1ad75: 00000000
+	00010108	0x1ad76: 00010108
+	00000000	0x1ad77: 00000000
+	00000000	0x1ad78: 00000000
+	00000000	0x1ad79: 00000000
+	00000000	0x1ad7a: 00000000
+	00010108	0x1ad7b: 00010108
+	00000000	0x1ad7c: 00000000
+	00000000	0x1ad7d: 00000000
+	00000000	0x1ad7e: 00000000
+	00000000	0x1ad7f: 00000000
+	00000000	0x1a800: 00000000
+	00000000	0x1a810: 00000000
+	00000000	0x1a811: 00000000
+	00000000	0x1a812: 00000000
+	00000000	0x1a813: 00000000
+	00000000	0x1a816: 00000000
+	00000000	0x1a818: 00000000
+	00000000	0x1a819: 00000000
+	00000000	0x1a81a: 00000000
+	00000000	0x1a81b: 00000000
+	00000000	0x1a81e: 00000000
+	00000000	0x1a820: 00000000
+	00000000	0x1a821: 00000000
+	00000000	0x1a822: 00000000
+	00000000	0x1a823: 00000000
+	00000000	0x1a826: 00000000
+	00000000	0x1a828: 00000000
+	00000000	0x1a829: 00000000
+	00000000	0x1a82a: 00000000
+	00000000	0x1a82b: 00000000
+	00000000	0x1a82e: 00000000
+	00000000	0x1a830: 00000000
+	00000000	0x1a831: 00000000
+	00000000	0x1a832: 00000000
+	00000000	0x1a833: 00000000
+	00000000	0x1a836: 00000000
+	00000000	0x1a838: 00000000
+	00000000	0x1a839: 00000000
+	00000000	0x1a83a: 00000000
+	00000000	0x1a83b: 00000000
+	00000000	0x1a83e: 00000000
+	00000000	0x1a840: 00000000
+	00000000	0x1a841: 00000000
+	00000000	0x1a842: 00000000
+	00000000	0x1a843: 00000000
+	00000000	0x1a846: 00000000
 	00008ff1	GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL: 0x8ff1
 	00778000	GMU_GX_SPTPRAC_POWER_CONTROL: 0x778000
-	00000020	RSCC_TIMESTAMP_UNIT0_TIMESTAMP_L_DRV0: 0x20
-	00000044	RSCC_TIMESTAMP_UNIT0_TIMESTAMP_H_DRV0: 0x44
-	00000044	0x84: 00000044
-	00000000	RSCC_OVERRIDE_START_ADDR: 0
-	00000000	RSCC_SEQ_BUSY_DRV0: 0
-	00000000	0x102: 00000000
-	00000000	0x103: 00000000
-	00000000	0x104: 00000000
-	00000000	0x105: 00000000
-	00000000	0x106: 00000000
-	00000000	0x107: 00000000
-	00000000	0x108: 00000000
-	00000000	0x109: 00000000
-	00000000	0x10a: 00000000
-	00000000	0x10b: 00000000
-	00000000	0x10c: 00000000
-	00000000	0x10d: 00000000
-	00000000	0x10e: 00000000
-	00000000	0x10f: 00000000
-	00000000	0x110: 00000000
-	00000000	0x111: 00000000
-	00000000	0x112: 00000000
-	00000000	0x113: 00000000
-	00000000	0x114: 00000000
-	00000000	0x115: 00000000
-	00000000	0x116: 00000000
-	00000000	0x117: 00000000
-	00000000	0x118: 00000000
-	00000000	0x119: 00000000
-	00000000	0x11a: 00000000
-	00000000	0x11b: 00000000
-	00000000	0x11c: 00000000
-	00000000	0x11d: 00000000
-	00000000	0x11e: 00000000
-	00000000	0x11f: 00000000
-	00000000	0x120: 00000000
-	00000000	0x121: 00000000
-	00000000	0x122: 00000000
-	00000000	0x123: 00000000
-	00000000	0x124: 00000000
-	00000000	0x125: 00000000
-	00000000	0x126: 00000000
-	00000000	0x127: 00000000
-	00000000	0x128: 00000000
-	00000000	0x129: 00000000
-	00000000	0x12a: 00000000
-	00000000	0x12b: 00000000
-	00000000	0x140: 00000000
+	00000020	0x1a882: 00000020
+	00000044	0x1a883: 00000044
+	00000044	0x1a884: 00000044
+	00000000	0x1a900: 00000000
+	00000000	0x1a901: 00000000
+	00000000	0x1a902: 00000000
+	00000000	0x1a903: 00000000
+	00000000	0x1a904: 00000000
+	00000000	0x1a905: 00000000
+	00000000	0x1a906: 00000000
+	00000000	0x1a907: 00000000
+	00000000	0x1a908: 00000000
+	00000000	0x1a909: 00000000
+	00000000	0x1a90a: 00000000
+	00000000	0x1a90b: 00000000
+	00000000	0x1a90c: 00000000
+	00000000	0x1a90d: 00000000
+	00000000	0x1a90e: 00000000
+	00000000	0x1a90f: 00000000
+	00000000	0x1a910: 00000000
+	00000000	0x1a911: 00000000
+	00000000	0x1a912: 00000000
+	00000000	0x1a913: 00000000
+	00000000	0x1a914: 00000000
+	00000000	0x1a915: 00000000
+	00000000	0x1a916: 00000000
+	00000000	0x1a917: 00000000
+	00000000	0x1a918: 00000000
+	00000000	0x1a919: 00000000
+	00000000	0x1a91a: 00000000
+	00000000	0x1a91b: 00000000
+	00000000	0x1a91c: 00000000
+	00000000	0x1a91d: 00000000
+	00000000	0x1a91e: 00000000
+	00000000	0x1a91f: 00000000
+	00000000	0x1a920: 00000000
+	00000000	0x1a921: 00000000
+	00000000	0x1a922: 00000000
+	00000000	0x1a923: 00000000
+	00000000	0x1a924: 00000000
+	00000000	0x1a925: 00000000
+	00000000	0x1a926: 00000000
+	00000000	0x1a927: 00000000
+	00000000	0x1a928: 00000000
+	00000000	0x1a929: 00000000
+	00000000	0x1a92a: 00000000
+	00000000	0x1a92b: 00000000
+	00000000	0x1a940: 00000000
 indexed-registers:
   - regs-name: CP_SQE_STAT
     dwords: 51