diff options
| author | Jerome Glisse <[email protected]> | 2013-04-23 19:22:33 -0400 |
|---|---|---|
| committer | Jerome Glisse <[email protected]> | 2013-04-25 18:36:31 -0400 |
| commit | abb96fdea70546f974ba59cbd00bc54afee9cfdb (patch) | |
| tree | 26cd3596731ed64e3a242ded8779bb1930472a70 /src/gallium/drivers/radeonsi | |
| parent | 53fbae7eace466d8fe22173c01518fbde7102d6c (diff) | |
winsys/radeon: consolidate tracing into winsys v2
This move the tracing timeout and printing into winsys and add
an debug environement variable for it (R600_DEBUG=trace_cs).
Lot of file touched because of winsys API changes.
v2: Do not write lockup file if ib uniq id does not match last one
Signed-off-by: Jerome Glisse <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/r600_hw_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_compute.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/r600_hw_context.c b/src/gallium/drivers/radeonsi/r600_hw_context.c index 0975a1fe978..f3f07a3e103 100644 --- a/src/gallium/drivers/radeonsi/r600_hw_context.c +++ b/src/gallium/drivers/radeonsi/r600_hw_context.c @@ -225,7 +225,7 @@ void si_context_flush(struct r600_context *ctx, unsigned flags) #endif /* Flush the CS. */ - ctx->ws->cs_flush(ctx->cs, flags); + ctx->ws->cs_flush(ctx->cs, flags, 0); #if R600_TRACE_CS if (ctx->screen->trace_bo) { diff --git a/src/gallium/drivers/radeonsi/radeonsi_compute.c b/src/gallium/drivers/radeonsi/radeonsi_compute.c index 67bc14eb26b..e67d127b223 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_compute.c +++ b/src/gallium/drivers/radeonsi/radeonsi_compute.c @@ -200,7 +200,7 @@ static void radeonsi_launch_grid( } #endif - rctx->ws->cs_flush(rctx->cs, RADEON_FLUSH_COMPUTE); + rctx->ws->cs_flush(rctx->cs, RADEON_FLUSH_COMPUTE, 0); rctx->ws->buffer_wait(program->shader.bo->buf, 0); FREE(pm4); diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 4e97f51dbdc..8a072fda89e 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -233,7 +233,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void case TAHITI: si_init_state_functions(rctx); LIST_INITHEAD(&rctx->active_query_list); - rctx->cs = rctx->ws->cs_create(rctx->ws, RING_GFX); + rctx->cs = rctx->ws->cs_create(rctx->ws, RING_GFX, NULL); rctx->max_db = 8; si_init_config(rctx); break; |