Mesa (master): r600g: cleanup some of the DB blit code
Dave Airlie
airlied at kemper.freedesktop.org
Wed Sep 22 03:37:19 UTC 2010
Module: Mesa
Branch: master
Commit: 41ef78c5af9a8b0ac80d9bd5375700a8bd0643f8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=41ef78c5af9a8b0ac80d9bd5375700a8bd0643f8
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 22 12:57:45 2010 +1000
r600g: cleanup some of the DB blit code
add cb/db flush states to the blit code.
add support for the rv6xx that need special treatment.
according to R6xx_7xx_3D.pdf
set r700 CB_SHADER_CONTROL reg in blit code
docs say dual export should be disabled for DB->CB
---
src/gallium/drivers/r600/r600_blit.c | 62 +++++++++++++++++++++++++++++++--
src/gallium/drivers/r600/r600d.h | 7 ++++
2 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 0506e82..e1f226c 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -160,6 +160,8 @@ struct r600_blit_states {
struct radeon_state vs_shader;
struct radeon_state vs_resource0;
struct radeon_state vs_resource1;
+ struct radeon_state cb_flush;
+ struct radeon_state db_flush;
};
static int r600_blit_state_vs_resources(struct r600_screen *rscreen, struct r600_blit_states *bstates)
@@ -445,6 +447,7 @@ static void r600_blit_state_rasterizer(struct r600_screen *rscreen, struct radeo
static void r600_blit_state_dsa(struct r600_screen *rscreen, struct radeon_state *rstate)
{
+ uint32_t db_render_override, db_shader_control;
radeon_state_init(rstate, rscreen->rw, R600_STATE_DSA, 0, 0);
/* set states (most default value are 0 and struct already
@@ -453,8 +456,16 @@ static void r600_blit_state_dsa(struct r600_screen *rscreen, struct radeon_state
rstate->states[R600_DSA__DB_ALPHA_TO_MASK] = 0x0000AA00;
rstate->states[R600_DSA__DB_DEPTH_CLEAR] = 0x3F800000;
rstate->states[R600_DSA__DB_RENDER_CONTROL] = 0x00000060;
- rstate->states[R600_DSA__DB_RENDER_OVERRIDE] = 0x0000002A;
- rstate->states[R600_DSA__DB_SHADER_CONTROL] = 0x00000210;
+
+ db_render_override = S_028D10_FORCE_HIZ_ENABLE(V_028D10_FORCE_DISABLE) |
+ S_028D10_FORCE_HIS_ENABLE0(V_028D10_FORCE_DISABLE) |
+ S_028D10_FORCE_HIS_ENABLE1(V_028D10_FORCE_DISABLE);
+
+ db_shader_control = S_02880C_DUAL_EXPORT_ENABLE(0) |
+ S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z);
+
+ rstate->states[R600_DSA__DB_RENDER_OVERRIDE] = db_render_override;
+ rstate->states[R600_DSA__DB_SHADER_CONTROL] = db_shader_control;
radeon_state_pm4(rstate);
}
@@ -475,6 +486,25 @@ static void r600_blit_state_cb_cntl(struct r600_screen *rscreen, struct radeon_s
rstate->states[R600_CB_CNTL__CB_SHADER_MASK] = 0x0000000F;
rstate->states[R600_CB_CNTL__CB_TARGET_MASK] = 0x0000000F;
rstate->states[R600_CB_CNTL__PA_SC_AA_MASK] = 0xFFFFFFFF;
+ rstate->states[R600_CB_CNTL__CB_SHADER_CONTROL] = 0x1;
+ radeon_state_pm4(rstate);
+}
+
+static void r600_blit_state_cb_flush(struct r600_screen *rscreen, struct radeon_state *rstate, struct r600_resource_texture *rtexture, unsigned cb, unsigned level)
+{
+ radeon_state_init(rstate, rscreen->rw, R600_STATE_CB_FLUSH, 0, 0);
+
+ radeon_ws_bo_reference(rscreen->rw, &rstate->bo[0], rtexture->uncompressed);
+ rstate->nbo = 1;
+ radeon_state_pm4(rstate);
+}
+
+static void r600_blit_state_db_flush(struct r600_screen *rscreen, struct radeon_state *rstate, struct r600_resource_texture *rtexture, unsigned cb, unsigned level)
+{
+ radeon_state_init(rstate, rscreen->rw, R600_STATE_DB_FLUSH, 0, 0);
+
+ radeon_ws_bo_reference(rscreen->rw, &rstate->bo[0], rtexture->resource.bo);
+ rstate->nbo = 1;
radeon_state_pm4(rstate);
}
@@ -512,6 +542,7 @@ int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_te
struct r600_context *rctx = r600_context(ctx);
struct radeon_draw draw;
struct r600_blit_states bstates;
+ enum radeon_family family;
int r;
r = r600_texture_scissor(ctx, rtexture, level);
@@ -535,8 +566,29 @@ int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_te
if (r) {
return r;
}
- bstates.dsa.states[R600_DSA__DB_RENDER_CONTROL] = 0x0000008C;
- bstates.cb_cntl.states[R600_CB_CNTL__CB_TARGET_MASK] = 0x00000001;
+
+ /* for some gpus we need special cases */
+ family = radeon_get_family(rscreen->rw);
+ /* according to R6xx_R7xx_3D.pdf section 6.3.1, these GPUs needs special handling */
+ if (family == CHIP_RV610 || family == CHIP_RV630 || family == CHIP_RV620 ||
+ family == CHIP_RV635) {
+ bstates.dsa.states[R600_DSA__DB_DEPTH_CONTROL] = S_028800_Z_ENABLE(1) |
+ S_028800_STENCIL_ENABLE(1) | S_028800_ZFUNC(PIPE_FUNC_LEQUAL) |
+ S_028800_STENCILFUNC(PIPE_FUNC_ALWAYS) |
+ S_028800_STENCILZPASS(V_028800_STENCIL_KEEP) |
+ S_028800_STENCILZFAIL(V_028800_STENCIL_INCR);
+
+ bstates.dsa.states[R600_DSA__DB_STENCILREFMASK] = S_028430_STENCILWRITEMASK(0xff);
+ } else {
+ bstates.dsa.states[R600_DSA__DB_RENDER_CONTROL] = S_028D0C_DEPTH_COPY_ENABLE(1) |
+ S_028D0C_STENCIL_COPY_ENABLE(1) |
+ S_028D0C_COPY_CENTROID(1);
+ bstates.cb_cntl.states[R600_CB_CNTL__CB_TARGET_MASK] = 0x00000001;
+ }
+
+ r600_blit_state_cb_flush(rscreen, &bstates.cb_flush, rtexture, 0, 0);
+ r600_blit_state_db_flush(rscreen, &bstates.db_flush, rtexture, 0, 0);
+
/* force rebuild */
bstates.dsa.cpm4 = bstates.cb_cntl.cpm4 = 0;
if (radeon_state_pm4(&bstates.dsa)) {
@@ -561,6 +613,8 @@ int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_te
radeon_draw_bind(&draw, &rctx->config);
radeon_draw_bind(&draw, &bstates.vgt);
radeon_draw_bind(&draw, &bstates.draw);
+ radeon_draw_bind(&draw, &bstates.cb_flush);
+ radeon_draw_bind(&draw, &bstates.db_flush);
radeon_draw_bind(&draw, &bstates.vs_resource0);
radeon_draw_bind(&draw, &bstates.vs_resource1);
radeon_draw_bind(&draw, &bstates.vs_constant0);
diff --git a/src/gallium/drivers/r600/r600d.h b/src/gallium/drivers/r600/r600d.h
index f1aa49c..56fba19 100644
--- a/src/gallium/drivers/r600/r600d.h
+++ b/src/gallium/drivers/r600/r600d.h
@@ -607,8 +607,15 @@
#define G_028D34_DEPTH_HEIGHT_TILE_MAX(x) (((x) >> 0) & 0x3FF)
#define C_028D34_DEPTH_HEIGHT_TILE_MAX 0xFFFFFC00
#define R_028D0C_DB_RENDER_CONTROL 0x028D0C
+#define S_028D0C_DEPTH_CLEAR_ENABLE(x) (((x) & 0x1) << 0)
+#define S_028D0C_STENCIL_CLEAR_ENABLE(x) (((x) & 0x1) << 1)
+#define S_028D0C_DEPTH_COPY_ENABLE(x) (((x) & 0x1) << 2)
+#define S_028D0C_STENCIL_COPY_ENABLE(x) (((x) & 0x1) << 3)
+#define S_028D0C_RESUMMARIZE_ENABLE(x) (((x) & 0x1) << 4)
#define S_028D0C_STENCIL_COMPRESS_DISABLE(x) (((x) & 0x1) << 5)
#define S_028D0C_DEPTH_COMPRESS_DISABLE(x) (((x) & 0x1) << 6)
+#define S_028D0C_COPY_CENTROID(x) (((x) & 0x1) << 7)
+#define S_028D0C_COPY_SAMPLE(x) (((x) & 0x1) << 8)
#define S_028D0C_R700_PERFECT_ZPASS_COUNTS(x) (((x) & 0x1) << 15)
#define R_028D10_DB_RENDER_OVERRIDE 0x028D10
#define V_028D10_FORCE_OFF 0
More information about the mesa-commit
mailing list