radeonsi/sid: add additional bits for the DRAW_(INDEX)_INDIRECT_MULTI packets
[mesa.git] / src / gallium / drivers / radeonsi / si_state_draw.c
index 8cb98d7317c1b1cd5624adbe33b8b70f46965e43..a60723d225d1e083f3d6bb5e5c7ca618823afaaf 100644 (file)
 #include "util/u_index_modify.h"
 #include "util/u_upload_mgr.h"
 #include "util/u_prim.h"
-
-static void si_decompress_textures(struct si_context *sctx)
-{
-       if (!sctx->blitter->running) {
-               /* Flush depth textures which need to be flushed. */
-               for (int i = 0; i < SI_NUM_SHADERS; i++) {
-                       if (sctx->samplers[i].depth_texture_mask) {
-                               si_flush_depth_textures(sctx, &sctx->samplers[i]);
-                       }
-                       if (sctx->samplers[i].compressed_colortex_mask) {
-                               si_decompress_color_textures(sctx, &sctx->samplers[i]);
-                       }
-               }
-       }
-}
+#include "util/u_memory.h"
 
 static unsigned si_conv_pipe_prim(unsigned mode)
 {
@@ -68,7 +54,7 @@ static unsigned si_conv_pipe_prim(unsigned mode)
                [PIPE_PRIM_PATCHES]                     = V_008958_DI_PT_PATCH,
                [R600_PRIM_RECTANGLE_LIST]              = V_008958_DI_PT_RECTLIST
         };
-       assert(mode < Elements(prim_conv));
+       assert(mode < ARRAY_SIZE(prim_conv));
        return prim_conv[mode];
 }
 
@@ -92,7 +78,7 @@ static unsigned si_conv_prim_to_gs_out(unsigned mode)
                [PIPE_PRIM_PATCHES]                     = V_028A6C_OUTPRIM_TYPE_POINTLIST,
                [R600_PRIM_RECTANGLE_LIST]              = V_028A6C_OUTPRIM_TYPE_TRISTRIP
        };
-       assert(mode < Elements(prim_conv));
+       assert(mode < ARRAY_SIZE(prim_conv));
 
        return prim_conv[mode];
 }
