Mesa (9.1): r600g: real fix for non 3.8 kernel

[Jerome Glisse]

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

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Mon Jan 28 17:14:09 2013 -0500

r600g: real fix for non 3.8 kernel

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

---

 src/gallium/drivers/r600/r600_pipe.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 0f51eb2..3ff42d3 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -869,9 +869,11 @@ static INLINE unsigned r600_context_bo_reloc(struct r600_context *ctx,
 	 * look serialized from driver pov
 	 */
 	if (!ring->flushing) {
-		if (ring == &ctx->rings.gfx && ctx->rings.dma.cs) {
-			/* flush dma ring */
-			ctx->rings.dma.flush(ctx, RADEON_FLUSH_ASYNC);
+		if (ring == &ctx->rings.gfx) {
+			if (ctx->rings.dma.cs) {
+				/* flush dma ring */
+				ctx->rings.dma.flush(ctx, RADEON_FLUSH_ASYNC);
+			}
 		} else {
 			/* flush gfx ring */
 			ctx->rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC);