r600g,radeonsi: Assert that there's enough space after flushing

[mesa.git] / src / gallium / drivers / radeon / r600_pipe_common.c

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 97eed13633128811cfcb126c64b4cb51df06f0fe..3def44468823557cea70140ec50c9e7da037fe2a 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -107,11 +107,10 @@ void r600_draw_rectangle(struct blitter_context *blitter,
 
 void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw)
 {
-       /* The number of dwords we already used in the DMA so far. */
-       num_dw += ctx->rings.dma.cs->cdw;
        /* Flush if there's not enough space. */
-       if (num_dw > RADEON_MAX_CMDBUF_DWORDS) {
+       if ((num_dw + ctx->rings.dma.cs->cdw) > RADEON_MAX_CMDBUF_DWORDS) {
                ctx->rings.dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
+               assert((num_dw + ctx->rings.dma.cs->cdw) <= RADEON_MAX_CMDBUF_DWORDS);
        }
 }
 
@@ -657,17 +656,18 @@ static int r600_get_driver_query_info(struct pipe_screen *screen,
 {
        struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
        struct pipe_driver_query_info list[] = {
-               {"draw-calls", R600_QUERY_DRAW_CALLS, 0},
-               {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, rscreen->info.vram_size, TRUE},
-               {"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->info.gart_size, TRUE},
-               {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, 0, FALSE},
-               {"num-cs-flushes", R600_QUERY_NUM_CS_FLUSHES, 0, FALSE},
-               {"num-bytes-moved", R600_QUERY_NUM_BYTES_MOVED, 0, TRUE},
-               {"VRAM-usage", R600_QUERY_VRAM_USAGE, rscreen->info.vram_size, TRUE},
-               {"GTT-usage", R600_QUERY_GTT_USAGE, rscreen->info.gart_size, TRUE},
-               {"temperature", R600_QUERY_GPU_TEMPERATURE, 100, FALSE},
-               {"shader-clock", R600_QUERY_CURRENT_GPU_SCLK, 0, FALSE},
-               {"memory-clock", R600_QUERY_CURRENT_GPU_MCLK, 0, FALSE}
+               {"draw-calls", R600_QUERY_DRAW_CALLS, {0}},
+               {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, {rscreen->info.vram_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
+               {"requested-GTT", R600_QUERY_REQUESTED_GTT, {rscreen->info.gart_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
+               {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, {0}},
+               {"num-cs-flushes", R600_QUERY_NUM_CS_FLUSHES, {0}},
+               {"num-bytes-moved", R600_QUERY_NUM_BYTES_MOVED, {0}, PIPE_DRIVER_QUERY_TYPE_BYTES},
+               {"VRAM-usage", R600_QUERY_VRAM_USAGE, {rscreen->info.vram_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
+               {"GTT-usage", R600_QUERY_GTT_USAGE, {rscreen->info.gart_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
+               {"temperature", R600_QUERY_GPU_TEMPERATURE, {100}},
+               {"shader-clock", R600_QUERY_CURRENT_GPU_SCLK, {0}},
+               {"memory-clock", R600_QUERY_CURRENT_GPU_MCLK, {0}},
+               {"GPU-load", R600_QUERY_GPU_LOAD, {100}}
        };
        unsigned num_queries;
 
@@ -872,6 +872,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
        }
        util_format_s3tc_init();
        pipe_mutex_init(rscreen->aux_context_lock);
+       pipe_mutex_init(rscreen->gpu_load_mutex);
 
        if (rscreen->info.drm_minor >= 28 && (rscreen->debug_flags & DBG_TRACE_CS)) {
                rscreen->trace_bo = (struct r600_resource*)pipe_buffer_create(&rscreen->b,
@@ -915,6 +916,9 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
 
 void r600_destroy_common_screen(struct r600_common_screen *rscreen)
 {
+       r600_gpu_load_kill_thread(rscreen);
+
+       pipe_mutex_destroy(rscreen->gpu_load_mutex);
        pipe_mutex_destroy(rscreen->aux_context_lock);
        rscreen->aux_context->destroy(rscreen->aux_context);