freedreno/regs: update a6xx VPC regs

Update some registers in the 0x9000-0x95ff range.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5870>

diff --git a/src/freedreno/registers/a6xx.xml b/src/freedreno/registers/a6xx.xml
index ab83037..b03bd3f 100644 (file)
--- a/src/freedreno/registers/a6xx.xml
+++ b/src/freedreno/registers/a6xx.xml
@@ -1620,13 +1620,6 @@ to upconvert to 32b float internally?
        <reg32 offset="0xA615" name="VFD_PERFCTR_VFD_SEL_5"/>
        <reg32 offset="0xA616" name="VFD_PERFCTR_VFD_SEL_6"/>
        <reg32 offset="0xA617" name="VFD_PERFCTR_VFD_SEL_7"/>
-       <reg32 offset="0x9601" name="VPC_ADDR_MODE_CNTL"/>
-       <reg32 offset="0x9604" name="VPC_PERFCTR_VPC_SEL_0"/>
-       <reg32 offset="0x9605" name="VPC_PERFCTR_VPC_SEL_1"/>
-       <reg32 offset="0x9606" name="VPC_PERFCTR_VPC_SEL_2"/>
-       <reg32 offset="0x9607" name="VPC_PERFCTR_VPC_SEL_3"/>
-       <reg32 offset="0x9608" name="VPC_PERFCTR_VPC_SEL_4"/>
-       <reg32 offset="0x9609" name="VPC_PERFCTR_VPC_SEL_5"/>
        <reg32 offset="0x0E00" name="UCHE_ADDR_MODE_CNTL"/>
        <reg32 offset="0x0E01" name="UCHE_MODE_CNTL"/>
        <reg32 offset="0x0E05" name="UCHE_WRITE_RANGE_MAX_LO"/>
@@ -2636,7 +2629,10 @@ to upconvert to 32b float internally?
        <!-- 0x8e80-0x8e83 are valid -->
        <!-- 0x8e84-0x90ff invalid -->
 
-       <reg32 offset="0x9100" name="VPC_UNKNOWN_9100"/>
+       <!-- 0x9000-0x90ff invalid -->
+
+       <!-- something to do with geometry shader: -->
+       <reg32 offset="0x9100" name="VPC_UNKNOWN_9100" low="0" high="7"/>
 
        <bitset name="a6xx_vpc_xs_clip_cntl" inline="yes">
                <bitfield name="CLIP_MASK" low="0" high="7" type="uint"/>
@@ -2653,18 +2649,18 @@ to upconvert to 32b float internally?
 
        <bitset name="a6xx_vpc_xs_layer_cntl" inline="yes">
                <bitfield name="LAYERLOC" low="0" high="7" type="uint"/>
-               <bitfield name="UNKLOC" low="8" high="15" type="uint"/>
+               <bitfield name="VIEWLOC" low="8" high="15" type="uint"/>
        </bitset>
 
        <reg32 offset="0x9104" name="VPC_VS_LAYER_CNTL" type="a6xx_vpc_xs_layer_cntl"/>
        <reg32 offset="0x9105" name="VPC_GS_LAYER_CNTL" type="a6xx_vpc_xs_layer_cntl"/>
        <reg32 offset="0x9106" name="VPC_DS_LAYER_CNTL" type="a6xx_vpc_xs_layer_cntl"/>
 
-       <reg32 offset="0x9107" name="VPC_UNKNOWN_9107"/>
+       <reg32 offset="0x9107" name="VPC_UNKNOWN_9107" pos="2"/>
        <reg32 offset="0x9108" name="VPC_POLYGON_MODE">
                <bitfield name="MODE" low="0" high="1" type="a6xx_polygon_mode"/>
        </reg32>
-
+       <!-- 0x9109-0x91ff invalid -->
        <array offset="0x9200" name="VPC_VARYING_INTERP" stride="1" length="8">
                <reg32 offset="0x0" name="MODE"/>
        </array>
@@ -2673,8 +2669,8 @@ to upconvert to 32b float internally?
        </array>
 
        <!-- always 0x0 -->
