radeonsi: Don't modify PA_SC_RASTER_CONFIG register value if rb_mask == 0
[mesa.git] / src / gallium / drivers / radeonsi / si_state_draw.c
index 2881199d56d45d5d479aaf6046f361a8df38ff9e..f3d58c3e2ab0e23880709a24590649a2f4bf1e8c 100644 (file)
 #include "radeon/r600_cs.h"
 #include "sid.h"
 
-#include "util/u_format.h"
 #include "util/u_index_modify.h"
-#include "util/u_memory.h"
-#include "util/u_prim.h"
 #include "util/u_upload_mgr.h"
 
-/*
- * Shaders
- */
-
-static void si_shader_es(struct pipe_context *ctx, struct si_shader *shader)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
-       struct si_pm4_state *pm4;
-       unsigned num_sgprs, num_user_sgprs;
-       unsigned vgpr_comp_cnt;
-       uint64_t va;
-
-       si_pm4_delete_state(sctx, es, shader->pm4);
-       pm4 = shader->pm4 = si_pm4_alloc_state(sctx);
-
-       if (pm4 == NULL)
-               return;
-
-       va = shader->bo->gpu_address;
-       si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ, RADEON_PRIO_SHADER_DATA);
-
-       vgpr_comp_cnt = shader->uses_instanceid ? 3 : 0;
-
-       num_user_sgprs = SI_VS_NUM_USER_SGPR;
-       num_sgprs = shader->num_sgprs;
-       /* One SGPR after user SGPRs is pre-loaded with es2gs_offset */
-       if ((num_user_sgprs + 1) > num_sgprs) {
-               /* Last 2 reserved SGPRs are used for VCC */
-               num_sgprs = num_user_sgprs + 1 + 2;
-       }
-       assert(num_sgprs <= 104);
-
-       si_pm4_set_reg(pm4, R_00B320_SPI_SHADER_PGM_LO_ES, va >> 8);
-       si_pm4_set_reg(pm4, R_00B324_SPI_SHADER_PGM_HI_ES, va >> 40);
-       si_pm4_set_reg(pm4, R_00B328_SPI_SHADER_PGM_RSRC1_ES,
-                      S_00B328_VGPRS((shader->num_vgprs - 1) / 4) |
-                      S_00B328_SGPRS((num_sgprs - 1) / 8) |
-                      S_00B328_VGPR_COMP_CNT(vgpr_comp_cnt));
-       si_pm4_set_reg(pm4, R_00B32C_SPI_SHADER_PGM_RSRC2_ES,
-                      S_00B32C_USER_SGPR(num_user_sgprs));
-
-       sctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;
-}
-
-static void si_shader_gs(struct pipe_context *ctx, struct si_shader *shader)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
-       unsigned gs_vert_itemsize = shader->noutput * (16 >> 2);
-       unsigned gs_max_vert_out = shader->selector->gs_max_out_vertices;
-       unsigned gsvs_itemsize = gs_vert_itemsize * gs_max_vert_out;
-       unsigned cut_mode;
-       struct si_pm4_state *pm4;
-       unsigned num_sgprs, num_user_sgprs;
-       uint64_t va;
-
-       /* The GSVS_RING_ITEMSIZE register takes 15 bits */
-       assert(gsvs_itemsize < (1 << 15));
-
-       si_pm4_delete_state(sctx, gs, shader->pm4);
-       pm4 = shader->pm4 = si_pm4_alloc_state(sctx);
-
-       if (pm4 == NULL)
-               return;
-
-       if (gs_max_vert_out <= 128) {
-               cut_mode = V_028A40_GS_CUT_128;
-       } else if (gs_max_vert_out <= 256) {
-               cut_mode = V_028A40_GS_CUT_256;
-       } else if (gs_max_vert_out <= 512) {
-               cut_mode = V_028A40_GS_CUT_512;
-       } else {
-               assert(gs_max_vert_out <= 1024);
-               cut_mode = V_028A40_GS_CUT_1024;
-       }
-
-       si_pm4_set_reg(pm4, R_028A40_VGT_GS_MODE,
-                      S_028A40_MODE(V_028A40_GS_SCENARIO_G) |
-                      S_028A40_CUT_MODE(cut_mode)|
-                      S_028A40_ES_WRITE_OPTIMIZE(1) |
-                      S_028A40_GS_WRITE_OPTIMIZE(1));
-
-       si_pm4_set_reg(pm4, R_028A60_VGT_GSVS_RING_OFFSET_1, gsvs_itemsize);
-       si_pm4_set_reg(pm4, R_028A64_VGT_GSVS_RING_OFFSET_2, gsvs_itemsize);
-       si_pm4_set_reg(pm4, R_028A68_VGT_GSVS_RING_OFFSET_3, gsvs_itemsize);
-
-       si_pm4_set_reg(pm4, R_028AAC_VGT_ESGS_RING_ITEMSIZE,
-                      util_bitcount64(shader->selector->gs_used_inputs) * (16 >> 2));
-       si_pm4_set_reg(pm4, R_028AB0_VGT_GSVS_RING_ITEMSIZE, gsvs_itemsize);
-
-       si_pm4_set_reg(pm4, R_028B38_VGT_GS_MAX_VERT_OUT, gs_max_vert_out);
-
-       si_pm4_set_reg(pm4, R_028B5C_VGT_GS_VERT_ITEMSIZE, gs_vert_itemsize);
-
-       va = shader->bo->gpu_address;
-       si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ, RADEON_PRIO_SHADER_DATA);
-       si_pm4_set_reg(pm4, R_00B220_SPI_SHADER_PGM_LO_GS, va >> 8);
-       si_pm4_set_reg(pm4, R_00B224_SPI_SHADER_PGM_HI_GS, va >> 40);
-
-       num_user_sgprs = SI_GS_NUM_USER_SGPR;
-       num_sgprs = shader->num_sgprs;
-       /* Two SGPRs after user SGPRs are pre-loaded with gs2vs_offset, gs_wave_id */
-       if ((num_user_sgprs + 2) > num_sgprs) {
-               /* Last 2 reserved SGPRs are used for VCC */
-               num_sgprs = num_user_sgprs + 2 + 2;
-       }
-       assert(num_sgprs <= 104);
-
-       si_pm4_set_reg(pm4, R_00B228_SPI_SHADER_PGM_RSRC1_GS,
-                      S_00B228_VGPRS((shader->num_vgprs - 1) / 4) |
-                      S_00B228_SGPRS((num_sgprs - 1) / 8));
-       si_pm4_set_reg(pm4, R_00B22C_SPI_SHADER_PGM_RSRC2_GS,
-                      S_00B22C_USER_SGPR(num_user_sgprs));
-
-       sctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;
-}
-
-static void si_shader_vs(struct pipe_context *ctx, struct si_shader *shader)
-{
-       struct si_context *sctx = (struct si_context *)ctx;
-       struct si_pm4_state *pm4;
-       unsigned num_sgprs, num_user_sgprs;
-       unsigned nparams, i, vgpr_comp_cnt;
-       uint64_t va;
-
-       si_pm4_delete_state(sctx, vs, shader->pm4);
-       pm4 = shader->pm4 = si_pm4_alloc_state(sctx);
-
-       if (pm4 == NULL)
-               return;
-
-       va = shader->bo->gpu_address;
-       si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ, RADEON_PRIO_SHADER_DATA);
-
-       vgpr_comp_cnt = shader->uses_instanceid ? 3 : 0;
-
-       num_user_sgprs = SI_VS_NUM_USER_SGPR;
-       num_sgprs = shader->num_sgprs;
-       if (num_user_sgprs > num_sgprs) {
-               /* Last 2 reserved SGPRs are used for VCC */
-               num_sgprs = num_user_sgprs + 2;
-       }
-       assert(num_sgprs <= 104);
-
-       /* Certain attributes (position, psize, etc.) don't count as params.
-        * VS is required to export at least one param and r600_shader_from_tgsi()
-        * takes care of adding a dummy export.
-        */
-       for (nparams = 0, i = 0 ; i < shader->noutput; i++) {
-               switch (shader->output[i].name) {
-               case TGSI_SEMANTIC_CLIPVERTEX:
-               case TGSI_SEMANTIC_POSITION:
-               case TGSI_SEMANTIC_PSIZE:
-                       break;
-               default:
-                       nparams++;
-               }
-       }
-       if (nparams < 1)
-               nparams = 1;
-
-       si_pm4_set_reg(pm4, R_0286C4_SPI_VS_OUT_CONFIG,
-                      S_0286C4_VS_EXPORT_COUNT(nparams - 1));
-
-       si_pm4_set_reg(pm4, R_02870C_SPI_SHADER_POS_FORMAT,
-                      S_02870C_POS0_EXPORT_FORMAT(V_02870C_SPI_SHADER_4COMP) |
-                      S_02870C_POS1_EXPORT_FORMAT(shader->nr_pos_exports > 1 ?
-                                                  V_02870C_SPI_SHADER_4COMP :
-                                                  V_02870C_SPI_SHADER_NONE) |
-                      S_02870C_POS2_EXPORT_FORMAT(shader->nr_pos_exports > 2 ?
-                                                  V_02870C_SPI_SHADER_4COMP :
-                                                  V_02870C_SPI_SHADER_NONE) |
-                      S_02870C_POS3_EXPORT_FORMAT(shader->nr_pos_exports > 3 ?
-                                                  V_02870C_SPI_SHADER_4COMP :
-                                                  V_02870C_SPI_SHADER_NONE));
-
-       si_pm4_set_reg(pm4, R_00B120_SPI_SHADER_PGM_LO_VS, va >> 8);
-       si_pm4_set_reg(pm4, R_00B124_SPI_SHADER_PGM_HI_VS, va >> 40);
-       si_pm4_set_reg(pm4, R_00B128_SPI_SHADER_PGM_RSRC1_VS,
-                      S_00B128_VGPRS((shader->num_vgprs - 1) / 4) |
-                      S_00B128_SGPRS((num_sgprs - 1) / 8) |
-                      S_00B128_VGPR_COMP_CNT(vgpr_comp_cnt));
-       si_pm4_set_reg(pm4, R_00B12C_SPI_SHADER_PGM_RSRC2_VS,
-                      S_00B12C_USER_SGPR(num_user_sgprs) |
-                      S_00B12C_SO_BASE0_EN(!!shader->selector->so.stride[0]) |
-                      S_00B12C_SO_BASE1_EN(!!shader->selector->so.stride[1]) |
-                      S_00B12C_SO_BASE2_EN(!!shader->selector->so.stride[2]) |
-                      S_00B12C_SO_BASE3_EN(!!shader->selector->so.stride[3]) |
-                      S_00B12C_SO_EN(!!shader->selector->so.num_outputs));
-
-       sctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;
-}
-
-static void si_shader_ps(struct pipe_context *ctx, struct si_shader *shader)
+static void si_decompress_textures(struct si_context *sctx)
 {
-       struct si_context *sctx = (struct si_context *)ctx;
-       struct si_pm4_state *pm4;
-       unsigned i, spi_ps_in_control;
-       unsigned num_sgprs, num_user_sgprs;
-       unsigned spi_baryc_cntl = 0, spi_ps_input_ena;
-       uint64_t va;
-
-       si_pm4_delete_state(sctx, ps, shader->pm4);
-       pm4 = shader->pm4 = si_pm4_alloc_state(sctx);
-
-       if (pm4 == NULL)
-               return;
-
-       for (i = 0; i < shader->ninput; i++) {
-               switch (shader->input[i].name) {
-               case TGSI_SEMANTIC_POSITION:
-                       if (shader->input[i].centroid) {
-                               /* SPI_BARYC_CNTL.POS_FLOAT_LOCATION
-                                * Possible vaules:
-                                * 0 -> Position = pixel center (default)
-                                * 1 -> Position = pixel centroid
-                                * 2 -> Position = iterated sample number XXX:
-                                *                        What does this mean?
-                                */
-                               spi_baryc_cntl |= S_0286E0_POS_FLOAT_LOCATION(1);
+       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]);
                        }
-                       /* Fall through */
-               case TGSI_SEMANTIC_FACE:
-                       continue;
                }
        }
