diff options
| author | Jerome Glisse <[email protected]> | 2013-01-28 17:14:09 -0500 |
|---|---|---|
| committer | Jerome Glisse <[email protected]> | 2013-01-28 17:17:00 -0500 |
| commit | da638781f63df2020f6e6ab537226cd58232bd99 (patch) | |
| tree | 0806b387544b570e6ce25d8d5379490ed75edb81 /src/gallium/drivers | |
| parent | 1559994cba380a4e87a5e8dbb04b0a7475711756 (diff) | |
r600g: real fix for non 3.8 kernel
Signed-off-by: Jerome Glisse <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | 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 0f51eb2501f..3ff42d38f15 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); |