Module: Mesa
Branch: main
Commit: 891a8bfb2da72557025541e3d645506189ad0065
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=891a8bfb2da72557025541e3d645506189ad0065

Author: Konrad Dybcio <[email protected]>
Date:   Thu Feb 23 02:03:36 2023 +0100

freedreno: Add A2xx perf counter reg values

Required for good-looking kernel code

Signed-off-by: Konrad Dybcio <[email protected]>
[rob: fixup CI expectations]

Signed-off-by: Rob Clark <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21480>

---

 ...e.specification.basic_teximage2d.rgba16f_2d.log | 76 +++++++++++-----------
 src/freedreno/registers/adreno/a2xx.xml            | 11 +++-
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git 
a/src/freedreno/.gitlab-ci/reference/dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba16f_2d.log
 
b/src/freedreno/.gitlab-ci/reference/dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba16f_2d.log
index 9b7d21703f2..8ade566661d 100644
--- 
a/src/freedreno/.gitlab-ci/reference/dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba16f_2d.log
+++ 
b/src/freedreno/.gitlab-ci/reference/dEQP-GLES2.functional.texture.specification.basic_teximage2d.rgba16f_2d.log
@@ -15,7 +15,7 @@ cmdstream[0]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -248,7 +248,7 @@ cmdstream[0]: 124 dwords
                        draw[0] register values
 !+     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
 !+     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000009                        CP_SCRATCH_REG6: 9
                        :0,0,9,5
 !+     00000005                        CP_SCRATCH_REG7: 5
@@ -393,7 +393,7 @@ cmdstream[1]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -626,7 +626,7 @@ cmdstream[1]: 124 dwords
                        draw[1] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     0000000f                        CP_SCRATCH_REG6: 15
                        :0,0,15,11
 !+     0000000b                        CP_SCRATCH_REG7: 11
@@ -771,7 +771,7 @@ cmdstream[2]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -1004,7 +1004,7 @@ cmdstream[2]: 124 dwords
                        draw[2] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000015                        CP_SCRATCH_REG6: 21
                        :0,0,21,17
 !+     00000011                        CP_SCRATCH_REG7: 17
@@ -1149,7 +1149,7 @@ cmdstream[3]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -1382,7 +1382,7 @@ cmdstream[3]: 124 dwords
                        draw[3] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     0000001b                        CP_SCRATCH_REG6: 27
                        :0,0,27,23
 !+     00000017                        CP_SCRATCH_REG7: 23
@@ -1527,7 +1527,7 @@ cmdstream[4]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -1760,7 +1760,7 @@ cmdstream[4]: 124 dwords
                        draw[4] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000021                        CP_SCRATCH_REG6: 33
                        :0,0,33,29
 !+     0000001d                        CP_SCRATCH_REG7: 29
@@ -1905,7 +1905,7 @@ cmdstream[5]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -2138,7 +2138,7 @@ cmdstream[5]: 124 dwords
                        draw[5] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000027                        CP_SCRATCH_REG6: 39
                        :0,0,39,35
 !+     00000023                        CP_SCRATCH_REG7: 35
@@ -2283,7 +2283,7 @@ cmdstream[6]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -2516,7 +2516,7 @@ cmdstream[6]: 124 dwords
                        draw[6] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     0000002d                        CP_SCRATCH_REG6: 45
                        :0,0,45,41
 !+     00000029                        CP_SCRATCH_REG7: 41
@@ -2661,7 +2661,7 @@ cmdstream[7]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -2894,7 +2894,7 @@ cmdstream[7]: 124 dwords
                        draw[7] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000033                        CP_SCRATCH_REG6: 51
                        :0,0,51,47
 !+     0000002f                        CP_SCRATCH_REG7: 47
@@ -3039,7 +3039,7 @@ cmdstream[8]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -3272,7 +3272,7 @@ cmdstream[8]: 124 dwords
                        draw[8] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000039                        CP_SCRATCH_REG6: 57
                        :0,0,57,53
 !+     00000035                        CP_SCRATCH_REG7: 53
