projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1559994
)
r600g: real fix for non 3.8 kernel
author
Jerome Glisse
<jglisse@redhat.com>
Mon, 28 Jan 2013 22:14:09 +0000
(17:14 -0500)
committer
Jerome 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
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/r600/r600_pipe.h
b/src/gallium/drivers/r600/r600_pipe.h
index
0f51eb2
..
3ff42d3
100644
(file)
--- 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);