-
-       spi_ps_in_control = S_0286D8_NUM_INTERP(shader->nparam) |
-               S_0286D8_BC_OPTIMIZE_DISABLE(1);
-
-       si_pm4_set_reg(pm4, R_0286E0_SPI_BARYC_CNTL, spi_baryc_cntl);
-       spi_ps_input_ena = shader->spi_ps_input_ena;
-       /* we need to enable at least one of them, otherwise we hang the GPU */
-       assert(G_0286CC_PERSP_SAMPLE_ENA(spi_ps_input_ena) ||
-           G_0286CC_PERSP_CENTER_ENA(spi_ps_input_ena) ||
-           G_0286CC_PERSP_CENTROID_ENA(spi_ps_input_ena) ||
-           G_0286CC_PERSP_PULL_MODEL_ENA(spi_ps_input_ena) ||
-           G_0286CC_LINEAR_SAMPLE_ENA(spi_ps_input_ena) ||
-           G_0286CC_LINEAR_CENTER_ENA(spi_ps_input_ena) ||
-           G_0286CC_LINEAR_CENTROID_ENA(spi_ps_input_ena) ||
-           G_0286CC_LINE_STIPPLE_TEX_ENA(spi_ps_input_ena));
-
-       si_pm4_set_reg(pm4, R_0286CC_SPI_PS_INPUT_ENA, spi_ps_input_ena);
-       si_pm4_set_reg(pm4, R_0286D0_SPI_PS_INPUT_ADDR, spi_ps_input_ena);
-       si_pm4_set_reg(pm4, R_0286D8_SPI_PS_IN_CONTROL, spi_ps_in_control);
-
-       si_pm4_set_reg(pm4, R_028710_SPI_SHADER_Z_FORMAT, shader->spi_shader_z_format);
-       si_pm4_set_reg(pm4, R_028714_SPI_SHADER_COL_FORMAT,
-                      shader->spi_shader_col_format);
-       si_pm4_set_reg(pm4, R_02823C_CB_SHADER_MASK, shader->cb_shader_mask);
-
-       va = shader->bo->gpu_address;
-       si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ, RADEON_PRIO_SHADER_DATA);
-       si_pm4_set_reg(pm4, R_00B020_SPI_SHADER_PGM_LO_PS, va >> 8);
-       si_pm4_set_reg(pm4, R_00B024_SPI_SHADER_PGM_HI_PS, va >> 40);
-
-       num_user_sgprs = SI_PS_NUM_USER_SGPR;
-       num_sgprs = shader->num_sgprs;
-       /* One SGPR after user SGPRs is pre-loaded with {prim_mask, lds_offset} */
-       if ((num_user_sgprs + 1) > num_sgprs) {
-               /* Last 2 reserved SGPRs are used for VCC */
-               num_sgprs = num_user_sgprs + 1 + 2;
-       }
-       assert(num_sgprs <= 104);
-
-       si_pm4_set_reg(pm4, R_00B028_SPI_SHADER_PGM_RSRC1_PS,
-                      S_00B028_VGPRS((shader->num_vgprs - 1) / 4) |
-                      S_00B028_SGPRS((num_sgprs - 1) / 8));
-       si_pm4_set_reg(pm4, R_00B02C_SPI_SHADER_PGM_RSRC2_PS,
-                      S_00B02C_EXTRA_LDS_SIZE(shader->lds_size) |
-                      S_00B02C_USER_SGPR(num_user_sgprs));
-
-       sctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;
 }
 
