projects / platform / upstream / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6dd5b4c)
freedreno/registers: Define rest of CP_REG_WRITE
authorRob Clark <robdclark@chromium.org>
Tue, 7 Mar 2023 15:52:36 +0000 (07:52 -0800)
committerMarge Bot <emma+marge@anholt.net>
Mon, 13 Mar 2023 17:31:24 +0000 (17:31 +0000)
Enough that we can use OUT_PKT() to emit it, which will be needed when
we use it to write regs that are different btwn a6xx and a7xx.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21846>

src/freedreno/.gitlab-ci/reference/crash_prefetch.log patch | blob | history
src/freedreno/.gitlab-ci/reference/dEQP-VK.draw.indirect_draw.indexed.indirect_draw_count.triangle_list.log patch | blob | history
src/freedreno/.gitlab-ci/reference/fd-clouds.log patch | blob | history
src/freedreno/.gitlab-ci/reference/prefetch-test.log patch | blob | history
src/freedreno/registers/adreno/adreno_pm4.xml patch | blob | history

diff --git a/src/freedreno/.gitlab-ci/reference/crash_prefetch.log b/src/freedreno/.gitlab-ci/reference/crash_prefetch.log
index da99307..c6c7556 100644 (file)
--- a/src/freedreno/.gitlab-ci/reference/crash_prefetch.log
+++ b/src/freedreno/.gitlab-ci/reference/crash_prefetch.log
@@ -2403,6 +2403,8 @@ got cmdszdw=83
 0000000100227200:                              0000: 70c70002 3c000000 00000004
                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                        { TRACKER = TRACK_RENDER_CNTL }
+                                       { 1 = 0x8801 }
+                                       { 2 = 0xa0010 }
 000000010022720c:                              0000: 706d8003 00000002 00008801 000a0010
                                opcode: CP_SET_DRAW_STATE (43) (7 dwords)
                                        { COUNT = 0 | DISABLE | GMEM | GROUP_ID = 9 }
@@ -2615,6 +2617,8 @@ got cmdszdw=83
 00000001001e7378:                                              0000: 70340007 00704000 00000000 00000000 3d800000 d0d0d0d0 d0d0d0d0 d0d0d0d0
                                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                                        { TRACKER = UNK_EVENT_WRITE }
+                                                       { 1 = 0x9b07 }
+                                                       { 2 = 0 }
 00000001001e7398:                                              0000: 706d8003 00000004 00009b07 00000000
                                                opcode: CP_CONTEXT_REG_BUNCH (5c) (5 dwords)
                                                        VPC_SO_CNTL: { ADDR = 0 }
@@ -3096,6 +3100,8 @@ got cmdszdw=83
 00000001002274ac:                              0000: 70c70002 3c000000 00000004
                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                        { TRACKER = TRACK_RENDER_CNTL }
+                                       { 1 = 0x8801 }
+                                       { 2 = 0x50010 }
 00000001002274b8:                              0000: 706d8003 00000002 00008801 00050010
                                opcode: CP_SET_DRAW_STATE (43) (7 dwords)
                                        { COUNT = 0 | DISABLE | GMEM | GROUP_ID = 9 }
@@ -3325,6 +3331,8 @@ got cmdszdw=83
 00000001001e8878:                                              0000: 70340007 00704000 00000000 00000000 3d800000 d0d0d0d0 d0d0d0d0 d0d0d0d0
                                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                                        { TRACKER = UNK_EVENT_WRITE }
+                                                       { 1 = 0x9b07 }
+                                                       { 2 = 0 }
 00000001001e8898:                                              0000: 706d8003 00000004 00009b07 00000000
                                                opcode: CP_CONTEXT_REG_BUNCH (5c) (5 dwords)
                                                        VPC_SO_CNTL: { ADDR = 0 }
@@ -3806,6 +3814,8 @@ got cmdszdw=83
 0000000100227780:                              0000: 70c70002 3c000000 00000004
                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                        { TRACKER = TRACK_RENDER_CNTL }
+                                       { 1 = 0x8801 }
+                                       { 2 = 0x20010 }
 000000010022778c:                              0000: 706d8003 00000002 00008801 00020010
                                opcode: CP_SET_DRAW_STATE (43) (7 dwords)
                                        { COUNT = 0 | DISABLE | GMEM | GROUP_ID = 9 }
@@ -4046,6 +4056,8 @@ got cmdszdw=83
 00000001001e9d78:                                              0000: 70340007 00704000 00000000 00000000 3d800000 d0d0d0d0 d0d0d0d0 d0d0d0d0
                                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                                        { TRACKER = UNK_EVENT_WRITE }
+                                                       { 1 = 0x9b07 }
+                                                       { 2 = 0 }
 00000001001e9d98:                                              0000: 706d8003 00000004 00009b07 00000000
                                                opcode: CP_CONTEXT_REG_BUNCH (5c) (5 dwords)
                                                        VPC_SO_CNTL: { ADDR = 0 }
@@ -4449,6 +4461,8 @@ ESTIMATED CRASH LOCATION!
 0000000100227930:                              0000: 70c70002 3c000000 00000004
                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                        { TRACKER = TRACK_RENDER_CNTL }
+                                       { 1 = 0x8801 }
+                                       { 2 = 0x10010 }
 000000010022793c:                              0000: 706d8003 00000002 00008801 00010010
                                opcode: CP_SET_DRAW_STATE (43) (7 dwords)
                                        { COUNT = 0 | DISABLE | GMEM | GROUP_ID = 9 }
