r600g: adjust flush flags (v3)
[mesa.git] / src / gallium / drivers / r600 / r600_hw_context.c
index 20feb7a8973d9a60458bd1293058af0755f2f162..120d0fd354abe25989a8fc805ebf35e854220aee 100644 (file)
  * Authors:
  *      Jerome Glisse
  */
-#include "r600_hw_context_priv.h"
+#include "r600_pipe.h"
 #include "r600d.h"
 #include "util/u_memory.h"
 #include <errno.h>
+#include <unistd.h>
 
 /* Get backends mask */
 void r600_get_backend_mask(struct r600_context *ctx)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
        struct r600_resource *buffer;
        uint32_t *results;
        unsigned num_backends = ctx->screen->info.r600_num_backends;
@@ -71,11 +72,10 @@ void r600_get_backend_mask(struct r600_context *ctx)
                                   PIPE_USAGE_STAGING, ctx->max_db*16);
        if (!buffer)
                goto err;
-
        va = r600_resource_va(&ctx->screen->screen, (void*)buffer);
 
        /* initialize buffer with zeroes */
-       results = ctx->ws->buffer_map(buffer->cs_buf, ctx->cs, PIPE_TRANSFER_WRITE);
+       results = r600_buffer_mmap_sync_with_rings(ctx, buffer, PIPE_TRANSFER_WRITE);
        if (results) {
                memset(results, 0, ctx->max_db * 4 * 4);
                ctx->ws->buffer_unmap(buffer->cs_buf);
@@ -87,10 +87,10 @@ void r600_get_backend_mask(struct r600_context *ctx)
                cs->buf[cs->cdw++] = (va >> 32UL) & 0xFF;
 
                cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
-               cs->buf[cs->cdw++] = r600_context_bo_reloc(ctx, buffer, RADEON_USAGE_WRITE);
+               cs->buf[cs->cdw++] = r600_context_bo_reloc(ctx, &ctx->rings.gfx, buffer, RADEON_USAGE_WRITE);
 
                /* analyze results */
-               results = ctx->ws->buffer_map(buffer->cs_buf, ctx->cs, PIPE_TRANSFER_READ);
+               results = r600_buffer_mmap_sync_with_rings(ctx, buffer, PIPE_TRANSFER_READ);
                if (results) {
                        for(i = 0; i < ctx->max_db; i++) {
                                /* at least highest bit will be set if backend is used */
@@ -114,868 +114,172 @@ err:
        return;
 }
 
-static void r600_init_block(struct r600_context *ctx,
-                           struct r600_block *block,
-                           const struct r600_reg *reg, int index, int nreg,
-                           unsigned opcode, unsigned offset_base)
-{
-       int i = index;
-       int j, n = nreg;
-
-       /* initialize block */
-       block->flags = 0;
-       block->status |= R600_BLOCK_STATUS_DIRTY; /* dirty all blocks at start */
-       block->start_offset = reg[i].offset;
-       block->pm4[block->pm4_ndwords++] = PKT3(opcode, n, 0);
-       block->pm4[block->pm4_ndwords++] = (block->start_offset - offset_base) >> 2;
-       block->reg = &block->pm4[block->pm4_ndwords];
-       block->pm4_ndwords += n;
-       block->nreg = n;
-       block->nreg_dirty = n;
-       LIST_INITHEAD(&block->list);
-       LIST_INITHEAD(&block->enable_list);
-
-       for (j = 0; j < n; j++) {
-               if (reg[i+j].flags & REG_FLAG_DIRTY_ALWAYS) {
-                       block->flags |= REG_FLAG_DIRTY_ALWAYS;
-               }
-               if (reg[i+j].flags & REG_FLAG_ENABLE_ALWAYS) {
-                       if (!(block->status & R600_BLOCK_STATUS_ENABLED)) {
-                               block->status |= R600_BLOCK_STATUS_ENABLED;
-                               LIST_ADDTAIL(&block->enable_list, &ctx->enable_list);
-                               LIST_ADDTAIL(&block->list,&ctx->dirty);
-                       }
-               }
-               if (reg[i+j].flags & REG_FLAG_FLUSH_CHANGE) {
-                       block->flags |= REG_FLAG_FLUSH_CHANGE;
-               }
-
-               if (reg[i+j].flags & REG_FLAG_NEED_BO) {
-                       block->nbo++;
-                       assert(block->nbo < R600_BLOCK_MAX_BO);
-                       block->pm4_bo_index[j] = block->nbo;
-                       block->pm4[block->pm4_ndwords++] = PKT3(PKT3_NOP, 0, 0);
-                       block->pm4[block->pm4_ndwords++] = 0x00000000;
-                       block->reloc[block->nbo].bo_pm4_index = block->pm4_ndwords - 1;
-               }
-               if ((ctx->family > CHIP_R600) &&
-                   (ctx->family < CHIP_RV770) && reg[i+j].flags & REG_FLAG_RV6XX_SBU) {
-                       block->pm4[block->pm4_ndwords++] = PKT3(PKT3_SURFACE_BASE_UPDATE, 0, 0);
-                       block->pm4[block->pm4_ndwords++] = reg[i+j].sbu_flags;
-               }
-       }
-       /* check that we stay in limit */
-       assert(block->pm4_ndwords < R600_BLOCK_MAX_REG);
-}
-
-int r600_context_add_block(struct r600_context *ctx, const struct r600_reg *reg, unsigned nreg,
-                          unsigned opcode, unsigned offset_base)
-{
-       struct r600_block *block;
-       struct r600_range *range;
-       int offset;
-
-       for (unsigned i = 0, n = 0; i < nreg; i += n) {
-               /* ignore new block balise */
-               if (reg[i].offset == GROUP_FORCE_NEW_BLOCK) {
-                       n = 1;
-                       continue;
-               }
-
-               /* ignore regs not on R600 on R600 */
-               if ((reg[i].flags & REG_FLAG_NOT_R600) && ctx->family == CHIP_R600) {
-                       n = 1;
-                       continue;
-               }
-
-               /* register that need relocation are in their own group */
-               /* find number of consecutive registers */
-               n = 0;
-               offset = reg[i].offset;
-               while (reg[i + n].offset == offset) {
-                       n++;
-                       offset += 4;
-                       if ((n + i) >= nreg)
-                               break;
-                       if (n >= (R600_BLOCK_MAX_REG - 2))
-                               break;
-               }
-
-               /* allocate new block */
-               block = calloc(1, sizeof(struct r600_block));
-               if (block == NULL) {
-                       return -ENOMEM;
-               }
-               ctx->nblocks++;
-               for (int j = 0; j < n; j++) {
-                       range = &ctx->range[CTX_RANGE_ID(reg[i + j].offset)];
-                       /* create block table if it doesn't exist */
-                       if (!range->blocks)
-                               range->blocks = calloc(1 << HASH_SHIFT, sizeof(void *));
-                       if (!range->blocks)
-                               return -1;
-
-                       range->blocks[CTX_BLOCK_ID(reg[i + j].offset)] = block;
-               }
-
-               r600_init_block(ctx, block, reg, i, n, opcode, offset_base);
-
-       }
-       return 0;
-}
-
-/* R600/R700 configuration */
-static const struct r600_reg r600_config_reg_list[] = {
-       {R_008958_VGT_PRIMITIVE_TYPE, 0, 0},
-       {R_008B40_PA_SC_AA_SAMPLE_LOCS_2S, 0, 0},
-       {R_008B44_PA_SC_AA_SAMPLE_LOCS_4S, 0, 0},
-       {R_008B48_PA_SC_AA_SAMPLE_LOCS_8S_WD0, 0, 0},
-       {R_008B4C_PA_SC_AA_SAMPLE_LOCS_8S_WD1, 0, 0},
-       {R_008C04_SQ_GPR_RESOURCE_MGMT_1, REG_FLAG_ENABLE_ALWAYS | REG_FLAG_FLUSH_CHANGE, 0},
-};
-
-static const struct r600_reg r600_ctl_const_list[] = {
-       {R_03CFF4_SQ_VTX_START_INST_LOC, 0, 0},
-};
-
-static const struct r600_reg r600_context_reg_list[] = {
-       {R_028A4C_PA_SC_MODE_CNTL, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028040_CB_COLOR0_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(0)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280A0_CB_COLOR0_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028060_CB_COLOR0_SIZE, 0, 0},
-       {R_028080_CB_COLOR0_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280E0_CB_COLOR0_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280C0_CB_COLOR0_TILE, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028100_CB_COLOR0_MASK, 0, 0},
-       {R_028044_CB_COLOR1_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(1)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280A4_CB_COLOR1_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028064_CB_COLOR1_SIZE, 0, 0},
-       {R_028084_CB_COLOR1_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280E4_CB_COLOR1_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280C4_CB_COLOR1_TILE, REG_FLAG_NEED_BO, 0},
-       {R_028104_CB_COLOR1_MASK, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028048_CB_COLOR2_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(2)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280A8_CB_COLOR2_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028068_CB_COLOR2_SIZE, 0, 0},
-       {R_028088_CB_COLOR2_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280E8_CB_COLOR2_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280C8_CB_COLOR2_TILE, REG_FLAG_NEED_BO, 0},
-       {R_028108_CB_COLOR2_MASK, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_02804C_CB_COLOR3_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(3)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280AC_CB_COLOR3_INFO, REG_FLAG_NEED_BO, 0},
-       {R_02806C_CB_COLOR3_SIZE, 0, 0},
-       {R_02808C_CB_COLOR3_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280EC_CB_COLOR3_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280CC_CB_COLOR3_TILE, REG_FLAG_NEED_BO, 0},
-       {R_02810C_CB_COLOR3_MASK, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028050_CB_COLOR4_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(4)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280B0_CB_COLOR4_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028070_CB_COLOR4_SIZE, 0, 0},
-       {R_028090_CB_COLOR4_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280F0_CB_COLOR4_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280D0_CB_COLOR4_TILE, REG_FLAG_NEED_BO, 0},
-       {R_028110_CB_COLOR4_MASK, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028054_CB_COLOR5_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(5)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280B4_CB_COLOR5_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028074_CB_COLOR5_SIZE, 0, 0},
-       {R_028094_CB_COLOR5_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280F4_CB_COLOR5_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280D4_CB_COLOR5_TILE, REG_FLAG_NEED_BO, 0},
-       {R_028114_CB_COLOR5_MASK, 0, 0},
-       {R_028058_CB_COLOR6_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(6)},
-       {R_0280B8_CB_COLOR6_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028078_CB_COLOR6_SIZE, 0, 0},
-       {R_028098_CB_COLOR6_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280F8_CB_COLOR6_FRAG, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280D8_CB_COLOR6_TILE, REG_FLAG_NEED_BO, 0},
-       {R_028118_CB_COLOR6_MASK, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_02805C_CB_COLOR7_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_COLOR(7)},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0280BC_CB_COLOR7_INFO, REG_FLAG_NEED_BO, 0},
-       {R_02807C_CB_COLOR7_SIZE, 0, 0},
-       {R_02809C_CB_COLOR7_VIEW, 0, 0},
-       {R_0280FC_CB_COLOR7_FRAG, REG_FLAG_NEED_BO, 0},
-       {R_0280DC_CB_COLOR7_TILE, REG_FLAG_NEED_BO, 0},
-       {R_02811C_CB_COLOR7_MASK, 0, 0},
-       {R_028120_CB_CLEAR_RED, 0, 0},
-       {R_028124_CB_CLEAR_GREEN, 0, 0},
-       {R_028128_CB_CLEAR_BLUE, 0, 0},
-       {R_02812C_CB_CLEAR_ALPHA, 0, 0},
-       {R_028414_CB_BLEND_RED, 0, 0},
-       {R_028418_CB_BLEND_GREEN, 0, 0},
-       {R_02841C_CB_BLEND_BLUE, 0, 0},
-       {R_028420_CB_BLEND_ALPHA, 0, 0},
-       {R_028424_CB_FOG_RED, 0, 0},
-       {R_028428_CB_FOG_GREEN, 0, 0},
-       {R_02842C_CB_FOG_BLUE, 0, 0},
-       {R_028430_DB_STENCILREFMASK, 0, 0},
-       {R_028434_DB_STENCILREFMASK_BF, 0, 0},
-       {R_028780_CB_BLEND0_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_028784_CB_BLEND1_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_028788_CB_BLEND2_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_02878C_CB_BLEND3_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_028790_CB_BLEND4_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_028794_CB_BLEND5_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_028798_CB_BLEND6_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_02879C_CB_BLEND7_CONTROL, REG_FLAG_NOT_R600, 0},
-       {R_0287A0_CB_SHADER_CONTROL, 0, 0},
-       {R_028800_DB_DEPTH_CONTROL, 0, 0},
-       {R_028804_CB_BLEND_CONTROL, 0, 0},
-       {R_02880C_DB_SHADER_CONTROL, 0, 0},
-       {R_02800C_DB_DEPTH_BASE, REG_FLAG_NEED_BO|REG_FLAG_RV6XX_SBU, SURFACE_BASE_UPDATE_DEPTH},
-       {R_028000_DB_DEPTH_SIZE, 0, 0},
-       {R_028004_DB_DEPTH_VIEW, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028010_DB_DEPTH_INFO, REG_FLAG_NEED_BO, 0},
-       {R_028A6C_VGT_GS_OUT_PRIM_TYPE, 0, 0},
-       {R_028D24_DB_HTILE_SURFACE, 0, 0},
-       {R_028D34_DB_PREFETCH_LIMIT, 0, 0},
-       {R_028D44_DB_ALPHA_TO_MASK, 0, 0},
-       {R_028204_PA_SC_WINDOW_SCISSOR_TL, 0, 0},
-       {R_028208_PA_SC_WINDOW_SCISSOR_BR, 0, 0},
-       {R_028250_PA_SC_VPORT_SCISSOR_0_TL, 0, 0},
-       {R_028254_PA_SC_VPORT_SCISSOR_0_BR, 0, 0},
-       {R_02843C_PA_CL_VPORT_XSCALE_0, 0, 0},
-       {R_028440_PA_CL_VPORT_XOFFSET_0, 0, 0},
-       {R_028444_PA_CL_VPORT_YSCALE_0, 0, 0},
-       {R_028448_PA_CL_VPORT_YOFFSET_0, 0, 0},
-       {R_02844C_PA_CL_VPORT_ZSCALE_0, 0, 0},
-       {R_028450_PA_CL_VPORT_ZOFFSET_0, 0, 0},
-       {R_0286D4_SPI_INTERP_CONTROL_0, 0, 0},
-       {R_028810_PA_CL_CLIP_CNTL, 0, 0},
-       {R_028814_PA_SU_SC_MODE_CNTL, 0, 0},
-       {R_02881C_PA_CL_VS_OUT_CNTL, 0, 0},
-       {R_028A00_PA_SU_POINT_SIZE, 0, 0},
-       {R_028A04_PA_SU_POINT_MINMAX, 0, 0},
-       {R_028A08_PA_SU_LINE_CNTL, 0, 0},
-       {R_028A0C_PA_SC_LINE_STIPPLE, 0, 0},
-       {R_028C00_PA_SC_LINE_CNTL, 0, 0},
-       {R_028C04_PA_SC_AA_CONFIG, 0, 0},
-       {R_028C08_PA_SU_VTX_CNTL, 0, 0},
-       {R_028DF8_PA_SU_POLY_OFFSET_DB_FMT_CNTL, 0, 0},
-       {R_028DFC_PA_SU_POLY_OFFSET_CLAMP, 0, 0},
-       {R_028E00_PA_SU_POLY_OFFSET_FRONT_SCALE, 0, 0},
-       {R_028E04_PA_SU_POLY_OFFSET_FRONT_OFFSET, 0, 0},
-       {R_028E08_PA_SU_POLY_OFFSET_BACK_SCALE, 0, 0},
-       {R_028E0C_PA_SU_POLY_OFFSET_BACK_OFFSET, 0, 0},
-       {R_028E20_PA_CL_UCP0_X, 0, 0},
-       {R_028E24_PA_CL_UCP0_Y, 0, 0},
-       {R_028E28_PA_CL_UCP0_Z, 0, 0},
-       {R_028E2C_PA_CL_UCP0_W, 0, 0},
-       {R_028E30_PA_CL_UCP1_X, 0, 0},
-       {R_028E34_PA_CL_UCP1_Y, 0, 0},
-       {R_028E38_PA_CL_UCP1_Z, 0, 0},
-       {R_028E3C_PA_CL_UCP1_W, 0, 0},
-       {R_028E40_PA_CL_UCP2_X, 0, 0},
-       {R_028E44_PA_CL_UCP2_Y, 0, 0},
-       {R_028E48_PA_CL_UCP2_Z, 0, 0},
-       {R_028E4C_PA_CL_UCP2_W, 0, 0},
-       {R_028E50_PA_CL_UCP3_X, 0, 0},
-       {R_028E54_PA_CL_UCP3_Y, 0, 0},
-       {R_028E58_PA_CL_UCP3_Z, 0, 0},
-       {R_028E5C_PA_CL_UCP3_W, 0, 0},
-       {R_028E60_PA_CL_UCP4_X, 0, 0},
-       {R_028E64_PA_CL_UCP4_Y, 0, 0},
-       {R_028E68_PA_CL_UCP4_Z, 0, 0},
-       {R_028E6C_PA_CL_UCP4_W, 0, 0},
-       {R_028E70_PA_CL_UCP5_X, 0, 0},
-       {R_028E74_PA_CL_UCP5_Y, 0, 0},
-       {R_028E78_PA_CL_UCP5_Z, 0, 0},
-       {R_028E7C_PA_CL_UCP5_W, 0, 0},
-       {R_028350_SX_MISC, 0, 0},
-       {R_028380_SQ_VTX_SEMANTIC_0, 0, 0},
-       {R_028384_SQ_VTX_SEMANTIC_1, 0, 0},
-       {R_028388_SQ_VTX_SEMANTIC_2, 0, 0},
-       {R_02838C_SQ_VTX_SEMANTIC_3, 0, 0},
-       {R_028390_SQ_VTX_SEMANTIC_4, 0, 0},
-       {R_028394_SQ_VTX_SEMANTIC_5, 0, 0},
-       {R_028398_SQ_VTX_SEMANTIC_6, 0, 0},
-       {R_02839C_SQ_VTX_SEMANTIC_7, 0, 0},
-       {R_0283A0_SQ_VTX_SEMANTIC_8, 0, 0},
-       {R_0283A4_SQ_VTX_SEMANTIC_9, 0, 0},
-       {R_0283A8_SQ_VTX_SEMANTIC_10, 0, 0},
-       {R_0283AC_SQ_VTX_SEMANTIC_11, 0, 0},
-       {R_0283B0_SQ_VTX_SEMANTIC_12, 0, 0},
-       {R_0283B4_SQ_VTX_SEMANTIC_13, 0, 0},
-       {R_0283B8_SQ_VTX_SEMANTIC_14, 0, 0},
-       {R_0283BC_SQ_VTX_SEMANTIC_15, 0, 0},
-       {R_0283C0_SQ_VTX_SEMANTIC_16, 0, 0},
-       {R_0283C4_SQ_VTX_SEMANTIC_17, 0, 0},
-       {R_0283C8_SQ_VTX_SEMANTIC_18, 0, 0},
-       {R_0283CC_SQ_VTX_SEMANTIC_19, 0, 0},
-       {R_0283D0_SQ_VTX_SEMANTIC_20, 0, 0},
-       {R_0283D4_SQ_VTX_SEMANTIC_21, 0, 0},
-       {R_0283D8_SQ_VTX_SEMANTIC_22, 0, 0},
-       {R_0283DC_SQ_VTX_SEMANTIC_23, 0, 0},
-       {R_0283E0_SQ_VTX_SEMANTIC_24, 0, 0},
-       {R_0283E4_SQ_VTX_SEMANTIC_25, 0, 0},
-       {R_0283E8_SQ_VTX_SEMANTIC_26, 0, 0},
-       {R_0283EC_SQ_VTX_SEMANTIC_27, 0, 0},
-       {R_0283F0_SQ_VTX_SEMANTIC_28, 0, 0},
-       {R_0283F4_SQ_VTX_SEMANTIC_29, 0, 0},
-       {R_0283F8_SQ_VTX_SEMANTIC_30, 0, 0},
-       {R_0283FC_SQ_VTX_SEMANTIC_31, 0, 0},
-       {R_028614_SPI_VS_OUT_ID_0, 0, 0},
-       {R_028618_SPI_VS_OUT_ID_1, 0, 0},
-       {R_02861C_SPI_VS_OUT_ID_2, 0, 0},
-       {R_028620_SPI_VS_OUT_ID_3, 0, 0},
-       {R_028624_SPI_VS_OUT_ID_4, 0, 0},
-       {R_028628_SPI_VS_OUT_ID_5, 0, 0},
-       {R_02862C_SPI_VS_OUT_ID_6, 0, 0},
-       {R_028630_SPI_VS_OUT_ID_7, 0, 0},
-       {R_028634_SPI_VS_OUT_ID_8, 0, 0},
-       {R_028638_SPI_VS_OUT_ID_9, 0, 0},
-       {R_0286C4_SPI_VS_OUT_CONFIG, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028858_SQ_PGM_START_VS, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028868_SQ_PGM_RESOURCES_VS, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028894_SQ_PGM_START_FS, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_0288A4_SQ_PGM_RESOURCES_FS, 0, 0},
-       {R_0288DC_SQ_PGM_CF_OFFSET_FS, 0, 0},
-       {R_028644_SPI_PS_INPUT_CNTL_0, 0, 0},
-       {R_028648_SPI_PS_INPUT_CNTL_1, 0, 0},
-       {R_02864C_SPI_PS_INPUT_CNTL_2, 0, 0},
-       {R_028650_SPI_PS_INPUT_CNTL_3, 0, 0},
-       {R_028654_SPI_PS_INPUT_CNTL_4, 0, 0},
-       {R_028658_SPI_PS_INPUT_CNTL_5, 0, 0},
-       {R_02865C_SPI_PS_INPUT_CNTL_6, 0, 0},
-       {R_028660_SPI_PS_INPUT_CNTL_7, 0, 0},
-       {R_028664_SPI_PS_INPUT_CNTL_8, 0, 0},
-       {R_028668_SPI_PS_INPUT_CNTL_9, 0, 0},
-       {R_02866C_SPI_PS_INPUT_CNTL_10, 0, 0},
-       {R_028670_SPI_PS_INPUT_CNTL_11, 0, 0},
-       {R_028674_SPI_PS_INPUT_CNTL_12, 0, 0},
-       {R_028678_SPI_PS_INPUT_CNTL_13, 0, 0},
-       {R_02867C_SPI_PS_INPUT_CNTL_14, 0, 0},
-       {R_028680_SPI_PS_INPUT_CNTL_15, 0, 0},
-       {R_028684_SPI_PS_INPUT_CNTL_16, 0, 0},
-       {R_028688_SPI_PS_INPUT_CNTL_17, 0, 0},
-       {R_02868C_SPI_PS_INPUT_CNTL_18, 0, 0},
-       {R_028690_SPI_PS_INPUT_CNTL_19, 0, 0},
-       {R_028694_SPI_PS_INPUT_CNTL_20, 0, 0},
-       {R_028698_SPI_PS_INPUT_CNTL_21, 0, 0},
-       {R_02869C_SPI_PS_INPUT_CNTL_22, 0, 0},
-       {R_0286A0_SPI_PS_INPUT_CNTL_23, 0, 0},
-       {R_0286A4_SPI_PS_INPUT_CNTL_24, 0, 0},
-       {R_0286A8_SPI_PS_INPUT_CNTL_25, 0, 0},
-       {R_0286AC_SPI_PS_INPUT_CNTL_26, 0, 0},
-       {R_0286B0_SPI_PS_INPUT_CNTL_27, 0, 0},
-       {R_0286B4_SPI_PS_INPUT_CNTL_28, 0, 0},
-       {R_0286B8_SPI_PS_INPUT_CNTL_29, 0, 0},
-       {R_0286BC_SPI_PS_INPUT_CNTL_30, 0, 0},
-       {R_0286C0_SPI_PS_INPUT_CNTL_31, 0, 0},
-       {R_0286CC_SPI_PS_IN_CONTROL_0, 0, 0},
-       {R_0286D0_SPI_PS_IN_CONTROL_1, 0, 0},
-       {R_0286D8_SPI_INPUT_Z, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028840_SQ_PGM_START_PS, REG_FLAG_NEED_BO, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028850_SQ_PGM_RESOURCES_PS, 0, 0},
-       {R_028854_SQ_PGM_EXPORTS_PS, 0, 0},
-       {R_028408_VGT_INDX_OFFSET, 0, 0},
-       {R_02840C_VGT_MULTI_PRIM_IB_RESET_INDX, 0, 0},
-       {R_028A94_VGT_MULTI_PRIM_IB_RESET_EN, 0, 0},
-       {R_028C1C_PA_SC_AA_SAMPLE_LOCS_MCTX, 0, 0},
-       {R_028C20_PA_SC_AA_SAMPLE_LOCS_8S_WD1_MCTX, 0, 0},
-};
-
-static int r600_loop_const_init(struct r600_context *ctx, uint32_t offset)
-{
-       unsigned nreg = 32;
-       struct r600_reg r600_loop_consts[32];
-       int i;
-
-       for (i = 0; i < nreg; i++) {
-               r600_loop_consts[i].offset = R600_LOOP_CONST_OFFSET + ((offset + i) * 4);
-               r600_loop_consts[i].flags = REG_FLAG_DIRTY_ALWAYS;
-               r600_loop_consts[i].sbu_flags = 0;
-       }
-       return r600_context_add_block(ctx, r600_loop_consts, nreg, PKT3_SET_LOOP_CONST, R600_LOOP_CONST_OFFSET);
-}
-
-/* initialize */
-void r600_context_fini(struct r600_context *ctx)
-{
-       struct r600_block *block;
-       struct r600_range *range;
-
-       if (ctx->range) {
-               for (int i = 0; i < NUM_RANGES; i++) {
-                       if (!ctx->range[i].blocks)
-                               continue;
-                       for (int j = 0; j < (1 << HASH_SHIFT); j++) {
-                               block = ctx->range[i].blocks[j];
-                               if (block) {
-                                       for (int k = 0, offset = block->start_offset; k < block->nreg; k++, offset += 4) {
-                                               range = &ctx->range[CTX_RANGE_ID(offset)];
-                                               range->blocks[CTX_BLOCK_ID(offset)] = NULL;
-                                       }
-                                       for (int k = 1; k <= block->nbo; k++) {
-                                               pipe_resource_reference((struct pipe_resource**)&block->reloc[k].bo, NULL);
-                                       }
-                                       free(block);
-                               }
-                       }
-                       free(ctx->range[i].blocks);
-               }
-       }
-       free(ctx->blocks);
-}
-
-int r600_setup_block_table(struct r600_context *ctx)
-{
-       /* setup block table */
-       int c = 0;
-       ctx->blocks = calloc(ctx->nblocks, sizeof(void*));
-       if (!ctx->blocks)
-               return -ENOMEM;
-       for (int i = 0; i < NUM_RANGES; i++) {
-               if (!ctx->range[i].blocks)
-                       continue;
-               for (int j = 0, add; j < (1 << HASH_SHIFT); j++) {
-                       if (!ctx->range[i].blocks[j])
-                               continue;
-
-                       add = 1;
-                       for (int k = 0; k < c; k++) {
-                               if (ctx->blocks[k] == ctx->range[i].blocks[j]) {
-                                       add = 0;
-                                       break;
-                               }
-                       }
-                       if (add) {
-                               assert(c < ctx->nblocks);
-                               ctx->blocks[c++] = ctx->range[i].blocks[j];
-                               j += (ctx->range[i].blocks[j]->nreg) - 1;
-                       }
-               }
-       }
-       return 0;
-}
-
-int r600_context_init(struct r600_context *ctx)
-{
-       int r;
-
-       /* add blocks */
-       r = r600_context_add_block(ctx, r600_config_reg_list,
-                                  Elements(r600_config_reg_list), PKT3_SET_CONFIG_REG, R600_CONFIG_REG_OFFSET);
-       if (r)
-               goto out_err;
-       r = r600_context_add_block(ctx, r600_context_reg_list,
-                                  Elements(r600_context_reg_list), PKT3_SET_CONTEXT_REG, R600_CONTEXT_REG_OFFSET);
-       if (r)
-               goto out_err;
-       r = r600_context_add_block(ctx, r600_ctl_const_list,
-                                  Elements(r600_ctl_const_list), PKT3_SET_CTL_CONST, R600_CTL_CONST_OFFSET);
-       if (r)
-               goto out_err;
-
-       /* PS loop const */
-       r600_loop_const_init(ctx, 0);
-       /* VS loop const */
-       r600_loop_const_init(ctx, 32);
-
-       r = r600_setup_block_table(ctx);
-       if (r)
-               goto out_err;
-
-       ctx->max_db = 4;
-       return 0;
-out_err:
-       r600_context_fini(ctx);
-       return r;
-}
-
 void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
                        boolean count_draw_in)
 {
+       if (!ctx->ws->cs_memory_below_limit(ctx->rings.gfx.cs, ctx->vram, ctx->gtt)) {
+               ctx->gtt = 0;
+               ctx->vram = 0;
+               ctx->rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC);
+               return;
+       }
+       /* all will be accounted once relocation are emited */
+       ctx->gtt = 0;
+       ctx->vram = 0;
+
        /* The number of dwords we already used in the CS so far. */