-/*
- * Drawing
- */
-
-static unsigned si_conv_pipe_prim(unsigned pprim)
+static unsigned si_conv_pipe_prim(unsigned mode)
 {
         static const unsigned prim_conv[] = {
                [PIPE_PRIM_POINTS]                      = V_008958_DI_PT_POINTLIST,
@@ -332,11 +66,8 @@ static unsigned si_conv_pipe_prim(unsigned pprim)
                [PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY]    = V_008958_DI_PT_TRISTRIP_ADJ,
                [R600_PRIM_RECTANGLE_LIST]              = V_008958_DI_PT_RECTLIST
         };
-       unsigned result = prim_conv[pprim];
-        if (result == ~0) {
-               R600_ERR("unsupported primitive type %d\n", pprim);
-        }
-       return result;
+       assert(mode < Elements(prim_conv));
+       return prim_conv[mode];
 }
 
 static unsigned si_conv_prim_to_gs_out(unsigned mode)
@@ -418,370 +149,218 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
                S_028AA8_WD_SWITCH_ON_EOP(sctx->b.chip_class >= CIK ? wd_switch_on_eop : 0);
 }
 
-static bool si_update_draw_info_state(struct si_context *sctx,
-                                     const struct pipe_draw_info *info,
-                                     const struct pipe_index_buffer *ib)
+static void si_emit_rasterizer_prim_state(struct si_context *sctx, unsigned mode)
 {
-       struct si_pm4_state *pm4 = si_pm4_alloc_state(sctx);
-       struct si_shader *vs = si_get_vs_state(sctx);
-       unsigned prim = si_conv_pipe_prim(info->mode);
-       unsigned gs_out_prim =
-               si_conv_prim_to_gs_out(sctx->gs_shader ?
-                                      sctx->gs_shader->gs_output_prim :
-                                      info->mode);
-       unsigned ls_mask = 0;
-       unsigned ia_multi_vgt_param = si_get_ia_multi_vgt_param(sctx, info);
+       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
 
-       if (pm4 == NULL)
-               return false;
+       if (sctx->gs_shader)
+               mode = sctx->gs_shader->gs_output_prim;
 
-       if (prim == ~0) {
-               FREE(pm4);
-               return false;
-       }
+       if (mode == sctx->last_rast_prim)
+               return;
 
-       if (sctx->b.chip_class >= CIK) {
-               si_pm4_set_reg(pm4, R_028B74_VGT_DISPATCH_DRAW_INDEX,
-                              ib->index_size == 4 ? 0xFC000000 : 0xFC00);
-
-               si_pm4_cmd_begin(pm4, PKT3_DRAW_PREAMBLE);
-               si_pm4_cmd_add(pm4, prim); /* VGT_PRIMITIVE_TYPE */
-               si_pm4_cmd_add(pm4, ia_multi_vgt_param); /* IA_MULTI_VGT_PARAM */
-               si_pm4_cmd_add(pm4, 0); /* VGT_LS_HS_CONFIG */
-               si_pm4_cmd_end(pm4, false);
-       } else {
-               si_pm4_set_reg(pm4, R_008958_VGT_PRIMITIVE_TYPE, prim);
-               si_pm4_set_reg(pm4, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param);
-       }
+       r600_write_context_reg(cs, R_028A0C_PA_SC_LINE_STIPPLE,
+               sctx->pa_sc_line_stipple |
+               S_028A0C_AUTO_RESET_CNTL(mode == PIPE_PRIM_LINES ? 1 :
+                                        mode == PIPE_PRIM_LINE_STRIP ? 2 : 0));
 
-       si_pm4_set_reg(pm4, R_028A6C_VGT_GS_OUT_PRIM_TYPE, gs_out_prim);
-       si_pm4_set_reg(pm4, R_02840C_VGT_MULTI_PRIM_IB_RESET_INDX, info->restart_index);
-       si_pm4_set_reg(pm4, R_028A94_VGT_MULTI_PRIM_IB_RESET_EN, info->primitive_restart);
-
-        if (prim == V_008958_DI_PT_LINELIST)
-                ls_mask = 1;
-        else if (prim == V_008958_DI_PT_LINESTRIP)
-                ls_mask = 2;
-       si_pm4_set_reg(pm4, R_028A0C_PA_SC_LINE_STIPPLE,
-                      S_028A0C_AUTO_RESET_CNTL(ls_mask) |
-                      sctx->pa_sc_line_stipple);
-
-        if (info->mode == PIPE_PRIM_QUADS || info->mode == PIPE_PRIM_QUAD_STRIP || info->mode == PIPE_PRIM_POLYGON) {
-               si_pm4_set_reg(pm4, R_028814_PA_SU_SC_MODE_CNTL,
-                              S_028814_PROVOKING_VTX_LAST(1) | sctx->pa_su_sc_mode_cntl);
-        } else {
-               si_pm4_set_reg(pm4, R_028814_PA_SU_SC_MODE_CNTL, sctx->pa_su_sc_mode_cntl);
-        }
-       si_pm4_set_reg(pm4, R_02881C_PA_CL_VS_OUT_CNTL,
-                      S_02881C_USE_VTX_POINT_SIZE(vs->vs_out_point_size) |
-                      S_02881C_USE_VTX_EDGE_FLAG(vs->vs_out_edgeflag) |
-                      S_02881C_USE_VTX_RENDER_TARGET_INDX(vs->vs_out_layer) |
-                      S_02881C_VS_OUT_CCDIST0_VEC_ENA((vs->clip_dist_write & 0x0F) != 0) |
-                      S_02881C_VS_OUT_CCDIST1_VEC_ENA((vs->clip_dist_write & 0xF0) != 0) |
-                      S_02881C_VS_OUT_MISC_VEC_ENA(vs->vs_out_misc_write) |
-                      (sctx->queued.named.rasterizer->clip_plane_enable &
-                       vs->clip_dist_write));
-       si_pm4_set_reg(pm4, R_028810_PA_CL_CLIP_CNTL,
-                      sctx->queued.named.rasterizer->pa_cl_clip_cntl |
-                      (vs->clip_dist_write ? 0 :
-                       sctx->queued.named.rasterizer->clip_plane_enable & 0x3F));
-
-       si_pm4_set_state(sctx, draw_info, pm4);
-       return true;
+       r600_write_context_reg(cs, R_028814_PA_SU_SC_MODE_CNTL,
+               sctx->pa_su_sc_mode_cntl |
+               S_028814_PROVOKING_VTX_LAST(mode == PIPE_PRIM_QUADS ||
+                                           mode == PIPE_PRIM_QUAD_STRIP ||
+                                           mode == PIPE_PRIM_POLYGON));
+
+       sctx->last_rast_prim = mode;
 }
 