@@ -108,12 +94,12 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
                                       const struct pipe_draw_info *info,
                                       unsigned *num_patches)
 {
-       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
-       struct si_shader_selector *ls = sctx->vs_shader;
+       struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
+       struct si_shader_ctx_state *ls = &sctx->vs_shader;
        /* The TES pointer will only be used for sctx->last_tcs.
         * It would be wrong to think that TCS = TES. */
        struct si_shader_selector *tcs =
-               sctx->tcs_shader ? sctx->tcs_shader : sctx->tes_shader;
+               sctx->tcs_shader.cso ? sctx->tcs_shader.cso : sctx->tes_shader.cso;
        unsigned tes_sh_base = sctx->shader_userdata.sh_base[PIPE_SHADER_TESS_EVAL];
        unsigned num_tcs_input_cp = info->vertices_per_patch;
        unsigned num_tcs_output_cp, num_tcs_inputs, num_tcs_outputs;
@@ -122,25 +108,13 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
        unsigned input_patch_size, output_patch_size, output_patch0_offset;
        unsigned perpatch_output_offset, lds_size, ls_rsrc2;
        unsigned tcs_in_layout, tcs_out_layout, tcs_out_offsets;
-
-       *num_patches = 1; /* TODO: calculate this */
-
-       if (sctx->last_ls == ls->current &&
-           sctx->last_tcs == tcs &&
-           sctx->last_tes_sh_base == tes_sh_base &&
-           sctx->last_num_tcs_input_cp == num_tcs_input_cp)
-               return;
-
-       sctx->last_ls = ls->current;
-       sctx->last_tcs = tcs;
-       sctx->last_tes_sh_base = tes_sh_base;
-       sctx->last_num_tcs_input_cp = num_tcs_input_cp;
+       unsigned offchip_layout, hardware_lds_size;
 
        /* This calculates how shader inputs and outputs among VS, TCS, and TES
         * are laid out in LDS. */
-       num_tcs_inputs = util_last_bit64(ls->outputs_written);
+       num_tcs_inputs = util_last_bit64(ls->cso->outputs_written);
 
-       if (sctx->tcs_shader) {
+       if (sctx->tcs_shader.cso) {
                num_tcs_outputs = util_last_bit64(tcs->outputs_written);
                num_tcs_output_cp = tcs->info.properties[TGSI_PROPERTY_TCS_VERTICES_OUT];
                num_tcs_patch_outputs = util_last_bit64(tcs->patch_outputs_written);
@@ -159,11 +133,34 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
        pervertex_output_patch_size = num_tcs_output_cp * output_vertex_size;
        output_patch_size = pervertex_output_patch_size + num_tcs_patch_outputs * 16;
 
-       output_patch0_offset = sctx->tcs_shader ? input_patch_size * *num_patches : 0;
+       /* Ensure that we only need one wave per SIMD so we don't need to check
+        * resource usage. Also ensures that the number of tcs in and out
+        * vertices per threadgroup are at most 256.
+        */
+       *num_patches = 64 / MAX2(num_tcs_input_cp, num_tcs_output_cp) * 4;
+
+       /* Make sure that the data fits in LDS. This assumes the shaders only
+        * use LDS for the inputs and outputs.
+        */
+       hardware_lds_size = sctx->b.chip_class >= CIK ? 65536 : 32768;
+       *num_patches = MIN2(*num_patches, hardware_lds_size / (input_patch_size +
+                                                              output_patch_size));
+
+       /* Make sure the output data fits in the offchip buffer */
+       *num_patches = MIN2(*num_patches,
+                           (sctx->screen->tess_offchip_block_dw_size * 4) /
+                           output_patch_size);
+
+       /* Not necessary for correctness, but improves performance. The
+        * specific value is taken from the proprietary driver.
+        */
+       *num_patches = MIN2(*num_patches, 40);
+
+       output_patch0_offset = input_patch_size * *num_patches;
        perpatch_output_offset = output_patch0_offset + pervertex_output_patch_size;
 
        lds_size = output_patch0_offset + output_patch_size * *num_patches;
-       ls_rsrc2 = ls->current->ls_rsrc2;
+       ls_rsrc2 = ls->current->config.rsrc2;
 
        if (sctx->b.chip_class >= CIK) {
                assert(lds_size <= 65536);
@@ -173,12 +170,23 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
                ls_rsrc2 |= S_00B52C_LDS_SIZE(align(lds_size, 256) / 256);
        }
 
+       if (sctx->last_ls == ls->current &&
+           sctx->last_tcs == tcs &&
+           sctx->last_tes_sh_base == tes_sh_base &&
+           sctx->last_num_tcs_input_cp == num_tcs_input_cp)
+               return;
+
+       sctx->last_ls = ls->current;
+       sctx->last_tcs = tcs;
+       sctx->last_tes_sh_base = tes_sh_base;
+       sctx->last_num_tcs_input_cp = num_tcs_input_cp;
+
        /* Due to a hw bug, RSRC2_LS must be written twice with another
         * LS register written in between. */
        if (sctx->b.chip_class == CIK && sctx->b.family != CHIP_HAWAII)
                radeon_set_sh_reg(cs, R_00B52C_SPI_SHADER_PGM_RSRC2_LS, ls_rsrc2);
        radeon_set_sh_reg_seq(cs, R_00B528_SPI_SHADER_PGM_RSRC1_LS, 2);
-       radeon_emit(cs, ls->current->ls_rsrc1);
+       radeon_emit(cs, ls->current->config.rsrc1);
        radeon_emit(cs, ls_rsrc2);
 
        /* Compute userdata SGPRs. */
@@ -197,6 +205,8 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
                         ((output_vertex_size / 4) << 13);
        tcs_out_offsets = (output_patch0_offset / 16) |
                          ((perpatch_output_offset / 16) << 16);
+       offchip_layout = (pervertex_output_patch_size * *num_patches << 16) |
+                        (num_tcs_output_cp << 9) | *num_patches;
 
        /* Set them for LS. */
        radeon_set_sh_reg(cs,
@@ -205,15 +215,27 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
 
        /* Set them for TCS. */
        radeon_set_sh_reg_seq(cs,
-               R_00B430_SPI_SHADER_USER_DATA_HS_0 + SI_SGPR_TCS_OUT_OFFSETS * 4, 3);
+               R_00B430_SPI_SHADER_USER_DATA_HS_0 + SI_SGPR_TCS_OFFCHIP_LAYOUT * 4, 4);
+       radeon_emit(cs, offchip_layout);
        radeon_emit(cs, tcs_out_offsets);
        radeon_emit(cs, tcs_out_layout | (num_tcs_input_cp << 26));
        radeon_emit(cs, tcs_in_layout);
 
        /* Set them for TES. */
-       radeon_set_sh_reg_seq(cs, tes_sh_base + SI_SGPR_TCS_OUT_OFFSETS * 4, 2);
-       radeon_emit(cs, tcs_out_offsets);
-       radeon_emit(cs, tcs_out_layout | (num_tcs_output_cp << 26));
+       radeon_set_sh_reg_seq(cs, tes_sh_base + SI_SGPR_TCS_OFFCHIP_LAYOUT * 4, 1);
+       radeon_emit(cs, offchip_layout);
+}
+
+static unsigned si_num_prims_for_vertices(const struct pipe_draw_info *info)
+{
+       switch (info->mode) {
+       case PIPE_PRIM_PATCHES:
+               return info->count / info->vertices_per_patch;
+       case R600_PRIM_RECTANGLE_LIST:
+               return info->count / 3;
+       default:
+               return u_prims_for_vertices(info->mode, info->count);
+       }
 }
 
 static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
@@ -223,6 +245,7 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
        struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
        unsigned prim = info->mode;
        unsigned primgroup_size = 128; /* recommended without a GS */
+       unsigned max_primgroup_in_wave = 2;
 
        /* SWITCH_ON_EOP(0) is always preferable. */
        bool wd_switch_on_eop = false;
@@ -231,35 +254,32 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
        bool partial_vs_wave = false;
        bool partial_es_wave = false;
 
-       if (sctx->gs_shader)
+       if (sctx->gs_shader.cso)
                primgroup_size = 64; /* recommended with a GS */
 
-       if (sctx->tes_shader) {
-               unsigned num_cp_out =
-                       sctx->tcs_shader ?
-                       sctx->tcs_shader->info.properties[TGSI_PROPERTY_TCS_VERTICES_OUT] :
-                       info->vertices_per_patch;
-               unsigned max_size = 256 / MAX2(info->vertices_per_patch, num_cp_out);
-
-               primgroup_size = MIN2(primgroup_size, max_size);
-
+       if (sctx->tes_shader.cso) {
                /* primgroup_size must be set to a multiple of NUM_PATCHES */
-               primgroup_size = (primgroup_size / num_patches) * num_patches;
+               primgroup_size = num_patches;
 
-               /* SWITCH_ON_EOI must be set if PrimID is used.
-                * If SWITCH_ON_EOI is set, PARTIAL_ES_WAVE must be set too. */
-               if ((sctx->tcs_shader && sctx->tcs_shader->info.uses_primid) ||
-                   sctx->tes_shader->info.uses_primid) {
+               /* SWITCH_ON_EOI must be set if PrimID is used. */
+               if ((sctx->tcs_shader.cso && sctx->tcs_shader.cso->info.uses_primid) ||
+                   sctx->tes_shader.cso->info.uses_primid)
                        ia_switch_on_eoi = true;
-                       partial_es_wave = true;
-               }
 
                /* Bug with tessellation and GS on Bonaire and older 2 SE chips. */
                if ((sctx->b.family == CHIP_TAHITI ||
                     sctx->b.family == CHIP_PITCAIRN ||
                     sctx->b.family == CHIP_BONAIRE) &&
-                   sctx->gs_shader)
+                   sctx->gs_shader.cso)
                        partial_vs_wave = true;
+
+               /* Needed for 028B6C_DISTRIBUTION_MODE != 0 */
+               if (sctx->screen->has_distributed_tess) {
+                       if (sctx->gs_shader.cso)
+                               partial_es_wave = true;
+                       else
+                               partial_vs_wave = true;
+               }
        }
 
        /* This is a hardware requirement. */
@@ -269,20 +289,25 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
                wd_switch_on_eop = true;
        }
 
-       if (sctx->b.streamout.streamout_enabled ||
-           sctx->b.streamout.prims_gen_query_enabled)
-               partial_vs_wave = true;
-
        if (sctx->b.chip_class >= CIK) {
                /* WD_SWITCH_ON_EOP has no effect on GPUs with less than
                 * 4 shader engines. Set 1 to pass the assertion below.
-                * The other cases are hardware requirements. */
+                * The other cases are hardware requirements.
+                *
+                * Polaris supports primitive restart with WD_SWITCH_ON_EOP=0
+                * for points, line strips, and tri strips.
+                */
                if (sctx->b.screen->info.max_se < 4 ||
                    prim == PIPE_PRIM_POLYGON ||
                    prim == PIPE_PRIM_LINE_LOOP ||
                    prim == PIPE_PRIM_TRIANGLE_FAN ||
                    prim == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY ||
-                   info->primitive_restart)
+                   (info->primitive_restart &&
+                    (sctx->b.family < CHIP_POLARIS10 ||
+                     (prim != PIPE_PRIM_POINTS &&
+                      prim != PIPE_PRIM_LINE_STRIP &&
+                      prim != PIPE_PRIM_TRIANGLE_STRIP))) ||
+                   info->count_from_stream_output)
                        wd_switch_on_eop = true;
 
                /* Hawaii hangs if instancing is enabled and WD_SWITCH_ON_EOP is 0.
@@ -292,34 +317,61 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
                    (info->indirect || info->instance_count > 1))
                        wd_switch_on_eop = true;
 
-               /* USE_OPAQUE doesn't work when WD_SWITCH_ON_EOP is 0. */
-               if (info->count_from_stream_output)
+               /* Performance recommendation for 4 SE Gfx7-8 parts if
+                * instances are smaller than a primgroup. Ignore the fact
+                * primgroup_size is a primitive count, not vertex count.
+                * Don't do anything for indirect draws.
+                */
+               if (sctx->b.chip_class <= VI &&
+                   sctx->b.screen->info.max_se >= 4 &&
+                   !info->indirect &&
+                   info->instance_count > 1 && info->count < primgroup_size)
                        wd_switch_on_eop = true;
 
+               /* Required on CIK and later. */
+               if (sctx->b.screen->info.max_se > 2 && !wd_switch_on_eop)
+                       ia_switch_on_eoi = true;
+
+               /* Required by Hawaii and, for some special cases, by VI. */
+               if (ia_switch_on_eoi &&
+                   (sctx->b.family == CHIP_HAWAII ||
+                    (sctx->b.chip_class == VI &&
+                     (sctx->gs_shader.cso || max_primgroup_in_wave != 2))))
+                       partial_vs_wave = true;
+
+               /* Instancing bug on Bonaire. */
+               if (sctx->b.family == CHIP_BONAIRE && ia_switch_on_eoi &&
+                   (info->indirect || info->instance_count > 1))
+                       partial_vs_wave = true;
+
                /* If the WD switch is false, the IA switch must be false too. */
                assert(wd_switch_on_eop || !ia_switch_on_eop);
        }
 
