gallium/radeon: use r600_gfx_write_event_eop everywhere
[mesa.git] / src / gallium / drivers / radeon / r600_pipe_common.c
index cea6b7bce8252ae253c45bd253933421af78566f..1a7a712beb2121de5fb50563ddb3e5ec58092e0b 100644 (file)
@@ -37,6 +37,7 @@
 #include "vl/vl_video_buffer.h"
 #include "radeon/radeon_video.h"
 #include <inttypes.h>
+#include <sys/utsname.h>
 
 #ifndef HAVE_LLVM
 #define HAVE_LLVM 0
@@ -46,6 +47,12 @@ struct r600_multi_fence {
        struct pipe_reference reference;
        struct pipe_fence_handle *gfx;
        struct pipe_fence_handle *sdma;
+
+       /* If the context wasn't flushed at fence creation, this is non-NULL. */
+       struct {
+               struct r600_common_context *ctx;
+               unsigned ib_index;
+       } gfx_unflushed;
 };
 
 /*
@@ -66,12 +73,87 @@ void radeon_shader_binary_clean(struct radeon_shader_binary *b)
        FREE(b->global_symbol_offsets);
        FREE(b->relocs);
        FREE(b->disasm_string);
+       FREE(b->llvm_ir_string);
 }
 
 /*
  * pipe_context
  */
 