-static void si_update_spi_map(struct si_context *sctx)
+static void si_emit_draw_registers(struct si_context *sctx,
+                                  const struct pipe_draw_info *info,
+                                  const struct pipe_index_buffer *ib)
 {
-       struct si_shader *ps = sctx->ps_shader->current;
-       struct si_shader *vs = si_get_vs_state(sctx);
-       struct si_pm4_state *pm4 = si_pm4_alloc_state(sctx);
-       unsigned i, j, tmp;
-
-       for (i = 0; i < ps->ninput; i++) {
-               unsigned name = ps->input[i].name;
-               unsigned param_offset = ps->input[i].param_offset;
-
-               if (name == TGSI_SEMANTIC_POSITION)
-                       /* Read from preloaded VGPRs, not parameters */
-                       continue;
-
-bcolor:
-               tmp = 0;
-
-               if (ps->input[i].interpolate == TGSI_INTERPOLATE_CONSTANT ||
-                   (ps->input[i].interpolate == TGSI_INTERPOLATE_COLOR &&
-                    sctx->ps_shader->current->key.ps.flatshade)) {
-                       tmp |= S_028644_FLAT_SHADE(1);
-               }
-
-               if (name == TGSI_SEMANTIC_GENERIC &&
-                   sctx->sprite_coord_enable & (1 << ps->input[i].sid)) {
-                       tmp |= S_028644_PT_SPRITE_TEX(1);
-               }
+       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       unsigned prim = si_conv_pipe_prim(info->mode);
+       unsigned gs_out_prim =
+               si_conv_prim_to_gs_out(sctx->gs_shader ?
+                                      sctx->gs_shader->gs_output_prim :
+                                      info->mode);
+       unsigned ia_multi_vgt_param = si_get_ia_multi_vgt_param(sctx, info);
 
-               for (j = 0; j < vs->noutput; j++) {
-                       if (name == vs->output[j].name &&
-                           ps->input[i].sid == vs->output[j].sid) {
-                               tmp |= S_028644_OFFSET(vs->output[j].param_offset);
-                               break;
-                       }
+       /* Draw state. */
+       if (prim != sctx->last_prim ||
+           ia_multi_vgt_param != sctx->last_multi_vgt_param) {
+               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, 0); /* VGT_LS_HS_CONFIG */
+               } else {
+                       r600_write_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE, prim);
+                       r600_write_context_reg(cs, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param);
                }
+               sctx->last_prim = prim;
+               sctx->last_multi_vgt_param = ia_multi_vgt_param;
+       }
 