-       <reg32 offset="0x9210" name="VPC_UNKNOWN_9210"/>
-       <reg32 offset="0x9211" name="VPC_UNKNOWN_9211"/>
+       <reg32 offset="0x9210" name="VPC_UNKNOWN_9210" low="0" high="31"/>
+       <reg32 offset="0x9211" name="VPC_UNKNOWN_9211" low="0" high="31"/>
 
        <array offset="0x9212" name="VPC_VAR" stride="1" length="4">
                <!-- one bit per varying component: -->
@@ -2682,9 +2678,11 @@ to upconvert to 32b float internally?
        </array>
 
        <reg32 offset="0x9216" name="VPC_SO_CNTL">
+               <bitfield name="UNK0" low="0" high="7"/>
                <!-- always 0x10000 when SO enabled.. -->
                <bitfield name="ENABLE" pos="16" type="boolean"/>
        </reg32>
+       <!-- special register, write multiple times to load SO program (not readable) -->
        <reg32 offset="0x9217" name="VPC_SO_PROG">
                <bitfield name="A_BUF" low="0" high="1" type="uint"/>
                <bitfield name="A_OFF" low="2" high="10" shr="2" type="uint"/>
@@ -2696,26 +2694,26 @@ to upconvert to 32b float internally?
 
        <reg32 offset="0x9218" name="VPC_SO_STREAM_COUNTS_LO"/>
        <reg32 offset="0x9219" name="VPC_SO_STREAM_COUNTS_HI"/>
+       <reg32 offset="0x9218" name="VPC_SO_STREAM_COUNTS" type="waddress" align="32"/>
 
        <array offset="0x921a" name="VPC_SO" stride="7" length="4">
-               <reg64 offset="0" name="BUFFER_BASE" type="waddress"/>
+               <reg64 offset="0" name="BUFFER_BASE" type="waddress" align="32"/>
                <reg32 offset="0" name="BUFFER_BASE_LO"/>
                <reg32 offset="1" name="BUFFER_BASE_HI"/>
-               <reg32 offset="2" name="BUFFER_SIZE"/>
-               <reg32 offset="3" name="NCOMP"/>  <!-- component count -->
-               <reg32 offset="4" name="BUFFER_OFFSET"/>
-               <reg64 offset="5" name="FLUSH_BASE" type="waddress"/>
+               <reg32 offset="2" name="BUFFER_SIZE" low="2" high="31" shr="2"/>
+               <reg32 offset="3" name="NCOMP" low="0" high="9"/>  <!-- component count -->
+               <reg32 offset="4" name="BUFFER_OFFSET" low="2" high="31" shr="2"/>
+               <reg64 offset="5" name="FLUSH_BASE" type="waddress" align="32"/>
                <reg32 offset="5" name="FLUSH_BASE_LO"/>
                <reg32 offset="6" name="FLUSH_BASE_HI"/>
        </array>
 
-       <!-- always 0x0 ? -->
-       <reg32 offset="0x9236" name="VPC_UNKNOWN_9236">
-               <bitfield name="POINT_COORD_INVERT" pos="0" type="uint"/>
+       <reg32 offset="0x9236" name="VPC_POINT_COORD_INVERT">
+               <bitfield name="INVERT" pos="0" type="boolean"/>
        </reg32>
-
+       <!-- 0x9237-0x92ff invalid -->
        <!-- always 0x0 ? -->
-       <reg32 offset="0x9300" name="VPC_UNKNOWN_9300"/>
+       <reg32 offset="0x9300" name="VPC_UNKNOWN_9300" low="0" high="2"/>
 
        <bitset name="a6xx_vpc_xs_pack" inline="yes">
                <doc>
@@ -2726,6 +2724,7 @@ to upconvert to 32b float internally?
                <bitfield name="STRIDE_IN_VPC" low="0" high="7" type="uint"/>
                <bitfield name="POSITIONLOC" low="8" high="15" type="uint"/>
                <bitfield name="PSIZELOC" low="16" high="23" type="uint"/>
