r600g: don't call buffer_wait in buffer_mmap_sync_with_rings
authorMarek Olšák <maraeo@gmail.com>
Sun, 30 Jun 2013 12:57:17 +0000 (14:57 +0200)
committerMarek Olšák <maraeo@gmail.com>
Mon, 8 Jul 2013 18:25:18 +0000 (20:25 +0200)
The winsys should do this, because it measures how much time we spend
in buffer_map doing synchronization, which can be viewed with the gallium
HUD.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
src/gallium/drivers/r600/r600_pipe.c

index c9f460751d6baabef4eef1ccba43fc38e759bb74..8b67e85af196930fab157a7ce04bc8b5ea64ed02 100644 (file)
@@ -292,10 +292,9 @@ void *r600_buffer_mmap_sync_with_rings(struct r600_context *ctx,
                        ctx->ws->cs_sync_flush(ctx->rings.dma.cs);
                }
        }
-       ctx->ws->buffer_wait(resource->buf, rusage);
 
        /* at this point everything is synchronized */
-       return ctx->ws->buffer_map(resource->cs_buf, NULL, usage | PIPE_TRANSFER_UNSYNCHRONIZED);
+       return ctx->ws->buffer_map(resource->cs_buf, NULL, usage);
 }
 
 static void r600_flush_from_winsys(void *ctx, unsigned flags)