+       /* If SWITCH_ON_EOI is set, PARTIAL_ES_WAVE must be set too. */
+       if (ia_switch_on_eoi)
+               partial_es_wave = true;
+
+       /* GS requirement. */
+       if (SI_GS_PER_ES / primgroup_size >= sctx->screen->gs_table_depth - 3)
+               partial_es_wave = true;
+
        /* Hw bug with single-primitive instances and SWITCH_ON_EOI
         * on multi-SE chips. */
        if (sctx->b.screen->info.max_se >= 2 && ia_switch_on_eoi &&
            (info->indirect ||
             (info->instance_count > 1 &&
-             u_prims_for_vertices(info->mode, info->count) <= 1)))
+             si_num_prims_for_vertices(info) <= 1)))
                sctx->b.flags |= SI_CONTEXT_VGT_FLUSH;
 
-       /* Instancing bug on 2 SE chips. */
-       if (sctx->b.screen->info.max_se == 2 && ia_switch_on_eoi &&
-           (info->indirect || info->instance_count > 1))
-               partial_vs_wave = true;
-
        return S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) |
                S_028AA8_SWITCH_ON_EOI(ia_switch_on_eoi) |
                S_028AA8_PARTIAL_VS_WAVE_ON(partial_vs_wave) |
                S_028AA8_PARTIAL_ES_WAVE_ON(partial_es_wave) |
                S_028AA8_PRIMGROUP_SIZE(primgroup_size - 1) |
                S_028AA8_WD_SWITCH_ON_EOP(sctx->b.chip_class >= CIK ? wd_switch_on_eop : 0) |