@@ -4690,6 +4704,8 @@ ESTIMATED CRASH LOCATION!
 00000001001eb278:                                              0000: 70340007 00704000 00000000 00000000 3d800000 d0d0d0d0 d0d0d0d0 d0d0d0d0
                                                opcode: CP_REG_WRITE (6d) (4 dwords)
                                                        { TRACKER = UNK_EVENT_WRITE }
+                                                       { 1 = 0x9b07 }
+                                                       { 2 = 0 }
 00000001001eb298:                                              0000: 706d8003 00000004 00009b07 00000000
                                                opcode: CP_CONTEXT_REG_BUNCH (5c) (5 dwords)
                                                        VPC_SO_CNTL: { ADDR = 0 }
diff --git a/src/freedreno/.gitlab-ci/reference/dEQP-VK.draw.indirect_draw.indexed.indirect_draw_count.triangle_list.log b/src/freedreno/.gitlab-ci/reference/dEQP-VK.draw.indirect_draw.indexed.indirect_draw_count.triangle_list.log
index 8e03a23..b32d17d 100644 (file)
--- a/src/freedreno/.gitlab-ci/reference/dEQP-VK.draw.indirect_draw.indexed.indirect_draw_count.triangle_list.log
+++ b/src/freedreno/.gitlab-ci/reference/dEQP-VK.draw.indirect_draw.indexed.indirect_draw_count.triangle_list.log
@@ -560,6 +560,8 @@ cmdstream[0]: 265 dwords
 000000000115e130:                      0000: 70c70002 3c000000 00000004
                        opcode: CP_REG_WRITE (6d) (4 dwords)
                                { TRACKER = TRACK_RENDER_CNTL }
+                               { 1 = 0x8801 }
+                               { 2 = 0x10010 }
                                RB_RENDER_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | FLAG_MRTS = 0x1 }
 000000000115e13c:                      0000: 706d8003 00000002 00008801 00010010
                        opcode: CP_SET_DRAW_STATE (43) (7 dwords)
diff --git a/src/freedreno/.gitlab-ci/reference/fd-clouds.log b/src/freedreno/.gitlab-ci/reference/fd-clouds.log
index fe12252..bada0c3 100644 (file)
--- a/src/freedreno/.gitlab-ci/reference/fd-clouds.log
+++ b/src/freedreno/.gitlab-ci/reference/fd-clouds.log
@@ -323,6 +323,8 @@ cmdstream[0]: 1023 dwords
 0000000001d91368:              0000: 4088d301 00001e11
                opcode: CP_REG_WRITE (6d) (4 dwords)
                        { TRACKER = TRACK_RENDER_CNTL }
+                       { 1 = 0x8801 }
+                       { 2 = 0x90 }
                        RB_RENDER_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | BINNING | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | FLAG_MRTS = 0 }
 0000000001d91370:              0000: 706d8003 00000002 00008801 00000090
                write GRAS_SC_WINDOW_SCISSOR_TL (80f0)
@@ -1523,6 +1525,8 @@ cmdstream[0]: 1023 dwords
 0000000001d9197c:              0000: 709d0001 00000001
                opcode: CP_REG_WRITE (6d) (4 dwords)
                        { TRACKER = TRACK_RENDER_CNTL }
+                       { 1 = 0x8801 }
+                       { 2 = 0x10 }
                        RB_RENDER_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | FLAG_MRTS = 0 }
 0000000001d91984:              0000: 706d8003 00000002 00008801 00000010
                opcode: CP_WAIT_FOR_IDLE (26) (1 dwords)
diff --git a/src/freedreno/.gitlab-ci/reference/prefetch-test.log b/src/freedreno/.gitlab-ci/reference/prefetch-test.log
index 7ae2bff..15b1758 100644 (file)
--- a/src/freedreno/.gitlab-ci/reference/prefetch-test.log
+++ b/src/freedreno/.gitlab-ci/reference/prefetch-test.log
@@ -2697,6 +2697,8 @@ got cmdszdw=438
 000000010391d080:                      0000: 70640001 00000001
                        opcode: CP_REG_WRITE (6d) (4 dwords)
                                { TRACKER = TRACK_RENDER_CNTL }
+                               { 1 = 0x8801 }
+                               { 2 = 0x10010 }
 000000010391d14c:                      0000: 706d8003 00000002 00008801 00010010
                        opcode: CP_EVENT_WRITE (46) (2 dwords)
                                { EVENT = ZPASS_DONE }
diff --git a/src/freedreno/registers/adreno/adreno_pm4.xml b/src/freedreno/registers/adreno/adreno_pm4.xml
index 655b0e5..74660ea 100644 (file)
--- a/src/freedreno/registers/adreno/adreno_pm4.xml
+++ b/src/freedreno/registers/adreno/adreno_pm4.xml
@@ -1918,6 +1918,8 @@ opcode: CP_LOAD_STATE4 (30) (4 dwords)
        <reg32 offset="0" name="0">
                <bitfield name="TRACKER" low="0" high="3" type="reg_tracker"/>
        </reg32>
+       <reg32 offset="1" name="1"/>
+       <reg32 offset="2" name="2"/>
 </domain>
 
 <domain name="CP_SMMU_TABLE_UPDATE" width="32">
Domain: Graphics System / GL;