freedreno: constify fd_vsc_pipe

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

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c b/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c
index 4119e19a358fd3726c58ae6b418d27dc03a7b7f3..a548e9e946cebf9ea01cb246612c0b9d7dcf93a1 100644 (file)
--- a/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c
@@ -609,7 +609,7 @@ fd2_emit_tile_init(struct fd_batch *batch)
                OUT_RING(ring, 0x0000018C);
 
                for (int i = 0; i < gmem->num_vsc_pipes; i++) {
-                       struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
+                       const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
                        float off_x, off_y, mul_x, mul_y;
 
                        /* const to tranform from [-1,1] to bin coordinates for this pipe

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
index 6a9f6433c3dc331088d53f12eaa3a15d11fe1c81..5f4ee32008b274578dbae77a7474cf2907f064a8 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
@@ -786,7 +786,7 @@ update_vsc_pipe(struct fd_batch *batch)
        OUT_RELOCW(ring, fd3_ctx->vsc_size_mem, 0, 0, 0); /* VSC_SIZE_ADDRESS */
 
        for (i = 0; i < 8; i++) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
 
                if (!ctx->vsc_pipe_bo[i]) {
                        ctx->vsc_pipe_bo[i] = fd_bo_new(ctx->dev, 0x40000,
@@ -1019,7 +1019,7 @@ fd3_emit_tile_renderprep(struct fd_batch *batch, const struct fd_tile *tile)
        }
 
        if (use_hw_binning(batch)) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
                struct fd_bo *pipe_bo = ctx->vsc_pipe_bo[tile->p];
 
                assert(pipe->w && pipe->h);

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
index 52e020d1aa619b4c53f3ef8878bbb41000451d39..fb825267ca762c74ec1567571e39161fd4d53127 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
@@ -571,7 +571,7 @@ update_vsc_pipe(struct fd_batch *batch)
 
        OUT_PKT0(ring, REG_A4XX_VSC_PIPE_CONFIG_REG(0), 8);
        for (i = 0; i < 8; i++) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
                OUT_RING(ring, A4XX_VSC_PIPE_CONFIG_REG_X(pipe->x) |
                                A4XX_VSC_PIPE_CONFIG_REG_Y(pipe->y) |
                                A4XX_VSC_PIPE_CONFIG_REG_W(pipe->w) |
@@ -767,7 +767,7 @@ fd4_emit_tile_renderprep(struct fd_batch *batch, const struct fd_tile *tile)
        uint32_t y2 = tile->yoff + tile->bin_h - 1;
 
        if (use_hw_binning(batch)) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
                struct fd_bo *pipe_bo = ctx->vsc_pipe_bo[tile->p];
 
                assert(pipe->w && pipe->h);

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_gmem.c b/src/gallium/drivers/freedreno/a5xx/fd5_gmem.c
index 8897d7735aaf9ad345c74b899cd57c066ce58952..05aa119c9ba3cc5d621988ec88e1dc6695a3fe68 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_gmem.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_gmem.c
@@ -277,7 +277,7 @@ update_vsc_pipe(struct fd_batch *batch)
 
        OUT_PKT4(ring, REG_A5XX_VSC_PIPE_CONFIG_REG(0), 16);
        for (i = 0; i < 16; i++) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
                OUT_RING(ring, A5XX_VSC_PIPE_CONFIG_REG_X(pipe->x) |
                                A5XX_VSC_PIPE_CONFIG_REG_Y(pipe->y) |
                                A5XX_VSC_PIPE_CONFIG_REG_W(pipe->w) |
@@ -435,7 +435,7 @@ fd5_emit_tile_prep(struct fd_batch *batch, const struct fd_tile *tile)
                        A5XX_RB_RESOLVE_CNTL_2_Y(y2));
 
        if (use_hw_binning(batch)) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
                struct fd_bo *pipe_bo = ctx->vsc_pipe_bo[tile->p];
 
                OUT_PKT7(ring, CP_WAIT_FOR_ME, 0);

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
index 09407de90a3588f51a60dba4d05fbf4be55f7bea..0b96741787c91ba6f9342a1fbb5c586cdd84c8e8 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
@@ -358,7 +358,7 @@ update_vsc_pipe(struct fd_batch *batch)
 
        OUT_PKT4(ring, REG_A6XX_VSC_PIPE_CONFIG_REG(0), 32);
        for (i = 0; i < 32; i++) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[i];
                OUT_RING(ring, A6XX_VSC_PIPE_CONFIG_REG_X(pipe->x) |
                                A6XX_VSC_PIPE_CONFIG_REG_Y(pipe->y) |
                                A6XX_VSC_PIPE_CONFIG_REG_W(pipe->w) |
@@ -839,7 +839,7 @@ fd6_emit_tile_prep(struct fd_batch *batch, const struct fd_tile *tile)
        set_scissor(ring, x1, y1, x2, y2);
 
        if (use_hw_binning(batch)) {
-               struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
+               const struct fd_vsc_pipe *pipe = &gmem->vsc_pipe[tile->p];
 
                OUT_PKT7(ring, CP_WAIT_FOR_ME, 0);