-               S_028AA8_MAX_PRIMGRP_IN_WAVE(sctx->b.chip_class >= VI ? 2 : 0);
+               S_028AA8_MAX_PRIMGRP_IN_WAVE(sctx->b.chip_class >= VI ?
+                                            max_primgroup_in_wave : 0);
 }
 
 static unsigned si_get_ls_hs_config(struct si_context *sctx,
@@ -328,11 +380,11 @@ static unsigned si_get_ls_hs_config(struct si_context *sctx,
 {
        unsigned num_output_cp;
 
-       if (!sctx->tes_shader)
+       if (!sctx->tes_shader.cso)
                return 0;
 
-       num_output_cp = sctx->tcs_shader ?
-               sctx->tcs_shader->info.properties[TGSI_PROPERTY_TCS_VERTICES_OUT] :
+       num_output_cp = sctx->tcs_shader.cso ?
+               sctx->tcs_shader.cso->info.properties[TGSI_PROPERTY_TCS_VERTICES_OUT] :
                info->vertices_per_patch;
 
        return S_028B58_NUM_PATCHES(num_patches) |
@@ -342,7 +394,7 @@ static unsigned si_get_ls_hs_config(struct si_context *sctx,
 
 static void si_emit_scratch_reloc(struct si_context *sctx)
 {
-       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
 
        if (!sctx->emit_scratch_reloc)
                return;
@@ -351,9 +403,9 @@ static void si_emit_scratch_reloc(struct si_context *sctx)
                               sctx->spi_tmpring_size);
 
        if (sctx->scratch_buffer) {
-               radeon_add_to_buffer_list(&sctx->b, &sctx->b.rings.gfx,
+               radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx,
                                      sctx->scratch_buffer, RADEON_USAGE_READWRITE,
-                                     RADEON_PRIO_SHADER_RESOURCE_RW);
+                                     RADEON_PRIO_SCRATCH_BUFFER);
 
        }
        sctx->emit_scratch_reloc = false;
@@ -362,7 +414,7 @@ static void si_emit_scratch_reloc(struct si_context *sctx)
 /* rast_prim is the primitive type after GS. */
 static void si_emit_rasterizer_prim_state(struct si_context *sctx)
 {
-       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
        unsigned rast_prim = sctx->current_rast_prim;
        struct si_state_rasterizer *rs = sctx->emitted.named.rasterizer;
 
@@ -378,10 +430,12 @@ static void si_emit_rasterizer_prim_state(struct si_context *sctx)
            rs->pa_sc_line_stipple == sctx->last_sc_line_stipple)
                return;
 
+       /* For lines, reset the stipple pattern at each primitive. Otherwise,
+        * reset the stipple pattern at each packet (line strips, line loops).
+        */
        radeon_set_context_reg(cs, R_028A0C_PA_SC_LINE_STIPPLE,
                rs->pa_sc_line_stipple |
-               S_028A0C_AUTO_RESET_CNTL(rast_prim == PIPE_PRIM_LINES ? 1 :
-                                        rast_prim == PIPE_PRIM_LINE_STRIP ? 2 : 0));
+               S_028A0C_AUTO_RESET_CNTL(rast_prim == PIPE_PRIM_LINES ? 1 : 2));
 
        sctx->last_rast_prim = rast_prim;
        sctx->last_sc_line_stipple = rs->pa_sc_line_stipple;
@@ -390,12 +444,31 @@ static void si_emit_rasterizer_prim_state(struct si_context *sctx)
 static void si_emit_draw_registers(struct si_context *sctx,
                                   const struct pipe_draw_info *info)
 {
-       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
        unsigned prim = si_conv_pipe_prim(info->mode);
        unsigned gs_out_prim = si_conv_prim_to_gs_out(sctx->current_rast_prim);
        unsigned ia_multi_vgt_param, ls_hs_config, num_patches = 0;
 
-       if (sctx->tes_shader)
+       /* Polaris needs different VTX_REUSE_DEPTH settings depending on
+        * whether the "fractional odd" tessellation spacing is used.
+        */
+       if (sctx->b.family >= CHIP_POLARIS10) {
+               struct si_shader_selector *tes = sctx->tes_shader.cso;
+               unsigned vtx_reuse_depth = 30;
+
+               if (tes &&
+                   tes->info.properties[TGSI_PROPERTY_TES_SPACING] ==
+                   PIPE_TESS_SPACING_FRACTIONAL_ODD)
+                       vtx_reuse_depth = 14;
+
+               if (vtx_reuse_depth != sctx->last_vtx_reuse_depth) {
+                       radeon_set_context_reg(cs, R_028C58_VGT_VERTEX_REUSE_BLOCK_CNTL,
+                                              vtx_reuse_depth);
+                       sctx->last_vtx_reuse_depth = vtx_reuse_depth;
+               }
+       }
+
+       if (sctx->tes_shader.cso)
                si_emit_derived_tess_state(sctx, info, &num_patches);
 
        ia_multi_vgt_param = si_get_ia_multi_vgt_param(sctx, info, num_patches);
@@ -406,15 +479,15 @@ static void si_emit_draw_registers(struct si_context *sctx,
            ia_multi_vgt_param != sctx->last_multi_vgt_param ||
            ls_hs_config != sctx->last_ls_hs_config) {
                if (sctx->b.chip_class >= CIK) {
-                       radeon_emit(cs, PKT3(PKT3_DRAW_PREAMBLE, 2, 0));
-                       radeon_emit(cs, prim); /* VGT_PRIMITIVE_TYPE */
-                       radeon_emit(cs, ia_multi_vgt_param); /* IA_MULTI_VGT_PARAM */
-                       radeon_emit(cs, ls_hs_config); /* VGT_LS_HS_CONFIG */
+                       radeon_set_context_reg_idx(cs, R_028AA8_IA_MULTI_VGT_PARAM, 1, ia_multi_vgt_param);
+                       radeon_set_context_reg_idx(cs, R_028B58_VGT_LS_HS_CONFIG, 2, ls_hs_config);
+                       radeon_set_uconfig_reg_idx(cs, R_030908_VGT_PRIMITIVE_TYPE, 1, prim);
                } else {
                        radeon_set_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE, prim);
                        radeon_set_context_reg(cs, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param);
                        radeon_set_context_reg(cs, R_028B58_VGT_LS_HS_CONFIG, ls_hs_config);
                }
+
                sctx->last_prim = prim;
                sctx->last_multi_vgt_param = ia_multi_vgt_param;
                sctx->last_ls_hs_config = ls_hs_config;
@@ -444,8 +517,11 @@ static void si_emit_draw_packets(struct si_context *sctx,
                                 const struct pipe_draw_info *info,
                                 const struct pipe_index_buffer *ib)
 {
-       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
        unsigned sh_base_reg = sctx->shader_userdata.sh_base[PIPE_SHADER_VERTEX];
+       bool render_cond_bit = sctx->b.render_cond && !sctx->b.render_cond_force_off;
+       uint32_t index_max_size = 0;
+       uint64_t index_va = 0;
 
        if (info->count_from_stream_output) {
                struct r600_so_target *t =
@@ -465,9 +541,9 @@ static void si_emit_draw_packets(struct si_context *sctx,
                radeon_emit(cs, R_028B2C_VGT_STRMOUT_DRAW_OPAQUE_BUFFER_FILLED_SIZE >> 2);
                radeon_emit(cs, 0); /* unused */
 
-               radeon_add_to_buffer_list(&sctx->b, &sctx->b.rings.gfx,
+               radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx,
                                      t->buf_filled_size, RADEON_USAGE_READ,
-                                     RADEON_PRIO_MIN);
+                                     RADEON_PRIO_SO_FILLED_SIZE);
        }
 
        /* draw packet */
@@ -493,6 +569,16 @@ static void si_emit_draw_packets(struct si_context *sctx,
                        assert(!"unreachable");
                        return;
                }
+
+               index_max_size = (ib->buffer->width0 - ib->offset) /
+                                 ib->index_size;
+               index_va = r600_resource(ib->buffer)->gpu_address + ib->offset;
+
+               assert(index_va % 2 == 0);
+
+               radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx,
+                                     (struct r600_resource *)ib->buffer,
+                                     RADEON_USAGE_READ, RADEON_PRIO_INDEX_BUFFER);
        }
 
        if (!info->indirect) {
@@ -517,111 +603,102 @@ static void si_emit_draw_packets(struct si_context *sctx,
                        sctx->last_sh_base_reg = sh_base_reg;
                }
        } else {
-               si_invalidate_draw_sh_constants(sctx);
+               uint64_t indirect_va = r600_resource(info->indirect)->gpu_address;
 
-               radeon_add_to_buffer_list(&sctx->b, &sctx->b.rings.gfx,
-                                     (struct r600_resource *)info->indirect,
-                                     RADEON_USAGE_READ, RADEON_PRIO_MIN);
-       }
+               assert(indirect_va % 8 == 0);
 
-       if (info->indexed) {
-               uint32_t index_max_size = (ib->buffer->width0 - ib->offset) /
-                                         ib->index_size;
-               uint64_t index_va = r600_resource(ib->buffer)->gpu_address + ib->offset;
+               si_invalidate_draw_sh_constants(sctx);
 
-               radeon_add_to_buffer_list(&sctx->b, &sctx->b.rings.gfx,
-                                     (struct r600_resource *)ib->buffer,
-                                     RADEON_USAGE_READ, RADEON_PRIO_MIN);
+               radeon_emit(cs, PKT3(PKT3_SET_BASE, 2, 0));
+               radeon_emit(cs, 1);
+               radeon_emit(cs, indirect_va);
+               radeon_emit(cs, indirect_va >> 32);
 
-               if (info->indirect) {
-                       uint64_t indirect_va = r600_resource(info->indirect)->gpu_address;
+               radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx,
+                                     (struct r600_resource *)info->indirect,
+                                     RADEON_USAGE_READ, RADEON_PRIO_DRAW_INDIRECT);
+       }
 
-                       assert(indirect_va % 8 == 0);
-                       assert(index_va % 2 == 0);
-                       assert(info->indirect_offset % 4 == 0);
+       if (info->indirect) {
+               unsigned di_src_sel = info->indexed ? V_0287F0_DI_SRC_SEL_DMA
+                                                   : V_0287F0_DI_SRC_SEL_AUTO_INDEX;
 
-                       radeon_emit(cs, PKT3(PKT3_SET_BASE, 2, 0));
-                       radeon_emit(cs, 1);
-                       radeon_emit(cs, indirect_va);
-                       radeon_emit(cs, indirect_va >> 32);
+               assert(info->indirect_offset % 4 == 0);
 
+               if (info->indexed) {
                        radeon_emit(cs, PKT3(PKT3_INDEX_BASE, 1, 0));
                        radeon_emit(cs, index_va);
                        radeon_emit(cs, index_va >> 32);
 
                        radeon_emit(cs, PKT3(PKT3_INDEX_BUFFER_SIZE, 0, 0));
                        radeon_emit(cs, index_max_size);
+               }
 
-                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_INDIRECT, 3, sctx->b.predicate_drawing));
+               if (!sctx->screen->has_draw_indirect_multi) {
+                       radeon_emit(cs, PKT3(info->indexed ? PKT3_DRAW_INDEX_INDIRECT
+                                                          : PKT3_DRAW_INDIRECT,
+                                            3, render_cond_bit));
                        radeon_emit(cs, info->indirect_offset);
                        radeon_emit(cs, (sh_base_reg + SI_SGPR_BASE_VERTEX * 4 - SI_SH_REG_OFFSET) >> 2);
                        radeon_emit(cs, (sh_base_reg + SI_SGPR_START_INSTANCE * 4 - SI_SH_REG_OFFSET) >> 2);
-                       radeon_emit(cs, V_0287F0_DI_SRC_SEL_DMA);
+                       radeon_emit(cs, di_src_sel);
                } else {
+                       radeon_emit(cs, PKT3(info->indexed ? PKT3_DRAW_INDEX_INDIRECT_MULTI :
+                                                            PKT3_DRAW_INDIRECT_MULTI,
+                                            8, render_cond_bit));
+                       radeon_emit(cs, info->indirect_offset);
+                       radeon_emit(cs, (sh_base_reg + SI_SGPR_BASE_VERTEX * 4 - SI_SH_REG_OFFSET) >> 2);
+                       radeon_emit(cs, (sh_base_reg + SI_SGPR_START_INSTANCE * 4 - SI_SH_REG_OFFSET) >> 2);
+                       radeon_emit(cs, 0); /* draw_index */
+                       radeon_emit(cs, 1); /* count */
+                       radeon_emit(cs, 0); /* count_addr -- disabled */
+                       radeon_emit(cs, 0);
+                       radeon_emit(cs, 16); /* stride */
+                       radeon_emit(cs, di_src_sel);
+               }
+       } else {
+               if (info->indexed) {
                        index_va += info->start * ib->index_size;
 
-                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_2, 4, sctx->b.predicate_drawing));
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_2, 4, render_cond_bit));
                        radeon_emit(cs, index_max_size);
                        radeon_emit(cs, index_va);
                        radeon_emit(cs, (index_va >> 32UL) & 0xFF);
                        radeon_emit(cs, info->count);
                        radeon_emit(cs, V_0287F0_DI_SRC_SEL_DMA);
