summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_flush.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-12-13 20:27:48 +0100
committerMarek Olšák <[email protected]>2011-12-13 21:34:18 +0100
commit35d2764f853fa749e36871d11fc22ced2a851702 (patch)
tree14b8d0ac2bcfadbcabbc660702f9a6312b967f0a /src/gallium/drivers/r300/r300_flush.c
parent10e931219f0619c01456dd13fea65b8c21f3b87b (diff)
r300g: take advantage of KEEP_TILING_FLAGS flush flag
This fixes at least two multi-context-related races.
Diffstat (limited to 'src/gallium/drivers/r300/r300_flush.c')
-rw-r--r--src/gallium/drivers/r300/r300_flush.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c
index 8b710c1a5ee..9459a95cd73 100644
--- a/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@ -72,6 +72,10 @@ void r300_flush(struct pipe_context *pipe,
if (r300->draw && !r300->draw_vbo_locked)
r300_draw_flush_vbuf(r300);
+ if (r300->screen->info.drm_minor >= 12) {
+ flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
+ }
+
if (rfence) {
/* Create a fence, which is a dummy BO. */
*rfence = r300->rws->buffer_create(r300->rws, 1, 1,