r600g: fix DB decompression on evergreen

Separated out of the hyperz patch by Marek with minor modifications.

Signed-off-by: Marek Olšák <maraeo@gmail.com>

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 53d45824136e218978a40a920f2dd99d73d60220..081701f24412607e366e967a43f826e324adf77a 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -43,7 +43,6 @@ static const struct r600_reg evergreen_ctl_const_list[] = {
 };
 
 static const struct r600_reg evergreen_context_reg_list[] = {
-       {R_028000_DB_RENDER_CONTROL, 0, 0},
        {R_028008_DB_DEPTH_VIEW, 0, 0},
        {R_028010_DB_RENDER_OVERRIDE2, 0, 0},
        {GROUP_FORCE_NEW_BLOCK, 0, 0},
@@ -301,7 +300,6 @@ static const struct r600_reg evergreen_context_reg_list[] = {
 };
 
 static const struct r600_reg cayman_context_reg_list[] = {
-       {R_028000_DB_RENDER_CONTROL, 0, 0},
        {R_028008_DB_DEPTH_VIEW, 0, 0},
        {R_028010_DB_RENDER_OVERRIDE2, 0, 0},
        {GROUP_FORCE_NEW_BLOCK, 0, 0},

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 9a64f67e6115b0a765a2ce6c6fd530fb99db9087..a66387b2aeb26ae44989154b86c47c25d4167208 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -759,7 +759,6 @@ static void *evergreen_create_dsa_state(struct pipe_context *ctx,
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_pipe_dsa *dsa = CALLOC_STRUCT(r600_pipe_dsa);
        unsigned db_depth_control, alpha_test_control, alpha_ref;
-       unsigned db_render_control;
        struct r600_pipe_state *rstate;
 
        if (dsa == NULL) {
@@ -807,9 +806,7 @@ static void *evergreen_create_dsa_state(struct pipe_context *ctx,
        dsa->alpha_ref = alpha_ref;
 
        /* misc */
-       db_render_control = 0;
        r600_pipe_state_add_reg(rstate, R_028800_DB_DEPTH_CONTROL, db_depth_control);
-       r600_pipe_state_add_reg(rstate, R_028000_DB_RENDER_CONTROL, db_render_control);
        return rstate;
 }
 
@@ -1750,6 +1747,7 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_
 {
        struct radeon_winsys_cs *cs = rctx->cs;
        struct r600_db_misc_state *a = (struct r600_db_misc_state*)atom;
+       unsigned db_render_control = 0;
        unsigned db_count_control = 0;
        unsigned db_render_override =
                S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_DISABLE) |
@@ -1760,8 +1758,15 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_
                db_count_control |= S_028004_PERFECT_ZPASS_COUNTS(1);
                db_render_override |= S_02800C_NOOP_CULL_DISABLE(1);
        }
+       if (a->flush_depthstencil_through_cb) {
+               db_render_control |= S_028000_DEPTH_COPY_ENABLE(1) |
+                                    S_028000_STENCIL_COPY_ENABLE(1) |
+                                    S_028000_COPY_CENTROID(1);
+       }
 
-       r600_write_context_reg(cs, R_028004_DB_COUNT_CONTROL, db_count_control);
+       r600_write_context_reg_seq(cs, R_028000_DB_RENDER_CONTROL, 2);
+       r600_write_value(cs, db_render_control); /* R_028000_DB_RENDER_CONTROL */
+       r600_write_value(cs, db_count_control); /* R_028004_DB_COUNT_CONTROL */
        r600_write_context_reg(cs, R_02800C_DB_RENDER_OVERRIDE, db_render_override);
 }
 
@@ -1906,7 +1911,7 @@ void evergreen_init_state_functions(struct r600_context *rctx)
 {
        r600_init_atom(&rctx->cb_misc_state.atom, evergreen_emit_cb_misc_state, 0, 0);
        r600_atom_dirty(rctx, &rctx->cb_misc_state.atom);
-       r600_init_atom(&rctx->db_misc_state.atom, evergreen_emit_db_misc_state, 6, 0);
+       r600_init_atom(&rctx->db_misc_state.atom, evergreen_emit_db_misc_state, 7, 0);
        r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
        r600_init_atom(&rctx->vertex_buffer_state.atom, evergreen_fs_emit_vertex_buffers, 0, 0);
        r600_init_atom(&rctx->cs_vertex_buffer_state.atom, evergreen_cs_emit_vertex_buffers, 0, 0);
@@ -2861,19 +2866,9 @@ void evergreen_fetch_shader(struct pipe_context *ctx,
 
 void *evergreen_create_db_flush_dsa(struct r600_context *rctx)
 {
-       struct pipe_depth_stencil_alpha_state dsa;
-       struct r600_pipe_state *rstate;
-
-       memset(&dsa, 0, sizeof(dsa));
+       struct pipe_depth_stencil_alpha_state dsa = {{0}};
 
-       rstate = rctx->context.create_depth_stencil_alpha_state(&rctx->context, &dsa);
-       r600_pipe_state_add_reg(rstate,
-                               R_028000_DB_RENDER_CONTROL,
-                               S_028000_DEPTH_COPY_ENABLE(1) |
-                               S_028000_STENCIL_COPY_ENABLE(1) |
-                               S_028000_COPY_CENTROID(1));
-       /* Don't set the 'is_flush' flag in r600_pipe_dsa, evergreen doesn't need it. */
-       return rstate;
+       return rctx->context.create_depth_stencil_alpha_state(&rctx->context, &dsa);
 }
 
 void evergreen_update_dual_export_state(struct r600_context * rctx)

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index fff48a41adfcb8631bbe496c9b1ccd1d12490008..98f8b84a51a65b5c789ecb6223fc32aa2440944b 100644 (file)
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -132,8 +132,7 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx,
            rctx->family == CHIP_RV620 || rctx->family == CHIP_RV635)
                depth = 0.0f;
 
-       if (rctx->chip_class <= R700 &&
-           !rctx->db_misc_state.flush_depthstencil_through_cb) {
+       if (!rctx->db_misc_state.flush_depthstencil_through_cb) {
                /* Enable decompression in DB_RENDER_CONTROL */
                rctx->db_misc_state.flush_depthstencil_through_cb = true;
                r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
@@ -179,11 +178,9 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx,
                }
        }
 
-       if (rctx->chip_class <= R700) {
-               /* Disable decompression in DB_RENDER_CONTROL */
-               rctx->db_misc_state.flush_depthstencil_through_cb = false;
-               r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
-       }
+       /* reenable compression in DB_RENDER_CONTROL */
+       rctx->db_misc_state.flush_depthstencil_through_cb = false;
+       r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
 }
 
 static void r600_flush_depth_textures(struct r600_context *rctx,