@@ -3417,7 +3417,7 @@ cmdstream[9]: 340 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0110a020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0110a02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -3642,7 +3642,7 @@ cmdstream[9]: 340 dwords
                        draw[9] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000043                        CP_SCRATCH_REG6: 67
                        :0,0,67,61
 !+     0000003d                        CP_SCRATCH_REG7: 61
@@ -4654,7 +4654,7 @@ NEEDS WFI: RB_BC_CONTROL (f01)
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
 NEEDS WFI: CP_PERFMON_CNTL (444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
 NEEDS WFI: RBBM_PM_OVERRIDE1 (39c)
@@ -4894,7 +4894,7 @@ NEEDS WFI: CP_SCRATCH_REG7 (57f)
                        draw[14] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000059                        CP_SCRATCH_REG6: 89
                        :0,0,89,85
 !+     00000055                        CP_SCRATCH_REG7: 85
@@ -5042,7 +5042,7 @@ cmdstream[11]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0110c020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0110c02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -5277,7 +5277,7 @@ cmdstream[11]: 124 dwords
                        draw[15] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     0000005f                        CP_SCRATCH_REG6: 95
                        :0,0,95,91
 !+     0000005b                        CP_SCRATCH_REG7: 91
@@ -5422,7 +5422,7 @@ cmdstream[12]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -5655,7 +5655,7 @@ cmdstream[12]: 124 dwords
                        draw[16] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000065                        CP_SCRATCH_REG6: 101
                        :0,0,101,97
 !+     00000061                        CP_SCRATCH_REG7: 97
@@ -5800,7 +5800,7 @@ cmdstream[13]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0110a020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0110a02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -6035,7 +6035,7 @@ cmdstream[13]: 124 dwords
                        draw[17] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     0000006b                        CP_SCRATCH_REG6: 107
                        :0,0,107,103
 !+     00000067                        CP_SCRATCH_REG7: 103
@@ -6180,7 +6180,7 @@ cmdstream[14]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -6413,7 +6413,7 @@ cmdstream[14]: 124 dwords
                        draw[18] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000071                        CP_SCRATCH_REG6: 113
                        :0,0,113,109
 !+     0000006d                        CP_SCRATCH_REG7: 109
@@ -6558,7 +6558,7 @@ cmdstream[15]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0110c020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0110c02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -6793,7 +6793,7 @@ cmdstream[15]: 124 dwords
                        draw[19] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000077                        CP_SCRATCH_REG6: 119
                        :0,0,119,115
 !+     00000073                        CP_SCRATCH_REG7: 115
@@ -6938,7 +6938,7 @@ cmdstream[16]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122d020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122d02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -7171,7 +7171,7 @@ cmdstream[16]: 124 dwords
                        draw[20] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     0000007d                        CP_SCRATCH_REG6: 125
                        :0,0,125,121
 !+     00000079                        CP_SCRATCH_REG7: 121
@@ -7316,7 +7316,7 @@ cmdstream[17]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0110a020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0110a02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -7551,7 +7551,7 @@ cmdstream[17]: 124 dwords
                        draw[21] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000083                        CP_SCRATCH_REG6: 131
                        :0,0,131,127
 !+     0000007f                        CP_SCRATCH_REG7: 127
@@ -7696,7 +7696,7 @@ cmdstream[18]: 124 dwords
                        VGT_OUT_DEALLOC_CNTL: { DEALLOC_DIST = 2 }
 0122f020:              0000: c0012d00 00040317 00000002
                write CP_PERFMON_CNTL (0444)
-                       CP_PERFMON_CNTL: 0
+                       CP_PERFMON_CNTL: { PERF_MODE_CNT = PERF_STATE_RESET }
 0122f02c:              0000: 00000444 00000000
                write RBBM_PM_OVERRIDE1 (039c)
                        RBBM_PM_OVERRIDE1: { RBBM_AHBCLK_PM_OVERRIDE | 
SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | SP_TOP_SCLK_PM_OVERRIDE | 
SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
@@ -7929,7 +7929,7 @@ cmdstream[18]: 124 dwords
                        draw[22] register values
  +     ffffffff                        RBBM_PM_OVERRIDE1: { 
RBBM_AHBCLK_PM_OVERRIDE | SC_REG_SCLK_PM_OVERRIDE | SC_SCLK_PM_OVERRIDE | 
SP_TOP_SCLK_PM_OVERRIDE | SP_V0_SCLK_PM_OVERRIDE | SQ_REG_SCLK_PM_OVERRIDE | 
SQ_REG_FIFOS_SCLK_PM_OVERRIDE | SQ_CONST_MEM_SCLK_PM_OVERRIDE | 
SQ_SQ_SCLK_PM_OVERRIDE | SX_SCLK_PM_OVERRIDE | SX_REG_SCLK_PM_OVERRIDE | 
TCM_TCO_SCLK_PM_OVERRIDE | TCM_TCM_SCLK_PM_OVERRIDE | TCM_TCD_SCLK_PM_OVERRIDE 
| TCM_REG_SCLK_PM_OVERRIDE | TPC_TPC_SCLK_PM_OVERRIDE | 
TPC_REG_SCLK_PM_OVERRIDE | TCF_TCA_SCLK_PM_OVERRIDE | TCF_TCB_SCLK_PM_OVERRIDE 
| TCF_TCB_READ_SCLK_PM_OVERRIDE | TP_TP_SCLK_PM_OVERRIDE | 
TP_REG_SCLK_PM_OVERRIDE | CP_G_SCLK_PM_OVERRIDE | CP_REG_SCLK_PM_OVERRIDE | 
CP_G_REG_SCLK_PM_OVERRIDE | SPI_SCLK_PM_OVERRIDE | RB_REG_SCLK_PM_OVERRIDE | 
RB_SCLK_PM_OVERRIDE | MH_MH_SCLK_PM_OVERRIDE | MH_REG_SCLK_PM_OVERRIDE | 
MH_MMU_SCLK_PM_OVERRIDE | MH_TCROQ_SCLK_PM_OVERRIDE }
  +     00000fff                        RBBM_PM_OVERRIDE2: 0xfff
- +     00000000                        CP_PERFMON_CNTL: 0
+ +     00000000                        CP_PERFMON_CNTL: { PERF_MODE_CNT = 
PERF_STATE_RESET }
 !+     00000089                        CP_SCRATCH_REG6: 137
                        :0,0,137,133
 !+     00000085                        CP_SCRATCH_REG7: 133
diff --git a/src/freedreno/registers/adreno/a2xx.xml 
b/src/freedreno/registers/adreno/a2xx.xml
index b95709cf84d..641c9974f66 100644
--- a/src/freedreno/registers/adreno/a2xx.xml
+++ b/src/freedreno/registers/adreno/a2xx.xml
@@ -1019,6 +1019,12 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ 
rules-ng.xsd">
        <value value="181" name="AXI_TOTAL_READ_REQUEST_DATA_BEATS"/>
 </enum>
 
+<enum name="perf_mode_cnt">
+       <value name="PERF_STATE_RESET" value="0"/>
+       <value name="PERF_STATE_ENABLE" value="1"/>
+       <value name="PERF_STATE_FREEZE" value="2"/>
+</enum>
+
 <domain name="A2XX" width="32">
 
        <bitset name="a2xx_vgt_current_bin_id_min_max" inline="yes">
@@ -1135,7 +1141,10 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ 
rules-ng.xsd">
        </reg32>
        <reg32 offset="0x03f9" name="RBBM_PERIPHID1"/>
        <reg32 offset="0x03fa" name="RBBM_PERIPHID2"/>
-       <reg32 offset="0x0444" name="CP_PERFMON_CNTL"/>
+       <reg32 offset="0x0444" name="CP_PERFMON_CNTL">
+               <!-- The width is uncertain -->
+               <bitfield name="PERF_MODE_CNT" low="0" high="2" 
type="perf_mode_cnt"/>
+       </reg32>
        <reg32 offset="0x0445" name="CP_PERFCOUNTER_SELECT"/>
        <reg32 offset="0x0446" name="CP_PERFCOUNTER_LO"/>
        <reg32 offset="0x0447" name="CP_PERFCOUNTER_HI"/>


Reply via email to