+               <bitfield name="UNK24" low="24" high="27"/>
        </bitset>
        <reg32 offset="0x9301" name="VPC_VS_PACK" type="a6xx_vpc_xs_pack"/>
        <reg32 offset="0x9302" name="VPC_GS_PACK" type="a6xx_vpc_xs_pack"/>
@@ -2740,20 +2739,33 @@ to upconvert to 32b float internally?
        </reg32>
 
        <reg32 offset="0x9305" name="VPC_SO_BUF_CNTL">
+               <!-- TODO: the first 12 bits are valid, likely 3-bit enum instead of bools -->
                <bitfield name="BUF0" pos="0" type="boolean"/>
                <bitfield name="BUF1" pos="3" type="boolean"/>
                <bitfield name="BUF2" pos="6" type="boolean"/>
                <bitfield name="BUF3" pos="9" type="boolean"/>
                <bitfield name="ENABLE" pos="15" type="boolean"/>
+               <bitfield name="UNK16" low="16" high="19"/>
        </reg32>
-       <reg32 offset="0x9306" name="VPC_SO_OVERRIDE">
-               <bitfield name="SO_DISABLE" pos="0" type="boolean"/>
+       <reg32 offset="0x9306" name="VPC_SO_DISABLE">
+               <bitfield name="DISABLE" pos="0" type="boolean"/>
        </reg32>
+       <!-- 0x9307-0x95ff invalid -->
 
