radeonsi/gfx10: implement gfx10_emit_cache_flush
[mesa.git] / src / gallium / drivers / radeonsi / si_pipe.c
index 7123e7d46d5e0fe908b648ba9fc9d71968c72715..a290d16b02d3aaffdb11dce1c0c70dc9ff561307 100644 (file)
@@ -26,6 +26,7 @@
 #include "si_pipe.h"
 #include "si_public.h"
 #include "si_shader_internal.h"
+#include "si_compute.h"
 #include "sid.h"
 
 #include "ac_llvm_util.h"
 #include "vl/vl_decoder.h"
 #include "driver_ddebug/dd_util.h"
 
+#include "gallium/winsys/radeon/drm/radeon_drm_public.h"
+#include "gallium/winsys/amdgpu/drm/amdgpu_public.h"
+#include <xf86drm.h>
+
 static const struct debug_named_value debug_options[] = {
        /* Shader logging options: */
        { "vs", DBG(VS), "Print vertex shaders" },
@@ -61,7 +66,6 @@ static const struct debug_named_value debug_options[] = {
 
        /* Shader compiler options (with no effect on the shader cache): */
        { "checkir", DBG(CHECK_IR), "Enable additional sanity checks on shader IR" },
-       { "nir", DBG(NIR), "Enable experimental NIR shaders" },
        { "mono", DBG(MONOLITHIC_SHADERS), "Use old-style monolithic shaders compiled on demand" },
        { "nooptvariant", DBG(NO_OPT_VARIANT), "Disable compiling optimized shader variants." },
 
@@ -80,6 +84,9 @@ static const struct debug_named_value debug_options[] = {
        { "zerovram", DBG(ZERO_VRAM), "Clear VRAM allocations." },
 
        /* 3D engine options: */
+       { "alwayspd", DBG(ALWAYS_PD), "Always enable the primitive discard compute shader." },
+       { "pd", DBG(PD), "Enable the primitive discard compute shader for large draw calls." },
+       { "nopd", DBG(NO_PD), "Disable the primitive discard compute shader." },
        { "switch_on_eop", DBG(SWITCH_ON_EOP), "Program WD/IA to switch on end-of-packet." },
        { "nooutoforder", DBG(NO_OUT_OF_ORDER), "Disable out-of-order rasterization" },
        { "nodpbb", DBG(NO_DPBB), "Disable DPBB." },
@@ -115,7 +122,7 @@ static void si_init_compiler(struct si_screen *sscreen,
        /* Only create the less-optimizing version of the compiler on APUs
         * predating Ryzen (Raven). */
        bool create_low_opt_compiler = !sscreen->info.has_dedicated_vram &&
-                                      sscreen->info.chip_class <= VI;
+                                      sscreen->info.chip_class <= GFX8;
 
        enum ac_target_machine_options tm_options =
                (sscreen->debug_flags & DBG(SI_SCHED) ? AC_TM_SISCHED : 0) |
@@ -149,6 +156,9 @@ static void si_destroy_context(struct pipe_context *context)
        struct si_context *sctx = (struct si_context *)context;
        int i;
 
+       util_queue_finish(&sctx->screen->shader_compiler_queue);
+       util_queue_finish(&sctx->screen->shader_compiler_queue_low_priority);
+
        /* Unreference the framebuffer normally to disable related logic
         * properly.
         */
@@ -163,11 +173,11 @@ static void si_destroy_context(struct pipe_context *context)
        pipe_resource_reference(&sctx->tess_rings, NULL);
        pipe_resource_reference(&sctx->null_const_buf.buffer, NULL);
        pipe_resource_reference(&sctx->sample_pos_buffer, NULL);
-       r600_resource_reference(&sctx->border_color_buffer, NULL);
+       si_resource_reference(&sctx->border_color_buffer, NULL);
        free(sctx->border_color_table);
-       r600_resource_reference(&sctx->scratch_buffer, NULL);
-       r600_resource_reference(&sctx->compute_scratch_buffer, NULL);
-       r600_resource_reference(&sctx->wait_mem_scratch, NULL);
+       si_resource_reference(&sctx->scratch_buffer, NULL);
+       si_resource_reference(&sctx->compute_scratch_buffer, NULL);
+       si_resource_reference(&sctx->wait_mem_scratch, NULL);
 
        si_pm4_free_state(sctx, sctx->init_config, ~0);
        if (sctx->init_config_gs_rings)
@@ -201,6 +211,16 @@ static void si_destroy_context(struct pipe_context *context)
                sctx->b.delete_compute_state(&sctx->b, sctx->cs_clear_buffer);
        if (sctx->cs_copy_buffer)
                sctx->b.delete_compute_state(&sctx->b, sctx->cs_copy_buffer);
+       if (sctx->cs_copy_image)
+               sctx->b.delete_compute_state(&sctx->b, sctx->cs_copy_image);
+       if (sctx->cs_copy_image_1d_array)
+               sctx->b.delete_compute_state(&sctx->b, sctx->cs_copy_image_1d_array);
+       if (sctx->cs_clear_render_target)
+               sctx->b.delete_compute_state(&sctx->b, sctx->cs_clear_render_target);
+       if (sctx->cs_clear_render_target_1d_array)
+               sctx->b.delete_compute_state(&sctx->b, sctx->cs_clear_render_target_1d_array);
+       if (sctx->cs_dcc_retile)
+               sctx->b.delete_compute_state(&sctx->b, sctx->cs_dcc_retile);
 
        if (sctx->blitter)
                util_blitter_destroy(sctx->blitter);
@@ -242,7 +262,13 @@ static void si_destroy_context(struct pipe_context *context)
 
        sctx->ws->fence_reference(&sctx->last_gfx_fence, NULL);
        sctx->ws->fence_reference(&sctx->last_sdma_fence, NULL);
-       r600_resource_reference(&sctx->eop_bug_scratch, NULL);
+       sctx->ws->fence_reference(&sctx->last_ib_barrier_fence, NULL);
+       si_resource_reference(&sctx->eop_bug_scratch, NULL);
+       si_resource_reference(&sctx->index_ring, NULL);
+       si_resource_reference(&sctx->barrier_buf, NULL);
+       si_resource_reference(&sctx->last_ib_barrier_buf, NULL);
+       pb_reference(&sctx->gds, NULL);
+       pb_reference(&sctx->gds_oa, NULL);
 
        si_destroy_compiler(&sctx->compiler);
 
@@ -256,6 +282,7 @@ static void si_destroy_context(struct pipe_context *context)
        util_dynarray_fini(&sctx->resident_tex_needs_color_decompress);
        util_dynarray_fini(&sctx->resident_img_needs_color_decompress);
        util_dynarray_fini(&sctx->resident_tex_needs_depth_decompress);
+       si_unref_sdma_uploads(sctx);
        FREE(sctx);
 }
 
@@ -263,21 +290,7 @@ static enum pipe_reset_status si_get_reset_status(struct pipe_context *ctx)
 {
        struct si_context *sctx = (struct si_context *)ctx;
 
-       if (sctx->screen->info.has_gpu_reset_status_query)
-               return sctx->ws->ctx_query_reset_status(sctx->ctx);
-
-       if (sctx->screen->info.has_gpu_reset_counter_query) {
-               unsigned latest = sctx->ws->query_value(sctx->ws,
-                                                       RADEON_GPU_RESET_COUNTER);
-
-               if (sctx->gpu_reset_counter == latest)
-                       return PIPE_NO_RESET;
-
-               sctx->gpu_reset_counter = latest;
-               return PIPE_UNKNOWN_CONTEXT_RESET;
-       }
-
-       return PIPE_NO_RESET;
+       return sctx->ws->ctx_query_reset_status(sctx->ctx);
 }
 
 static void si_set_device_reset_callback(struct pipe_context *ctx,
@@ -299,10 +312,7 @@ bool si_check_device_reset(struct si_context *sctx)
        if (!sctx->device_reset_callback.reset)
                return false;
 
-       if (!sctx->b.get_device_reset_status)
-               return false;
-
-       status = sctx->b.get_device_reset_status(&sctx->b);
+       status = sctx->ws->ctx_query_reset_status(sctx->ctx);
        if (status == PIPE_NO_RESET)
                return false;
 
@@ -380,16 +390,15 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (!sctx)
                return NULL;
 
+       sctx->has_graphics = sscreen->info.chip_class == GFX6 ||
+                            !(flags & PIPE_CONTEXT_COMPUTE_ONLY);
+
        if (flags & PIPE_CONTEXT_DEBUG)
                sscreen->record_llvm_ir = true; /* racy but not critical */
 
        sctx->b.screen = screen; /* this must be set first */
        sctx->b.priv = NULL;
        sctx->b.destroy = si_destroy_context;
-       sctx->b.emit_string_marker = si_emit_string_marker;
-       sctx->b.set_debug_callback = si_set_debug_callback;
-       sctx->b.set_log_context = si_set_log_context;
-       sctx->b.set_context_param = si_set_context_param;
        sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
        sctx->is_debug = (flags & PIPE_CONTEXT_DEBUG) != 0;
 
@@ -400,31 +409,22 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        sctx->family = sscreen->info.family;
        sctx->chip_class = sscreen->info.chip_class;
 
-       if (sscreen->info.has_gpu_reset_counter_query) {
-               sctx->gpu_reset_counter =
-                       sctx->ws->query_value(sctx->ws, RADEON_GPU_RESET_COUNTER);
-       }
-
-       sctx->b.get_device_reset_status = si_get_reset_status;
-       sctx->b.set_device_reset_callback = si_set_device_reset_callback;
-
-       si_init_context_texture_functions(sctx);
-       si_init_query_functions(sctx);
-
-       if (sctx->chip_class == CIK ||
-           sctx->chip_class == VI ||
+       if (sctx->chip_class == GFX7 ||
+           sctx->chip_class == GFX8 ||
            sctx->chip_class == GFX9) {
-               sctx->eop_bug_scratch = r600_resource(
+               sctx->eop_bug_scratch = si_resource(
                        pipe_buffer_create(&sscreen->b, 0, PIPE_USAGE_DEFAULT,
                                           16 * sscreen->info.num_render_backends));
                if (!sctx->eop_bug_scratch)
                        goto fail;
        }
 
+       /* Initialize context allocators. */
        sctx->allocator_zeroed_memory =
-                       u_suballocator_create(&sctx->b, sscreen->info.gart_page_size,
-                                             0, PIPE_USAGE_DEFAULT,
-                                             SI_RESOURCE_FLAG_SO_FILLED_SIZE, true);
+               u_suballocator_create(&sctx->b, 128 * 1024,
+                                     0, PIPE_USAGE_DEFAULT,
+                                     SI_RESOURCE_FLAG_UNMAPPABLE |
+                                     SI_RESOURCE_FLAG_CLEAR, false);
        if (!sctx->allocator_zeroed_memory)
                goto fail;
 
@@ -434,14 +434,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (!sctx->b.stream_uploader)
                goto fail;
 
-       sctx->b.const_uploader = u_upload_create(&sctx->b, 128 * 1024,
-                                                  0, PIPE_USAGE_DEFAULT,
-                                                  SI_RESOURCE_FLAG_32BIT |
-                                                  (sscreen->cpdma_prefetch_writes_memory ?
-                                                           0 : SI_RESOURCE_FLAG_READ_ONLY));
-       if (!sctx->b.const_uploader)
-               goto fail;
-
        sctx->cached_gtt_allocator = u_upload_create(&sctx->b, 16 * 1024,
                                                       0, PIPE_USAGE_STAGING, 0);
        if (!sctx->cached_gtt_allocator)
@@ -457,24 +449,22 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
                                                   sctx, stop_exec_on_failure);
        }
 
-       si_init_buffer_functions(sctx);
-       si_init_clear_functions(sctx);
-       si_init_blit_functions(sctx);
-       si_init_compute_functions(sctx);
-       si_init_compute_blit_functions(sctx);
-       si_init_debug_functions(sctx);
-       si_init_msaa_functions(sctx);
-       si_init_streamout_functions(sctx);
+       bool use_sdma_upload = sscreen->info.has_dedicated_vram && sctx->dma_cs;
+       sctx->b.const_uploader = u_upload_create(&sctx->b, 256 * 1024,
+                                                0, PIPE_USAGE_DEFAULT,
+                                                SI_RESOURCE_FLAG_32BIT |
+                                                (use_sdma_upload ?
+                                                         SI_RESOURCE_FLAG_UPLOAD_FLUSH_EXPLICIT_VIA_SDMA :
+                                                         (sscreen->cpdma_prefetch_writes_memory ?
+                                                                  0 : SI_RESOURCE_FLAG_READ_ONLY)));
+       if (!sctx->b.const_uploader)
+               goto fail;
 
-       if (sscreen->info.has_hw_decode) {
-               sctx->b.create_video_codec = si_uvd_create_decoder;
-               sctx->b.create_video_buffer = si_video_buffer_create;
-       } else {
-               sctx->b.create_video_codec = vl_create_decoder;
-               sctx->b.create_video_buffer = vl_video_buffer_create;
-       }
+       if (use_sdma_upload)
+               u_upload_enable_flush_explicit(sctx->b.const_uploader);
 
-       sctx->gfx_cs = ws->cs_create(sctx->ctx, RING_GFX,
+       sctx->gfx_cs = ws->cs_create(sctx->ctx,
+                                    sctx->has_graphics ? RING_GFX : RING_COMPUTE,
                                     (void*)si_flush_gfx_cs, sctx, stop_exec_on_failure);
 
        /* Border colors. */
@@ -483,7 +473,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (!sctx->border_color_table)
                goto fail;
 
-       sctx->border_color_buffer = r600_resource(
+       sctx->border_color_buffer = si_resource(
                pipe_buffer_create(screen, 0, PIPE_USAGE_DEFAULT,
                                   SI_MAX_BORDER_COLORS *
                                   sizeof(*sctx->border_color_table)));
@@ -496,13 +486,50 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (!sctx->border_color_map)
                goto fail;
 
+       /* Initialize context functions used by graphics and compute. */
+       if (sctx->chip_class >= GFX10)
+               sctx->emit_cache_flush = gfx10_emit_cache_flush;
+       else
+               sctx->emit_cache_flush = si_emit_cache_flush;
+
+       sctx->b.emit_string_marker = si_emit_string_marker;
+       sctx->b.set_debug_callback = si_set_debug_callback;
+       sctx->b.set_log_context = si_set_log_context;
+       sctx->b.set_context_param = si_set_context_param;
+       sctx->b.get_device_reset_status = si_get_reset_status;
+       sctx->b.set_device_reset_callback = si_set_device_reset_callback;
+
        si_init_all_descriptors(sctx);
+       si_init_buffer_functions(sctx);
+       si_init_clear_functions(sctx);
+       si_init_blit_functions(sctx);
+       si_init_compute_functions(sctx);
+       si_init_compute_blit_functions(sctx);
+       si_init_debug_functions(sctx);
        si_init_fence_functions(sctx);
-       si_init_state_functions(sctx);
-       si_init_shader_functions(sctx);
-       si_init_viewport_functions(sctx);
+       si_init_query_functions(sctx);
+       si_init_state_compute_functions(sctx);
+
+       /* Initialize graphics-only context functions. */
+       if (sctx->has_graphics) {
+               si_init_context_texture_functions(sctx);
+               si_init_msaa_functions(sctx);
+               si_init_shader_functions(sctx);
+               si_init_state_functions(sctx);
+               si_init_streamout_functions(sctx);
+               si_init_viewport_functions(sctx);
+
+               sctx->blitter = util_blitter_create(&sctx->b);
+               if (sctx->blitter == NULL)
+                       goto fail;
+               sctx->blitter->skip_viewport_restore = true;
+
+               si_init_draw_functions(sctx);
+               si_initialize_prim_discard_tunables(sctx);
+       }
 
-       if (sctx->chip_class >= CIK)
+       /* Initialize SDMA functions. */
+       if (sctx->chip_class >= GFX7)
                cik_init_sdma_functions(sctx);
        else
                si_init_dma_functions(sctx);
@@ -510,45 +537,31 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (sscreen->debug_flags & DBG(FORCE_DMA))
                sctx->b.resource_copy_region = sctx->dma_copy;
 
-       bool dst_stream_policy = SI_COMPUTE_DST_CACHE_POLICY != L2_LRU;
-       sctx->cs_clear_buffer = si_create_dma_compute_shader(&sctx->b,
-                                            SI_COMPUTE_CLEAR_DW_PER_THREAD,
-                                            dst_stream_policy, false);
-       sctx->cs_copy_buffer = si_create_dma_compute_shader(&sctx->b,
-                                            SI_COMPUTE_COPY_DW_PER_THREAD,
-                                            dst_stream_policy, true);
-
-       sctx->blitter = util_blitter_create(&sctx->b);
-       if (sctx->blitter == NULL)
-               goto fail;
-       sctx->blitter->skip_viewport_restore = true;
-
-       si_init_draw_functions(sctx);
-
        sctx->sample_mask = 0xffff;
 
+       /* Initialize multimedia functions. */
+       if (sscreen->info.has_hw_decode) {
+               sctx->b.create_video_codec = si_uvd_create_decoder;
+               sctx->b.create_video_buffer = si_video_buffer_create;
+       } else {
+               sctx->b.create_video_codec = vl_create_decoder;
+               sctx->b.create_video_buffer = vl_video_buffer_create;
+       }
+
        if (sctx->chip_class >= GFX9) {
-               sctx->wait_mem_scratch = r600_resource(
-                       pipe_buffer_create(screen, 0, PIPE_USAGE_DEFAULT, 4));
+               sctx->wait_mem_scratch = si_resource(
+                       pipe_buffer_create(screen, 0, PIPE_USAGE_DEFAULT, 8));
                if (!sctx->wait_mem_scratch)
                        goto fail;
 
                /* Initialize the memory. */
-               struct radeon_cmdbuf *cs = sctx->gfx_cs;
-               radeon_emit(cs, PKT3(PKT3_WRITE_DATA, 3, 0));
-               radeon_emit(cs, S_370_DST_SEL(V_370_MEMORY_SYNC) |
-                           S_370_WR_CONFIRM(1) |
-                           S_370_ENGINE_SEL(V_370_ME));
-               radeon_emit(cs, sctx->wait_mem_scratch->gpu_address);
-               radeon_emit(cs, sctx->wait_mem_scratch->gpu_address >> 32);
-               radeon_emit(cs, sctx->wait_mem_number);
-               radeon_add_to_buffer_list(sctx, cs, sctx->wait_mem_scratch,
-                                         RADEON_USAGE_WRITE, RADEON_PRIO_FENCE);
+               si_cp_write_data(sctx, sctx->wait_mem_scratch, 0, 4,
+                                V_370_MEM, V_370_ME, &sctx->wait_mem_number);
        }
 
-       /* CIK cannot unbind a constant buffer (S_BUFFER_LOAD doesn't skip loads
+       /* GFX7 cannot unbind a constant buffer (S_BUFFER_LOAD doesn't skip loads
         * if NUM_RECORDS == 0). We need to use a dummy buffer instead. */
-       if (sctx->chip_class == CIK) {
+       if (sctx->chip_class == GFX7) {
                sctx->null_const_buf.buffer =
                        pipe_aligned_buffer_create(screen,
                                                   SI_RESOURCE_FLAG_32BIT,
@@ -558,7 +571,8 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
                        goto fail;
                sctx->null_const_buf.buffer_size = sctx->null_const_buf.buffer->width0;
 
-               for (shader = 0; shader < SI_NUM_SHADERS; shader++) {
+               unsigned start_shader = sctx->has_graphics ? 0 :  PIPE_SHADER_COMPUTE;
+               for (shader = start_shader; shader < SI_NUM_SHADERS; shader++) {
                        for (i = 0; i < SI_NUM_CONST_BUFFERS; i++) {
                                sctx->b.set_constant_buffer(&sctx->b, shader, i,
                                                              &sctx->null_const_buf);
@@ -620,12 +634,15 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        /* this must be last */
        si_begin_new_gfx_cs(sctx);
 
-       if (sctx->chip_class == CIK) {
-               /* Clear the NULL constant buffer, because loads should return zeros. */
+       if (sctx->chip_class == GFX7) {
+               /* Clear the NULL constant buffer, because loads should return zeros.
+                * Note that this forces CP DMA to be used, because clover deadlocks
+                * for some reason when the compute codepath is used.
+                */
                uint32_t clear_value = 0;
                si_clear_buffer(sctx, sctx->null_const_buf.buffer, 0,
                                sctx->null_const_buf.buffer->width0,
-                               &clear_value, 4, SI_COHERENCY_SHADER);
+                               &clear_value, 4, SI_COHERENCY_SHADER, true);
        }
        return &sctx->b;
 fail:
@@ -661,7 +678,7 @@ static struct pipe_context *si_pipe_create_context(struct pipe_screen *screen,
         * implementation for fence_server_sync is incomplete. */
        return threaded_context_create(ctx, &sscreen->pool_transfers,
                                       si_replace_buffer_storage,
-                                      sscreen->info.drm_major >= 3 ? si_create_fence : NULL,
+                                      sscreen->info.is_amdgpu ? si_create_fence : NULL,
                                       &((struct si_context*)ctx)->tc);
 }
 
@@ -683,6 +700,17 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
        if (!sscreen->ws->unref(sscreen->ws))
                return;
 
+       mtx_destroy(&sscreen->aux_context_lock);
+
+       struct u_log_context *aux_log = ((struct si_context *)sscreen->aux_context)->log;
+       if (aux_log) {
+               sscreen->aux_context->set_log_context(sscreen->aux_context, NULL);
+               u_log_context_destroy(aux_log);
+               FREE(aux_log);
+       }
+
+       sscreen->aux_context->destroy(sscreen->aux_context);
+
        util_queue_destroy(&sscreen->shader_compiler_queue);
        util_queue_destroy(&sscreen->shader_compiler_queue_low_priority);
 
@@ -698,19 +726,17 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
                        struct si_shader_part *part = parts[i];
 
                        parts[i] = part->next;
-                       ac_shader_binary_clean(&part->binary);
+                       si_shader_binary_clean(&part->binary);
                        FREE(part);
                }
        }
        mtx_destroy(&sscreen->shader_parts_mutex);
        si_destroy_shader_cache(sscreen);
 
-       si_perfcounters_destroy(sscreen);
+       si_destroy_perfcounters(sscreen);
        si_gpu_load_kill_thread(sscreen);
 
        mtx_destroy(&sscreen->gpu_load_mutex);
-       mtx_destroy(&sscreen->aux_context_lock);
-       sscreen->aux_context->destroy(sscreen->aux_context);
 
        slab_destroy_parent(&sscreen->pool_transfers);
 
@@ -737,7 +763,7 @@ static void si_test_vmfault(struct si_screen *sscreen)
                exit(1);
        }
 
-       r600_resource(buf)->gpu_address = 0; /* cause a VM fault */
+       si_resource(buf)->gpu_address = 0; /* cause a VM fault */
 
        if (sscreen->debug_flags & DBG(TEST_VMFAULT_CP)) {
                si_cp_dma_copy_buffer(sctx, buf, buf, 0, 4, 4, 0,
@@ -816,8 +842,7 @@ static void si_disk_cache_create(struct si_screen *sscreen)
        #define ALL_FLAGS (DBG(FS_CORRECT_DERIVS_AFTER_KILL) |  \
                           DBG(SI_SCHED) |                      \
                           DBG(GISEL) |                         \
-                          DBG(UNSAFE_MATH) |                   \
-                          DBG(NIR))
+                          DBG(UNSAFE_MATH))
        uint64_t shader_debug_flags = sscreen->debug_flags &
                ALL_FLAGS;
 
@@ -825,7 +850,11 @@ static void si_disk_cache_create(struct si_screen *sscreen)
         * how 32-bit addresses are expanded to 64 bits.
         */
        STATIC_ASSERT(ALL_FLAGS <= UINT_MAX);
-       shader_debug_flags |= (uint64_t)sscreen->info.address32_hi << 32;
+       assert((int16_t)sscreen->info.address32_hi == (int32_t)sscreen->info.address32_hi);
+       shader_debug_flags |= (uint64_t)(sscreen->info.address32_hi & 0xffff) << 32;
+
+       if (sscreen->options.enable_nir)
+               shader_debug_flags |= 1ull << 48;
 
        sscreen->disk_shader_cache =
                disk_cache_create(sscreen->info.name,
@@ -833,8 +862,35 @@ static void si_disk_cache_create(struct si_screen *sscreen)
                                  shader_debug_flags);
 }
 
-struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
-                                          const struct pipe_screen_config *config)
+static void si_set_max_shader_compiler_threads(struct pipe_screen *screen,
+                                              unsigned max_threads)
+{
+       struct si_screen *sscreen = (struct si_screen *)screen;
+
+       /* This function doesn't allow a greater number of threads than
+        * the queue had at its creation. */
+       util_queue_adjust_num_threads(&sscreen->shader_compiler_queue,
+                                     max_threads);
+       /* Don't change the number of threads on the low priority queue. */
+}
+
+static bool si_is_parallel_shader_compilation_finished(struct pipe_screen *screen,
+                                                      void *shader,
+                                                      unsigned shader_type)
+{
+       if (shader_type == PIPE_SHADER_COMPUTE) {
+               struct si_compute *cs = (struct si_compute*)shader;
+
+               return util_queue_fence_is_signalled(&cs->ready);
+       }
+       struct si_shader_selector *sel = (struct si_shader_selector *)shader;
+
+       return util_queue_fence_is_signalled(&sel->ready);
+}
+
+static struct pipe_screen *
+radeonsi_screen_create_impl(struct radeon_winsys *ws,
+                           const struct pipe_screen_config *config)
 {
        struct si_screen *sscreen = CALLOC_STRUCT(si_screen);
        unsigned hw_threads, num_comp_hi_threads, num_comp_lo_threads, i;
@@ -846,6 +902,12 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
        sscreen->ws = ws;
        ws->query_info(ws, &sscreen->info);
 
+       if (sscreen->info.chip_class == GFX10 && HAVE_LLVM < 0x0900) {
+               fprintf(stderr, "radeonsi: Navi family support requires LLVM 9 or higher\n");
+               FREE(sscreen);
+               return NULL;
+       }
+
        if (sscreen->info.chip_class >= GFX9) {
                sscreen->se_tile_repeat = 32 * sscreen->info.max_se;
        } else {
@@ -856,11 +918,17 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
        }
 
        sscreen->debug_flags = debug_get_flags_option("R600_DEBUG",
-                                                       debug_options, 0);
+                                                     debug_options, 0);
+       sscreen->debug_flags |= debug_get_flags_option("AMD_DEBUG",
+                                                      debug_options, 0);
 
        /* Set functions first. */
        sscreen->b.context_create = si_pipe_create_context;
        sscreen->b.destroy = si_destroy_screen;
+       sscreen->b.set_max_shader_compiler_threads =
+               si_set_max_shader_compiler_threads;
+       sscreen->b.is_parallel_shader_compilation_finished =
+               si_is_parallel_shader_compilation_finished;
 
        si_init_screen_get_functions(sscreen);
        si_init_screen_buffer_functions(sscreen);
@@ -878,7 +946,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
        if (driQueryOptionb(config->options, "radeonsi_enable_sisched"))
                sscreen->debug_flags |= DBG(SI_SCHED);
 
-
        if (sscreen->debug_flags & DBG(INFO))
                ac_print_gpu_info(&sscreen->info);
 
@@ -886,6 +953,10 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
                           sizeof(struct si_transfer), 64);
 
        sscreen->force_aniso = MIN2(16, debug_get_num_option("R600_TEX_ANISO", -1));
+       if (sscreen->force_aniso == -1) {
+               sscreen->force_aniso = MIN2(16, debug_get_num_option("AMD_TEX_ANISO", -1));
+       }
+
        if (sscreen->force_aniso >= 0) {
                printf("radeonsi: Forcing anisotropy filter to %ix\n",
                       /* round down to a power of two */
@@ -949,11 +1020,11 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
                si_init_perfcounters(sscreen);
 
        /* Determine tessellation ring info. */
-       bool double_offchip_buffers = sscreen->info.chip_class >= CIK &&
+       bool double_offchip_buffers = sscreen->info.chip_class >= GFX7 &&
                                      sscreen->info.family != CHIP_CARRIZO &&
                                      sscreen->info.family != CHIP_STONEY;
        /* This must be one less than the maximum number due to a hw limitation.
-        * Various hardware bugs in SI, CIK, and GFX9 need this.
+        * Various hardware bugs need this.
         */
        unsigned max_offchip_buffers_per_se;
 
@@ -984,8 +1055,8 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
        sscreen->tess_offchip_ring_size = max_offchip_buffers *
                                          sscreen->tess_offchip_block_dw_size * 4;
 
-       if (sscreen->info.chip_class >= CIK) {
-               if (sscreen->info.chip_class >= VI)
+       if (sscreen->info.chip_class >= GFX7) {
+               if (sscreen->info.chip_class >= GFX8)
                        --max_offchip_buffers;
                sscreen->vgt_hs_offchip_param =
                        S_03093C_OFFCHIP_BUFFERING(max_offchip_buffers) |
@@ -997,36 +1068,44 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
        }
 
        /* The mere presense of CLEAR_STATE in the IB causes random GPU hangs
-        * on SI. Some CLEAR_STATE cause asic hang on radeon kernel, etc.
-        * SPI_VS_OUT_CONFIG. So only enable CI CLEAR_STATE on amdgpu kernel.*/
-       sscreen->has_clear_state = sscreen->info.chip_class >= CIK &&
-                                  sscreen->info.drm_major == 3;
+        * on GFX6. Some CLEAR_STATE cause asic hang on radeon kernel, etc.
+        * SPI_VS_OUT_CONFIG. So only enable GFX7 CLEAR_STATE on amdgpu kernel.*/
+       sscreen->has_clear_state = sscreen->info.chip_class >= GFX7 &&
+                                  sscreen->info.is_amdgpu;
 
        sscreen->has_distributed_tess =
-               sscreen->info.chip_class >= VI &&
+               sscreen->info.chip_class >= GFX8 &&
                sscreen->info.max_se >= 2;
 
        sscreen->has_draw_indirect_multi =
                (sscreen->info.family >= CHIP_POLARIS10) ||
-               (sscreen->info.chip_class == VI &&
+               (sscreen->info.chip_class == GFX8 &&
                 sscreen->info.pfp_fw_version >= 121 &&
                 sscreen->info.me_fw_version >= 87) ||
-               (sscreen->info.chip_class == CIK &&
+               (sscreen->info.chip_class == GFX7 &&
                 sscreen->info.pfp_fw_version >= 211 &&
                 sscreen->info.me_fw_version >= 173) ||
-               (sscreen->info.chip_class == SI &&
+               (sscreen->info.chip_class == GFX6 &&
                 sscreen->info.pfp_fw_version >= 79 &&
                 sscreen->info.me_fw_version >= 142);
 
-       sscreen->has_out_of_order_rast = sscreen->info.chip_class >= VI &&
+       sscreen->has_out_of_order_rast = sscreen->info.chip_class >= GFX8 &&
                                         sscreen->info.max_se >= 2 &&
                                         !(sscreen->debug_flags & DBG(NO_OUT_OF_ORDER));
        sscreen->assume_no_z_fights =
                driQueryOptionb(config->options, "radeonsi_assume_no_z_fights");
        sscreen->commutative_blend_add =
                driQueryOptionb(config->options, "radeonsi_commutative_blend_add");
-       sscreen->clear_db_cache_before_clear =
-               driQueryOptionb(config->options, "radeonsi_clear_db_cache_before_clear");
+
+       {
+#define OPT_BOOL(name, dflt, description) \
+               sscreen->options.name = \
+                       driQueryOptionb(config->options, "radeonsi_"#name);
+#include "si_debug_options.h"
+       }
+
+       sscreen->has_gfx9_scissor_bug = sscreen->info.family == CHIP_VEGA10 ||
+                                       sscreen->info.family == CHIP_RAVEN;
        sscreen->has_msaa_sample_loc_bug = (sscreen->info.family >= CHIP_POLARIS10 &&
                                            sscreen->info.family <= CHIP_POLARIS12) ||
                                           sscreen->info.family == CHIP_VEGA10 ||
@@ -1061,7 +1140,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
         * by the reality that LLVM 5.0 doesn't have working VGPR indexing
         * on GFX9.
         */
-       sscreen->llvm_has_working_vgpr_indexing = sscreen->info.chip_class <= VI;
+       sscreen->llvm_has_working_vgpr_indexing = sscreen->info.chip_class <= GFX8;
 
        /* Some chips have RB+ registers, but don't support RB+. Those must
         * always disable it.
@@ -1081,17 +1160,17 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
        sscreen->dcc_msaa_allowed =
                !(sscreen->debug_flags & DBG(NO_DCC_MSAA));
 
-       sscreen->cpdma_prefetch_writes_memory = sscreen->info.chip_class <= VI;
+       sscreen->cpdma_prefetch_writes_memory = sscreen->info.chip_class <= GFX8;
 
        (void) mtx_init(&sscreen->shader_parts_mutex, mtx_plain);
        sscreen->use_monolithic_shaders =
                (sscreen->debug_flags & DBG(MONOLITHIC_SHADERS)) != 0;
 
-       sscreen->barrier_flags.cp_to_L2 = SI_CONTEXT_INV_SMEM_L1 |
-                                           SI_CONTEXT_INV_VMEM_L1;
-       if (sscreen->info.chip_class <= VI) {
-               sscreen->barrier_flags.cp_to_L2 |= SI_CONTEXT_INV_GLOBAL_L2;
-               sscreen->barrier_flags.L2_to_cp |= SI_CONTEXT_WRITEBACK_GLOBAL_L2;
+       sscreen->barrier_flags.cp_to_L2 = SI_CONTEXT_INV_SCACHE |
+                                         SI_CONTEXT_INV_VCACHE;
+       if (sscreen->info.chip_class <= GFX8) {
+               sscreen->barrier_flags.cp_to_L2 |= SI_CONTEXT_INV_L2;
+               sscreen->barrier_flags.L2_to_cp |= SI_CONTEXT_WB_L2;
        }
 
        if (debug_get_bool_option("RADEON_DUMP_SHADERS", false))
@@ -1128,7 +1207,13 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
                si_init_compiler(sscreen, &sscreen->compiler_lowp[i]);
 
        /* Create the auxiliary context. This must be done last. */
-       sscreen->aux_context = si_create_context(&sscreen->b, 0);
+       sscreen->aux_context = si_create_context(
+               &sscreen->b, sscreen->options.aux_debug ? PIPE_CONTEXT_DEBUG : 0);
+       if (sscreen->options.aux_debug) {
+               struct u_log_context *log = CALLOC_STRUCT(u_log_context);
+               u_log_context_init(log);
+               sscreen->aux_context->set_log_context(sscreen->aux_context, log);
+       }
 
        if (sscreen->debug_flags & DBG(TEST_DMA))
                si_test_dma(sscreen);
@@ -1156,3 +1241,21 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
 
        return &sscreen->b;
 }
+
+struct pipe_screen *radeonsi_screen_create(int fd, const struct pipe_screen_config *config)
+{
+       drmVersionPtr version = drmGetVersion(fd);
+       struct radeon_winsys *rw = NULL;
+
+       switch (version->version_major) {
+       case 2:
+               rw = radeon_drm_winsys_create(fd, config, radeonsi_screen_create_impl);
+               break;
+       case 3:
+               rw = amdgpu_winsys_create(fd, config, radeonsi_screen_create_impl);
+               break;
+       }
+
+       drmFreeVersion(version);
+       return rw ? rw->screen : NULL;
+}