projects / platform / upstream / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 388e4ea)
freedreno: Document A6XX_GRAS_SC_CNTL::rotation field
authorDanylo Piliaiev <dpiliaiev@igalia.com>
Mon, 6 Feb 2023 19:36:48 +0000 (20:36 +0100)
committerMarge Bot <emma+marge@anholt.net>
Fri, 10 Feb 2023 20:29:40 +0000 (20:29 +0000)
Likely used for VK_QCOM_render_pass_transform.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21148>

src/freedreno/.gitlab-ci/reference/crash.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/registers/adreno/a6xx.xml patch | blob | history

diff --git a/src/freedreno/.gitlab-ci/reference/crash.log b/src/freedreno/.gitlab-ci/reference/crash.log
index fee7f14..3bee2b6 100644 (file)
--- a/src/freedreno/.gitlab-ci/reference/crash.log
+++ b/src/freedreno/.gitlab-ci/reference/crash.log
@@ -5364,7 +5364,7 @@ clusters:
        00000000        GRAS_VS_LAYER_CNTL: { 0 }
        00000000        GRAS_GS_LAYER_CNTL: { 0 }
        00000000        GRAS_DS_LAYER_CNTL: { 0 }
-       00000002        GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD }
+       00000002        GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD | ROTATION = 0 }
        00000101        GRAS_BIN_CONTROL: { BINW = 32 | BINH = 16 | RENDER_MODE = RENDERING_PASS | BUFFERS_LOCATION = BUFFERS_IN_GMEM | LRZ_FEEDBACK_ZMODE_MASK = 0 }
        00000000        GRAS_RAS_MSAA_CNTL: { SAMPLES = MSAA_ONE }
        00000000        GRAS_DEST_MSAA_CNTL: { SAMPLES = MSAA_ONE }
@@ -5607,7 +5607,7 @@ clusters:
        00000000        GRAS_VS_LAYER_CNTL: { 0 }
        00000000        GRAS_GS_LAYER_CNTL: { 0 }
        00000000        GRAS_DS_LAYER_CNTL: { 0 }
-       00000002        GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD }
+       00000002        GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD | ROTATION = 0 }
        00000101        GRAS_BIN_CONTROL: { BINW = 32 | BINH = 16 | RENDER_MODE = RENDERING_PASS | BUFFERS_LOCATION = BUFFERS_IN_GMEM | LRZ_FEEDBACK_ZMODE_MASK = 0 }
        00000000        GRAS_RAS_MSAA_CNTL: { SAMPLES = MSAA_ONE }
        00000000        GRAS_DEST_MSAA_CNTL: { SAMPLES = MSAA_ONE }
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 f0b353a..8e03a23 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
@@ -156,7 +156,7 @@ cmdstream[0]: 265 dwords
                        GRAS_SU_CONSERVATIVE_RAS_CNTL: { SHIFTAMOUNT = 0 }
 000000000105818c:              0000: 40809901 00000000
                write GRAS_SC_CNTL (80a0)
-                       GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD }
+                       GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD | ROTATION = 0 }
 0000000001058194:              0000: 4080a001 00000002
                write GRAS_UNKNOWN_80AF (80af)
                        GRAS_UNKNOWN_80AF: FALSE
@@ -275,7 +275,7 @@ cmdstream[0]: 265 dwords
 !+     03200000                UCHE_UNKNOWN_0E12: 0x3200000
 !+     00000004                UCHE_CLIENT_PF: { PERFSEL = 0x4 }
  +     00000000                GRAS_SU_CONSERVATIVE_RAS_CNTL: { SHIFTAMOUNT = 0 }
-!+     00000002                GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD }
+!+     00000002                GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD | ROTATION = 0 }
  +     00000000                GRAS_UNKNOWN_80AF: FALSE
  +     00000000                GRAS_LRZ_CNTL: { DIR = 0 }
  +     00000000                GRAS_UNKNOWN_8110: 0
diff --git a/src/freedreno/.gitlab-ci/reference/fd-clouds.log b/src/freedreno/.gitlab-ci/reference/fd-clouds.log
index 20e572a..fe12252 100644 (file)
--- a/src/freedreno/.gitlab-ci/reference/fd-clouds.log
+++ b/src/freedreno/.gitlab-ci/reference/fd-clouds.log
@@ -147,7 +147,7 @@ cmdstream[0]: 1023 dwords
                        GRAS_VS_LAYER_CNTL: { 0 }
 0000000001d91174:              0000: 48809b01 00000000
                write GRAS_SC_CNTL (80a0)
-                       GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD }
+                       GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD | ROTATION = 0 }
 0000000001d9117c:              0000: 4080a001 00000002
                write GRAS_UNKNOWN_80AF (80af)
                        GRAS_UNKNOWN_80AF: FALSE
@@ -927,7 +927,7 @@ cmdstream[0]: 1023 dwords
  +     00000000                        GRAS_SU_DEPTH_BUFFER_INFO: { DEPTH_FORMAT = DEPTH6_NONE }
  +     00000000                        GRAS_SU_CONSERVATIVE_RAS_CNTL: { SHIFTAMOUNT = 0 }
  +     00000000                        GRAS_VS_LAYER_CNTL: { 0 }
-!+     00000002                        GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD }
+!+     00000002                        GRAS_SC_CNTL: { CCUSINGLECACHELINESIZE = 0x2 | SINGLE_PRIM_MODE = NO_FLUSH | RASTER_MODE = TYPE_TILED | RASTER_DIRECTION = LR_TB | SEQUENCED_THREAD_DISTRIBUTION = DIST_SCREEN_COORD | ROTATION = 0 }
 !+     06041e11                        GRAS_BIN_CONTROL: { BINW = 544 | BINH = 480 | RENDER_MODE = BINNING_PASS | BUFFERS_LOCATION = BUFFERS_IN_GMEM | LRZ_FEEDBACK_ZMODE_MASK = 0x6 }
  +     00000000                        GRAS_RAS_MSAA_CNTL: { SAMPLES = MSAA_ONE }
 !+     00000004                        GRAS_DEST_MSAA_CNTL: { SAMPLES = MSAA_ONE | MSAA_DISABLE }
diff --git a/src/freedreno/registers/adreno/a6xx.xml b/src/freedreno/registers/adreno/a6xx.xml
index 8bae0f5..20ea4b6 100644 (file)
--- a/src/freedreno/registers/adreno/a6xx.xml
+++ b/src/freedreno/registers/adreno/a6xx.xml
@@ -1705,7 +1705,8 @@ to upconvert to 32b float internally?
                <bitfield name="RASTER_DIRECTION" low="6" high="7" type="a6xx_raster_direction"/>
                <bitfield name="SEQUENCED_THREAD_DISTRIBUTION" pos="8" type="a6xx_sequenced_thread_dist"/>
                <!-- CCUSINGLECACHELINESIZE is ignored unless bit 9 is set -->
-               <bitfield name="UNK9" low="9" high="11"/>
+               <bitfield name="UNK9" pos="9" type="boolean"/>
+               <bitfield name="ROTATION" low="10" high="11" type="uint"/>
                <bitfield name="EARLYVIZOUTEN" pos="12" type="boolean"/>
        </reg32>
 
Domain: Graphics System / GL;