+/**
+ * Write an EOP event.
+ *
+ * \param event                EVENT_TYPE_*
+ * \param event_flags  Optional cache flush flags (TC)
+ * \param data_sel     1 = fence, 3 = timestamp
+ * \param buf          Buffer
+ * \param va           GPU address
+ * \param old_value    Previous fence value (for a bug workaround)
+ * \param new_value    Fence value to write for this event.
+ */
+void r600_gfx_write_event_eop(struct r600_common_context *ctx,
+                             unsigned event, unsigned event_flags,
+                             unsigned data_sel,
+                             struct r600_resource *buf, uint64_t va,
+                             uint32_t old_fence, uint32_t new_fence)
+{
+       struct radeon_winsys_cs *cs = ctx->gfx.cs;
+       unsigned op = EVENT_TYPE(event) |
+                     EVENT_INDEX(5) |
+                     event_flags;
+
+       if (ctx->chip_class == CIK) {
+               /* Two EOP events are required to make all engines go idle
+                * (and optional cache flushes executed) before the timestamp
+                * is written.
+                */
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
+               radeon_emit(cs, op);
+               radeon_emit(cs, va);
+               radeon_emit(cs, ((va >> 32) & 0xffff) | EOP_DATA_SEL(data_sel));
+               radeon_emit(cs, old_fence); /* immediate data */
+               radeon_emit(cs, 0); /* unused */
+       }
+
+       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
+       radeon_emit(cs, op);
+       radeon_emit(cs, va);
+       radeon_emit(cs, ((va >> 32) & 0xffff) | EOP_DATA_SEL(data_sel));
+       radeon_emit(cs, new_fence); /* immediate data */
+       radeon_emit(cs, 0); /* unused */
+
+       if (buf)
+               r600_emit_reloc(ctx, &ctx->gfx, buf, RADEON_USAGE_WRITE,
+                               RADEON_PRIO_QUERY);
+}
+
+unsigned r600_gfx_write_fence_dwords(struct r600_common_screen *screen)
+{
+       unsigned dwords = 6;
+
+       if (screen->chip_class == CIK)
+               dwords *= 2;
+
+       if (!screen->info.has_virtual_memory)
+               dwords += 2;
+
+       return dwords;
+}
+
+void r600_gfx_wait_fence(struct r600_common_context *ctx,
+                        uint64_t va, uint32_t ref, uint32_t mask)
+{
+       struct radeon_winsys_cs *cs = ctx->gfx.cs;
+
+       radeon_emit(cs, PKT3(PKT3_WAIT_REG_MEM, 5, 0));
+       radeon_emit(cs, WAIT_REG_MEM_EQUAL | WAIT_REG_MEM_MEM_SPACE(1));
+       radeon_emit(cs, va);
+       radeon_emit(cs, va >> 32);
+       radeon_emit(cs, ref); /* reference value */
+       radeon_emit(cs, mask); /* mask */
+       radeon_emit(cs, 4); /* poll interval */
+}
+
 void r600_draw_rectangle(struct blitter_context *blitter,
                         int x1, int y1, int x2, int y2, float depth,
                         enum blitter_attrib_type type,
@@ -136,16 +218,89 @@ void r600_draw_rectangle(struct blitter_context *blitter,
        pipe_resource_reference(&buf, NULL);
 }
 
-void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw)
+void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
+                         struct r600_resource *dst, struct r600_resource *src)
 {
-       /* Flush the GFX IB if it's not empty. */
-       if (ctx->gfx.cs->cdw > ctx->initial_gfx_cs_size)
+       uint64_t vram = 0, gtt = 0;
+
+       if (dst) {
+               vram += dst->vram_usage;
+               gtt += dst->gart_usage;
+       }
+       if (src) {
+               vram += src->vram_usage;
+               gtt += src->gart_usage;
+       }
+
+       /* Flush the GFX IB if DMA depends on it. */
+       if (radeon_emitted(ctx->gfx.cs, ctx->initial_gfx_cs_size) &&
+           ((dst &&
+             ctx->ws->cs_is_buffer_referenced(ctx->gfx.cs, dst->buf,
+                                              RADEON_USAGE_READWRITE)) ||
+            (src &&
+             ctx->ws->cs_is_buffer_referenced(ctx->gfx.cs, src->buf,
+                                              RADEON_USAGE_WRITE))))
                ctx->gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
 
-       /* Flush if there's not enough space. */
-       if ((num_dw + ctx->dma.cs->cdw) > ctx->dma.cs->max_dw) {
+       /* Flush if there's not enough space, or if the memory usage per IB
+        * is too large.
+        */
+       if (!ctx->ws->cs_check_space(ctx->dma.cs, num_dw) ||
+           !radeon_cs_memory_below_limit(ctx->screen, ctx->dma.cs, vram, gtt)) {
                ctx->dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
-               assert((num_dw + ctx->dma.cs->cdw) <= ctx->dma.cs->max_dw);
+               assert((num_dw + ctx->dma.cs->current.cdw) <= ctx->dma.cs->current.max_dw);
+       }
+
+       /* If GPUVM is not supported, the CS checker needs 2 entries
+        * in the buffer list per packet, which has to be done manually.
+        */
+       if (ctx->screen->info.has_virtual_memory) {
+               if (dst)
+                       radeon_add_to_buffer_list(ctx, &ctx->dma, dst,
+                                                 RADEON_USAGE_WRITE,
+                                                 RADEON_PRIO_SDMA_BUFFER);
+               if (src)
+                       radeon_add_to_buffer_list(ctx, &ctx->dma, src,
+                                                 RADEON_USAGE_READ,
+                                                 RADEON_PRIO_SDMA_BUFFER);
+       }
+}
+
+/* This is required to prevent read-after-write hazards. */
+void r600_dma_emit_wait_idle(struct r600_common_context *rctx)
+{
+       struct radeon_winsys_cs *cs = rctx->dma.cs;
+
+       /* done at the end of DMA calls, so increment this. */
+       rctx->num_dma_calls++;
+
+       /* IBs using too little memory are limited by the IB submission overhead.
+        * IBs using too much memory are limited by the kernel/TTM overhead.
+        * Too long IBs create CPU-GPU pipeline bubbles and add latency.
+        *
+        * This heuristic makes sure that DMA requests are executed
+        * very soon after the call is made and lowers memory usage.
+        * It improves texture upload performance by keeping the DMA
+        * engine busy while uploads are being submitted.
+        */
+       if (cs->used_vram + cs->used_gart > 64 * 1024 * 1024) {
+               rctx->dma.flush(rctx, RADEON_FLUSH_ASYNC, NULL);
+               return;
+       }
+
+       r600_need_dma_space(rctx, 1, NULL, NULL);
+
+       if (!radeon_emitted(cs, 0)) /* empty queue */
+               return;
+
+       /* NOP waits for idle on Evergreen and later. */
+       if (rctx->chip_class >= CIK)
+               radeon_emit(cs, 0x00000000); /* NOP */
+       else if (rctx->chip_class >= EVERGREEN)
+               radeon_emit(cs, 0xf0000000); /* NOP */
+       else {
+               /* TODO: R600-R700 should use the FENCE packet.
+                * CS checker support is required. */
        }
 }
 
@@ -184,29 +339,57 @@ static void r600_flush_from_st(struct pipe_context *ctx,
 {
        struct pipe_screen *screen = ctx->screen;
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
+       struct radeon_winsys *ws = rctx->ws;
        unsigned rflags = 0;
        struct pipe_fence_handle *gfx_fence = NULL;
        struct pipe_fence_handle *sdma_fence = NULL;
+       bool deferred_fence = false;
 
        if (flags & PIPE_FLUSH_END_OF_FRAME)
                rflags |= RADEON_FLUSH_END_OF_FRAME;
+       if (flags & PIPE_FLUSH_DEFERRED)
+               rflags |= RADEON_FLUSH_ASYNC;
 
        if (rctx->dma.cs) {
                rctx->dma.flush(rctx, rflags, fence ? &sdma_fence : NULL);
        }
-       rctx->gfx.flush(rctx, rflags, fence ? &gfx_fence : NULL);
+
+       if (!radeon_emitted(rctx->gfx.cs, rctx->initial_gfx_cs_size)) {
+               if (fence)
+                       ws->fence_reference(&gfx_fence, rctx->last_gfx_fence);
+               if (!(rflags & RADEON_FLUSH_ASYNC))
+                       ws->cs_sync_flush(rctx->gfx.cs);
+       } else {
+               /* Instead of flushing, create a deferred fence. Constraints:
+                * - The state tracker must allow a deferred flush.
+                * - The state tracker must request a fence.
+                * Thread safety in fence_finish must be ensured by the state tracker.
+                */
+               if (flags & PIPE_FLUSH_DEFERRED && fence) {
+                       gfx_fence = rctx->ws->cs_get_next_fence(rctx->gfx.cs);
+                       deferred_fence = true;
+               } else {
+                       rctx->gfx.flush(rctx, rflags, fence ? &gfx_fence : NULL);
+               }
+       }
 
        /* Both engines can signal out of order, so we need to keep both fences. */
-       if (gfx_fence || sdma_fence) {
+       if (fence) {
                struct r600_multi_fence *multi_fence =
                        CALLOC_STRUCT(r600_multi_fence);
                if (!multi_fence)
                        return;
 
                multi_fence->reference.count = 1;
+               /* If both fences are NULL, fence_finish will always return true. */
                multi_fence->gfx = gfx_fence;
                multi_fence->sdma = sdma_fence;
 
+               if (deferred_fence) {
+                       multi_fence->gfx_unflushed.ctx = rctx;
+                       multi_fence->gfx_unflushed.ib_index = rctx->num_gfx_cs_flushes;
+               }
+
                screen->fence_reference(screen, fence, NULL);
                *fence = (struct pipe_fence_handle*)multi_fence;
        }
@@ -217,11 +400,81 @@ static void r600_flush_dma_ring(void *ctx, unsigned flags,
 {
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
        struct radeon_winsys_cs *cs = rctx->dma.cs;
+       struct radeon_saved_cs saved;
+       bool check_vm =
+               (rctx->screen->debug_flags & DBG_CHECK_VM) &&
+               rctx->check_vm_faults;
+
+       if (!radeon_emitted(cs, 0)) {
+               if (fence)
+                       rctx->ws->fence_reference(fence, rctx->last_sdma_fence);
+               return;
+       }
+
+       if (check_vm)
+               radeon_save_cs(rctx->ws, cs, &saved);
 
-       if (cs->cdw)
-               rctx->ws->cs_flush(cs, flags, &rctx->last_sdma_fence);
+       rctx->ws->cs_flush(cs, flags, &rctx->last_sdma_fence);
        if (fence)
                rctx->ws->fence_reference(fence, rctx->last_sdma_fence);
+
+       if (check_vm) {
+               /* Use conservative timeout 800ms, after which we won't wait any
+                * longer and assume the GPU is hung.
+                */
+               rctx->ws->fence_wait(rctx->ws, rctx->last_sdma_fence, 800*1000*1000);
+
+               rctx->check_vm_faults(rctx, &saved, RING_DMA);
+               radeon_clear_saved_cs(&saved);
+       }
+}
+
+/**
+ * Store a linearized copy of all chunks of \p cs together with the buffer
+ * list in \p saved.
+ */
+void radeon_save_cs(struct radeon_winsys *ws, struct radeon_winsys_cs *cs,
+                   struct radeon_saved_cs *saved)
+{
+       void *buf;
+       unsigned i;
+
+       /* Save the IB chunks. */
+       saved->num_dw = cs->prev_dw + cs->current.cdw;
+       saved->ib = MALLOC(4 * saved->num_dw);
+       if (!saved->ib)
+               goto oom;
+
+       buf = saved->ib;
+       for (i = 0; i < cs->num_prev; ++i) {
+               memcpy(buf, cs->prev[i].buf, cs->prev[i].cdw * 4);
+               buf += cs->prev[i].cdw;
+       }
+       memcpy(buf, cs->current.buf, cs->current.cdw * 4);
+
+       /* Save the buffer list. */
+       saved->bo_count = ws->cs_get_buffer_list(cs, NULL);
+       saved->bo_list = CALLOC(saved->bo_count,
+                               sizeof(saved->bo_list[0]));
+       if (!saved->bo_list) {
+               FREE(saved->ib);
+               goto oom;
+       }
+       ws->cs_get_buffer_list(cs, saved->bo_list);
+
+       return;
+
+oom:
+       fprintf(stderr, "%s: out of memory\n", __func__);
+       memset(saved, 0, sizeof(*saved));
+}
+
+void radeon_clear_saved_cs(struct radeon_saved_cs *saved)
+{
+       FREE(saved->ib);
+       FREE(saved->bo_list);
+
+       memset(saved, 0, sizeof(*saved));
 }
 
 static enum pipe_reset_status r600_get_reset_status(struct pipe_context *ctx)
@@ -248,12 +501,41 @@ static void r600_set_debug_callback(struct pipe_context *ctx,
                memset(&rctx->debug, 0, sizeof(rctx->debug));
 }
 
+static void r600_set_device_reset_callback(struct pipe_context *ctx,
+                                          const struct pipe_device_reset_callback *cb)
+{
+       struct r600_common_context *rctx = (struct r600_common_context *)ctx;
+
+       if (cb)
+               rctx->device_reset_callback = *cb;
+       else
+               memset(&rctx->device_reset_callback, 0,
+                      sizeof(rctx->device_reset_callback));
+}
+
+bool r600_check_device_reset(struct r600_common_context *rctx)
+{
+       enum pipe_reset_status status;
+
+       if (!rctx->device_reset_callback.reset)
+               return false;
+
+       if (!rctx->b.get_device_reset_status)
+               return false;
+
+       status = rctx->b.get_device_reset_status(&rctx->b);
+       if (status == PIPE_NO_RESET)
+               return false;
+
+       rctx->device_reset_callback.reset(rctx->device_reset_callback.data, status);
+       return true;
+}
+
 bool r600_common_context_init(struct r600_common_context *rctx,
-                             struct r600_common_screen *rscreen)
+                             struct r600_common_screen *rscreen,
+                             unsigned context_flags)
 {
-       util_slab_create(&rctx->pool_transfers,
-                        sizeof(struct r600_transfer), 64,
-                        UTIL_SLAB_SINGLETHREADED);
+       slab_create_child(&rctx->pool_transfers, &rscreen->pool_transfers);
 
        rctx->screen = rscreen;
        rctx->ws = rscreen->ws;
@@ -271,11 +553,20 @@ bool r600_common_context_init(struct r600_common_context *rctx,
        rctx->b.transfer_map = u_transfer_map_vtbl;
        rctx->b.transfer_flush_region = u_transfer_flush_region_vtbl;
        rctx->b.transfer_unmap = u_transfer_unmap_vtbl;
-       rctx->b.transfer_inline_write = u_default_transfer_inline_write;
-        rctx->b.memory_barrier = r600_memory_barrier;
+       rctx->b.texture_subdata = u_default_texture_subdata;
+       rctx->b.memory_barrier = r600_memory_barrier;
        rctx->b.flush = r600_flush_from_st;
        rctx->b.set_debug_callback = r600_set_debug_callback;
 
+       /* evergreen_compute.c has a special codepath for global buffers.
+        * Everything else can use the direct path.
+        */
+       if ((rscreen->chip_class == EVERGREEN || rscreen->chip_class == CAYMAN) &&
+           (context_flags & PIPE_CONTEXT_COMPUTE_ONLY))
+               rctx->b.buffer_subdata = u_default_buffer_subdata;
+       else
+               rctx->b.buffer_subdata = r600_buffer_subdata;
+
        if (rscreen->info.drm_major == 2 && rscreen->info.drm_minor >= 43) {
                rctx->b.get_device_reset_status = r600_get_reset_status;
                rctx->gpu_reset_counter =
@@ -283,7 +574,7 @@ bool r600_common_context_init(struct r600_common_context *rctx,
                                              RADEON_GPU_RESET_COUNTER);
        }
 
-       LIST_INITHEAD(&rctx->texture_buffers);
+       rctx->b.set_device_reset_callback = r600_set_device_reset_callback;
 
        r600_init_context_texture_functions(rctx);
        r600_init_viewport_functions(rctx);
@@ -291,10 +582,10 @@ bool r600_common_context_init(struct r600_common_context *rctx,
        r600_query_init(rctx);
        cayman_init_msaa(&rctx->b);
 
-       rctx->allocator_so_filled_size =
+       rctx->allocator_zeroed_memory =
                u_suballocator_create(&rctx->b, rscreen->info.gart_page_size,
-                                     4, 0, PIPE_USAGE_DEFAULT, TRUE);
-       if (!rctx->allocator_so_filled_size)
+                                     0, PIPE_USAGE_DEFAULT, true);
+       if (!rctx->allocator_zeroed_memory)
                return false;
 
        rctx->uploader = u_upload_create(&rctx->b, 1024 * 1024,
@@ -319,6 +610,23 @@ bool r600_common_context_init(struct r600_common_context *rctx,
 
 void r600_common_context_cleanup(struct r600_common_context *rctx)
 {
+       unsigned i,j;
+
+       /* Release DCC stats. */
+       for (i = 0; i < ARRAY_SIZE(rctx->dcc_stats); i++) {
+               assert(!rctx->dcc_stats[i].query_active);
+
+               for (j = 0; j < ARRAY_SIZE(rctx->dcc_stats[i].ps_stats); j++)
+                       if (rctx->dcc_stats[i].ps_stats[j])
+                               rctx->b.destroy_query(&rctx->b,
+                                                     rctx->dcc_stats[i].ps_stats[j]);
+
+               r600_texture_reference(&rctx->dcc_stats[i].tex, NULL);
+       }
+
+       if (rctx->query_result_shader)
+               rctx->b.delete_compute_state(&rctx->b, rctx->query_result_shader);
+
        if (rctx->gfx.cs)
                rctx->ws->cs_destroy(rctx->gfx.cs);
        if (rctx->dma.cs)
@@ -330,36 +638,15 @@ void r600_common_context_cleanup(struct r600_common_context *rctx)
                u_upload_destroy(rctx->uploader);
        }
 
-       util_slab_destroy(&rctx->pool_transfers);
+       slab_destroy_child(&rctx->pool_transfers);
 
-       if (rctx->allocator_so_filled_size) {
-               u_suballocator_destroy(rctx->allocator_so_filled_size);
+       if (rctx->allocator_zeroed_memory) {
+               u_suballocator_destroy(rctx->allocator_zeroed_memory);
        }
+       rctx->ws->fence_reference(&rctx->last_gfx_fence, NULL);
        rctx->ws->fence_reference(&rctx->last_sdma_fence, NULL);
 }
 
-void r600_context_add_resource_size(struct pipe_context *ctx, struct pipe_resource *r)
-{
-       struct r600_common_context *rctx = (struct r600_common_context *)ctx;
-       struct r600_resource *rr = (struct r600_resource *)r;
-
-       if (!r) {
-               return;
-       }
-
-       /*
-        * The idea is to compute a gross estimate of memory requirement of
-        * each draw call. After each draw call, memory will be precisely
-        * accounted. So the uncertainty is only on the current draw call.
-        * In practice this gave very good estimate (+/- 10% of the target
-        * memory limit).
-        */
-       if (rr->domains & RADEON_DOMAIN_VRAM)
-               rctx->vram += rr->buf->size;
-       else if (rr->domains & RADEON_DOMAIN_GTT)
-               rctx->gtt += rr->buf->size;
-}
-
 /*
  * pipe_screen
  */
@@ -383,6 +670,7 @@ static const struct debug_named_value common_debug_options[] = {
        { "notgsi", DBG_NO_TGSI, "Don't print the TGSI"},
        { "noasm", DBG_NO_ASM, "Don't print disassembled shaders"},
        { "preoptir", DBG_PREOPT_IR, "Print the LLVM IR before initial optimizations" },
+       { "checkir", DBG_CHECK_IR, "Enable additional sanity checks on shader IR" },
 
        { "testdma", DBG_TEST_DMA, "Invoke SDMA tests and exit." },
 
@@ -404,6 +692,8 @@ static const struct debug_named_value common_debug_options[] = {
        { "sisched", DBG_SI_SCHED, "Enable LLVM SI Machine Instruction Scheduler." },
        { "mono", DBG_MONOLITHIC_SHADERS, "Use old-style monolithic shaders compiled on demand" },
        { "noce", DBG_NO_CE, "Disable the constant engine"},
+       { "unsafemath", DBG_UNSAFE_MATH, "Enable unsafe math shader optimizations" },
+       { "nodccfb", DBG_NO_DCC_FB, "Disable separate DCC on the main framebuffer" },
 
        DEBUG_NAMED_VALUE_END /* must be last */
 };
@@ -619,7 +909,11 @@ static int r600_get_compute_param(struct pipe_screen *screen,
                if (rscreen->family <= CHIP_ARUBA) {
                        triple = "r600--";
                } else {
-                       triple = "amdgcn--";
+                       if (HAVE_LLVM < 0x0400) {
+                               triple = "amdgcn--";
+                       } else {
+                               triple = "amdgcn-mesa-mesa3d";
+                       }
                }
                switch(rscreen->family) {
                /* Clang < 3.6 is missing Hainan in its list of
@@ -677,6 +971,14 @@ static int r600_get_compute_param(struct pipe_screen *screen,
                                *max_threads_per_block = 256;
                }
                return sizeof(uint64_t);
+       case PIPE_COMPUTE_CAP_ADDRESS_BITS:
+               if (ret) {
+                       uint32_t *address_bits = ret;
+                       address_bits[0] = 32;
+                       if (rscreen->chip_class >= SI)
+                               address_bits[0] = 64;
+               }
+               return 1 * sizeof(uint32_t);
 
        case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE:
                if (ret) {
@@ -694,8 +996,8 @@ static int r600_get_compute_param(struct pipe_screen *screen,
                         * 4 * MAX_MEM_ALLOC_SIZE.
                         */
                        *max_global_size = MIN2(4 * max_mem_alloc_size,
-                               rscreen->info.gart_size +
-                               rscreen->info.vram_size);
+                                               MAX2(rscreen->info.gart_size,
+                                                    rscreen->info.vram_size));
                }
                return sizeof(uint64_t);
 
@@ -719,10 +1021,7 @@ static int r600_get_compute_param(struct pipe_screen *screen,
                if (ret) {
                        uint64_t *max_mem_alloc_size = ret;
 
-                       /* XXX: The limit in older kernels is 256 MB.  We
-                        * should add a query here for newer kernels.
-                        */
-                       *max_mem_alloc_size = 256 * 1024 * 1024;
+                       *max_mem_alloc_size = rscreen->info.max_alloc_size;
                }
                return sizeof(uint64_t);
 
@@ -754,6 +1053,16 @@ static int r600_get_compute_param(struct pipe_screen *screen,
                        *subgroup_size = r600_wavefront_size(rscreen->family);
                }
                return sizeof(uint32_t);
+       case PIPE_COMPUTE_CAP_MAX_VARIABLE_THREADS_PER_BLOCK:
+               if (ret) {
+                       uint64_t *max_variable_threads_per_block = ret;
+                       if (rscreen->chip_class >= SI && HAVE_LLVM >= 0x309 &&
+                           ir_type == PIPE_SHADER_IR_TGSI)
+                               *max_variable_threads_per_block = SI_MAX_VARIABLE_THREADS_PER_BLOCK;
+                       else
+                               *max_variable_threads_per_block = 0;
+               }
+               return sizeof(uint64_t);
        }
 
         fprintf(stderr, "unknown PIPE_COMPUTE_CAP %d\n", param);
@@ -785,11 +1094,14 @@ static void r600_fence_reference(struct pipe_screen *screen,
 }
 
 static boolean r600_fence_finish(struct pipe_screen *screen,
+                                struct pipe_context *ctx,
                                 struct pipe_fence_handle *fence,
                                 uint64_t timeout)
 {
        struct radeon_winsys *rws = ((struct r600_common_screen*)screen)->ws;
        struct r600_multi_fence *rfence = (struct r600_multi_fence *)fence;
+       struct r600_common_context *rctx =
+               ctx ? (struct r600_common_context*)ctx : NULL;
        int64_t abs_timeout = os_time_get_absolute_timeout(timeout);
 
        if (rfence->sdma) {
@@ -806,6 +1118,23 @@ static boolean r600_fence_finish(struct pipe_screen *screen,
        if (!rfence->gfx)
                return true;
 
+       /* Flush the gfx IB if it hasn't been flushed yet. */
+       if (rctx &&
+           rfence->gfx_unflushed.ctx == rctx &&
+           rfence->gfx_unflushed.ib_index == rctx->num_gfx_cs_flushes) {
+               rctx->gfx.flush(rctx, timeout ? 0 : RADEON_FLUSH_ASYNC, NULL);
+               rfence->gfx_unflushed.ctx = NULL;
+
+               if (!timeout)
+                       return false;
+
+               /* Recompute the timeout after all that. */
+               if (timeout && timeout != PIPE_TIMEOUT_INFINITE) {
+                       int64_t time = os_time_get_nano();
+                       timeout = abs_timeout > time ? abs_timeout - time : 0;
+               }
+       }
+
        return rws->fence_wait(rws, rfence->gfx, timeout);
 }
 
@@ -841,18 +1170,20 @@ static void r600_query_memory_info(struct pipe_screen *screen,
 
        info->device_memory_evicted =
                ws->query_value(ws, RADEON_NUM_BYTES_MOVED) / 1024;
-       /* Just return the number of evicted 64KB pages. */
-       info->nr_device_memory_evictions = info->device_memory_evicted / 64;
+
+       if (rscreen->info.drm_major == 3 && rscreen->info.drm_minor >= 4)
+               info->nr_device_memory_evictions =
+                       ws->query_value(ws, RADEON_NUM_EVICTIONS);
+       else
+               /* Just return the number of evicted 64KB pages. */
+               info->nr_device_memory_evictions = info->device_memory_evicted / 64;
 }
 
 struct pipe_resource *r600_resource_create_common(struct pipe_screen *screen,
                                                  const struct pipe_resource *templ)
 {
-       struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
-
        if (templ->target == PIPE_BUFFER) {
-               return r600_buffer_create(screen, templ,
-                                         rscreen->info.gart_page_size);
+               return r600_buffer_create(screen, templ, 256);
        } else {
                return r600_texture_create(screen, templ);
        }
@@ -861,10 +1192,15 @@ struct pipe_resource *r600_resource_create_common(struct pipe_screen *screen,
 bool r600_common_screen_init(struct r600_common_screen *rscreen,
                             struct radeon_winsys *ws)
 {
-       char llvm_string[32] = {};
+       char llvm_string[32] = {}, kernel_version[128] = {};
+       struct utsname uname_data;
 
        ws->query_info(ws, &rscreen->info);
 
+       if (uname(&uname_data) == 0)
+               snprintf(kernel_version, sizeof(kernel_version),
+                        " / %s", uname_data.release);
+
 #if HAVE_LLVM
        snprintf(llvm_string, sizeof(llvm_string),
                 ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
@@ -872,10 +1208,10 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
 #endif
 
        snprintf(rscreen->renderer_string, sizeof(rscreen->renderer_string),
-                "%s (DRM %i.%i.%i%s)",
+                "%s (DRM %i.%i.%i%s%s)",
                 r600_get_chip_name(rscreen), rscreen->info.drm_major,
                 rscreen->info.drm_minor, rscreen->info.drm_patchlevel,
-                llvm_string);
+                kernel_version, llvm_string);
 
        rscreen->b.get_name = r600_get_name;
        rscreen->b.get_vendor = r600_get_vendor;
@@ -905,6 +1241,8 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
        rscreen->chip_class = rscreen->info.chip_class;
        rscreen->debug_flags = debug_get_flags_option("R600_DEBUG", common_debug_options, 0);
 
+       slab_create_parent(&rscreen->pool_transfers, sizeof(struct r600_transfer), 64);
+
        rscreen->force_aniso = MIN2(16, debug_get_num_option("R600_TEX_ANISO", -1));
        if (rscreen->force_aniso >= 0) {
                printf("radeon: Forcing anisotropy filter to %ix\n",
@@ -923,10 +1261,15 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
                printf("chip_class = %i\n", rscreen->info.chip_class);
                printf("gart_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.gart_size, 1024*1024));
                printf("vram_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.vram_size, 1024*1024));
+               printf("max_alloc_size = %i MB\n",
+                      (int)DIV_ROUND_UP(rscreen->info.max_alloc_size, 1024*1024));
                printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory);
                printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2);
                printf("has_sdma = %i\n", rscreen->info.has_sdma);
                printf("has_uvd = %i\n", rscreen->info.has_uvd);
+               printf("me_fw_version = %i\n", rscreen->info.me_fw_version);
+               printf("pfp_fw_version = %i\n", rscreen->info.pfp_fw_version);
+               printf("ce_fw_version = %i\n", rscreen->info.ce_fw_version);
                printf("vce_fw_version = %i\n", rscreen->info.vce_fw_version);
                printf("vce_harvest_config = %i\n", rscreen->info.vce_harvest_config);
                printf("clock_crystal_freq = %i\n", rscreen->info.clock_crystal_freq);
@@ -959,6 +1302,8 @@ void r600_destroy_common_screen(struct r600_common_screen *rscreen)
        pipe_mutex_destroy(rscreen->aux_context_lock);
        rscreen->aux_context->destroy(rscreen->aux_context);
 
+       slab_destroy_parent(&rscreen->pool_transfers);
+
        rscreen->ws->destroy(rscreen->ws);
        FREE(rscreen);
 }
@@ -984,6 +1329,12 @@ bool r600_can_dump_shader(struct r600_common_screen *rscreen,
        }
 }
 
+bool r600_extra_shader_checks(struct r600_common_screen *rscreen, unsigned processor)
+{
+       return (rscreen->debug_flags & DBG_CHECK_IR) ||
+              r600_can_dump_shader(rscreen, processor);
+}
+
 void r600_screen_clear_buffer(struct r600_common_screen *rscreen, struct pipe_resource *dst,
                              uint64_t offset, uint64_t size, unsigned value,
                              enum r600_coherency coher)