-       num_dw += ctx->cs->cdw;
+       num_dw += ctx->rings.gfx.cs->cdw;
 
        if (count_draw_in) {
                unsigned i;
 
                /* The number of dwords all the dirty states would take. */
-               for (i = 0; i < R600_MAX_ATOM; i++) {
+               for (i = 0; i < R600_NUM_ATOMS; i++) {
                        if (ctx->atoms[i] && ctx->atoms[i]->dirty) {
                                num_dw += ctx->atoms[i]->num_dw;
+                               if (ctx->screen->trace_bo) {
+                                       num_dw += R600_TRACE_CS_DWORDS;
+                               }
                        }
                }
 
-               num_dw += ctx->pm4_dirty_cdwords;
-
-               /* The upper-bound of how much a draw command would take. */
-               num_dw += R600_MAX_DRAW_CS_DWORDS;
+               /* The upper-bound of how much space a draw command would take. */
+               num_dw += R600_MAX_FLUSH_CS_DWORDS + R600_MAX_DRAW_CS_DWORDS;
+               if (ctx->screen->trace_bo) {
+                       num_dw += R600_TRACE_CS_DWORDS;
+               }
        }
 
        /* Count in queries_suspend. */
        num_dw += ctx->num_cs_dw_nontimer_queries_suspend;
-       num_dw += ctx->num_cs_dw_timer_queries_suspend;
 
        /* Count in streamout_end at the end of CS. */
-       num_dw += ctx->num_cs_dw_streamout_end;
+       if (ctx->streamout.begin_emitted) {
+               num_dw += ctx->streamout.num_dw_for_end;
+       }
 
        /* Count in render_condition(NULL) at the end of CS. */
        if (ctx->predicate_drawing) {
                num_dw += 3;
        }
 
+       /* SX_MISC */
+       if (ctx->chip_class <= R700) {
+               num_dw += 3;
+       }
+
        /* Count in framebuffer cache flushes at the end of CS. */
-       num_dw += 44; /* one SURFACE_SYNC and CACHE_FLUSH_AND_INV (r6xx-only) */
+       num_dw += R600_MAX_FLUSH_CS_DWORDS;
 
-       /* Save 16 dwords for the fence mechanism. */
-       num_dw += 16;
+       /* The fence at the end of CS. */
+       num_dw += 10;
 
        /* Flush if there's not enough space. */
        if (num_dw > RADEON_MAX_CMDBUF_DWORDS) {
-               r600_flush(&ctx->context, NULL, RADEON_FLUSH_ASYNC);
+               ctx->rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC);
        }
 }
 
