Mesa (master): r600g: don't emit forbidden reg with old kernel on evergreen

Jerome Glisse glisse at kemper.freedesktop.org
Mon Jul 23 15:25:46 UTC 2012


Module: Mesa
Branch: master
Commit: cb149bf9e12aebd38bd0a6d009673e8400659110
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb149bf9e12aebd38bd0a6d009673e8400659110

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Mon Jul 23 11:42:36 2012 -0400

r600g: don't emit forbidden reg with old kernel on evergreen

Fix https://bugs.freedesktop.org/show_bug.cgi?id=52313

Signed-off-by: Jerome Glisse <jglisse at redhat.com>

---

 src/gallium/drivers/r600/evergreen_state.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 61d893b..654aeff 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -2595,7 +2595,9 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
 
 	r600_store_context_reg(cb, R_028354_SX_SURFACE_SYNC, S_028354_SURFACE_SYNC_MASK(0xf));
 	r600_store_context_reg(cb, R_028800_DB_DEPTH_CONTROL, 0);
-	r600_store_context_reg(cb, R_028B28_VGT_STRMOUT_DRAW_OPAQUE_OFFSET, 0);
+	if (rctx->screen->has_streamout) {
+		r600_store_context_reg(cb, R_028B28_VGT_STRMOUT_DRAW_OPAQUE_OFFSET, 0);
+	}
 
 	eg_store_loop_const(cb, R_03A200_SQ_LOOP_CONST_0, 0x01000FFF);
 	eg_store_loop_const(cb, R_03A200_SQ_LOOP_CONST_0 + (32 * 4), 0x01000FFF);




More information about the mesa-commit mailing list