-               }
-       } else {
-               if (info->indirect) {
-                       uint64_t indirect_va = r600_resource(info->indirect)->gpu_address;
-
-                       assert(indirect_va % 8 == 0);
-                       assert(info->indirect_offset % 4 == 0);
-
-                       radeon_emit(cs, PKT3(PKT3_SET_BASE, 2, 0));
-                       radeon_emit(cs, 1);
-                       radeon_emit(cs, indirect_va);
-                       radeon_emit(cs, indirect_va >> 32);
-
-                       radeon_emit(cs, PKT3(PKT3_DRAW_INDIRECT, 3, sctx->b.predicate_drawing));
-                       radeon_emit(cs, info->indirect_offset);
-                       radeon_emit(cs, (sh_base_reg + SI_SGPR_BASE_VERTEX * 4 - SI_SH_REG_OFFSET) >> 2);
-                       radeon_emit(cs, (sh_base_reg + SI_SGPR_START_INSTANCE * 4 - SI_SH_REG_OFFSET) >> 2);
-                       radeon_emit(cs, V_0287F0_DI_SRC_SEL_AUTO_INDEX);
                } else {
-                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_AUTO, 1, sctx->b.predicate_drawing));
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_AUTO, 1, render_cond_bit));
                        radeon_emit(cs, info->count);
                        radeon_emit(cs, V_0287F0_DI_SRC_SEL_AUTO_INDEX |
-                                   S_0287F0_USE_OPAQUE(!!info->count_from_stream_output));
+                                       S_0287F0_USE_OPAQUE(!!info->count_from_stream_output));
                }
        }
 }
 