-               if (j == vs->noutput) {
-                       /* No corresponding output found, load defaults into input */
-                       tmp |= S_028644_OFFSET(0x20);
-               }
+       if (gs_out_prim != sctx->last_gs_out_prim) {
+               r600_write_context_reg(cs, R_028A6C_VGT_GS_OUT_PRIM_TYPE, gs_out_prim);
+               sctx->last_gs_out_prim = gs_out_prim;
+       }
 
-               si_pm4_set_reg(pm4,
-                              R_028644_SPI_PS_INPUT_CNTL_0 + param_offset * 4,
-                              tmp);
+       /* Primitive restart. */
+       if (info->primitive_restart != sctx->last_primitive_restart_en) {
+               r600_write_context_reg(cs, R_028A94_VGT_MULTI_PRIM_IB_RESET_EN, info->primitive_restart);
+               sctx->last_primitive_restart_en = info->primitive_restart;
 
-               if (name == TGSI_SEMANTIC_COLOR &&
-                   sctx->ps_shader->current->key.ps.color_two_side) {
-                       name = TGSI_SEMANTIC_BCOLOR;
-                       param_offset++;
-                       goto bcolor;
+               if (info->primitive_restart &&
+                   (info->restart_index != sctx->last_restart_index ||
+                    sctx->last_restart_index == SI_RESTART_INDEX_UNKNOWN)) {
+                       r600_write_context_reg(cs, R_02840C_VGT_MULTI_PRIM_IB_RESET_INDX,
+                                              info->restart_index);
+                       sctx->last_restart_index = info->restart_index;
                }
        }
-
-       si_pm4_set_state(sctx, spi, pm4);
 }
 
-/* Initialize state related to ESGS / GSVS ring buffers */
-static void si_init_gs_rings(struct si_context *sctx)
+static void si_emit_draw_packets(struct si_context *sctx,
+                                const struct pipe_draw_info *info,
+                                const struct pipe_index_buffer *ib)
 {
-       unsigned esgs_ring_size = 128 * 1024;
-       unsigned gsvs_ring_size = 64 * 1024 * 1024;
+       struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs;
+       unsigned sh_base_reg = (sctx->gs_shader ? R_00B330_SPI_SHADER_USER_DATA_ES_0 :
+                                                 R_00B130_SPI_SHADER_USER_DATA_VS_0);
 
-       assert(!sctx->gs_rings);
-       sctx->gs_rings = si_pm4_alloc_state(sctx);
+       if (info->count_from_stream_output) {
+               struct r600_so_target *t =
+                       (struct r600_so_target*)info->count_from_stream_output;
+               uint64_t va = t->buf_filled_size->gpu_address +
+                             t->buf_filled_size_offset;
 
-       sctx->esgs_ring = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM,
-                                      PIPE_USAGE_DEFAULT, esgs_ring_size);
+               r600_write_context_reg(cs, R_028B30_VGT_STRMOUT_DRAW_OPAQUE_VERTEX_STRIDE,
+                                      t->stride_in_dw);
 
-       sctx->gsvs_ring = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM,
-                                            PIPE_USAGE_DEFAULT, gsvs_ring_size);
+               radeon_emit(cs, PKT3(PKT3_COPY_DATA, 4, 0));
+               radeon_emit(cs, COPY_DATA_SRC_SEL(COPY_DATA_MEM) |
+                           COPY_DATA_DST_SEL(COPY_DATA_REG) |
+                           COPY_DATA_WR_CONFIRM);
+               radeon_emit(cs, va);     /* src address lo */
+               radeon_emit(cs, va >> 32); /* src address hi */
+               radeon_emit(cs, R_028B2C_VGT_STRMOUT_DRAW_OPAQUE_BUFFER_FILLED_SIZE >> 2);
+               radeon_emit(cs, 0); /* unused */
 
