From: Alex Deucher <alexdeucher@gmail.com>
Date: Sun, 23 Aug 2009 16:59:09 +0000 (-0400)
Subject: r600: always emit CB base
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=41934be2544ac47a308719c08ee1bba344fed78d;p=mesa.git

r600: always emit CB base

Not doing so seems to cause lock-ups or rendering problems
on some chips.  I think there is an logic issue related to
CB and VGT on some chips.  We ran into similar issues in
r600_demo IIRC.
---

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 6a066f35105..0b0c4f5049b 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -185,7 +185,13 @@ static void r600_vtbl_emit_cs_header(struct radeon_cs *cs, radeonContextPtr rmes
 
 static void r600_vtbl_pre_emit_atoms(radeonContextPtr radeon)
 {
-	r700Start3D((context_t *)radeon);
+	context_t *context = (context_t *)radeon;
+
+	/* always emit CB base to prevent
+	 * lock ups on some chips.
+	 */
+	R600_STATECHANGE(context, cb_target);
+	r700Start3D(context);
 }
 
 static void r600_fallback(GLcontext *ctx, GLuint bit, GLboolean mode)