-#define BOTH_ICACHE_KCACHE (SI_CONTEXT_INV_ICACHE | SI_CONTEXT_INV_KCACHE)
-
 void si_emit_cache_flush(struct si_context *si_ctx, struct r600_atom *atom)
 {
        struct r600_common_context *sctx = &si_ctx->b;
-       struct radeon_winsys_cs *cs = sctx->rings.gfx.cs;
+       struct radeon_winsys_cs *cs = sctx->gfx.cs;
        uint32_t cp_coher_cntl = 0;
-       uint32_t compute =
-               PKT3_SHADER_TYPE_S(!!(sctx->flags & SI_CONTEXT_FLAG_COMPUTE));
 
        /* SI has a bug that it always flushes ICACHE and KCACHE if either
         * bit is set. An alternative way is to write SQC_CACHES, but that
         * doesn't seem to work reliably. Since the bug doesn't affect
         * correctness (it only does more work than necessary) and
         * the performance impact is likely negligible, there is no plan
-        * to fix it.
+        * to add a workaround for it.
         */
 
        if (sctx->flags & SI_CONTEXT_INV_ICACHE)
                cp_coher_cntl |= S_0085F0_SH_ICACHE_ACTION_ENA(1);
-       if (sctx->flags & SI_CONTEXT_INV_KCACHE)
+       if (sctx->flags & SI_CONTEXT_INV_SMEM_L1)
                cp_coher_cntl |= S_0085F0_SH_KCACHE_ACTION_ENA(1);
 
-       if (sctx->flags & SI_CONTEXT_INV_TC_L1)
+       if (sctx->flags & SI_CONTEXT_INV_VMEM_L1)
                cp_coher_cntl |= S_0085F0_TCL1_ACTION_ENA(1);
-       if (sctx->flags & SI_CONTEXT_INV_TC_L2) {
+       if (sctx->flags & SI_CONTEXT_INV_GLOBAL_L2) {
                cp_coher_cntl |= S_0085F0_TC_ACTION_ENA(1);
 
-               /* TODO: this might not be needed. */
                if (sctx->chip_class >= VI)
                        cp_coher_cntl |= S_0301F0_TC_WB_ACTION_ENA(1);
        }
@@ -636,6 +713,17 @@ void si_emit_cache_flush(struct si_context *si_ctx, struct r600_atom *atom)
                                 S_0085F0_CB5_DEST_BASE_ENA(1) |
                                 S_0085F0_CB6_DEST_BASE_ENA(1) |
                                 S_0085F0_CB7_DEST_BASE_ENA(1);
+
+               /* Necessary for DCC */
+               if (sctx->chip_class >= VI) {
+                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
+                       radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_AND_INV_CB_DATA_TS) |
+                                       EVENT_INDEX(5));
+                       radeon_emit(cs, 0);
+                       radeon_emit(cs, 0);
+                       radeon_emit(cs, 0);
+                       radeon_emit(cs, 0);
+               }
        }
        if (sctx->flags & SI_CONTEXT_FLUSH_AND_INV_DB) {
                cp_coher_cntl |= S_0085F0_DB_ACTION_ENA(1) |
@@ -643,65 +731,75 @@ void si_emit_cache_flush(struct si_context *si_ctx, struct r600_atom *atom)
        }
 
        if (sctx->flags & SI_CONTEXT_FLUSH_AND_INV_CB_META) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
                radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_AND_INV_CB_META) | EVENT_INDEX(0));
+               /* needed for wait for idle in SURFACE_SYNC */
+               assert(sctx->flags & SI_CONTEXT_FLUSH_AND_INV_CB);
        }
        if (sctx->flags & SI_CONTEXT_FLUSH_AND_INV_DB_META) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
                radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_AND_INV_DB_META) | EVENT_INDEX(0));
+               /* needed for wait for idle in SURFACE_SYNC */
+               assert(sctx->flags & SI_CONTEXT_FLUSH_AND_INV_DB);
        }
-       if (sctx->flags & SI_CONTEXT_FLUSH_WITH_INV_L2) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
-               radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH) | EVENT_INDEX(7) |
-                               EVENT_WRITE_INV_L2);
-        }
 
-       /* FLUSH_AND_INV events must be emitted before PS_PARTIAL_FLUSH.
-        * Otherwise, clearing CMASK (CB meta) with CP DMA isn't reliable.
-        *
-        * I think the reason is that FLUSH_AND_INV is only added to a queue
-        * and it is PS_PARTIAL_FLUSH that waits for it to complete.
+       /* Wait for shader engines to go idle.
+        * VS and PS waits are unnecessary if SURFACE_SYNC is going to wait
+        * for everything including CB/DB cache flushes.
         */
-       if (sctx->flags & SI_CONTEXT_PS_PARTIAL_FLUSH) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
-               radeon_emit(cs, EVENT_TYPE(V_028A90_PS_PARTIAL_FLUSH) | EVENT_INDEX(4));
-       } else if (sctx->flags & SI_CONTEXT_VS_PARTIAL_FLUSH) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
-               radeon_emit(cs, EVENT_TYPE(V_028A90_VS_PARTIAL_FLUSH) | EVENT_INDEX(4));
+       if (!(sctx->flags & (SI_CONTEXT_FLUSH_AND_INV_CB |
+                            SI_CONTEXT_FLUSH_AND_INV_DB))) {
+               if (sctx->flags & SI_CONTEXT_PS_PARTIAL_FLUSH) {
+                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+                       radeon_emit(cs, EVENT_TYPE(V_028A90_PS_PARTIAL_FLUSH) | EVENT_INDEX(4));
+               } else if (sctx->flags & SI_CONTEXT_VS_PARTIAL_FLUSH) {
+                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+                       radeon_emit(cs, EVENT_TYPE(V_028A90_VS_PARTIAL_FLUSH) | EVENT_INDEX(4));
+               }
        }
        if (sctx->flags & SI_CONTEXT_CS_PARTIAL_FLUSH) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
                radeon_emit(cs, EVENT_TYPE(V_028A90_CS_PARTIAL_FLUSH | EVENT_INDEX(4)));
        }