-       <!-- always 0x0 ? -->
-       <reg32 offset="0x9600" name="VPC_UNKNOWN_9600"/>
-       <!-- always 0x0 ? -->
-       <reg32 offset="0x9602" name="VPC_UNKNOWN_9602"/>
+       <!-- TODO: 0x9600-0x97ff range -->
+       <reg32 offset="0x9600" name="VPC_UNKNOWN_9600"/> <!-- always 0x0 ? TODO: 0x1fbf37ff valid mask -->
+       <reg32 offset="0x9601" name="VPC_ADDR_MODE_CNTL" pos="0" type="boolean"/>
+       <reg32 offset="0x9602" name="VPC_UNKNOWN_9602" pos="0"/> <!-- always 0x0 ? -->
+       <reg32 offset="0x9603" name="VPC_UNKNOWN_9603" low="0" high="26"/>
+       <reg32 offset="0x9604" name="VPC_PERFCTR_VPC_SEL_0"/>
+       <reg32 offset="0x9605" name="VPC_PERFCTR_VPC_SEL_1"/>
+       <reg32 offset="0x9606" name="VPC_PERFCTR_VPC_SEL_2"/>
+       <reg32 offset="0x9607" name="VPC_PERFCTR_VPC_SEL_3"/>
+       <reg32 offset="0x9608" name="VPC_PERFCTR_VPC_SEL_4"/>
+       <reg32 offset="0x9609" name="VPC_PERFCTR_VPC_SEL_5"/>
+       <!-- 0x960a-0x9623 invalid -->
+       <!-- TODO: regs from 0x9624-0x963a -->
+       <!-- 0x963b-0x97ff invalid -->
 
        <reg32 offset="0x9800" name="PC_TESS_NUM_VERTEX"/>
 

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index cbfc7dc..c7c6df4 100644 (file)
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -592,8 +592,7 @@ tu6_emit_tile_select(struct tu_cmd_buffer *cmd,
    tu6_emit_window_scissor(cs, x1, y1, x2, y2);
    tu6_emit_window_offset(cs, x1, y1);
 
-   tu_cs_emit_regs(cs,
-                   A6XX_VPC_SO_OVERRIDE(.so_disable = false));
+   tu_cs_emit_regs(cs, A6XX_VPC_SO_DISABLE(false));
 
    if (use_hw_binning(cmd)) {
       tu_cs_emit_pkt7(cs, CP_WAIT_FOR_ME, 0);
@@ -785,12 +784,10 @@ tu6_init_hw(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
 
    tu_cs_emit_write_reg(cs, REG_A6XX_VPC_UNKNOWN_9107, 0);
 
-   tu_cs_emit_write_reg(cs, REG_A6XX_VPC_UNKNOWN_9236,
-                        A6XX_VPC_UNKNOWN_9236_POINT_COORD_INVERT(0));
+   tu_cs_emit_regs(cs, A6XX_VPC_POINT_COORD_INVERT(false));
    tu_cs_emit_write_reg(cs, REG_A6XX_VPC_UNKNOWN_9300, 0);
 
-   tu_cs_emit_write_reg(cs, REG_A6XX_VPC_SO_OVERRIDE,
-                        A6XX_VPC_SO_OVERRIDE_SO_DISABLE);
+   tu_cs_emit_regs(cs, A6XX_VPC_SO_DISABLE(true));
 
    tu_cs_emit_write_reg(cs, REG_A6XX_PC_UNKNOWN_9801, 0);
    tu_cs_emit_write_reg(cs, REG_A6XX_PC_UNKNOWN_9980, 0);
@@ -1171,8 +1168,7 @@ tu6_sysmem_render_begin(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
    tu_emit_cache_flush_ccu(cmd, cs, TU_CMD_CCU_SYSMEM);
 
    /* enable stream-out, with sysmem there is only one pass: */
-   tu_cs_emit_regs(cs,
-                   A6XX_VPC_SO_OVERRIDE(.so_disable = false));
+   tu_cs_emit_regs(cs, A6XX_VPC_SO_DISABLE(false));
 
    tu_cs_emit_pkt7(cs, CP_SET_VISIBILITY_OVERRIDE, 1);
    tu_cs_emit(cs, 0x1);
@@ -1218,7 +1214,7 @@ tu6_tile_render_begin(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
    const struct tu_framebuffer *fb = cmd->state.framebuffer;
    if (use_hw_binning(cmd)) {
       /* enable stream-out during binning pass: */
-      tu_cs_emit_regs(cs, A6XX_VPC_SO_OVERRIDE(.so_disable=false));
+      tu_cs_emit_regs(cs, A6XX_VPC_SO_DISABLE(false));
 
       tu6_emit_bin_size(cs, fb->tile0.width, fb->tile0.height,
                         A6XX_RB_BIN_CONTROL_BINNING_PASS | 0x6000000);
@@ -1228,7 +1224,7 @@ tu6_tile_render_begin(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
       tu6_emit_binning_pass(cmd, cs);
 
       /* and disable stream-out for draw pass: */
-      tu_cs_emit_regs(cs, A6XX_VPC_SO_OVERRIDE(.so_disable=true));
+      tu_cs_emit_regs(cs, A6XX_VPC_SO_DISABLE(true));
 
       tu6_emit_bin_size(cs, fb->tile0.width, fb->tile0.height,
                         A6XX_RB_BIN_CONTROL_USE_VIZ | 0x6000000);
@@ -1244,7 +1240,7 @@ tu6_tile_render_begin(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
       tu_cs_emit(cs, 0x1);
    } else {
       /* no binning pass, so enable stream-out for draw pass:: */
-      tu_cs_emit_regs(cs, A6XX_VPC_SO_OVERRIDE(.so_disable=false));
+      tu_cs_emit_regs(cs, A6XX_VPC_SO_DISABLE(false));
 
       tu6_emit_bin_size(cs, fb->tile0.width, fb->tile0.height, 0x6000000);
    }

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index d073465..249fd63 100644 (file)
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -2235,7 +2235,7 @@ tu_pipeline_builder_parse_rasterization(struct tu_pipeline_builder *builder,
                      .vp_clip_code_ignore = 1));
 
    tu_cs_emit_regs(&cs,
-                   A6XX_VPC_POLYGON_MODE(.mode = mode));
+                   A6XX_VPC_POLYGON_MODE(mode));
 
    tu_cs_emit_regs(&cs,
                    A6XX_PC_POLYGON_MODE(.mode = mode));

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
index 09085b6..2260f17 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
@@ -1184,11 +1184,11 @@ fd6_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring)
        WRITE(REG_A6XX_RB_UNKNOWN_881E, 0);
        WRITE(REG_A6XX_RB_UNKNOWN_88F0, 0);
 
-       WRITE(REG_A6XX_VPC_UNKNOWN_9236,
-                 A6XX_VPC_UNKNOWN_9236_POINT_COORD_INVERT(0));
+       WRITE(REG_A6XX_VPC_POINT_COORD_INVERT,
+                 A6XX_VPC_POINT_COORD_INVERT(0).value);
        WRITE(REG_A6XX_VPC_UNKNOWN_9300, 0);
 
-       WRITE(REG_A6XX_VPC_SO_OVERRIDE, A6XX_VPC_SO_OVERRIDE_SO_DISABLE);
+       WRITE(REG_A6XX_VPC_SO_DISABLE, A6XX_VPC_SO_DISABLE(true).value);
 
        WRITE(REG_A6XX_PC_UNKNOWN_9990, 0);
        WRITE(REG_A6XX_PC_UNKNOWN_9980, 0);

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
index 8e7ba94..a07e02c 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
@@ -705,8 +705,7 @@ fd6_emit_tile_init(struct fd_batch *batch)
 
        if (use_hw_binning(batch)) {
                /* enable stream-out during binning pass: */
-               OUT_PKT4(ring, REG_A6XX_VPC_SO_OVERRIDE, 1);
-               OUT_RING(ring, 0);
+               OUT_REG(ring, A6XX_VPC_SO_DISABLE(false));
 
                set_bin_size(ring, gmem->bin_w, gmem->bin_h,
                                A6XX_RB_BIN_CONTROL_BINNING_PASS | 0x6000000);
@@ -714,8 +713,7 @@ fd6_emit_tile_init(struct fd_batch *batch)
                emit_binning_pass(batch);
 
                /* and disable stream-out for draw pass: */
-               OUT_PKT4(ring, REG_A6XX_VPC_SO_OVERRIDE, 1);
-               OUT_RING(ring, A6XX_VPC_SO_OVERRIDE_SO_DISABLE);
+               OUT_REG(ring, A6XX_VPC_SO_DISABLE(true));
 
                /*
                 * NOTE: even if we detect VSC overflow and disable use of
@@ -742,8 +740,7 @@ fd6_emit_tile_init(struct fd_batch *batch)
                OUT_RING(ring, 0x1);
        } else {
                /* no binning pass, so enable stream-out for draw pass:: */
-               OUT_PKT4(ring, REG_A6XX_VPC_SO_OVERRIDE, 1);
-               OUT_RING(ring, 0);
+               OUT_REG(ring, A6XX_VPC_SO_DISABLE(false));
 
                set_bin_size(ring, gmem->bin_w, gmem->bin_h, 0x6000000);
        }
@@ -1406,8 +1403,7 @@ fd6_emit_sysmem_prep(struct fd_batch *batch)
        OUT_RING(ring, fd6_context(batch->ctx)->magic.RB_CCU_CNTL_bypass);
 
        /* enable stream-out, with sysmem there is only one pass: */
-       OUT_PKT4(ring, REG_A6XX_VPC_SO_OVERRIDE, 1);
-       OUT_RING(ring, 0);
+       OUT_REG(ring, A6XX_VPC_SO_DISABLE(false));
 
        OUT_PKT7(ring, CP_SET_VISIBILITY_OVERRIDE, 1);
        OUT_RING(ring, 0x1);

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c b/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c
index 4d9ecf2..692e14e 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c
@@ -107,7 +107,7 @@ __fd6_setup_rasterizer_stateobj(struct fd_context *ctx,
                break;
        }
 
-       OUT_REG(ring, A6XX_VPC_POLYGON_MODE(.mode = mode));
+       OUT_REG(ring, A6XX_VPC_POLYGON_MODE(mode));
        OUT_REG(ring, A6XX_PC_POLYGON_MODE(.mode = mode));
 
        return ring;