From fa3f1348e49feeac511dbe5b22bbddc47f56ba81 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Wed, 16 Feb 2011 22:23:23 +0100 Subject: r300g: fix a race between CS and SET_TILING ioctls --- src/gallium/drivers/r300/r300_state.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/gallium/drivers/r300/r300_state.c') diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index aa18ab7d1e..5d8298341d 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -624,12 +624,7 @@ static void r300_tex_set_tiling_flags(struct r300_context *r300, * Skip changing the flags otherwise. */ if (tex->tex.macrotile[tex->surface_level] != tex->tex.macrotile[level]) { - /* Tiling determines how DRM treats the buffer data. - * We must flush CS when changing it if the buffer is referenced. */ - if (r300->rws->cs_is_buffer_referenced(r300->cs, tex->cs_buf)) - r300->context.flush(&r300->context, 0, NULL); - - r300->rws->buffer_set_tiling(tex->buf, + r300->rws->buffer_set_tiling(tex->buf, r300->cs, tex->tex.microtile, tex->tex.macrotile[level], tex->tex.stride_in_bytes[0]); -- cgit v1.2.3