-       if (sctx->b.chip_class >= CIK) {
-               si_pm4_set_reg(sctx->gs_rings, R_030900_VGT_ESGS_RING_SIZE,
-                              esgs_ring_size / 256);
-               si_pm4_set_reg(sctx->gs_rings, R_030904_VGT_GSVS_RING_SIZE,
-                              gsvs_ring_size / 256);
-       } else {
-               si_pm4_set_reg(sctx->gs_rings, R_0088C8_VGT_ESGS_RING_SIZE,
-                              esgs_ring_size / 256);
-               si_pm4_set_reg(sctx->gs_rings, R_0088CC_VGT_GSVS_RING_SIZE,
-                              gsvs_ring_size / 256);
+               r600_context_bo_reloc(&sctx->b, &sctx->b.rings.gfx,
+                                     t->buf_filled_size, RADEON_USAGE_READ,
+                                     RADEON_PRIO_MIN);
        }
 
-       si_set_ring_buffer(&sctx->b.b, PIPE_SHADER_VERTEX, SI_RING_ESGS,
-                          sctx->esgs_ring, 0, esgs_ring_size,
-                          true, true, 4, 64);
-       si_set_ring_buffer(&sctx->b.b, PIPE_SHADER_GEOMETRY, SI_RING_ESGS,
-                          sctx->esgs_ring, 0, esgs_ring_size,
-                          false, false, 0, 0);
-       si_set_ring_buffer(&sctx->b.b, PIPE_SHADER_VERTEX, SI_RING_GSVS,
-                          sctx->gsvs_ring, 0, gsvs_ring_size,
-                          false, false, 0, 0);
-}
-
-static void si_update_derived_state(struct si_context *sctx)
-{
-       struct pipe_context * ctx = (struct pipe_context*)sctx;
+       /* draw packet */
+       if (info->indexed) {
+               radeon_emit(cs, PKT3(PKT3_INDEX_TYPE, 0, 0));
 
-       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]);
-                       }
+               if (ib->index_size == 4) {
+                       radeon_emit(cs, V_028A7C_VGT_INDEX_32 | (SI_BIG_ENDIAN ?
+                                       V_028A7C_VGT_DMA_SWAP_32_BIT : 0));
+               } else {
+                       radeon_emit(cs, V_028A7C_VGT_INDEX_16 | (SI_BIG_ENDIAN ?
+                                       V_028A7C_VGT_DMA_SWAP_16_BIT : 0));
                }
        }
 