+
+       /* VGT state synchronization. */
        if (sctx->flags & SI_CONTEXT_VGT_FLUSH) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
                radeon_emit(cs, EVENT_TYPE(V_028A90_VGT_FLUSH) | EVENT_INDEX(0));
        }
        if (sctx->flags & SI_CONTEXT_VGT_STREAMOUT_SYNC) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0) | compute);
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
                radeon_emit(cs, EVENT_TYPE(V_028A90_VGT_STREAMOUT_SYNC) | EVENT_INDEX(0));
        }
 
-       /* SURFACE_SYNC must be emitted after partial flushes.
-        * It looks like SURFACE_SYNC flushes caches immediately and doesn't
-        * wait for any engines. This should be last.
+       /* Make sure ME is idle (it executes most packets) before continuing.
+        * This prevents read-after-write hazards between PFP and ME.
+        */
+       if (cp_coher_cntl || (sctx->flags & SI_CONTEXT_CS_PARTIAL_FLUSH)) {
+               radeon_emit(cs, PKT3(PKT3_PFP_SYNC_ME, 0, 0));
+               radeon_emit(cs, 0);
+       }
+
+       /* When one of the DEST_BASE flags is set, SURFACE_SYNC waits for idle.
+        * Therefore, it should be last. Done in PFP.
         */
        if (cp_coher_cntl) {
-               if (sctx->chip_class >= CIK) {
-                       radeon_emit(cs, PKT3(PKT3_ACQUIRE_MEM, 5, 0) | compute);
-                       radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
-                       radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
-                       radeon_emit(cs, 0xff);            /* CP_COHER_SIZE_HI */
-                       radeon_emit(cs, 0);               /* CP_COHER_BASE */
-                       radeon_emit(cs, 0);               /* CP_COHER_BASE_HI */
-                       radeon_emit(cs, 0x0000000A);      /* POLL_INTERVAL */
-               } else {
-                       radeon_emit(cs, PKT3(PKT3_SURFACE_SYNC, 3, 0) | compute);
-                       radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
-                       radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
-                       radeon_emit(cs, 0);               /* CP_COHER_BASE */
-                       radeon_emit(cs, 0x0000000A);      /* POLL_INTERVAL */
-               }
+               /* ACQUIRE_MEM is only required on a compute ring. */
+               radeon_emit(cs, PKT3(PKT3_SURFACE_SYNC, 3, 0));
+               radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
+               radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
+               radeon_emit(cs, 0);               /* CP_COHER_BASE */
+               radeon_emit(cs, 0x0000000A);      /* POLL_INTERVAL */
+       }
+
+       if (sctx->flags & R600_CONTEXT_START_PIPELINE_STATS) {
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, EVENT_TYPE(V_028A90_PIPELINESTAT_START) |
+                               EVENT_INDEX(0));
+       } else if (sctx->flags & R600_CONTEXT_STOP_PIPELINE_STATS) {
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, EVENT_TYPE(V_028A90_PIPELINESTAT_STOP) |
+                               EVENT_INDEX(0));
        }
 
        sctx->flags = 0;
@@ -725,42 +823,91 @@ static void si_get_draw_start_count(struct si_context *sctx,
        }
 }
 
