r600g: real fix for non 3.8 kernel
authorJerome Glisse <jglisse@redhat.com>
Mon, 28 Jan 2013 22:14:09 +0000 (17:14 -0500)
committerJerome Glisse <jglisse@redhat.com>
Mon, 28 Jan 2013 22:17:00 +0000 (17:17 -0500)
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
src/gallium/drivers/r600/r600_pipe.h

index 0f51eb2501fcad58daf264aaa73d1665487bc23e..3ff42d38f15c71a1d3c0fc2ca23628b07864528f 100644 (file)
@@ -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);