-       if (sctx->gs_shader) {
-               si_shader_select(ctx, sctx->gs_shader);
-
-               if (!sctx->gs_shader->current->pm4) {
-                       si_shader_gs(ctx, sctx->gs_shader->current);
-                       si_shader_vs(ctx, sctx->gs_shader->current->gs_copy_shader);
-               }
-
-               si_pm4_bind_state(sctx, gs, sctx->gs_shader->current->pm4);
-               si_pm4_bind_state(sctx, vs, sctx->gs_shader->current->gs_copy_shader->pm4);
-
-               sctx->b.streamout.stride_in_dw = sctx->gs_shader->so.stride;
-
-               si_shader_select(ctx, sctx->vs_shader);
-
-               if (!sctx->vs_shader->current->pm4)
-                       si_shader_es(ctx, sctx->vs_shader->current);
-
-               si_pm4_bind_state(sctx, es, sctx->vs_shader->current->pm4);
+       if (!info->indirect) {
+               int base_vertex;
 
-               if (!sctx->gs_rings)
-                       si_init_gs_rings(sctx);
-               if (sctx->emitted.named.gs_rings != sctx->gs_rings)
-                       sctx->b.flags |= R600_CONTEXT_VGT_FLUSH;
-               si_pm4_bind_state(sctx, gs_rings, sctx->gs_rings);
+               radeon_emit(cs, PKT3(PKT3_NUM_INSTANCES, 0, 0));
+               radeon_emit(cs, info->instance_count);
 
-               si_set_ring_buffer(ctx, PIPE_SHADER_GEOMETRY, SI_RING_GSVS,
-                                  sctx->gsvs_ring,
-                                  sctx->gs_shader->gs_max_out_vertices *
-                                  sctx->gs_shader->current->noutput * 16,
-                                  64, true, true, 4, 16);
+               /* Base vertex and start instance. */
+               base_vertex = info->indexed ? info->index_bias : info->start;
 
-               if (!sctx->gs_on) {
-                       sctx->gs_on = si_pm4_alloc_state(sctx);
+               if (base_vertex != sctx->last_base_vertex ||
+                   sctx->last_base_vertex == SI_BASE_VERTEX_UNKNOWN ||
+                   info->start_instance != sctx->last_start_instance ||
+                   sh_base_reg != sctx->last_sh_base_reg) {
+                       si_write_sh_reg_seq(cs, sh_base_reg + SI_SGPR_BASE_VERTEX * 4, 2);
+                       radeon_emit(cs, base_vertex);
+                       radeon_emit(cs, info->start_instance);
 
-                       si_pm4_set_reg(sctx->gs_on, R_028B54_VGT_SHADER_STAGES_EN,
-                                      S_028B54_ES_EN(V_028B54_ES_STAGE_REAL) |
-                                      S_028B54_GS_EN(1) |
-                                      S_028B54_VS_EN(V_028B54_VS_STAGE_COPY_SHADER));
+                       sctx->last_base_vertex = base_vertex;
+                       sctx->last_start_instance = info->start_instance;
+                       sctx->last_sh_base_reg = sh_base_reg;
                }
-               si_pm4_bind_state(sctx, gs_onoff, sctx->gs_on);
        } else {
-               si_shader_select(ctx, sctx->vs_shader);
-
-               if (!sctx->vs_shader->current->pm4)
-                       si_shader_vs(ctx, sctx->vs_shader->current);
-
-               si_pm4_bind_state(sctx, vs, sctx->vs_shader->current->pm4);
-
-               sctx->b.streamout.stride_in_dw = sctx->vs_shader->so.stride;
-
-               if (!sctx->gs_off) {
-                       sctx->gs_off = si_pm4_alloc_state(sctx);
-
-                       si_pm4_set_reg(sctx->gs_off, R_028A40_VGT_GS_MODE, 0);
-                       si_pm4_set_reg(sctx->gs_off, R_028B54_VGT_SHADER_STAGES_EN, 0);
-               }
-               si_pm4_bind_state(sctx, gs_onoff, sctx->gs_off);
-               si_pm4_bind_state(sctx, gs_rings, NULL);
-               si_pm4_bind_state(sctx, gs, NULL);
-               si_pm4_bind_state(sctx, es, NULL);
-       }
-
-       si_shader_select(ctx, sctx->ps_shader);
+               si_invalidate_draw_sh_constants(sctx);
 
-       if (!sctx->ps_shader->current->pm4)
-               si_shader_ps(ctx, sctx->ps_shader->current);
-
-       si_pm4_bind_state(sctx, ps, sctx->ps_shader->current->pm4);
-
-       if (si_pm4_state_changed(sctx, ps) || si_pm4_state_changed(sctx, vs)) {
-               /* XXX: Emitting the PS state even when only the VS changed
-                * fixes random failures with piglit glsl-max-varyings.
-                * Not sure why...
-                */
-               sctx->emitted.named.ps = NULL;
-               si_update_spi_map(sctx);
+               r600_context_bo_reloc(&sctx->b, &sctx->b.rings.gfx,
+                                     (struct r600_resource *)info->indirect,
+                                     RADEON_USAGE_READ, RADEON_PRIO_MIN);
        }
 
-       if (sctx->ps_db_shader_control != sctx->ps_shader->current->db_shader_control) {
-               sctx->ps_db_shader_control = sctx->ps_shader->current->db_shader_control;
-               sctx->db_render_state.dirty = true;
-       }
-}
+       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;
 
-static void si_state_draw(struct si_context *sctx,
-                         const struct pipe_draw_info *info,
-                         const struct pipe_index_buffer *ib)
-{
-       unsigned sh_base_reg = (sctx->gs_shader ? R_00B330_SPI_SHADER_USER_DATA_ES_0 :
-                                                 R_00B130_SPI_SHADER_USER_DATA_VS_0);
-       struct si_pm4_state *pm4 = si_pm4_alloc_state(sctx);
+               r600_context_bo_reloc(&sctx->b, &sctx->b.rings.gfx,
+                                     (struct r600_resource *)ib->buffer,
+                                     RADEON_USAGE_READ, RADEON_PRIO_MIN);
 
-       if (pm4 == NULL)
-               return;
-
-       if (info->count_from_stream_output) {
-               struct r600_so_target *t =
-                       (struct r600_so_target*)info->count_from_stream_output;
-               uint64_t va = t->buf_filled_size->gpu_address +
-                             t->buf_filled_size_offset;
+               if (info->indirect) {
+                       uint64_t indirect_va = r600_resource(info->indirect)->gpu_address;
 
-               si_pm4_set_reg(pm4, R_028B30_VGT_STRMOUT_DRAW_OPAQUE_VERTEX_STRIDE,
-                              t->stride_in_dw);
-
-               si_pm4_cmd_begin(pm4, PKT3_COPY_DATA);
-               si_pm4_cmd_add(pm4,
-                              COPY_DATA_SRC_SEL(COPY_DATA_MEM) |
-                              COPY_DATA_DST_SEL(COPY_DATA_REG) |
-                              COPY_DATA_WR_CONFIRM);
-               si_pm4_cmd_add(pm4, va);     /* src address lo */
-               si_pm4_cmd_add(pm4, va >> 32UL); /* src address hi */
-               si_pm4_cmd_add(pm4, R_028B2C_VGT_STRMOUT_DRAW_OPAQUE_BUFFER_FILLED_SIZE >> 2);
-               si_pm4_cmd_add(pm4, 0); /* unused */
-               si_pm4_add_bo(pm4, t->buf_filled_size, RADEON_USAGE_READ,
-                             RADEON_PRIO_MIN);
-               si_pm4_cmd_end(pm4, true);
-       }
+                       assert(indirect_va % 8 == 0);
+                       assert(index_va % 2 == 0);
+                       assert(info->indirect_offset % 4 == 0);
 
-       /* draw packet */
-       si_pm4_cmd_begin(pm4, PKT3_INDEX_TYPE);
-       if (ib->index_size == 4) {
-               si_pm4_cmd_add(pm4, V_028A7C_VGT_INDEX_32 | (SI_BIG_ENDIAN ?
-                               V_028A7C_VGT_DMA_SWAP_32_BIT : 0));
-       } else {
-               si_pm4_cmd_add(pm4, V_028A7C_VGT_INDEX_16 | (SI_BIG_ENDIAN ?
-                               V_028A7C_VGT_DMA_SWAP_16_BIT : 0));
-       }
-       si_pm4_cmd_end(pm4, sctx->b.predicate_drawing);
-
-       if (!info->indirect) {
-               si_pm4_cmd_begin(pm4, PKT3_NUM_INSTANCES);
-               si_pm4_cmd_add(pm4, info->instance_count);
-               si_pm4_cmd_end(pm4, sctx->b.predicate_drawing);
-
-               si_pm4_set_reg(pm4, sh_base_reg + SI_SGPR_BASE_VERTEX * 4,
-                              info->indexed ? info->index_bias : info->start);
-               si_pm4_set_reg(pm4, sh_base_reg + SI_SGPR_START_INSTANCE * 4,
-                              info->start_instance);
-       } else {
-               si_pm4_add_bo(pm4, (struct r600_resource *)info->indirect,
-                             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->indexed) {
-               uint32_t max_size = (ib->buffer->width0 - ib->offset) /
-                                sctx->index_buffer.index_size;
-               uint64_t va = r600_resource(ib->buffer)->gpu_address + ib->offset;
+                       radeon_emit(cs, PKT3(PKT3_INDEX_BASE, 1, 0));
+                       radeon_emit(cs, index_va);
+                       radeon_emit(cs, index_va >> 32);
 
-               si_pm4_add_bo(pm4, (struct r600_resource *)ib->buffer, RADEON_USAGE_READ,
-                             RADEON_PRIO_MIN);
+                       radeon_emit(cs, PKT3(PKT3_INDEX_BUFFER_SIZE, 0, 0));
+                       radeon_emit(cs, index_max_size);
 
-               if (info->indirect) {
-                       uint64_t indirect_va = r600_resource(info->indirect)->gpu_address;
-                       si_cmd_draw_index_indirect(pm4, indirect_va, va, max_size,
-                                                  info->indirect_offset,
-                                                  sh_base_reg + SI_SGPR_BASE_VERTEX * 4,
-                                                  sh_base_reg + SI_SGPR_START_INSTANCE * 4,
-                                                  sctx->b.predicate_drawing);
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_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_DMA);
                } else {
-                       va += info->start * ib->index_size;
-                       si_cmd_draw_index_2(pm4, max_size, va, info->count,
-                                           V_0287F0_DI_SRC_SEL_DMA,
-                                           sctx->b.predicate_drawing);
+                       index_va += info->start * ib->index_size;
+
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_2, 4, sctx->b.predicate_drawing));
+                       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;
-                       si_cmd_draw_indirect(pm4, indirect_va, info->indirect_offset,
-                                            sh_base_reg + SI_SGPR_BASE_VERTEX * 4,
-                                            sh_base_reg + SI_SGPR_START_INSTANCE * 4,
-                                            sctx->b.predicate_drawing);
+
+                       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 {
-                       si_cmd_draw_index_auto(pm4, info->count,
-                                              V_0287F0_DI_SRC_SEL_AUTO_INDEX |
-                                              S_0287F0_USE_OPAQUE(!!info->count_from_stream_output),
-                                              sctx->b.predicate_drawing);
+                       radeon_emit(cs, PKT3(PKT3_DRAW_INDEX_AUTO, 1, sctx->b.predicate_drawing));
+                       radeon_emit(cs, info->count);
+                       radeon_emit(cs, V_0287F0_DI_SRC_SEL_AUTO_INDEX |
+                                   S_0287F0_USE_OPAQUE(!!info->count_from_stream_output));
                }
        }
-
-       si_pm4_set_state(sctx, draw, pm4);
 }
 
 void si_emit_cache_flush(struct r600_common_context *sctx, struct r600_atom *atom)
@@ -913,7 +492,8 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
        if (!sctx->ps_shader || !sctx->vs_shader)
                return;
 
-       si_update_derived_state(sctx);
+       si_decompress_textures(sctx);
+       si_update_shaders(sctx);
 
        if (sctx->vertex_buffers_dirty) {
                si_update_vertex_buffers(sctx);
@@ -963,13 +543,6 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                }
        }
 
-       if (!si_update_draw_info_state(sctx, info, &ib))
-               return;
-
-       si_state_draw(sctx, info, &ib);
-
-       sctx->pm4_dirty_cdwords += si_pm4_dirty_dw(sctx);
-
        /* Check flush flags. */
        if (sctx->b.flags)
                sctx->atoms.s.cache_flush->dirty = true;
@@ -985,7 +558,9 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
        }
 
        si_pm4_emit_dirty(sctx);
-       sctx->pm4_dirty_cdwords = 0;
+       si_emit_rasterizer_prim_state(sctx, info->mode);
+       si_emit_draw_registers(sctx, info, &ib);
+       si_emit_draw_packets(sctx, info, &ib);
 
 #if SI_TRACE_CS
        if (sctx->screen->b.trace_bo) {