+void si_ce_pre_draw_synchronization(struct si_context *sctx)
+{
+       if (sctx->ce_need_synchronization) {
+               radeon_emit(sctx->ce_ib, PKT3(PKT3_INCREMENT_CE_COUNTER, 0, 0));
+               radeon_emit(sctx->ce_ib, 1);
+
+               radeon_emit(sctx->b.gfx.cs, PKT3(PKT3_WAIT_ON_CE_COUNTER, 0, 0));
+               radeon_emit(sctx->b.gfx.cs, 1);
+       }
+}
+
+void si_ce_post_draw_synchronization(struct si_context *sctx)
+{
+       if (sctx->ce_need_synchronization) {
+               radeon_emit(sctx->b.gfx.cs, PKT3(PKT3_INCREMENT_DE_COUNTER, 0, 0));
+               radeon_emit(sctx->b.gfx.cs, 0);
+
+               sctx->ce_need_synchronization = false;
+       }
+}
+
 void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 {
        struct si_context *sctx = (struct si_context *)ctx;
+       struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
        struct pipe_index_buffer ib = {};
-       unsigned mask;
+       unsigned mask, dirty_fb_counter, dirty_tex_counter, rast_prim;
 
        if (!info->count && !info->indirect &&
            (info->indexed || !info->count_from_stream_output))
                return;
 
-       if (!sctx->ps_shader || !sctx->vs_shader) {
+       if (!sctx->vs_shader.cso) {
+               assert(0);
+               return;
+       }
+       if (!sctx->ps_shader.cso && (!rs || !rs->rasterizer_discard)) {
                assert(0);
                return;
        }
-       if (!!sctx->tes_shader != (info->mode == PIPE_PRIM_PATCHES)) {
+       if (!!sctx->tes_shader.cso != (info->mode == PIPE_PRIM_PATCHES)) {
                assert(0);
                return;
        }
 
-       si_decompress_textures(sctx);
+       /* Re-emit the framebuffer state if needed. */
+       dirty_fb_counter = p_atomic_read(&sctx->b.screen->dirty_fb_counter);
+       if (dirty_fb_counter != sctx->b.last_dirty_fb_counter) {
+               sctx->b.last_dirty_fb_counter = dirty_fb_counter;
+               sctx->framebuffer.dirty_cbufs |=
+                       ((1 << sctx->framebuffer.state.nr_cbufs) - 1);
+               sctx->framebuffer.dirty_zsbuf = true;
+               si_mark_atom_dirty(sctx, &sctx->framebuffer.atom);
+       }
+
+       /* Invalidate & recompute texture descriptors if needed. */
+       dirty_tex_counter = p_atomic_read(&sctx->b.screen->dirty_tex_descriptor_counter);
+       if (dirty_tex_counter != sctx->b.last_dirty_tex_descriptor_counter) {
+               sctx->b.last_dirty_tex_descriptor_counter = dirty_tex_counter;
+               si_update_all_texture_descriptors(sctx);
+       }
+
+       si_decompress_graphics_textures(sctx);
 
        /* Set the rasterization primitive type.
         *
         * This must be done after si_decompress_textures, which can call
         * draw_vbo recursively, and before si_update_shaders, which uses
         * current_rast_prim for this draw_vbo call. */
-       if (sctx->gs_shader)
-               sctx->current_rast_prim = sctx->gs_shader->gs_output_prim;
-       else if (sctx->tes_shader)
-               sctx->current_rast_prim =
-                       sctx->tes_shader->info.properties[TGSI_PROPERTY_TES_PRIM_MODE];
+       if (sctx->gs_shader.cso)
+               rast_prim = sctx->gs_shader.cso->gs_output_prim;
+       else if (sctx->tes_shader.cso)
+               rast_prim = sctx->tes_shader.cso->info.properties[TGSI_PROPERTY_TES_PRIM_MODE];
        else
-               sctx->current_rast_prim = info->mode;
+               rast_prim = info->mode;
 
-       si_update_shaders(sctx);
-       if (!si_upload_shader_descriptors(sctx))
+       if (rast_prim != sctx->current_rast_prim) {
+               sctx->current_rast_prim = rast_prim;
+               sctx->do_update_shaders = true;
+       }
+
+       if (sctx->do_update_shaders && !si_update_shaders(sctx))
+               return;
+
+       if (!si_upload_graphics_shader_descriptors(sctx))
                return;
 
        if (info->indexed) {
@@ -780,8 +927,12 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                        si_get_draw_start_count(sctx, info, &start, &count);
                        start_offset = start * ib.index_size;
 
-                       u_upload_alloc(sctx->b.uploader, start_offset, count * 2,
+                       u_upload_alloc(sctx->b.uploader, start_offset, count * 2, 256,
                                       &out_offset, &out_buffer, &ptr);
+                       if (!out_buffer) {
+                               pipe_resource_reference(&ib.buffer, NULL);
+                               return;
+                       }
 
                        util_shorten_ubyte_elts_to_userptr(&sctx->b.b, &ib, 0,
                                                           ib.offset + start_offset,
@@ -800,17 +951,19 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                        start_offset = start * ib.index_size;
 
                        u_upload_data(sctx->b.uploader, start_offset, count * ib.index_size,
-                                     (char*)ib.user_buffer + start_offset,
+                                     256, (char*)ib.user_buffer + start_offset,
                                      &ib.offset, &ib.buffer);
+                       if (!ib.buffer)
+                               return;
                        /* info->start will be added by the drawing code */
                        ib.offset -= start_offset;
                }
        }
 
-       /* TODO: VI should read index buffers through TC, so this shouldn't be
-        * needed on VI. */
-       if (info->indexed && r600_resource(ib.buffer)->TC_L2_dirty) {
-               sctx->b.flags |= SI_CONTEXT_INV_TC_L2;
+       /* VI reads index buffers through TC L2. */
+       if (info->indexed && sctx->b.chip_class <= CIK &&
+           r600_resource(ib.buffer)->TC_L2_dirty) {
+               sctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2;
                r600_resource(ib.buffer)->TC_L2_dirty = false;
        }
 
@@ -818,8 +971,21 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
        if (sctx->b.flags)
                si_mark_atom_dirty(sctx, sctx->atoms.s.cache_flush);
 
+       /* Add buffer sizes for memory checking in need_cs_space. */
+       if (sctx->emit_scratch_reloc && sctx->scratch_buffer)
+               r600_context_add_resource_size(ctx, &sctx->scratch_buffer->b.b);
+       if (info->indirect)
+               r600_context_add_resource_size(ctx, info->indirect);
+
        si_need_cs_space(sctx);
 
+       /* Since we've called r600_context_add_resource_size for vertex buffers,
+        * this must be called after si_need_cs_space, because we must let
+        * need_cs_space flush before we add buffers to the buffer list.
+        */
+       if (!si_upload_vertex_buffer_descriptors(sctx))
+               return;
+
        /* Emit states. */
        mask = sctx->dirty_atoms;
        while (mask) {
@@ -833,16 +999,22 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
        si_emit_scratch_reloc(sctx);
        si_emit_rasterizer_prim_state(sctx);
        si_emit_draw_registers(sctx, info);
+
+       si_ce_pre_draw_synchronization(sctx);
+
        si_emit_draw_packets(sctx, info, &ib);
 
+       si_ce_post_draw_synchronization(sctx);
+
        if (sctx->trace_buf)
                si_trace_emit(sctx);
 
        /* Workaround for a VGT hang when streamout is enabled.
         * It must be done after drawing. */
-       if ((sctx->b.family == CHIP_HAWAII || sctx->b.family == CHIP_TONGA) &&
-           (sctx->b.streamout.streamout_enabled ||
-            sctx->b.streamout.prims_gen_query_enabled)) {
+       if ((sctx->b.family == CHIP_HAWAII ||
+            sctx->b.family == CHIP_TONGA ||
+            sctx->b.family == CHIP_FIJI) &&
+           r600_get_strmout_en(&sctx->b)) {
                sctx->b.flags |= SI_CONTEXT_VGT_STREAMOUT_SYNC;
        }
 
@@ -852,6 +1024,9 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                struct r600_texture *rtex = (struct r600_texture *)surf->texture;
 
                rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+
+               if (rtex->surface.flags & RADEON_SURF_SBUFFER)
+                       rtex->stencil_dirty_level_mask |= 1 << surf->u.tex.level;
        }
        if (sctx->framebuffer.compressed_cb_mask) {
                struct pipe_surface *surf;
@@ -863,21 +1038,26 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                        surf = sctx->framebuffer.state.cbufs[i];
                        rtex = (struct r600_texture*)surf->texture;
 
-                       rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+                       if (rtex->fmask.size)
+                               rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+                       if (rtex->dcc_gather_statistics)
+                               rtex->separate_dcc_dirty = true;
                } while (mask);
        }
 
        pipe_resource_reference(&ib.buffer, NULL);
        sctx->b.num_draw_calls++;
+       if (G_0286E8_WAVESIZE(sctx->spi_tmpring_size))
+               sctx->b.num_spill_draw_calls++;
 }
 
 void si_trace_emit(struct si_context *sctx)
 {
-       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
 
        sctx->trace_id++;
-       radeon_add_to_buffer_list(&sctx->b, &sctx->b.rings.gfx, sctx->trace_buf,
-                             RADEON_USAGE_READWRITE, RADEON_PRIO_MIN);
+       radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx, sctx->trace_buf,
+                             RADEON_USAGE_READWRITE, RADEON_PRIO_TRACE);
        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) |