-void r600_context_dirty_block(struct r600_context *ctx,
-                             struct r600_block *block,
-                             int dirty, int index)
+void r600_flush_emit(struct r600_context *rctx)
 {
-       if ((index + 1) > block->nreg_dirty)
-               block->nreg_dirty = index + 1;
-
-       if ((dirty != (block->status & R600_BLOCK_STATUS_DIRTY)) || !(block->status & R600_BLOCK_STATUS_ENABLED)) {
-               block->status |= R600_BLOCK_STATUS_DIRTY;
-               ctx->pm4_dirty_cdwords += block->pm4_ndwords;
-               if (!(block->status & R600_BLOCK_STATUS_ENABLED)) {
-                       block->status |= R600_BLOCK_STATUS_ENABLED;
-                       LIST_ADDTAIL(&block->enable_list, &ctx->enable_list);
-               }
-               LIST_ADDTAIL(&block->list,&ctx->dirty);
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
+       unsigned cp_coher_cntl = 0;
+       unsigned wait_until = 0;
 
-               if (block->flags & REG_FLAG_FLUSH_CHANGE) {
-                       ctx->flags |= R600_CONTEXT_PS_PARTIAL_FLUSH;
-               }
+       if (!rctx->flags) {
+               return;
        }
-}
 
-/**
- * If reg needs a reloc, this function will add it to its block's reloc list.
- * @return true if reg needs a reloc, false otherwise
- */
-static bool r600_reg_set_block_reloc(struct r600_pipe_reg *reg)
-{
-       unsigned reloc_id;
-
-       if (!reg->block->pm4_bo_index[reg->id]) {
-               return false;
+       if (rctx->flags & R600_CONTEXT_WAIT_3D_IDLE) {
+               wait_until |= S_008040_WAIT_3D_IDLE(1);
        }
-       /* find relocation */
-       reloc_id = reg->block->pm4_bo_index[reg->id];
-       pipe_resource_reference(
-               (struct pipe_resource**)&reg->block->reloc[reloc_id].bo,
-               &reg->bo->b.b);
-       reg->block->reloc[reloc_id].bo_usage = reg->bo_usage;
-       return true;
-}
-
-/**
- * This function will emit all the registers in state directly to the command
- * stream allowing you to bypass the r600_context dirty list.
- *
- * This is used for dispatching compute shaders to avoid mixing compute and
- * 3D states in the context's dirty list.
- *
- * @param pkt_flags Should be either 0 or RADEON_CP_PACKET3_COMPUTE_MODE.  This
- * value will be passed on to r600_context_block_emit_dirty an or'd against
- * the PKT3 headers.
- */
-void r600_context_pipe_state_emit(struct r600_context *ctx,
-                          struct r600_pipe_state *state,
-                          unsigned pkt_flags)
-{
-       unsigned i;
-
-       /* Mark all blocks as dirty: 
-        * Since two registers can be in the same block, we need to make sure
-        * we mark all the blocks dirty before we emit any of them.  If we were
-        * to mark blocks dirty and emit them in the same loop, like this:
-        *
-        * foreach (reg in state->regs) {
-        *     mark_dirty(reg->block)
-        *     emit_block(reg->block)
-        * }
-        *
-        * Then if we have two registers in this state that are in the same
-        * block, we would end up emitting that block twice.
-        */
-       for (i = 0; i < state->nregs; i++) {
-               struct r600_pipe_reg *reg = &state->regs[i];
-               /* Mark all the registers in the block as dirty */
-               reg->block->nreg_dirty = reg->block->nreg;
-               reg->block->status |= R600_BLOCK_STATUS_DIRTY;
-               /* Update the reloc for this register if necessary. */
-               r600_reg_set_block_reloc(reg);
+       if (rctx->flags & R600_CONTEXT_WAIT_CP_DMA_IDLE) {
+               wait_until |= S_008040_WAIT_CP_DMA_IDLE(1);
        }
 
-       /* Emit the registers writes */
-       for (i = 0; i < state->nregs; i++) {
-               struct r600_pipe_reg *reg = &state->regs[i];
-               if (reg->block->status & R600_BLOCK_STATUS_DIRTY) {
-                       r600_context_block_emit_dirty(ctx, reg->block, pkt_flags);
+       if (wait_until) {
+               /* Use of WAIT_UNTIL is deprecated on Cayman+ */
+               if (rctx->family >= CHIP_CAYMAN) {
+                       /* emit a PS partial flush on Cayman/TN */
+                       rctx->flags |= R600_CONTEXT_PS_PARTIAL_FLUSH;
                }
        }
-}
-
-void r600_context_pipe_state_set(struct r600_context *ctx, struct r600_pipe_state *state)
-{
-       struct r600_block *block;
-       int dirty;
-       for (int i = 0; i < state->nregs; i++) {
-               unsigned id;
-               struct r600_pipe_reg *reg = &state->regs[i];
-
-               block = reg->block;
-               id = reg->id;
 
-               dirty = block->status & R600_BLOCK_STATUS_DIRTY;
-
-               if (reg->value != block->reg[id]) {
-                       block->reg[id] = reg->value;
-                       dirty |= R600_BLOCK_STATUS_DIRTY;
-               }
-               if (block->flags & REG_FLAG_DIRTY_ALWAYS)
-                       dirty |= R600_BLOCK_STATUS_DIRTY;
-               if (r600_reg_set_block_reloc(reg)) {
-                       /* always force dirty for relocs for now */
-                       dirty |= R600_BLOCK_STATUS_DIRTY;
-               }
-
-               if (dirty)
-                       r600_context_dirty_block(ctx, block, dirty, id);
-       }
-}
-
-/**
- * @param pkt_flags should be set to RADEON_CP_PACKET3_COMPUTE_MODE if this
- * block will be used for compute shaders.
- */
-void r600_context_block_emit_dirty(struct r600_context *ctx, struct r600_block *block,
-       unsigned pkt_flags)
-{
-       struct radeon_winsys_cs *cs = ctx->cs;
-       int optional = block->nbo == 0 && !(block->flags & REG_FLAG_DIRTY_ALWAYS);
-       int cp_dwords = block->pm4_ndwords, start_dword = 0;
-       int new_dwords = 0;
-       int nbo = block->nbo;
-
-       if (block->nreg_dirty == 0 && optional) {
-               goto out;
-       }
-
-       if (nbo) {
-               for (int j = 0; j < block->nreg; j++) {
-                       if (block->pm4_bo_index[j]) {
-                               /* find relocation */
-                               struct r600_block_reloc *reloc = &block->reloc[block->pm4_bo_index[j]];
-                               if (reloc->bo) {
-                                       block->pm4[reloc->bo_pm4_index] =
-                                                       r600_context_bo_reloc(ctx, reloc->bo, reloc->bo_usage);
-                               } else {
-                                       block->pm4[reloc->bo_pm4_index] = 0;
-                               }
-                               nbo--;
-                               if (nbo == 0)
-                                       break;
-
-                       }
-               }
-       }
-
-       optional &= (block->nreg_dirty != block->nreg);
-       if (optional) {
-               new_dwords = block->nreg_dirty;
-               start_dword = cs->cdw;
-               cp_dwords = new_dwords + 2;
-       }
-       memcpy(&cs->buf[cs->cdw], block->pm4, cp_dwords * 4);
-
-       /* We are applying the pkt_flags after copying the register block to
-        * the the command stream, because it is possible this block will be
-        * emitted with a different pkt_flags, and we don't want to store the
-        * pkt_flags in the block.
-        */
-       cs->buf[cs->cdw] |= pkt_flags;
-       cs->cdw += cp_dwords;
-
-       if (optional) {
-               uint32_t newword;
-
-               newword = cs->buf[start_dword];
-               newword &= PKT_COUNT_C;
-               newword |= PKT_COUNT_S(new_dwords);
-               cs->buf[start_dword] = newword;
+       if (rctx->flags & R600_CONTEXT_PS_PARTIAL_FLUSH) {
+               cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
+               cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
        }
-out:
-       block->status ^= R600_BLOCK_STATUS_DIRTY;
-       block->nreg_dirty = 0;
-       LIST_DELINIT(&block->list);
-}
 
-void r600_flush_emit(struct r600_context *rctx)
-{
-       struct radeon_winsys_cs *cs = rctx->cs;
-
-       if (!rctx->flags) {
-               return;
+       if (rctx->chip_class >= R700 &&
+           (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_CB_META)) {
+               cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
+               cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_FLUSH_AND_INV_CB_META) | EVENT_INDEX(0);
        }
 
-       if (rctx->flags & R600_CONTEXT_PS_PARTIAL_FLUSH) {
+       if (rctx->chip_class >= R700 &&
+           (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_DB_META)) {
                cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
-               cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
+               cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_FLUSH_AND_INV_DB_META) | EVENT_INDEX(0);
        }
 
        if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV) {
                cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
                cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT) | EVENT_INDEX(0);
-
-               /* DB flushes are special due to errata with hyperz, we need to
-                * insert a no-op, so that the cache has time to really flush.
-                */
-               if (rctx->chip_class <= R700 &&
-                   rctx->flags & R600_CONTEXT_HTILE_ERRATA) {
-                       cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 31, 0);
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-                       cs->buf[cs->cdw++] = 0xdeadcafe;
-               }
        }
 
-       if (rctx->flags & (R600_CONTEXT_CB_FLUSH |
-                          R600_CONTEXT_DB_FLUSH |
-                          R600_CONTEXT_SHADERCONST_FLUSH |
-                          R600_CONTEXT_TEX_FLUSH |
-                          R600_CONTEXT_VTX_FLUSH |
-                          R600_CONTEXT_STREAMOUT_FLUSH)) {
-               /* anything left (cb, vtx, shader, streamout) can be flushed
-                * using the surface sync packet
-                */
-               unsigned flags = 0;
-
-               if (rctx->flags & R600_CONTEXT_CB_FLUSH) {
-                       flags |= S_0085F0_CB_ACTION_ENA(1) |
-                                S_0085F0_CB0_DEST_BASE_ENA(1) |
-                                S_0085F0_CB1_DEST_BASE_ENA(1) |
-                                S_0085F0_CB2_DEST_BASE_ENA(1) |
-                                S_0085F0_CB3_DEST_BASE_ENA(1) |
-                                S_0085F0_CB4_DEST_BASE_ENA(1) |
-                                S_0085F0_CB5_DEST_BASE_ENA(1) |
-                                S_0085F0_CB6_DEST_BASE_ENA(1) |
-                                S_0085F0_CB7_DEST_BASE_ENA(1);
-
-                       if (rctx->chip_class >= EVERGREEN) {
-                               flags |= S_0085F0_CB8_DEST_BASE_ENA(1) |
-                                        S_0085F0_CB9_DEST_BASE_ENA(1) |
-                                        S_0085F0_CB10_DEST_BASE_ENA(1) |
-                                        S_0085F0_CB11_DEST_BASE_ENA(1);
-                       }
+       if (rctx->flags & R600_CONTEXT_INVAL_READ_CACHES) {
+               cp_coher_cntl |= S_0085F0_VC_ACTION_ENA(1) |
+                               S_0085F0_TC_ACTION_ENA(1) |
+                               S_0085F0_SH_ACTION_ENA(1) |
+                               S_0085F0_FULL_CACHE_ENA(1);
+       }
 
-                       /* RV670 errata
-                        * (CB1_DEST_BASE_ENA is also required, which is
-                        * included unconditionally above). */
-                       if (rctx->family == CHIP_RV670 ||
-                           rctx->family == CHIP_RS780 ||
-                           rctx->family == CHIP_RS880) {
-                               flags |= S_0085F0_DEST_BASE_0_ENA(1);
-                       }
-               }
+       if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_DB) {
+               cp_coher_cntl |= S_0085F0_DB_ACTION_ENA(1) |
+                               S_0085F0_DB_DEST_BASE_ENA(1) |
+                               S_0085F0_SMX_ACTION_ENA(1);
+       }
 
-               if (rctx->flags & R600_CONTEXT_STREAMOUT_FLUSH) {
-                       flags |= S_0085F0_SO0_DEST_BASE_ENA(1) |
-                                S_0085F0_SO1_DEST_BASE_ENA(1) |
-                                S_0085F0_SO2_DEST_BASE_ENA(1) |
-                                S_0085F0_SO3_DEST_BASE_ENA(1) |
-                                S_0085F0_SMX_ACTION_ENA(1);
-
-                       /* RV670 errata */
-                       if (rctx->family == CHIP_RV670 ||
-                           rctx->family == CHIP_RS780 ||
-                           rctx->family == CHIP_RS880) {
-                               flags |= S_0085F0_DEST_BASE_0_ENA(1);
-                       }
-               }
+       if (rctx->flags & R600_CONTEXT_FLUSH_AND_INV_CB) {
+               cp_coher_cntl |= S_0085F0_CB_ACTION_ENA(1) |
+                               S_0085F0_CB0_DEST_BASE_ENA(1) |
+                               S_0085F0_CB1_DEST_BASE_ENA(1) |
+                               S_0085F0_CB2_DEST_BASE_ENA(1) |
+                               S_0085F0_CB3_DEST_BASE_ENA(1) |
+                               S_0085F0_CB4_DEST_BASE_ENA(1) |
+                               S_0085F0_CB5_DEST_BASE_ENA(1) |
+                               S_0085F0_CB6_DEST_BASE_ENA(1) |
+                               S_0085F0_CB7_DEST_BASE_ENA(1) |
+                               S_0085F0_SMX_ACTION_ENA(1);
+               if (rctx->chip_class >= EVERGREEN)
+                       cp_coher_cntl |= S_0085F0_CB8_DEST_BASE_ENA(1) |
+                                       S_0085F0_CB9_DEST_BASE_ENA(1) |
+                                       S_0085F0_CB10_DEST_BASE_ENA(1) |
+                                       S_0085F0_CB11_DEST_BASE_ENA(1);
+       }
 
-               flags |= (rctx->flags & R600_CONTEXT_DB_FLUSH) ? S_0085F0_DB_ACTION_ENA(1) |
-                                                                S_0085F0_DB_DEST_BASE_ENA(1): 0;
-               flags |= (rctx->flags & R600_CONTEXT_SHADERCONST_FLUSH) ? S_0085F0_SH_ACTION_ENA(1) : 0;
-               flags |= (rctx->flags & R600_CONTEXT_TEX_FLUSH) ? S_0085F0_TC_ACTION_ENA(1) : 0;
-               flags |= (rctx->flags & R600_CONTEXT_VTX_FLUSH) ? S_0085F0_VC_ACTION_ENA(1) : 0;
+       if (rctx->flags & R600_CONTEXT_STREAMOUT_FLUSH) {
+               cp_coher_cntl |= S_0085F0_SO0_DEST_BASE_ENA(1) |
+                               S_0085F0_SO1_DEST_BASE_ENA(1) |
+                               S_0085F0_SO2_DEST_BASE_ENA(1) |
+                               S_0085F0_SO3_DEST_BASE_ENA(1) |
+                               S_0085F0_SMX_ACTION_ENA(1);
+       }
 
+       if (cp_coher_cntl) {
                cs->buf[cs->cdw++] = PKT3(PKT3_SURFACE_SYNC, 3, 0);
-               cs->buf[cs->cdw++] = flags;           /* CP_COHER_CNTL */
+               cs->buf[cs->cdw++] = cp_coher_cntl;   /* CP_COHER_CNTL */
                cs->buf[cs->cdw++] = 0xffffffff;      /* CP_COHER_SIZE */
                cs->buf[cs->cdw++] = 0;               /* CP_COHER_BASE */
                cs->buf[cs->cdw++] = 0x0000000A;      /* POLL_INTERVAL */
        }
 
-       if (rctx->flags & R600_CONTEXT_WAIT_IDLE) {
-               /* wait for things to settle */
-               r600_write_config_reg(cs, R_008040_WAIT_UNTIL, S_008040_WAIT_3D_IDLE(1));
+       if (wait_until) {
+               /* Use of WAIT_UNTIL is deprecated on Cayman+ */
+               if (rctx->family < CHIP_CAYMAN) {
+                       /* wait for things to settle */
+                       r600_write_config_reg(cs, R_008040_WAIT_UNTIL, wait_until);
+               }
        }
 
        /* everything is properly flushed */
@@ -984,40 +288,35 @@ void r600_flush_emit(struct r600_context *rctx)
 
 void r600_context_flush(struct r600_context *ctx, unsigned flags)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
 
-       if (cs->cdw == ctx->start_cs_cmd.atom.num_dw)
+       if (cs->cdw == ctx->start_cs_cmd.num_dw)
                return;
 
-       ctx->timer_queries_suspended = false;
        ctx->nontimer_queries_suspended = false;
-       ctx->streamout_suspended = false;
+       ctx->streamout.suspended = false;
 
        /* suspend queries */
-       if (ctx->num_cs_dw_timer_queries_suspend) {
-               r600_suspend_timer_queries(ctx);
-               ctx->timer_queries_suspended = true;
-       }
        if (ctx->num_cs_dw_nontimer_queries_suspend) {
                r600_suspend_nontimer_queries(ctx);
                ctx->nontimer_queries_suspended = true;
        }
 
-       if (ctx->num_cs_dw_streamout_end) {
-               r600_context_streamout_end(ctx);
-               ctx->streamout_suspended = true;
+       if (ctx->streamout.begin_emitted) {
+               r600_emit_streamout_end(ctx);
+               ctx->streamout.suspended = true;
        }
 
-       /* partial flush is needed to avoid lockups on some chips with user fences */
-       ctx->flags |= R600_CONTEXT_PS_PARTIAL_FLUSH;
-
-       /* flush the framebuffer */
-       ctx->flags |= R600_CONTEXT_CB_FLUSH | R600_CONTEXT_DB_FLUSH;
-
-       /* R6xx errata */
-       if (ctx->chip_class == R600) {
-               ctx->flags |= R600_CONTEXT_FLUSH_AND_INV;
-       }
+       /* flush is needed to avoid lockups on some chips with user fences
+        * this will also flush the framebuffer cache
+        */
+       ctx->flags |= R600_CONTEXT_FLUSH_AND_INV |
+                     R600_CONTEXT_FLUSH_AND_INV_CB |
+                     R600_CONTEXT_FLUSH_AND_INV_DB |
+                     R600_CONTEXT_FLUSH_AND_INV_CB_META |
+                     R600_CONTEXT_FLUSH_AND_INV_DB_META |
+                     R600_CONTEXT_WAIT_3D_IDLE |
+                     R600_CONTEXT_WAIT_CP_DMA_IDLE;
 
        r600_flush_emit(ctx);
 
@@ -1027,34 +326,55 @@ void r600_context_flush(struct r600_context *ctx, unsigned flags)
        }
 
        /* force to keep tiling flags */
-       flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
+       if (ctx->keep_tiling_flags) {
+               flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
+       }
 
        /* Flush the CS. */
-       ctx->ws->cs_flush(ctx->cs, flags);
-
-       r600_begin_new_cs(ctx);
+       ctx->ws->cs_flush(ctx->rings.gfx.cs, flags, ctx->screen->cs_count++);
 }
 
 void r600_begin_new_cs(struct r600_context *ctx)
 {
-       struct r600_block *enable_block = NULL;
        unsigned shader;
 
-       ctx->pm4_dirty_cdwords = 0;
        ctx->flags = 0;
+       ctx->gtt = 0;
+       ctx->vram = 0;
 
        /* Begin a new CS. */
-       r600_emit_atom(ctx, &ctx->start_cs_cmd.atom);
+       r600_emit_command_buffer(ctx->rings.gfx.cs, &ctx->start_cs_cmd);
 
        /* Re-emit states. */
-       r600_atom_dirty(ctx, &ctx->alphatest_state.atom);
-       r600_atom_dirty(ctx, &ctx->cb_misc_state.atom);
-       r600_atom_dirty(ctx, &ctx->db_misc_state.atom);
+       ctx->alphatest_state.atom.dirty = true;
+       ctx->blend_color.atom.dirty = true;
+       ctx->cb_misc_state.atom.dirty = true;
+       ctx->clip_misc_state.atom.dirty = true;
+       ctx->clip_state.atom.dirty = true;
+       ctx->db_misc_state.atom.dirty = true;
+       ctx->db_state.atom.dirty = true;
+       ctx->framebuffer.atom.dirty = true;
+       ctx->pixel_shader.atom.dirty = true;
+       ctx->poly_offset_state.atom.dirty = true;
+       ctx->vgt_state.atom.dirty = true;
+       ctx->sample_mask.atom.dirty = true;
+       ctx->scissor.atom.dirty = true;
+       ctx->config_state.atom.dirty = true;
+       ctx->stencil_ref.atom.dirty = true;
+       ctx->vertex_fetch_shader.atom.dirty = true;
+       ctx->vertex_shader.atom.dirty = true;
+       ctx->viewport.atom.dirty = true;
+
+       if (ctx->blend_state.cso)
+               ctx->blend_state.atom.dirty = true;
+       if (ctx->dsa_state.cso)
+               ctx->dsa_state.atom.dirty = true;
+       if (ctx->rasterizer_state.cso)
+               ctx->rasterizer_state.atom.dirty = true;
 
        if (ctx->chip_class <= R700) {
-               r600_atom_dirty(ctx, &ctx->seamless_cube_map.atom);
+               ctx->seamless_cube_map.atom.dirty = true;
        }
-       r600_atom_dirty(ctx, &ctx->sample_mask.atom);
 
        ctx->vertex_buffer_state.dirty_mask = ctx->vertex_buffer_state.enabled_mask;
        r600_vertex_buffers_dirty(ctx);
@@ -1073,35 +393,24 @@ void r600_begin_new_cs(struct r600_context *ctx)
                r600_sampler_states_dirty(ctx, &samplers->states);
        }
 
-       if (ctx->streamout_suspended) {
-               ctx->streamout_start = TRUE;
-               ctx->streamout_append_bitmask = ~0;
+       if (ctx->streamout.suspended) {
+               ctx->streamout.append_bitmask = ctx->streamout.enabled_mask;
+               r600_streamout_buffers_dirty(ctx);
        }
 
        /* resume queries */
-       if (ctx->timer_queries_suspended) {
-               r600_resume_timer_queries(ctx);
-       }
        if (ctx->nontimer_queries_suspended) {
                r600_resume_nontimer_queries(ctx);
        }
 
-       /* set all valid group as dirty so they get reemited on
-        * next draw command
-        */
-       LIST_FOR_EACH_ENTRY(enable_block, &ctx->enable_list, enable_list) {
-               if(!(enable_block->status & R600_BLOCK_STATUS_DIRTY)) {
-                       LIST_ADDTAIL(&enable_block->list,&ctx->dirty);
-                       enable_block->status |= R600_BLOCK_STATUS_DIRTY;
-               }
-               ctx->pm4_dirty_cdwords += enable_block->pm4_ndwords;
-               enable_block->nreg_dirty = enable_block->nreg;
-       }
+       /* Re-emit the draw state. */
+       ctx->last_primitive_type = -1;
+       ctx->last_start_instance = -1;
 }
 
 void r600_context_emit_fence(struct r600_context *ctx, struct r600_resource *fence_bo, unsigned offset, unsigned value)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
        uint64_t va;
 
        r600_need_cs_space(ctx, 10, FALSE);
@@ -1109,9 +418,13 @@ void r600_context_emit_fence(struct r600_context *ctx, struct r600_resource *fen
        va = r600_resource_va(&ctx->screen->screen, (void*)fence_bo);
        va = va + (offset << 2);
 
-       ctx->flags &= ~R600_CONTEXT_PS_PARTIAL_FLUSH;
-       cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
-       cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
+       /* Use of WAIT_UNTIL is deprecated on Cayman+ */
+       if (ctx->family >= CHIP_CAYMAN) {
+               cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
+               cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
+       } else {
+               r600_write_config_reg(cs, R_008040_WAIT_UNTIL, S_008040_WAIT_3D_IDLE(1));
+       }
 
        cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE_EOP, 4, 0);
        cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_TS_EVENT) | EVENT_INDEX(5);
@@ -1121,16 +434,14 @@ void r600_context_emit_fence(struct r600_context *ctx, struct r600_resource *fen
        cs->buf[cs->cdw++] = value;                   /* DATA_LO */
        cs->buf[cs->cdw++] = 0;                       /* DATA_HI */
        cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
-       cs->buf[cs->cdw++] = r600_context_bo_reloc(ctx, fence_bo, RADEON_USAGE_WRITE);
+       cs->buf[cs->cdw++] = r600_context_bo_reloc(ctx, &ctx->rings.gfx, fence_bo, RADEON_USAGE_WRITE);
 }
 
 static void r600_flush_vgt_streamout(struct r600_context *ctx)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
 
-       cs->buf[cs->cdw++] = PKT3(PKT3_SET_CONFIG_REG, 1, 0);
-       cs->buf[cs->cdw++] = (R_008490_CP_STRMOUT_CNTL - R600_CONFIG_REG_OFFSET) >> 2;
-       cs->buf[cs->cdw++] = 0;
+       r600_write_config_reg(cs, R_008490_CP_STRMOUT_CNTL, 0);
 
        cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
        cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_SO_VGTSTREAMOUT_FLUSH) | EVENT_INDEX(0);
@@ -1146,60 +457,33 @@ static void r600_flush_vgt_streamout(struct r600_context *ctx)
 
 static void r600_set_streamout_enable(struct r600_context *ctx, unsigned buffer_enable_bit)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
 
        if (buffer_enable_bit) {
-               cs->buf[cs->cdw++] = PKT3(PKT3_SET_CONTEXT_REG, 1, 0);
-               cs->buf[cs->cdw++] = (R_028AB0_VGT_STRMOUT_EN - R600_CONTEXT_REG_OFFSET) >> 2;
-               cs->buf[cs->cdw++] = S_028AB0_STREAMOUT(1);
-
-               cs->buf[cs->cdw++] = PKT3(PKT3_SET_CONTEXT_REG, 1, 0);
-               cs->buf[cs->cdw++] = (R_028B20_VGT_STRMOUT_BUFFER_EN - R600_CONTEXT_REG_OFFSET) >> 2;
-               cs->buf[cs->cdw++] = buffer_enable_bit;
+               r600_write_context_reg(cs, R_028AB0_VGT_STRMOUT_EN, S_028AB0_STREAMOUT(1));
+               r600_write_context_reg(cs, R_028B20_VGT_STRMOUT_BUFFER_EN, buffer_enable_bit);
        } else {
-               cs->buf[cs->cdw++] = PKT3(PKT3_SET_CONTEXT_REG, 1, 0);
-               cs->buf[cs->cdw++] = (R_028AB0_VGT_STRMOUT_EN - R600_CONTEXT_REG_OFFSET) >> 2;
-               cs->buf[cs->cdw++] = S_028AB0_STREAMOUT(0);
+               r600_write_context_reg(cs, R_028AB0_VGT_STRMOUT_EN, S_028AB0_STREAMOUT(0));
        }
 }
 
-void r600_context_streamout_begin(struct r600_context *ctx)
+void r600_emit_streamout_begin(struct r600_context *ctx, struct r600_atom *atom)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
-       struct r600_so_target **t = ctx->so_targets;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
+       struct r600_so_target **t = ctx->streamout.targets;
        unsigned *stride_in_dw = ctx->vs_shader->so.stride;
-       unsigned buffer_en, i, update_flags = 0;
+       unsigned i, update_flags = 0;
        uint64_t va;
 
-       buffer_en = (ctx->num_so_targets >= 1 && t[0] ? 1 : 0) |
-                   (ctx->num_so_targets >= 2 && t[1] ? 2 : 0) |
-                   (ctx->num_so_targets >= 3 && t[2] ? 4 : 0) |
-                   (ctx->num_so_targets >= 4 && t[3] ? 8 : 0);
-
-       ctx->num_cs_dw_streamout_end =
-               12 + /* flush_vgt_streamout */
-               util_bitcount(buffer_en) * 8 + /* STRMOUT_BUFFER_UPDATE */
-               3 /* set_streamout_enable(0) */;
-
-       r600_need_cs_space(ctx,
-                          12 + /* flush_vgt_streamout */
-                          6 + /* set_streamout_enable */
-                          util_bitcount(buffer_en) * 7 + /* SET_CONTEXT_REG */
-                          (ctx->chip_class == R700 ? util_bitcount(buffer_en) * 5 : 0) + /* STRMOUT_BASE_UPDATE */
-                          util_bitcount(buffer_en & ctx->streamout_append_bitmask) * 8 + /* STRMOUT_BUFFER_UPDATE */
-                          util_bitcount(buffer_en & ~ctx->streamout_append_bitmask) * 6 + /* STRMOUT_BUFFER_UPDATE */
-                          (ctx->family > CHIP_R600 && ctx->family < CHIP_RV770 ? 2 : 0) + /* SURFACE_BASE_UPDATE */
-                          ctx->num_cs_dw_streamout_end, TRUE);
-
        if (ctx->chip_class >= EVERGREEN) {
                evergreen_flush_vgt_streamout(ctx);
-               evergreen_set_streamout_enable(ctx, buffer_en);
+               evergreen_set_streamout_enable(ctx, ctx->streamout.enabled_mask);
        } else {
                r600_flush_vgt_streamout(ctx);
-               r600_set_streamout_enable(ctx, buffer_en);
+               r600_set_streamout_enable(ctx, ctx->streamout.enabled_mask);
        }
 
-       for (i = 0; i < ctx->num_so_targets; i++) {
+       for (i = 0; i < ctx->streamout.num_targets; i++) {
                if (t[i]) {
                        t[i]->stride_in_dw = stride_in_dw[i];
                        t[i]->so_index = i;
@@ -1208,35 +492,33 @@ void r600_context_streamout_begin(struct r600_context *ctx)
 
                        update_flags |= SURFACE_BASE_UPDATE_STRMOUT(i);
 
-                       cs->buf[cs->cdw++] = PKT3(PKT3_SET_CONTEXT_REG, 3, 0);
-                       cs->buf[cs->cdw++] = (R_028AD0_VGT_STRMOUT_BUFFER_SIZE_0 +
-                                                       16*i - R600_CONTEXT_REG_OFFSET) >> 2;
-                       cs->buf[cs->cdw++] = (t[i]->b.buffer_offset +
-                                                       t[i]->b.buffer_size) >> 2; /* BUFFER_SIZE (in DW) */
-                       cs->buf[cs->cdw++] = stride_in_dw[i];              /* VTX_STRIDE (in DW) */
-                       cs->buf[cs->cdw++] = va >> 8;                      /* BUFFER_BASE */
+                       r600_write_context_reg_seq(cs, R_028AD0_VGT_STRMOUT_BUFFER_SIZE_0 + 16*i, 3);
+                       r600_write_value(cs, (t[i]->b.buffer_offset +
+                                             t[i]->b.buffer_size) >> 2); /* BUFFER_SIZE (in DW) */
+                       r600_write_value(cs, stride_in_dw[i]);            /* VTX_STRIDE (in DW) */
+                       r600_write_value(cs, va >> 8);                    /* BUFFER_BASE */
 
                        cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
                        cs->buf[cs->cdw++] =
-                               r600_context_bo_reloc(ctx, r600_resource(t[i]->b.buffer),
+                               r600_context_bo_reloc(ctx, &ctx->rings.gfx, r600_resource(t[i]->b.buffer),
                                                      RADEON_USAGE_WRITE);
 
                        /* R7xx requires this packet after updating BUFFER_BASE.
                         * Without this, R7xx locks up. */
-                       if (ctx->chip_class == R700) {
+                       if (ctx->family >= CHIP_RS780 && ctx->family <= CHIP_RV740) {
                                cs->buf[cs->cdw++] = PKT3(PKT3_STRMOUT_BASE_UPDATE, 1, 0);
                                cs->buf[cs->cdw++] = i;
                                cs->buf[cs->cdw++] = va >> 8;
 
                                cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
                                cs->buf[cs->cdw++] =
-                                       r600_context_bo_reloc(ctx, r600_resource(t[i]->b.buffer),
+                                       r600_context_bo_reloc(ctx, &ctx->rings.gfx, r600_resource(t[i]->b.buffer),
                                                              RADEON_USAGE_WRITE);
                        }
 
-                       if (ctx->streamout_append_bitmask & (1 << i)) {
+                       if (ctx->streamout.append_bitmask & (1 << i)) {
                                va = r600_resource_va(&ctx->screen->screen,
-                                                     (void*)t[i]->filled_size);
+                                                     (void*)t[i]->buf_filled_size) + t[i]->buf_filled_size_offset;
                                /* Append. */
                                cs->buf[cs->cdw++] = PKT3(PKT3_STRMOUT_BUFFER_UPDATE, 4, 0);
                                cs->buf[cs->cdw++] = STRMOUT_SELECT_BUFFER(i) |
@@ -1248,7 +530,7 @@ void r600_context_streamout_begin(struct r600_context *ctx)
 
                                cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
                                cs->buf[cs->cdw++] =
-                                       r600_context_bo_reloc(ctx,  t[i]->filled_size,
+                                       r600_context_bo_reloc(ctx,  &ctx->rings.gfx, t[i]->buf_filled_size,
                                                              RADEON_USAGE_READ);
                        } else {
                                /* Start from the beginning. */
@@ -1267,12 +549,13 @@ void r600_context_streamout_begin(struct r600_context *ctx)
                cs->buf[cs->cdw++] = PKT3(PKT3_SURFACE_BASE_UPDATE, 0, 0);
                cs->buf[cs->cdw++] = update_flags;
        }
+       ctx->streamout.begin_emitted = true;
 }
 
-void r600_context_streamout_end(struct r600_context *ctx)
+void r600_emit_streamout_end(struct r600_context *ctx)
 {
-       struct radeon_winsys_cs *cs = ctx->cs;
-       struct r600_so_target **t = ctx->so_targets;
+       struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
+       struct r600_so_target **t = ctx->streamout.targets;
        unsigned i;
        uint64_t va;
 
@@ -1282,10 +565,10 @@ void r600_context_streamout_end(struct r600_context *ctx)
                r600_flush_vgt_streamout(ctx);
        }
 
-       for (i = 0; i < ctx->num_so_targets; i++) {
+       for (i = 0; i < ctx->streamout.num_targets; i++) {
                if (t[i]) {
                        va = r600_resource_va(&ctx->screen->screen,
-                                             (void*)t[i]->filled_size);
+                                             (void*)t[i]->buf_filled_size) + t[i]->buf_filled_size_offset;
                        cs->buf[cs->cdw++] = PKT3(PKT3_STRMOUT_BUFFER_UPDATE, 4, 0);
                        cs->buf[cs->cdw++] = STRMOUT_SELECT_BUFFER(i) |
                                                       STRMOUT_OFFSET_SOURCE(STRMOUT_OFFSET_NONE) |
@@ -1297,22 +580,143 @@ void r600_context_streamout_end(struct r600_context *ctx)
 
                        cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
                        cs->buf[cs->cdw++] =
-                               r600_context_bo_reloc(ctx,  t[i]->filled_size,
+                               r600_context_bo_reloc(ctx,  &ctx->rings.gfx, t[i]->buf_filled_size,
                                                      RADEON_USAGE_WRITE);
-
                }
        }
 
        if (ctx->chip_class >= EVERGREEN) {
+               ctx->flags |= R600_CONTEXT_STREAMOUT_FLUSH;
                evergreen_set_streamout_enable(ctx, 0);
        } else {
+               if (ctx->chip_class >= R700) {
+                       ctx->flags |= R600_CONTEXT_STREAMOUT_FLUSH;
+               }
                r600_set_streamout_enable(ctx, 0);
        }
-       ctx->flags |= R600_CONTEXT_STREAMOUT_FLUSH;
+       ctx->flags |= R600_CONTEXT_WAIT_3D_IDLE | R600_CONTEXT_FLUSH_AND_INV;
+       ctx->streamout.begin_emitted = false;
+}
+
+/* The max number of bytes to copy per packet. */
+#define CP_DMA_MAX_BYTE_COUNT ((1 << 21) - 8)
+
+void r600_cp_dma_copy_buffer(struct r600_context *rctx,
+                            struct pipe_resource *dst, uint64_t dst_offset,
+                            struct pipe_resource *src, uint64_t src_offset,
+                            unsigned size)
+{
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
+
+       assert(size);
+       assert(rctx->screen->has_cp_dma);
+
+       dst_offset += r600_resource_va(&rctx->screen->screen, dst);
+       src_offset += r600_resource_va(&rctx->screen->screen, src);
+
+       /* We flush the caches, because we might read from or write
+        * to resources which are bound right now. */
+       rctx->flags |= R600_CONTEXT_INVAL_READ_CACHES |
+                      R600_CONTEXT_FLUSH_AND_INV |
+                      R600_CONTEXT_FLUSH_AND_INV_CB |
+                      R600_CONTEXT_FLUSH_AND_INV_DB |
+                      R600_CONTEXT_FLUSH_AND_INV_CB_META |
+                      R600_CONTEXT_FLUSH_AND_INV_DB_META |
+                      R600_CONTEXT_STREAMOUT_FLUSH |
+                      R600_CONTEXT_WAIT_3D_IDLE;
+
+       /* There are differences between R700 and EG in CP DMA,
+        * but we only use the common bits here. */
+       while (size) {
+               unsigned sync = 0;
+               unsigned byte_count = MIN2(size, CP_DMA_MAX_BYTE_COUNT);
+               unsigned src_reloc, dst_reloc;
+
+               r600_need_cs_space(rctx, 10 + (rctx->flags ? R600_MAX_FLUSH_CS_DWORDS : 0), FALSE);
+
+               /* Flush the caches for the first copy only. */
+               if (rctx->flags) {
+                       r600_flush_emit(rctx);
+               }
 
-       /* R6xx errata */
-       if (ctx->chip_class == R600) {
-               ctx->flags |= R600_CONTEXT_FLUSH_AND_INV;
+               /* Do the synchronization after the last copy, so that all data is written to memory. */
+               if (size == byte_count) {
+                       sync = PKT3_CP_DMA_CP_SYNC;
+               }
+
+               /* This must be done after r600_need_cs_space. */
+               src_reloc = r600_context_bo_reloc(rctx, &rctx->rings.gfx, (struct r600_resource*)src, RADEON_USAGE_READ);
+               dst_reloc = r600_context_bo_reloc(rctx, &rctx->rings.gfx, (struct r600_resource*)dst, RADEON_USAGE_WRITE);
+
+               r600_write_value(cs, PKT3(PKT3_CP_DMA, 4, 0));
+               r600_write_value(cs, src_offset);       /* SRC_ADDR_LO [31:0] */
+               r600_write_value(cs, sync | ((src_offset >> 32) & 0xff));               /* CP_SYNC [31] | SRC_ADDR_HI [7:0] */
+               r600_write_value(cs, dst_offset);       /* DST_ADDR_LO [31:0] */
+               r600_write_value(cs, (dst_offset >> 32) & 0xff);                /* DST_ADDR_HI [7:0] */
+               r600_write_value(cs, byte_count);       /* COMMAND [29:22] | BYTE_COUNT [20:0] */
+
+               r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
+               r600_write_value(cs, src_reloc);
+               r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
+               r600_write_value(cs, dst_reloc);
+
+               size -= byte_count;
+               src_offset += byte_count;
+               dst_offset += byte_count;
        }
-       ctx->num_cs_dw_streamout_end = 0;
+
+       /* Invalidate the read caches. */
+       rctx->flags |= R600_CONTEXT_INVAL_READ_CACHES;
+
+       util_range_add(&r600_resource(dst)->valid_buffer_range, dst_offset,
+                      dst_offset + size);
+}
+
+void r600_need_dma_space(struct r600_context *ctx, unsigned num_dw)
+{
+       /* The number of dwords we already used in the DMA so far. */
+       num_dw += ctx->rings.dma.cs->cdw;
+       /* Flush if there's not enough space. */
+       if (num_dw > RADEON_MAX_CMDBUF_DWORDS) {
+               ctx->rings.dma.flush(ctx, RADEON_FLUSH_ASYNC);
+       }
+}
+
+void r600_dma_copy(struct r600_context *rctx,
+               struct pipe_resource *dst,
+               struct pipe_resource *src,
+               uint64_t dst_offset,
+               uint64_t src_offset,
+               uint64_t size)
+{
+       struct radeon_winsys_cs *cs = rctx->rings.dma.cs;
+       unsigned i, ncopy, csize, shift;
+       struct r600_resource *rdst = (struct r600_resource*)dst;
+       struct r600_resource *rsrc = (struct r600_resource*)src;
+
+       /* make sure that the dma ring is only one active */
+       rctx->rings.gfx.flush(rctx, RADEON_FLUSH_ASYNC);
+
+       size >>= 2;
+       shift = 2;
+       ncopy = (size / 0xffff) + !!(size % 0xffff);
+
+       r600_need_dma_space(rctx, ncopy * 5);
+       for (i = 0; i < ncopy; i++) {
+               csize = size < 0xffff ? size : 0xffff;
+               /* emit reloc before writting cs so that cs is always in consistent state */
+               r600_context_bo_reloc(rctx, &rctx->rings.dma, rsrc, RADEON_USAGE_READ);
+               r600_context_bo_reloc(rctx, &rctx->rings.dma, rdst, RADEON_USAGE_WRITE);
+               cs->buf[cs->cdw++] = DMA_PACKET(DMA_PACKET_COPY, 0, 0, csize);
+               cs->buf[cs->cdw++] = dst_offset & 0xfffffffc;
+               cs->buf[cs->cdw++] = src_offset & 0xfffffffc;
+               cs->buf[cs->cdw++] = (dst_offset >> 32UL) & 0xff;
+               cs->buf[cs->cdw++] = (src_offset >> 32UL) & 0xff;
+               dst_offset += csize << shift;
+               src_offset += csize << shift;
+               size -= csize;
+       }
+
+       util_range_add(&rdst->valid_buffer_range, dst_offset,
+                      dst_offset + size);
 }