r600g: Add $(DEFINES) to AM_CXXFLAGS
[mesa.git] / src / gallium / drivers / r600 / evergreen_state.c
index 872fedfaf9d4f7556c8222f846a9d0d9d4a05974..ad0a62e968a40d1e79b73d6606bbb12eaea624dc 100644 (file)
@@ -21,6 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "r600_formats.h"
+#include "r600_shader.h"
 #include "evergreend.h"
 
 #include "pipe/p_shader_tokens.h"
 #include "util/u_framebuffer.h"
 #include "util/u_dual_blend.h"
 #include "evergreen_compute.h"
+#include "util/u_math.h"
+
+static INLINE unsigned evergreen_array_mode(unsigned mode)
+{
+       switch (mode) {
+       case RADEON_SURF_MODE_LINEAR_ALIGNED:   return V_028C70_ARRAY_LINEAR_ALIGNED;
+               break;
+       case RADEON_SURF_MODE_1D:               return V_028C70_ARRAY_1D_TILED_THIN1;
+               break;
+       case RADEON_SURF_MODE_2D:               return V_028C70_ARRAY_2D_TILED_THIN1;
+       default:
+       case RADEON_SURF_MODE_LINEAR:           return V_028C70_ARRAY_LINEAR_GENERAL;
+       }
+}
 
 static uint32_t eg_num_banks(uint32_t nbanks)
 {
@@ -173,6 +188,7 @@ static unsigned r600_tex_dim(unsigned dim, unsigned nr_samples)
        case PIPE_TEXTURE_3D:
                return V_030000_SQ_TEX_DIM_3D;
        case PIPE_TEXTURE_CUBE:
+       case PIPE_TEXTURE_CUBE_ARRAY:
                return V_030000_SQ_TEX_DIM_CUBEMAP;
        }
 }
@@ -184,6 +200,8 @@ static uint32_t r600_translate_dbformat(enum pipe_format format)
                return V_028040_Z_16;
        case PIPE_FORMAT_Z24X8_UNORM:
        case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+       case PIPE_FORMAT_X8Z24_UNORM:
+       case PIPE_FORMAT_S8_UINT_Z24_UNORM:
                return V_028040_Z_24;
        case PIPE_FORMAT_Z32_FLOAT:
        case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
@@ -274,6 +292,18 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_L32A32_UINT:
        case PIPE_FORMAT_L32A32_SINT:
        case PIPE_FORMAT_L32A32_FLOAT:
+        case PIPE_FORMAT_R8A8_UNORM:
+       case PIPE_FORMAT_R8A8_SNORM:
+       case PIPE_FORMAT_R8A8_UINT:
+       case PIPE_FORMAT_R8A8_SINT:
+       case PIPE_FORMAT_R16A16_UNORM:
+       case PIPE_FORMAT_R16A16_SNORM:
+       case PIPE_FORMAT_R16A16_UINT:
+       case PIPE_FORMAT_R16A16_SINT:
+       case PIPE_FORMAT_R16A16_FLOAT:
+       case PIPE_FORMAT_R32A32_UINT:
+       case PIPE_FORMAT_R32A32_SINT:
+       case PIPE_FORMAT_R32A32_FLOAT:
                return V_028C70_SWAP_ALT;
        case PIPE_FORMAT_R8G8_UNORM:
        case PIPE_FORMAT_R8G8_SNORM:
@@ -306,6 +336,10 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_R8G8B8A8_SINT:
        case PIPE_FORMAT_R8G8B8A8_UINT:
        case PIPE_FORMAT_R8G8B8X8_UNORM:
+       case PIPE_FORMAT_R8G8B8X8_SNORM:
+       case PIPE_FORMAT_R8G8B8X8_SRGB:
+       case PIPE_FORMAT_R8G8B8X8_UINT:
+       case PIPE_FORMAT_R8G8B8X8_SINT:
                return V_028C70_SWAP_STD;
 
        case PIPE_FORMAT_A8B8G8R8_UNORM:
@@ -319,7 +353,7 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
 
        case PIPE_FORMAT_X8Z24_UNORM:
        case PIPE_FORMAT_S8_UINT_Z24_UNORM:
-               return V_028C70_SWAP_STD;
+               return V_028C70_SWAP_STD_REV;
 
        case PIPE_FORMAT_R10G10B10A2_UNORM:
        case PIPE_FORMAT_R10G10B10X2_SNORM:
@@ -328,6 +362,7 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
 
        case PIPE_FORMAT_B10G10R10A2_UNORM:
        case PIPE_FORMAT_B10G10R10A2_UINT:
+       case PIPE_FORMAT_B10G10R10X2_UNORM:
                return V_028C70_SWAP_ALT;
 
        case PIPE_FORMAT_R11G11B10_FLOAT:
@@ -351,6 +386,11 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_R16G16B16A16_UINT:
        case PIPE_FORMAT_R16G16B16A16_SINT:
        case PIPE_FORMAT_R16G16B16A16_FLOAT:
+       case PIPE_FORMAT_R16G16B16X16_UNORM:
+       case PIPE_FORMAT_R16G16B16X16_SNORM:
+       case PIPE_FORMAT_R16G16B16X16_FLOAT:
+       case PIPE_FORMAT_R16G16B16X16_UINT:
+       case PIPE_FORMAT_R16G16B16X16_SINT:
        case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
 
        /* 128-bit buffers. */
@@ -359,6 +399,9 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
        case PIPE_FORMAT_R32G32B32A32_UNORM:
        case PIPE_FORMAT_R32G32B32A32_SINT:
        case PIPE_FORMAT_R32G32B32A32_UINT:
+       case PIPE_FORMAT_R32G32B32X32_FLOAT:
+       case PIPE_FORMAT_R32G32B32X32_UINT:
+       case PIPE_FORMAT_R32G32B32X32_SINT:
                return V_028C70_SWAP_STD;
        default:
                R600_ERR("unsupported colorswap format %d\n", format);
@@ -414,6 +457,10 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R8G8_SNORM:
        case PIPE_FORMAT_R8G8_UINT:
        case PIPE_FORMAT_R8G8_SINT:
+        case PIPE_FORMAT_R8A8_UNORM:
+       case PIPE_FORMAT_R8A8_SNORM:
+       case PIPE_FORMAT_R8A8_UINT:
+       case PIPE_FORMAT_R8A8_SINT:
                return V_028C70_COLOR_8_8;
 
        case PIPE_FORMAT_R16_UNORM:
@@ -450,6 +497,10 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R8G8B8A8_SNORM:
        case PIPE_FORMAT_R8G8B8A8_UNORM:
        case PIPE_FORMAT_R8G8B8X8_UNORM:
+       case PIPE_FORMAT_R8G8B8X8_SNORM:
+       case PIPE_FORMAT_R8G8B8X8_SRGB:
+       case PIPE_FORMAT_R8G8B8X8_UINT:
+       case PIPE_FORMAT_R8G8B8X8_SINT:
        case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
        case PIPE_FORMAT_X8B8G8R8_UNORM:
        case PIPE_FORMAT_X8R8G8B8_UNORM:
@@ -462,6 +513,7 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R10G10B10X2_SNORM:
        case PIPE_FORMAT_B10G10R10A2_UNORM:
        case PIPE_FORMAT_B10G10R10A2_UINT:
+       case PIPE_FORMAT_B10G10R10X2_UNORM:
        case PIPE_FORMAT_R10SG10SB10SA2U_NORM:
                return V_028C70_COLOR_2_10_10_10;
 
@@ -495,6 +547,7 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
 
        case PIPE_FORMAT_R16G16_FLOAT:
        case PIPE_FORMAT_L16A16_FLOAT:
+        case PIPE_FORMAT_R16A16_FLOAT:
                return V_028C70_COLOR_16_16_FLOAT;
 
        case PIPE_FORMAT_R16G16_UNORM:
@@ -505,6 +558,10 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_L16A16_SNORM:
        case PIPE_FORMAT_L16A16_UINT:
        case PIPE_FORMAT_L16A16_SINT:
+        case PIPE_FORMAT_R16A16_UNORM:
+       case PIPE_FORMAT_R16A16_SNORM:
+       case PIPE_FORMAT_R16A16_UINT:
+       case PIPE_FORMAT_R16A16_SINT:
                return V_028C70_COLOR_16_16;
 
        case PIPE_FORMAT_R11G11B10_FLOAT:
@@ -515,13 +572,19 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R16G16B16A16_SINT:
        case PIPE_FORMAT_R16G16B16A16_UNORM:
        case PIPE_FORMAT_R16G16B16A16_SNORM:
+       case PIPE_FORMAT_R16G16B16X16_UNORM:
+       case PIPE_FORMAT_R16G16B16X16_SNORM:
+       case PIPE_FORMAT_R16G16B16X16_UINT:
+       case PIPE_FORMAT_R16G16B16X16_SINT:
                return V_028C70_COLOR_16_16_16_16;
 
        case PIPE_FORMAT_R16G16B16A16_FLOAT:
+       case PIPE_FORMAT_R16G16B16X16_FLOAT:
                return V_028C70_COLOR_16_16_16_16_FLOAT;
 
        case PIPE_FORMAT_R32G32_FLOAT:
        case PIPE_FORMAT_L32A32_FLOAT:
+        case PIPE_FORMAT_R32A32_FLOAT:
                return V_028C70_COLOR_32_32_FLOAT;
 
        case PIPE_FORMAT_R32G32_SINT:
@@ -535,8 +598,11 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R32G32B32A32_UNORM:
        case PIPE_FORMAT_R32G32B32A32_SINT:
        case PIPE_FORMAT_R32G32B32A32_UINT:
+       case PIPE_FORMAT_R32G32B32X32_UINT:
+       case PIPE_FORMAT_R32G32B32X32_SINT:
                return V_028C70_COLOR_32_32_32_32;
        case PIPE_FORMAT_R32G32B32A32_FLOAT:
+       case PIPE_FORMAT_R32G32B32X32_FLOAT:
                return V_028C70_COLOR_32_32_32_32_FLOAT;
 
        /* YUV buffers. */
@@ -632,7 +698,7 @@ boolean evergreen_is_format_supported(struct pipe_screen *screen,
                return FALSE;
 
        if (sample_count > 1) {
-               if (rscreen->info.drm_minor < 19)
+               if (!rscreen->has_msaa)
                        return FALSE;
 
                switch (sample_count) {
@@ -779,23 +845,20 @@ static void *evergreen_create_blend_state(struct pipe_context *ctx,
 static void *evergreen_create_dsa_state(struct pipe_context *ctx,
                                   const struct pipe_depth_stencil_alpha_state *state)
 {
-       struct r600_context *rctx = (struct r600_context *)ctx;
-       struct r600_pipe_dsa *dsa = CALLOC_STRUCT(r600_pipe_dsa);
        unsigned db_depth_control, alpha_test_control, alpha_ref;
-       struct r600_pipe_state *rstate;
+       struct r600_dsa_state *dsa = CALLOC_STRUCT(r600_dsa_state);
 
        if (dsa == NULL) {
                return NULL;
        }
 
+       r600_init_command_buffer(&dsa->buffer, 3);
+
        dsa->valuemask[0] = state->stencil[0].valuemask;
        dsa->valuemask[1] = state->stencil[1].valuemask;
        dsa->writemask[0] = state->stencil[0].writemask;
        dsa->writemask[1] = state->stencil[1].writemask;
 
-       rstate = &dsa->rstate;
-
-       rstate->id = R600_PIPE_STATE_DSA;
        db_depth_control = S_028800_Z_ENABLE(state->depth.enabled) |
                S_028800_Z_WRITE_ENABLE(state->depth.writemask) |
                S_028800_ZFUNC(state->depth.func);
@@ -829,31 +892,24 @@ static void *evergreen_create_dsa_state(struct pipe_context *ctx,
        dsa->alpha_ref = alpha_ref;
 
        /* misc */
-       r600_pipe_state_add_reg(rstate, R_028800_DB_DEPTH_CONTROL, db_depth_control);
-       return rstate;
+       r600_store_context_reg(&dsa->buffer, R_028800_DB_DEPTH_CONTROL, db_depth_control);
+       return dsa;
 }
 
 static void *evergreen_create_rs_state(struct pipe_context *ctx,
                                        const struct pipe_rasterizer_state *state)
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
-       struct r600_pipe_rasterizer *rs = CALLOC_STRUCT(r600_pipe_rasterizer);
-       struct r600_pipe_state *rstate;
-       unsigned tmp;
-       unsigned prov_vtx = 1, polygon_dual_mode;
+       unsigned tmp, spi_interp;
        float psize_min, psize_max;
+       struct r600_rasterizer_state *rs = CALLOC_STRUCT(r600_rasterizer_state);
 
        if (rs == NULL) {
                return NULL;
        }
 
-       polygon_dual_mode = (state->fill_front != PIPE_POLYGON_MODE_FILL ||
-                               state->fill_back != PIPE_POLYGON_MODE_FILL);
-
-       if (state->flatshade_first)
-               prov_vtx = 0;
+       r600_init_command_buffer(&rs->buffer, 30);
 
-       rstate = &rs->rstate;
        rs->flatshade = state->flatshade;
        rs->sprite_coord_enable = state->sprite_coord_enable;
        rs->two_side = state->light_twoside;
@@ -873,24 +929,6 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
        rs->offset_scale = state->offset_scale * 12.0f;
        rs->offset_enable = state->offset_point || state->offset_line || state->offset_tri;
 
-       rstate->id = R600_PIPE_STATE_RASTERIZER;
-       tmp = S_0286D4_FLAT_SHADE_ENA(1);
-       if (state->sprite_coord_enable) {
-               tmp |= S_0286D4_PNT_SPRITE_ENA(1) |
-                       S_0286D4_PNT_SPRITE_OVRD_X(2) |
-                       S_0286D4_PNT_SPRITE_OVRD_Y(3) |
-                       S_0286D4_PNT_SPRITE_OVRD_Z(0) |
-                       S_0286D4_PNT_SPRITE_OVRD_W(1);
-               if (state->sprite_coord_mode != PIPE_SPRITE_COORD_UPPER_LEFT) {
-                       tmp |= S_0286D4_PNT_SPRITE_TOP_1(1);
-               }
-       }
-       r600_pipe_state_add_reg(rstate, R_0286D4_SPI_INTERP_CONTROL_0, tmp);
-
-       /* point size 12.4 fixed point */
-       tmp = (unsigned)(state->point_size * 8.0);
-       r600_pipe_state_add_reg(rstate, R_028A00_PA_SU_POINT_SIZE, S_028A00_HEIGHT(tmp) | S_028A00_WIDTH(tmp));
-
        if (state->point_size_per_vertex) {
                psize_min = util_get_min_point_size(state);
                psize_max = 8192;
@@ -899,89 +937,154 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
                psize_min = state->point_size;
                psize_max = state->point_size;
        }
-       /* Divide by two, because 0.5 = 1 pixel. */
-       r600_pipe_state_add_reg(rstate, R_028A04_PA_SU_POINT_MINMAX,
-                               S_028A04_MIN_SIZE(r600_pack_float_12p4(psize_min/2)) |
-                               S_028A04_MAX_SIZE(r600_pack_float_12p4(psize_max/2)));
 
-       tmp = (unsigned)state->line_width * 8;
-       r600_pipe_state_add_reg(rstate, R_028A08_PA_SU_LINE_CNTL, S_028A08_WIDTH(tmp));
-       r600_pipe_state_add_reg(rstate, R_028A48_PA_SC_MODE_CNTL_0,
-                               S_028A48_MSAA_ENABLE(state->multisample) |
-                               S_028A48_VPORT_SCISSOR_ENABLE(state->scissor) |
-                               S_028A48_LINE_STIPPLE_ENABLE(state->line_stipple_enable));
+       spi_interp = S_0286D4_FLAT_SHADE_ENA(1);
+       if (state->sprite_coord_enable) {
+               spi_interp |= S_0286D4_PNT_SPRITE_ENA(1) |
+                             S_0286D4_PNT_SPRITE_OVRD_X(2) |
+                             S_0286D4_PNT_SPRITE_OVRD_Y(3) |
+                             S_0286D4_PNT_SPRITE_OVRD_Z(0) |
+                             S_0286D4_PNT_SPRITE_OVRD_W(1);
+               if (state->sprite_coord_mode != PIPE_SPRITE_COORD_UPPER_LEFT) {
+                       spi_interp |= S_0286D4_PNT_SPRITE_TOP_1(1);
+               }
+       }
+
+       r600_store_context_reg_seq(&rs->buffer, R_028A00_PA_SU_POINT_SIZE, 3);
+       /* point size 12.4 fixed point (divide by two, because 0.5 = 1 pixel) */
+       tmp = r600_pack_float_12p4(state->point_size/2);
+       r600_store_value(&rs->buffer, /* R_028A00_PA_SU_POINT_SIZE */
+                        S_028A00_HEIGHT(tmp) | S_028A00_WIDTH(tmp));
+       r600_store_value(&rs->buffer, /* R_028A04_PA_SU_POINT_MINMAX */
+                        S_028A04_MIN_SIZE(r600_pack_float_12p4(psize_min/2)) |
+                        S_028A04_MAX_SIZE(r600_pack_float_12p4(psize_max/2)));
+       r600_store_value(&rs->buffer, /* R_028A08_PA_SU_LINE_CNTL */
+                        S_028A08_WIDTH((unsigned)(state->line_width * 8)));
+
+       r600_store_context_reg(&rs->buffer, R_0286D4_SPI_INTERP_CONTROL_0, spi_interp);
+       r600_store_context_reg(&rs->buffer, R_028A48_PA_SC_MODE_CNTL_0,
+                              S_028A48_MSAA_ENABLE(state->multisample) |
+                              S_028A48_VPORT_SCISSOR_ENABLE(state->scissor) |
+                              S_028A48_LINE_STIPPLE_ENABLE(state->line_stipple_enable));
 
        if (rctx->chip_class == CAYMAN) {
-               r600_pipe_state_add_reg(rstate, CM_R_028BE4_PA_SU_VTX_CNTL,
-                                       S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules) |
-                                       S_028C08_QUANT_MODE(V_028C08_X_1_256TH));
+               r600_store_context_reg(&rs->buffer, CM_R_028BE4_PA_SU_VTX_CNTL,
+                                      S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules) |
+                                      S_028C08_QUANT_MODE(V_028C08_X_1_256TH));
        } else {
-               r600_pipe_state_add_reg(rstate, R_028C08_PA_SU_VTX_CNTL,
-                                       S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules) |
-                                       S_028C08_QUANT_MODE(V_028C08_X_1_256TH));
-       }
-       r600_pipe_state_add_reg(rstate, R_028B7C_PA_SU_POLY_OFFSET_CLAMP, fui(state->offset_clamp));
-       r600_pipe_state_add_reg(rstate, R_028814_PA_SU_SC_MODE_CNTL,
-                               S_028814_PROVOKING_VTX_LAST(prov_vtx) |
-                               S_028814_CULL_FRONT(state->rasterizer_discard || (state->cull_face & PIPE_FACE_FRONT) ? 1 : 0) |
-                               S_028814_CULL_BACK(state->rasterizer_discard || (state->cull_face & PIPE_FACE_BACK) ? 1 : 0) |
-                               S_028814_FACE(!state->front_ccw) |
-                               S_028814_POLY_OFFSET_FRONT_ENABLE(state->offset_tri) |
-                               S_028814_POLY_OFFSET_BACK_ENABLE(state->offset_tri) |
-                               S_028814_POLY_OFFSET_PARA_ENABLE(state->offset_tri) |
-                               S_028814_POLY_MODE(polygon_dual_mode) |
-                               S_028814_POLYMODE_FRONT_PTYPE(r600_translate_fill(state->fill_front)) |
-                               S_028814_POLYMODE_BACK_PTYPE(r600_translate_fill(state->fill_back)));
-       r600_pipe_state_add_reg(rstate, R_028350_SX_MISC, S_028350_MULTIPASS(state->rasterizer_discard));
-       return rstate;
+               r600_store_context_reg(&rs->buffer, R_028C08_PA_SU_VTX_CNTL,
+                                      S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules) |
+                                      S_028C08_QUANT_MODE(V_028C08_X_1_256TH));
+       }
+
+       r600_store_context_reg(&rs->buffer, R_028B7C_PA_SU_POLY_OFFSET_CLAMP, fui(state->offset_clamp));
+       r600_store_context_reg(&rs->buffer, R_028814_PA_SU_SC_MODE_CNTL,
+                              S_028814_PROVOKING_VTX_LAST(!state->flatshade_first) |
+                              S_028814_CULL_FRONT((state->cull_face & PIPE_FACE_FRONT) ? 1 : 0) |
+                              S_028814_CULL_BACK((state->cull_face & PIPE_FACE_BACK) ? 1 : 0) |
+                              S_028814_FACE(!state->front_ccw) |
+                              S_028814_POLY_OFFSET_FRONT_ENABLE(state->offset_tri) |
+                              S_028814_POLY_OFFSET_BACK_ENABLE(state->offset_tri) |
+                              S_028814_POLY_OFFSET_PARA_ENABLE(state->offset_tri) |
+                              S_028814_POLY_MODE(state->fill_front != PIPE_POLYGON_MODE_FILL ||
+                                                 state->fill_back != PIPE_POLYGON_MODE_FILL) |
+                              S_028814_POLYMODE_FRONT_PTYPE(r600_translate_fill(state->fill_front)) |
+                              S_028814_POLYMODE_BACK_PTYPE(r600_translate_fill(state->fill_back)));
+       r600_store_context_reg(&rs->buffer, R_028350_SX_MISC, S_028350_MULTIPASS(state->rasterizer_discard));
+       return rs;
 }
 
 static void *evergreen_create_sampler_state(struct pipe_context *ctx,
                                        const struct pipe_sampler_state *state)
 {
        struct r600_pipe_sampler_state *ss = CALLOC_STRUCT(r600_pipe_sampler_state);
-       union util_color uc;
        unsigned aniso_flag_offset = state->max_anisotropy > 1 ? 2 : 0;
 
        if (ss == NULL) {
                return NULL;
        }
 
-       /* directly into sampler avoid r6xx code to emit useless reg */
-       ss->seamless_cube_map = false;
-       util_pack_color(state->border_color.f, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
-       ss->border_color_use = false;
+       ss->border_color_use = sampler_state_needs_border_color(state);
+
        /* R_03C000_SQ_TEX_SAMPLER_WORD0_0 */
-       ss->tex_sampler_words[0] = S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
-                               S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
-                               S_03C000_CLAMP_Z(r600_tex_wrap(state->wrap_r)) |
-                               S_03C000_XY_MAG_FILTER(r600_tex_filter(state->mag_img_filter) | aniso_flag_offset) |
-                               S_03C000_XY_MIN_FILTER(r600_tex_filter(state->min_img_filter) | aniso_flag_offset) |
-                               S_03C000_MIP_FILTER(r600_tex_mipfilter(state->min_mip_filter)) |
-                               S_03C000_MAX_ANISO(r600_tex_aniso_filter(state->max_anisotropy)) |
-                               S_03C000_DEPTH_COMPARE_FUNCTION(r600_tex_compare(state->compare_func)) |
-                               S_03C000_BORDER_COLOR_TYPE(uc.ui ? V_03C000_SQ_TEX_BORDER_COLOR_REGISTER : 0);
+       ss->tex_sampler_words[0] =
+               S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
+               S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
+               S_03C000_CLAMP_Z(r600_tex_wrap(state->wrap_r)) |
+               S_03C000_XY_MAG_FILTER(r600_tex_filter(state->mag_img_filter) | aniso_flag_offset) |
+               S_03C000_XY_MIN_FILTER(r600_tex_filter(state->min_img_filter) | aniso_flag_offset) |
+               S_03C000_MIP_FILTER(r600_tex_mipfilter(state->min_mip_filter)) |
+               S_03C000_MAX_ANISO(r600_tex_aniso_filter(state->max_anisotropy)) |
+               S_03C000_DEPTH_COMPARE_FUNCTION(r600_tex_compare(state->compare_func)) |
+               S_03C000_BORDER_COLOR_TYPE(ss->border_color_use ? V_03C000_SQ_TEX_BORDER_COLOR_REGISTER : 0);
        /* R_03C004_SQ_TEX_SAMPLER_WORD1_0 */
-       ss->tex_sampler_words[1] = S_03C004_MIN_LOD(S_FIXED(CLAMP(state->min_lod, 0, 15), 8)) |
-                               S_03C004_MAX_LOD(S_FIXED(CLAMP(state->max_lod, 0, 15), 8));
+       ss->tex_sampler_words[1] =
+               S_03C004_MIN_LOD(S_FIXED(CLAMP(state->min_lod, 0, 15), 8)) |
+               S_03C004_MAX_LOD(S_FIXED(CLAMP(state->max_lod, 0, 15), 8));
        /* R_03C008_SQ_TEX_SAMPLER_WORD2_0 */
-       ss->tex_sampler_words[2] = S_03C008_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16, 16), 8)) |
-                               (state->seamless_cube_map ? 0 : S_03C008_DISABLE_CUBE_WRAP(1)) |
-                               S_03C008_TYPE(1);
-       if (uc.ui) {
-               ss->border_color_use = true;
-               /* R_00A400_TD_PS_SAMPLER0_BORDER_RED */
-               ss->border_color[0] = fui(state->border_color.f[0]);
-               /* R_00A404_TD_PS_SAMPLER0_BORDER_GREEN */
-               ss->border_color[1] = fui(state->border_color.f[1]);
-               /* R_00A408_TD_PS_SAMPLER0_BORDER_BLUE */
-               ss->border_color[2] = fui(state->border_color.f[2]);
-               /* R_00A40C_TD_PS_SAMPLER0_BORDER_ALPHA */
-               ss->border_color[3] = fui(state->border_color.f[3]);
+       ss->tex_sampler_words[2] =
+               S_03C008_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16, 16), 8)) |
+               (state->seamless_cube_map ? 0 : S_03C008_DISABLE_CUBE_WRAP(1)) |
+               S_03C008_TYPE(1);
+
+       if (ss->border_color_use) {
+               memcpy(&ss->border_color, &state->border_color, sizeof(state->border_color));
        }
        return ss;
 }
 
+static struct pipe_sampler_view *
+texture_buffer_sampler_view(struct r600_pipe_sampler_view *view,
+                           unsigned width0, unsigned height0)
+                           
+{
+       struct pipe_context *ctx = view->base.context;
+       struct r600_texture *tmp = (struct r600_texture*)view->base.texture;
+       uint64_t va;
+       int stride = util_format_get_blocksize(view->base.format);
+       unsigned format, num_format, format_comp, endian;
+       unsigned swizzle_res;
+       unsigned char swizzle[4];
+       const struct util_format_description *desc;
+
+       swizzle[0] = view->base.swizzle_r;
+       swizzle[1] = view->base.swizzle_g;
+       swizzle[2] = view->base.swizzle_b;
+       swizzle[3] = view->base.swizzle_a;
+
+       r600_vertex_data_type(view->base.format,
+                             &format, &num_format, &format_comp,
+                             &endian);
+
+       desc = util_format_description(view->base.format);
+
+       swizzle_res = r600_get_swizzle_combined(desc->swizzle, swizzle, TRUE);
+
+       va = r600_resource_va(ctx->screen, view->base.texture);
+       view->tex_resource = &tmp->resource;
+
+       view->skip_mip_address_reloc = true;
+       view->tex_resource_words[0] = va;
+       view->tex_resource_words[1] = width0 - 1;
+       view->tex_resource_words[2] = S_030008_BASE_ADDRESS_HI(va >> 32UL) |
+               S_030008_STRIDE(stride) |
+               S_030008_DATA_FORMAT(format) |
+               S_030008_NUM_FORMAT_ALL(num_format) |
+               S_030008_FORMAT_COMP_ALL(format_comp) |
+               S_030008_SRF_MODE_ALL(1) |
+               S_030008_ENDIAN_SWAP(endian);
+       view->tex_resource_words[3] = swizzle_res;
+       /*
+        * in theory dword 4 is for number of elements, for use with resinfo,
+        * but it seems to utterly fail to work, the amd gpu shader analyser
+        * uses a const buffer to store the element sizes for buffer txq
+        */
+       view->tex_resource_words[4] = 0;
+       view->tex_resource_words[5] = view->tex_resource_words[6] = 0;
+       view->tex_resource_words[7] = S_03001C_TYPE(V_03001C_SQ_TEX_VTX_VALID_BUFFER);
+       return &view->base;
+}
+
 struct pipe_sampler_view *
 evergreen_create_sampler_view_custom(struct pipe_context *ctx,
                                     struct pipe_resource *texture,
@@ -993,9 +1096,11 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
        struct r600_texture *tmp = (struct r600_texture*)texture;
        unsigned format, endian;
        uint32_t word4 = 0, yuv_format = 0, pitch = 0;
-       unsigned char swizzle[4], array_mode = 0, tile_type = 0;
+       unsigned char swizzle[4], array_mode = 0, non_disp_tiling = 0;
        unsigned height, depth, width;
        unsigned macro_aspect, tile_split, bankh, bankw, nbanks;
+       enum pipe_format pipe_format = state->format;
+       struct radeon_surface_level *surflevel;
 
        if (view == NULL)
                return NULL;
@@ -1008,12 +1113,40 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
        view->base.reference.count = 1;
        view->base.context = ctx;
 
+       if (texture->target == PIPE_BUFFER)
+               return texture_buffer_sampler_view(view, width0, height0);
+
        swizzle[0] = state->swizzle_r;
        swizzle[1] = state->swizzle_g;
        swizzle[2] = state->swizzle_b;
        swizzle[3] = state->swizzle_a;
 
-       format = r600_translate_texformat(ctx->screen, state->format,
+       tile_split = tmp->surface.tile_split;
+       surflevel = tmp->surface.level;
+
+       /* Texturing with separate depth and stencil. */
+       if (tmp->is_depth && !tmp->is_flushing_texture) {
+               switch (pipe_format) {
+               case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
+                       pipe_format = PIPE_FORMAT_Z32_FLOAT;
+                       break;
+               case PIPE_FORMAT_X8Z24_UNORM:
+               case PIPE_FORMAT_S8_UINT_Z24_UNORM:
+                       /* Z24 is always stored like this. */
+                       pipe_format = PIPE_FORMAT_Z24X8_UNORM;
+                       break;
+               case PIPE_FORMAT_X24S8_UINT:
+               case PIPE_FORMAT_S8X24_UINT:
+               case PIPE_FORMAT_X32_S8X24_UINT:
+                       pipe_format = PIPE_FORMAT_S8_UINT;
+                       tile_split = tmp->surface.stencil_tile_split;
+                       surflevel = tmp->surface.stencil_level;
+                       break;
+               default:;
+               }
+       }
+
+       format = r600_translate_texformat(ctx->screen, pipe_format,
                                          swizzle,
                                          &word4, &yuv_format);
        assert(format != ~0);
@@ -1022,23 +1155,15 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
                return NULL;
        }
 
-       if (tmp->is_depth && !tmp->is_flushing_texture) {
-               if (!r600_init_flushed_depth_texture(ctx, texture, NULL)) {
-                       FREE(view);
-                       return NULL;
-               }
-               tmp = tmp->flushed_depth_texture;
-       }
-
        endian = r600_colorformat_endian_swap(format);
 
        width = width0;
        height = height0;
-       depth = tmp->surface.level[0].npix_z;
-       pitch = tmp->surface.level[0].nblk_x * util_format_get_blockwidth(state->format);
-       tile_type = tmp->tile_type;
+       depth = texture->depth0;
+       pitch = surflevel[0].nblk_x * util_format_get_blockwidth(pipe_format);
+       non_disp_tiling = tmp->non_disp_tiling;
 
-       switch (tmp->surface.level[0].mode) {
+       switch (surflevel[0].mode) {
        case RADEON_SURF_MODE_LINEAR_ALIGNED:
                array_mode = V_028C70_ARRAY_LINEAR_ALIGNED;
                break;
@@ -1053,7 +1178,6 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
                array_mode = V_028C70_ARRAY_LINEAR_GENERAL;
                break;
        }
-       tile_split = tmp->surface.tile_split;
        macro_aspect = tmp->surface.mtilea;
        bankw = tmp->surface.bankw;
        bankh = tmp->surface.bankh;
@@ -1064,8 +1188,8 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
 
        /* 128 bit formats require tile type = 1 */
        if (rscreen->chip_class == CAYMAN) {
-               if (util_format_get_blocksize(state->format) >= 16)
-                       tile_type = 1;
+               if (util_format_get_blocksize(pipe_format) >= 16)
+                       non_disp_tiling = 1;
        }
        nbanks = eg_num_banks(rscreen->tiling_info.num_banks);
 
@@ -1074,25 +1198,39 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
                depth = texture->array_size;
        } else if (texture->target == PIPE_TEXTURE_2D_ARRAY) {
                depth = texture->array_size;
-       }
+       } else if (texture->target == PIPE_TEXTURE_CUBE_ARRAY)
+               depth = texture->array_size / 6;
 
        view->tex_resource = &tmp->resource;
        view->tex_resource_words[0] = (S_030000_DIM(r600_tex_dim(texture->target, texture->nr_samples)) |
                                       S_030000_PITCH((pitch / 8) - 1) |
                                       S_030000_TEX_WIDTH(width - 1));
        if (rscreen->chip_class == CAYMAN)
-               view->tex_resource_words[0] |= CM_S_030000_NON_DISP_TILING_ORDER(tile_type);
+               view->tex_resource_words[0] |= CM_S_030000_NON_DISP_TILING_ORDER(non_disp_tiling);
        else
-               view->tex_resource_words[0] |= S_030000_NON_DISP_TILING_ORDER(tile_type);
+               view->tex_resource_words[0] |= S_030000_NON_DISP_TILING_ORDER(non_disp_tiling);
        view->tex_resource_words[1] = (S_030004_TEX_HEIGHT(height - 1) |
                                       S_030004_TEX_DEPTH(depth - 1) |
                                       S_030004_ARRAY_MODE(array_mode));
-       view->tex_resource_words[2] = (tmp->surface.level[0].offset + r600_resource_va(ctx->screen, texture)) >> 8;
-       if (state->u.tex.last_level && texture->nr_samples <= 1) {
-               view->tex_resource_words[3] = (tmp->surface.level[1].offset + r600_resource_va(ctx->screen, texture)) >> 8;
+       view->tex_resource_words[2] = (surflevel[0].offset + r600_resource_va(ctx->screen, texture)) >> 8;
+
+       /* TEX_RESOURCE_WORD3.MIP_ADDRESS */
+       if (texture->nr_samples > 1 && rscreen->msaa_texture_support == MSAA_TEXTURE_COMPRESSED) {
+               /* XXX the 2x and 4x cases are broken. */
+               if (tmp->is_depth || tmp->resource.b.b.nr_samples != 8) {
+                       /* disable FMASK (0 = disabled) */
+                       view->tex_resource_words[3] = 0;
+                       view->skip_mip_address_reloc = true;
+               } else {
+                       /* FMASK should be in MIP_ADDRESS for multisample textures */
+                       view->tex_resource_words[3] = (tmp->fmask_offset + r600_resource_va(ctx->screen, texture)) >> 8;
+               }
+       } else if (state->u.tex.last_level && texture->nr_samples <= 1) {
+               view->tex_resource_words[3] = (surflevel[1].offset + r600_resource_va(ctx->screen, texture)) >> 8;
        } else {
-               view->tex_resource_words[3] = (tmp->surface.level[0].offset + r600_resource_va(ctx->screen, texture)) >> 8;
+               view->tex_resource_words[3] = (surflevel[0].offset + r600_resource_va(ctx->screen, texture)) >> 8;
        }
+
        view->tex_resource_words[4] = (word4 |
                                       S_030010_SRF_MODE_ALL(V_030010_SRF_MODE_ZERO_CLAMP_MINUS_ONE) |
                                       S_030010_ENDIAN_SWAP(endian));
@@ -1117,7 +1255,8 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
                                      S_03001C_BANK_WIDTH(bankw) |
                                      S_03001C_BANK_HEIGHT(bankh) |
                                      S_03001C_MACRO_TILE_ASPECT(macro_aspect) |
-                                     S_03001C_NUM_BANKS(nbanks);
+                                     S_03001C_NUM_BANKS(nbanks) |
+                                     S_03001C_DEPTH_SAMPLE_ORDER(tmp->is_depth && !tmp->is_flushing_texture);
        return &view->base;
 }
 
@@ -1132,7 +1271,7 @@ evergreen_create_sampler_view(struct pipe_context *ctx,
 
 static void evergreen_emit_clip_state(struct r600_context *rctx, struct r600_atom *atom)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct pipe_clip_state *state = &rctx->clip_state.state;
 
        r600_write_context_reg_seq(cs, R_0285BC_PA_CL_UCP0_X, 6*4);
@@ -1175,7 +1314,7 @@ static void evergreen_set_scissor_state(struct pipe_context *ctx,
 
 static void evergreen_emit_scissor_state(struct r600_context *rctx, struct r600_atom *atom)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct pipe_scissor_state *state = &rctx->scissor.scissor;
        uint32_t tl, br;
 
@@ -1254,17 +1393,11 @@ void evergreen_init_color_surface(struct r600_context *rctx,
        unsigned color_info, color_attrib, color_dim = 0;
        unsigned format, swap, ntype, endian;
        uint64_t offset, base_offset;
-       unsigned tile_type, macro_aspect, tile_split, bankh, bankw, fmask_bankh, nbanks;
+       unsigned non_disp_tiling, macro_aspect, tile_split, bankh, bankw, fmask_bankh, nbanks;
        const struct util_format_description *desc;
        int i;
        bool blend_clamp = 0, blend_bypass = 0;
 
-       if (rtex->is_depth && !rtex->is_flushing_texture) {
-               r600_init_flushed_depth_texture(&rctx->context, pipe_tex, NULL);
-               rtex = rtex->flushed_depth_texture;
-               assert(rtex);
-       }
-
        offset = rtex->surface.level[level].offset;
        if (rtex->surface.level[level].mode < RADEON_SURF_MODE_1D) {
                offset += rtex->surface.level[level].slice_size *
@@ -1279,20 +1412,20 @@ void evergreen_init_color_surface(struct r600_context *rctx,
        switch (rtex->surface.level[level].mode) {
        case RADEON_SURF_MODE_LINEAR_ALIGNED:
                color_info = S_028C70_ARRAY_MODE(V_028C70_ARRAY_LINEAR_ALIGNED);
-               tile_type = 1;
+               non_disp_tiling = 1;
                break;
        case RADEON_SURF_MODE_1D:
                color_info = S_028C70_ARRAY_MODE(V_028C70_ARRAY_1D_TILED_THIN1);
-               tile_type = rtex->tile_type;
+               non_disp_tiling = rtex->non_disp_tiling;
                break;
        case RADEON_SURF_MODE_2D:
                color_info = S_028C70_ARRAY_MODE(V_028C70_ARRAY_2D_TILED_THIN1);
-               tile_type = rtex->tile_type;
+               non_disp_tiling = rtex->non_disp_tiling;
                break;
        case RADEON_SURF_MODE_LINEAR:
        default:
                color_info = S_028C70_ARRAY_MODE(V_028C70_ARRAY_LINEAR_GENERAL);
-               tile_type = 1;
+               non_disp_tiling = 1;
                break;
        }
        tile_split = rtex->surface.tile_split;
@@ -1309,7 +1442,7 @@ void evergreen_init_color_surface(struct r600_context *rctx,
        /* 128 bit formats require tile type = 1 */
        if (rscreen->chip_class == CAYMAN) {
                if (util_format_get_blocksize(surf->base.format) >= 16)
-                       tile_type = 1;
+                       non_disp_tiling = 1;
        }
        nbanks = eg_num_banks(rscreen->tiling_info.num_banks);
        desc = util_format_description(surf->base.format);
@@ -1324,7 +1457,7 @@ void evergreen_init_color_surface(struct r600_context *rctx,
                        S_028C74_BANK_WIDTH(bankw) |
                        S_028C74_BANK_HEIGHT(bankh) |
                        S_028C74_MACRO_TILE_ASPECT(macro_aspect) |
-                       S_028C74_NON_DISP_TILING_ORDER(tile_type) |
+                       S_028C74_NON_DISP_TILING_ORDER(non_disp_tiling) |
                        S_028C74_FMASK_BANK_HEIGHT(fmask_bankh);
 
        if (rctx->chip_class == CAYMAN && rtex->resource.b.b.nr_samples > 1) {
@@ -1499,6 +1632,8 @@ static void evergreen_init_depth_surface(struct r600_context *rctx,
        switch (surf->base.format) {
        case PIPE_FORMAT_Z24X8_UNORM:
        case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+       case PIPE_FORMAT_X8Z24_UNORM:
+       case PIPE_FORMAT_S8_UINT_Z24_UNORM:
                surf->pa_su_poly_offset_db_fmt_cntl =
                        S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS((char)-24);
                break;
@@ -1516,26 +1651,15 @@ static void evergreen_init_depth_surface(struct r600_context *rctx,
        }
 
        if (rtex->surface.flags & RADEON_SURF_SBUFFER) {
-               uint64_t stencil_offset = rtex->surface.stencil_offset;
-               unsigned i, stile_split = rtex->surface.stencil_tile_split;
+               uint64_t stencil_offset;
+               unsigned stile_split = rtex->surface.stencil_tile_split;
 
                stile_split = eg_tile_split(stile_split);
+
+               stencil_offset = rtex->surface.stencil_level[level].offset;
                stencil_offset += r600_resource_va(screen, surf->base.texture);
-               stencil_offset += rtex->surface.level[level].offset / 4;
-               stencil_offset >>= 8;
-
-               /* We're guessing the stencil offset from the depth offset.
-                * Make sure each mipmap level has a unique offset. */
-               for (i = 1; i <= level; i++) {
-                       /* If two levels have the same address, add 256
-                        * to the offset of the smaller level. */
-                       if ((rtex->surface.level[i-1].offset / 4) >> 8 ==
-                           (rtex->surface.level[i].offset / 4) >> 8) {
-                               stencil_offset++;
-                       }
-               }
 
-               surf->db_stencil_base = stencil_offset;
+               surf->db_stencil_base = stencil_offset >> 8;
                surf->db_stencil_info = S_028044_FORMAT(V_028044_STENCIL_8) |
                                        S_028044_TILE_SPLIT(stile_split);
        } else {
@@ -1547,6 +1671,19 @@ static void evergreen_init_depth_surface(struct r600_context *rctx,
                                        S_028044_FORMAT(V_028044_STENCIL_8);
        }
 
+       surf->htile_enabled = 0;
+       /* use htile only for first level */
+       if (rtex->htile && !level) {
+               uint64_t va = r600_resource_va(&rctx->screen->screen, &rtex->htile->b.b);
+               surf->htile_enabled = 1;
+               surf->db_htile_data_base = va >> 8;
+               surf->db_htile_surface = S_028ABC_HTILE_WIDTH(1) |
+                                       S_028ABC_HTILE_HEIGHT(1) |
+                                       S_028ABC_LINEAR(1);
+               surf->db_depth_info |= S_028040_TILE_SURFACE_ENABLE(1);
+               surf->db_preload_control = 0;
+       }
+
        surf->depth_initialized = true;
 }
 
@@ -1559,14 +1696,14 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
        uint32_t i, log_samples;
 
        if (rctx->framebuffer.state.nr_cbufs) {
-               rctx->flags |= R600_CONTEXT_CB_FLUSH;
+               rctx->flags |= R600_CONTEXT_WAIT_3D_IDLE | R600_CONTEXT_FLUSH_AND_INV;
 
                if (rctx->framebuffer.state.cbufs[0]->texture->nr_samples > 1) {
                        rctx->flags |= R600_CONTEXT_FLUSH_AND_INV_CB_META;
                }
        }
        if (rctx->framebuffer.state.zsbuf) {
-               rctx->flags |= R600_CONTEXT_DB_FLUSH;
+               rctx->flags |= R600_CONTEXT_WAIT_3D_IDLE | R600_CONTEXT_FLUSH_AND_INV;
        }
 
        util_copy_framebuffer_state(&rctx->framebuffer.state, state);
@@ -1588,6 +1725,8 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                surf = (struct r600_surface*)state->cbufs[i];
                rtex = (struct r600_texture*)surf->base.texture;
 
+               r600_context_add_resource_size(ctx, state->cbufs[i]->texture);
+
                if (!surf->color_initialized) {
                        evergreen_init_color_surface(rctx, surf);
                }
@@ -1596,9 +1735,7 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                        rctx->framebuffer.export_16bpc = false;
                }
 
-               /* Cayman can fetch from a compressed MSAA colorbuffer,
-                * so it's pointless to track them. */
-               if (rctx->chip_class != CAYMAN && rtex->fmask_size && rtex->cmask_size) {
+               if (rtex->fmask_size && rtex->cmask_size) {
                        rctx->framebuffer.compressed_cb_mask |= 1 << i;
                }
        }
@@ -1621,6 +1758,8 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
        if (state->zsbuf) {
                surf = (struct r600_surface*)state->zsbuf;
 
+               r600_context_add_resource_size(ctx, state->zsbuf->texture);
+
                if (!surf->depth_initialized) {
                        evergreen_init_depth_surface(rctx, surf);
                }
@@ -1629,6 +1768,16 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                        rctx->poly_offset_state.zs_format = state->zsbuf->format;
                        rctx->poly_offset_state.atom.dirty = true;
                }
+
+               if (rctx->db_state.rsurf != surf) {
+                       rctx->db_state.rsurf = surf;
+                       rctx->db_state.atom.dirty = true;
+                       rctx->db_misc_state.atom.dirty = true;
+               }
+       } else if (rctx->db_state.rsurf) {
+               rctx->db_state.rsurf = NULL;
+               rctx->db_state.atom.dirty = true;
+               rctx->db_misc_state.atom.dirty = true;
        }
 
        if (rctx->cb_misc_state.nr_cbufs != state->nr_cbufs) {
@@ -1647,6 +1796,8 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                rctx->db_misc_state.atom.dirty = true;
        }
 
+       evergreen_update_db_shader_control(rctx);
+
        /* Calculate the CS size. */
        rctx->framebuffer.atom.num_dw = 4; /* SCISSOR */
 
@@ -1724,18 +1875,18 @@ static void evergreen_emit_msaa_state(struct r600_context *rctx, int nr_samples)
        static unsigned max_dist_4x = 6;
        /* 8xMSAA */
        static uint32_t sample_locs_8x[] = {
-               FILL_SREG(-2, -5, 3, -4, -1, 5, -6, -2),
-               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
-               FILL_SREG(-2, -5, 3, -4, -1, 5, -6, -2),
-               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
-               FILL_SREG(-2, -5, 3, -4, -1, 5, -6, -2),
-               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
-               FILL_SREG(-2, -5, 3, -4, -1, 5, -6, -2),
-               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
+               FILL_SREG(-1,  1,  1,  5,  3, -5,  5,  3),
+               FILL_SREG(-7, -1, -3, -7,  7, -3, -5,  7),
+               FILL_SREG(-1,  1,  1,  5,  3, -5,  5,  3),
+               FILL_SREG(-7, -1, -3, -7,  7, -3, -5,  7),
+               FILL_SREG(-1,  1,  1,  5,  3, -5,  5,  3),
+               FILL_SREG(-7, -1, -3, -7,  7, -3, -5,  7),
+               FILL_SREG(-1,  1,  1,  5,  3, -5,  5,  3),
+               FILL_SREG(-7, -1, -3, -7,  7, -3, -5,  7),
        };
-       static unsigned max_dist_8x = 8;
+       static unsigned max_dist_8x = 7;
 
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        unsigned max_dist = 0;
 
        switch (nr_samples) {
@@ -1825,7 +1976,7 @@ static void cayman_emit_msaa_state(struct r600_context *rctx, int nr_samples)
        };
        static unsigned max_dist_16x = 8;
 
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        unsigned max_dist = 0;
 
        switch (nr_samples) {
@@ -1916,7 +2067,7 @@ static void cayman_emit_msaa_state(struct r600_context *rctx, int nr_samples)
 
 static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r600_atom *atom)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct pipe_framebuffer_state *state = &rctx->framebuffer.state;
        unsigned nr_cbufs = state->nr_cbufs;
        unsigned i, tl, br;
@@ -1929,7 +2080,9 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r
        /* Colorbuffers. */
        for (i = 0; i < nr_cbufs; i++) {
                struct r600_surface *cb = (struct r600_surface*)state->cbufs[i];
-               unsigned reloc = r600_context_bo_reloc(rctx, (struct r600_resource*)cb->base.texture,
+               unsigned reloc = r600_context_bo_reloc(rctx,
+                                                      &rctx->rings.gfx,
+                                                      (struct r600_resource*)cb->base.texture,
                                                       RADEON_USAGE_READWRITE);
 
                r600_write_context_reg_seq(cs, R_028C60_CB_COLOR0_BASE + i * 0x3C, 11);
@@ -1968,7 +2121,9 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r
                                       ((struct r600_surface*)state->cbufs[0])->cb_color_info);
 
                if (!rctx->keep_tiling_flags) {
-                       unsigned reloc = r600_context_bo_reloc(rctx, (struct r600_resource*)state->cbufs[0]->texture,
+                       unsigned reloc = r600_context_bo_reloc(rctx,
+                                                              &rctx->rings.gfx,
+                                                              (struct r600_resource*)state->cbufs[0]->texture,
                                                               RADEON_USAGE_READWRITE);
 
                        r600_write_value(cs, PKT3(PKT3_NOP, 0, 0)); /* R_028C70_CB_COLOR0_INFO */
@@ -1988,7 +2143,9 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r
        /* ZS buffer. */
        if (state->zsbuf) {
                struct r600_surface *zb = (struct r600_surface*)state->zsbuf;
-               unsigned reloc = r600_context_bo_reloc(rctx, (struct r600_resource*)state->zsbuf->texture,
+               unsigned reloc = r600_context_bo_reloc(rctx,
+                                                      &rctx->rings.gfx,
+                                                      (struct r600_resource*)state->zsbuf->texture,
                                                       RADEON_USAGE_READWRITE);
 
                r600_write_context_reg(cs, R_028B78_PA_SU_POLY_OFFSET_DB_FMT_CNTL,
@@ -2045,7 +2202,7 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r
 
 static void evergreen_emit_polygon_offset(struct r600_context *rctx, struct r600_atom *a)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct r600_poly_offset_state *state = (struct r600_poly_offset_state*)a;
        float offset_units = state->offset_units;
        float offset_scale = state->offset_scale;
@@ -2053,6 +2210,8 @@ static void evergreen_emit_polygon_offset(struct r600_context *rctx, struct r600
        switch (state->zs_format) {
        case PIPE_FORMAT_Z24X8_UNORM:
        case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+       case PIPE_FORMAT_X8Z24_UNORM:
+       case PIPE_FORMAT_S8_UINT_Z24_UNORM:
                offset_units *= 2.0f;
                break;
        case PIPE_FORMAT_Z16_UNORM:
@@ -2070,7 +2229,7 @@ static void evergreen_emit_polygon_offset(struct r600_context *rctx, struct r600
 
 static void evergreen_emit_cb_misc_state(struct r600_context *rctx, struct r600_atom *atom)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct r600_cb_misc_state *a = (struct r600_cb_misc_state*)atom;
        unsigned fb_colormask = (1ULL << ((unsigned)a->nr_cbufs * 4)) - 1;
        unsigned ps_colormask = (1ULL << ((unsigned)a->nr_ps_color_outputs * 4)) - 1;
@@ -2083,14 +2242,35 @@ static void evergreen_emit_cb_misc_state(struct r600_context *rctx, struct r600_
        r600_write_value(cs, 0xf | (a->dual_src_blend ? ps_colormask : 0) | fb_colormask); /* R_02823C_CB_SHADER_MASK */
 }
 
+static void evergreen_emit_db_state(struct r600_context *rctx, struct r600_atom *atom)
+{
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
+       struct r600_db_state *a = (struct r600_db_state*)atom;
+
+       if (a->rsurf && a->rsurf->htile_enabled) {
+               struct r600_texture *rtex = (struct r600_texture *)a->rsurf->base.texture;
+               unsigned reloc_idx;
+
+               r600_write_context_reg(cs, R_02802C_DB_DEPTH_CLEAR, fui(rtex->depth_clear));
+               r600_write_context_reg(cs, R_028ABC_DB_HTILE_SURFACE, a->rsurf->db_htile_surface);
+               r600_write_context_reg(cs, R_028AC8_DB_PRELOAD_CONTROL, a->rsurf->db_preload_control);
+               r600_write_context_reg(cs, R_028014_DB_HTILE_DATA_BASE, a->rsurf->db_htile_data_base);
+               reloc_idx = r600_context_bo_reloc(rctx, &rctx->rings.gfx, rtex->htile, RADEON_USAGE_READWRITE);
+               cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
+               cs->buf[cs->cdw++] = reloc_idx;
+       } else {
+               r600_write_context_reg(cs, R_028ABC_DB_HTILE_SURFACE, 0);
+               r600_write_context_reg(cs, R_028AC8_DB_PRELOAD_CONTROL, 0);
+       }
+}
+
 static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_atom *atom)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct r600_db_misc_state *a = (struct r600_db_misc_state*)atom;
        unsigned db_render_control = 0;
        unsigned db_count_control = 0;
        unsigned db_render_override =
-               S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_DISABLE) |
                S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE) |
                S_02800C_FORCE_HIS_ENABLE1(V_02800C_FORCE_DISABLE);
 
@@ -2101,7 +2281,19 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_
                }
                db_render_override |= S_02800C_NOOP_CULL_DISABLE(1);
        }
-
+       if (rctx->db_state.rsurf && rctx->db_state.rsurf->htile_enabled) {
+               /* FORCE_OFF means HiZ/HiS are determined by DB_SHADER_CONTROL */
+               db_render_override |= S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_OFF);
+               /* This is to fix a lockup when hyperz and alpha test are enabled at
+                * the same time somehow GPU get confuse on which order to pick for
+                * z test
+                */
+               if (rctx->alphatest_state.sx_alpha_test_control) {
+                       db_render_override |= S_02800C_FORCE_SHADER_Z_ORDER(1);
+               }
+       } else {
+               db_render_override |= S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_DISABLE);
+       }
        if (a->flush_depthstencil_through_cb) {
                assert(a->copy_depth || a->copy_stencil);
 
@@ -2109,12 +2301,21 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_
                                     S_028000_STENCIL_COPY_ENABLE(a->copy_stencil) |
                                     S_028000_COPY_CENTROID(1) |
                                     S_028000_COPY_SAMPLE(a->copy_sample);
+       } else if (a->flush_depthstencil_in_place) {
+               db_render_control |= S_028000_DEPTH_COMPRESS_DISABLE(1) |
+                                    S_028000_STENCIL_COMPRESS_DISABLE(1);
+               db_render_override |= S_02800C_DISABLE_PIXEL_RATE_TILES(1);
+       }
+       if (a->htile_clear) {
+               /* FIXME we might want to disable cliprect here */
+               db_render_control |= S_028000_DEPTH_CLEAR_ENABLE(1);
        }
 
        r600_write_context_reg_seq(cs, R_028000_DB_RENDER_CONTROL, 2);
        r600_write_value(cs, db_render_control); /* R_028000_DB_RENDER_CONTROL */
        r600_write_value(cs, db_count_control); /* R_028004_DB_COUNT_CONTROL */
        r600_write_context_reg(cs, R_02800C_DB_RENDER_OVERRIDE, db_render_override);
+       r600_write_context_reg(cs, R_02880C_DB_SHADER_CONTROL, a->db_shader_control);
 }
 
 static void evergreen_emit_vertex_buffers(struct r600_context *rctx,
@@ -2122,7 +2323,7 @@ static void evergreen_emit_vertex_buffers(struct r600_context *rctx,
                                          unsigned resource_offset,
                                          unsigned pkt_flags)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        uint32_t dirty_mask = state->dirty_mask;
 
        while (dirty_mask) {
@@ -2158,7 +2359,7 @@ static void evergreen_emit_vertex_buffers(struct r600_context *rctx,
                r600_write_value(cs, 0xc0000000); /* RESOURCEi_WORD7 */
 
                r600_write_value(cs, PKT3(PKT3_NOP, 0, 0) | pkt_flags);
-               r600_write_value(cs, r600_context_bo_reloc(rctx, rbuffer, RADEON_USAGE_READ));
+               r600_write_value(cs, r600_context_bo_reloc(rctx, &rctx->rings.gfx, rbuffer, RADEON_USAGE_READ));
        }
        state->dirty_mask = 0;
 }
@@ -2180,7 +2381,7 @@ static void evergreen_emit_constant_buffers(struct r600_context *rctx,
                                            unsigned reg_alu_constbuf_size,
                                            unsigned reg_alu_const_cache)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        uint32_t dirty_mask = state->dirty_mask;
 
        while (dirty_mask) {
@@ -2201,7 +2402,7 @@ static void evergreen_emit_constant_buffers(struct r600_context *rctx,
                r600_write_context_reg(cs, reg_alu_const_cache + buffer_index * 4, va >> 8);
 
                r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
-               r600_write_value(cs, r600_context_bo_reloc(rctx, rbuffer, RADEON_USAGE_READ));
+               r600_write_value(cs, r600_context_bo_reloc(rctx, &rctx->rings.gfx, rbuffer, RADEON_USAGE_READ));
 
                r600_write_value(cs, PKT3(PKT3_SET_RESOURCE, 8, 0));
                r600_write_value(cs, (buffer_id_base + buffer_index) * 8);
@@ -2222,7 +2423,7 @@ static void evergreen_emit_constant_buffers(struct r600_context *rctx,
                r600_write_value(cs, 0xc0000000); /* RESOURCEi_WORD7 */
 
                r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
-               r600_write_value(cs, r600_context_bo_reloc(rctx, rbuffer, RADEON_USAGE_READ));
+               r600_write_value(cs, r600_context_bo_reloc(rctx, &rctx->rings.gfx, rbuffer, RADEON_USAGE_READ));
 
                dirty_mask &= ~(1 << buffer_index);
        }
@@ -2254,7 +2455,7 @@ static void evergreen_emit_sampler_views(struct r600_context *rctx,
                                         struct r600_samplerview_state *state,
                                         unsigned resource_id_base)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        uint32_t dirty_mask = state->dirty_mask;
 
        while (dirty_mask) {
@@ -2269,13 +2470,15 @@ static void evergreen_emit_sampler_views(struct r600_context *rctx,
                r600_write_value(cs, (resource_id_base + resource_index) * 8);
                r600_write_array(cs, 8, rview->tex_resource_words);
 
-               /* XXX The kernel needs two relocations. This is stupid. */
-               reloc = r600_context_bo_reloc(rctx, rview->tex_resource,
+               reloc = r600_context_bo_reloc(rctx, &rctx->rings.gfx, rview->tex_resource,
                                              RADEON_USAGE_READ);
                r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
                r600_write_value(cs, reloc);
-               r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
-               r600_write_value(cs, reloc);
+
+               if (!rview->skip_mip_address_reloc) {
+                       r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
+                       r600_write_value(cs, reloc);
+               }
        }
        state->dirty_mask = 0;
 }
@@ -2300,7 +2503,7 @@ static void evergreen_emit_sampler_states(struct r600_context *rctx,
                                unsigned resource_id_base,
                                unsigned border_index_reg)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        uint32_t dirty_mask = texinfo->states.dirty_mask;
 
        while (dirty_mask) {
@@ -2317,7 +2520,7 @@ static void evergreen_emit_sampler_states(struct r600_context *rctx,
                if (rstate->border_color_use) {
                        r600_write_config_reg_seq(cs, border_index_reg, 5);
                        r600_write_value(cs, i);
-                       r600_write_array(cs, 4, rstate->border_color);
+                       r600_write_array(cs, 4, rstate->border_color.ui);
                }
        }
        texinfo->states.dirty_mask = 0;
@@ -2343,14 +2546,14 @@ static void evergreen_emit_sample_mask(struct r600_context *rctx, struct r600_at
        struct r600_sample_mask *s = (struct r600_sample_mask*)a;
        uint8_t mask = s->sample_mask;
 
-       r600_write_context_reg(rctx->cs, R_028C3C_PA_SC_AA_MASK,
+       r600_write_context_reg(rctx->rings.gfx.cs, R_028C3C_PA_SC_AA_MASK,
                               mask | (mask << 8) | (mask << 16) | (mask << 24));
 }
 
 static void cayman_emit_sample_mask(struct r600_context *rctx, struct r600_atom *a)
 {
        struct r600_sample_mask *s = (struct r600_sample_mask*)a;
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        uint16_t mask = s->sample_mask;
 
        r600_write_context_reg_seq(cs, CM_R_028C38_PA_SC_AA_MASK_X0Y0_X1Y0, 2);
@@ -2360,14 +2563,14 @@ static void cayman_emit_sample_mask(struct r600_context *rctx, struct r600_atom
 
 static void evergreen_emit_vertex_fetch_shader(struct r600_context *rctx, struct r600_atom *a)
 {
-       struct radeon_winsys_cs *cs = rctx->cs;
+       struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
        struct r600_cso_state *state = (struct r600_cso_state*)a;
-       struct r600_resource *shader = (struct r600_resource*)state->cso;
+       struct r600_fetch_shader *shader = (struct r600_fetch_shader*)state->cso;
 
        r600_write_context_reg(cs, R_0288A4_SQ_PGM_START_FS,
-                              r600_resource_va(rctx->context.screen, &shader->b.b) >> 8);
+                              (r600_resource_va(rctx->context.screen, &shader->buffer->b.b) + shader->offset) >> 8);
        r600_write_value(cs, PKT3(PKT3_NOP, 0, 0));
-       r600_write_value(cs, r600_context_bo_reloc(rctx, shader, RADEON_USAGE_READ));
+       r600_write_value(cs, r600_context_bo_reloc(rctx, &rctx->rings.gfx, shader->buffer, RADEON_USAGE_READ));
 }
 
 void evergreen_init_state_functions(struct r600_context *rctx)
@@ -2418,8 +2621,11 @@ void evergreen_init_state_functions(struct r600_context *rctx)
        r600_init_atom(rctx, &rctx->cb_misc_state.atom, id++, evergreen_emit_cb_misc_state, 4);
        r600_init_atom(rctx, &rctx->clip_misc_state.atom, id++, r600_emit_clip_misc_state, 6);
        r600_init_atom(rctx, &rctx->clip_state.atom, id++, evergreen_emit_clip_state, 26);
-       r600_init_atom(rctx, &rctx->db_misc_state.atom, id++, evergreen_emit_db_misc_state, 7);
+       r600_init_atom(rctx, &rctx->db_misc_state.atom, id++, evergreen_emit_db_misc_state, 10);
+       r600_init_atom(rctx, &rctx->db_state.atom, id++, evergreen_emit_db_state, 14);
+       r600_init_atom(rctx, &rctx->dsa_state.atom, id++, r600_emit_cso_state, 0);
        r600_init_atom(rctx, &rctx->poly_offset_state.atom, id++, evergreen_emit_polygon_offset, 6);
+       r600_init_atom(rctx, &rctx->rasterizer_state.atom, id++, r600_emit_cso_state, 0);
        r600_init_atom(rctx, &rctx->scissor.atom, id++, evergreen_emit_scissor_state, 4);
        r600_init_atom(rctx, &rctx->stencil_ref.atom, id++, r600_emit_stencil_ref, 4);
        r600_init_atom(rctx, &rctx->viewport.atom, id++, r600_emit_viewport_state, 8);
@@ -2436,6 +2642,29 @@ void evergreen_init_state_functions(struct r600_context *rctx)
        evergreen_init_compute_state_functions(rctx);
 }
 
+void cayman_init_common_regs(struct r600_command_buffer *cb,
+                            enum chip_class ctx_chip_class,
+                            enum radeon_family ctx_family,
+                            int ctx_drm_minor)
+{
+       r600_store_config_reg_seq(cb, R_008C00_SQ_CONFIG, 2);
+       r600_store_value(cb, S_008C00_EXPORT_SRC_C(1)); /* R_008C00_SQ_CONFIG */
+       /* always set the temp clauses */
+       r600_store_value(cb, S_008C04_NUM_CLAUSE_TEMP_GPRS(4)); /* R_008C04_SQ_GPR_RESOURCE_MGMT_1 */
+
+       r600_store_config_reg_seq(cb, R_008C10_SQ_GLOBAL_GPR_RESOURCE_MGMT_1, 2);
+       r600_store_value(cb, 0); /* R_008C10_SQ_GLOBAL_GPR_RESOURCE_MGMT_1 */
+       r600_store_value(cb, 0); /* R_008C14_SQ_GLOBAL_GPR_RESOURCE_MGMT_2 */
+
+       r600_store_config_reg(cb, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, (1 << 8));
+
+       r600_store_context_reg(cb, R_028A4C_PA_SC_MODE_CNTL_1, 0);
+
+       r600_store_context_reg(cb, R_028354_SX_SURFACE_SYNC, S_028354_SURFACE_SYNC_MASK(0xf));
+
+       r600_store_context_reg(cb, R_028800_DB_DEPTH_CONTROL, 0);
+}
+
 static void cayman_init_atom_start_cs(struct r600_context *rctx)
 {
        struct r600_command_buffer *cb = &rctx->start_cs_cmd;
@@ -2447,18 +2676,29 @@ static void cayman_init_atom_start_cs(struct r600_context *rctx)
        r600_store_value(cb, 0x80000000);
        r600_store_value(cb, 0x80000000);
 
-       r600_store_config_reg_seq(cb, R_008C00_SQ_CONFIG, 2);
-       r600_store_value(cb, S_008C00_EXPORT_SRC_C(1)); /* R_008C00_SQ_CONFIG */
-       /* always set the temp clauses */
-       r600_store_value(cb, S_008C04_NUM_CLAUSE_TEMP_GPRS(4)); /* R_008C04_SQ_GPR_RESOURCE_MGMT_1 */
+       /* We're setting config registers here. */
+       r600_store_value(cb, PKT3(PKT3_EVENT_WRITE, 0, 0));
+       r600_store_value(cb, EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4));
 
-       r600_store_config_reg_seq(cb, R_008C10_SQ_GLOBAL_GPR_RESOURCE_MGMT_1, 2);
-       r600_store_value(cb, 0); /* R_008C10_SQ_GLOBAL_GPR_RESOURCE_MGMT_1 */
-       r600_store_value(cb, 0); /* R_008C14_SQ_GLOBAL_GPR_RESOURCE_MGMT_2 */
+       cayman_init_common_regs(cb, rctx->chip_class,
+                               rctx->family, rctx->screen->info.drm_minor);
 
-       r600_store_config_reg(cb, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, (1 << 8));
+       r600_store_config_reg(cb, R_009100_SPI_CONFIG_CNTL, 0);
+       r600_store_config_reg(cb, R_00913C_SPI_CONFIG_CNTL_1, S_00913C_VTX_DONE_DELAY(4));
 
-       r600_store_context_reg(cb, R_028A4C_PA_SC_MODE_CNTL_1, 0);
+       r600_store_context_reg_seq(cb, R_028900_SQ_ESGS_RING_ITEMSIZE, 6);
+       r600_store_value(cb, 0); /* R_028900_SQ_ESGS_RING_ITEMSIZE */
+       r600_store_value(cb, 0); /* R_028904_SQ_GSVS_RING_ITEMSIZE */
+       r600_store_value(cb, 0); /* R_028908_SQ_ESTMP_RING_ITEMSIZE */
+       r600_store_value(cb, 0); /* R_02890C_SQ_GSTMP_RING_ITEMSIZE */
+       r600_store_value(cb, 0); /* R_028910_SQ_VSTMP_RING_ITEMSIZE */
+       r600_store_value(cb, 0); /* R_028914_SQ_PSTMP_RING_ITEMSIZE */
+
+       r600_store_context_reg_seq(cb, R_02891C_SQ_GS_VERT_ITEMSIZE, 4);
+       r600_store_value(cb, 0); /* R_02891C_SQ_GS_VERT_ITEMSIZE */
+       r600_store_value(cb, 0); /* R_028920_SQ_GS_VERT_ITEMSIZE_1 */
+       r600_store_value(cb, 0); /* R_028924_SQ_GS_VERT_ITEMSIZE_2 */
+       r600_store_value(cb, 0); /* R_028928_SQ_GS_VERT_ITEMSIZE_3 */
 
        r600_store_context_reg_seq(cb, R_028A10_VGT_OUTPUT_PATH_CNTL, 13);
        r600_store_value(cb, 0); /* R_028A10_VGT_OUTPUT_PATH_CNTL */
@@ -2495,47 +2735,15 @@ static void cayman_init_atom_start_cs(struct r600_context *rctx)
        r600_store_value(cb, 0); /* CM_R_0288E8_SQ_LDS_ALLOC */
        r600_store_value(cb, 0); /* R_0288EC_SQ_LDS_ALLOC_PS */
 
-       r600_store_context_reg_seq(cb, R_028380_SQ_VTX_SEMANTIC_0, 34);
-       r600_store_value(cb, 0); /* R_028380_SQ_VTX_SEMANTIC_0 */
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0); /* R_0283FC_SQ_VTX_SEMANTIC_31 */
+        r600_store_context_reg(cb, R_0288F0_SQ_VTX_SEMANTIC_CLEAR, ~0);
+
+        r600_store_context_reg_seq(cb, R_028400_VGT_MAX_VTX_INDX, 2);
        r600_store_value(cb, ~0); /* R_028400_VGT_MAX_VTX_INDX */
        r600_store_value(cb, 0); /* R_028404_VGT_MIN_VTX_INDX */
 
        r600_store_ctl_const(cb, R_03CFF0_SQ_VTX_BASE_VTX_LOC, 0);
 
-       r600_store_context_reg_seq(cb, R_028028_DB_STENCIL_CLEAR, 2);
-       r600_store_value(cb, 0); /* R_028028_DB_STENCIL_CLEAR */
-       r600_store_value(cb, 0x3F800000); /* R_02802C_DB_DEPTH_CLEAR */
+       r600_store_context_reg(cb, R_028028_DB_STENCIL_CLEAR, 0);
 
        r600_store_context_reg(cb, R_0286DC_SPI_FOG_CNTL, 0);
 
@@ -2573,8 +2781,43 @@ static void cayman_init_atom_start_cs(struct r600_context *rctx)
        r600_store_context_reg(cb, R_028864_SQ_PGM_RESOURCES_2_VS, S_028864_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
        r600_store_context_reg(cb, R_0288A8_SQ_PGM_RESOURCES_FS, 0);
 
-       r600_store_context_reg(cb, R_028354_SX_SURFACE_SYNC, S_028354_SURFACE_SYNC_MASK(0xf));
-       r600_store_context_reg(cb, R_028800_DB_DEPTH_CONTROL, 0);
+       /* to avoid GPU doing any preloading of constant from random address */
+       r600_store_context_reg_seq(cb, R_028140_ALU_CONST_BUFFER_SIZE_PS_0, 16);
+       r600_store_value(cb, 0); /* R_028140_ALU_CONST_BUFFER_SIZE_PS_0 */
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+
+       r600_store_context_reg_seq(cb, R_028180_ALU_CONST_BUFFER_SIZE_VS_0, 16);
+       r600_store_value(cb, 0); /* R_028180_ALU_CONST_BUFFER_SIZE_VS_0 */
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+
        if (rctx->screen->has_streamout) {
                r600_store_context_reg(cb, R_028B28_VGT_STRMOUT_DRAW_OPAQUE_OFFSET, 0);
        }
@@ -2615,100 +2858,13 @@ void evergreen_init_common_regs(struct r600_command_buffer *cb,
        ls_prio = 0;
        cs_prio = 0;
 
-       switch (ctx_family) {
-       case CHIP_CEDAR:
-       default:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_REDWOOD:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_JUNIPER:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_CYPRESS:
-       case CHIP_HEMLOCK:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_PALM:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_SUMO:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_SUMO2:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_BARTS:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_TURKS:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       case CHIP_CAICOS:
-               num_ps_gprs = 93;
-               num_vs_gprs = 46;
-               num_temp_gprs = 4;
-               num_gs_gprs = 31;
-               num_es_gprs = 31;
-               num_hs_gprs = 23;
-               num_ls_gprs = 23;
-               break;
-       }
+       num_ps_gprs = 93;
+       num_vs_gprs = 46;
+       num_temp_gprs = 4;
+       num_gs_gprs = 31;
+       num_es_gprs = 31;
+       num_hs_gprs = 23;
+       num_ls_gprs = 23;
 
        tmp = 0;
        switch (ctx_family) {
@@ -2771,47 +2927,9 @@ void evergreen_init_common_regs(struct r600_command_buffer *cb,
 
        r600_store_context_reg(cb, R_028A4C_PA_SC_MODE_CNTL_1, 0);
 
-       r600_store_context_reg_seq(cb, R_028B94_VGT_STRMOUT_CONFIG, 2);
-       r600_store_value(cb, 0); /* R_028B94_VGT_STRMOUT_CONFIG */
-       r600_store_value(cb, 0); /* R_028B98_VGT_STRMOUT_BUFFER_CONFIG */
-
-       r600_store_context_reg(cb, R_028230_PA_SC_EDGERULE, 0xAAAAAAAA);
-
-       r600_store_context_reg_seq(cb, R_0282D0_PA_SC_VPORT_ZMIN_0, 2);
-       r600_store_value(cb, 0); /* R_0282D0_PA_SC_VPORT_ZMIN_0 */
-       r600_store_value(cb, 0x3F800000); /* R_0282D4_PA_SC_VPORT_ZMAX_0 */
-
-       r600_store_context_reg_seq(cb, R_028AC0_DB_SRESULTS_COMPARE_STATE0, 3);
-       r600_store_value(cb, 0); /* R_028AC0_DB_SRESULTS_COMPARE_STATE0 */
-       r600_store_value(cb, 0); /* R_028AC4_DB_SRESULTS_COMPARE_STATE1 */
-       r600_store_value(cb, 0); /* R_028AC8_DB_PRELOAD_CONTROL */
-
        /* The cs checker requires this register to be set. */
        r600_store_context_reg(cb, R_028800_DB_DEPTH_CONTROL, 0);
 
-       r600_store_context_reg(cb, R_028848_SQ_PGM_RESOURCES_2_PS, S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
-       r600_store_context_reg(cb, R_028864_SQ_PGM_RESOURCES_2_VS, S_028864_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
-
-       /* to avoid GPU doing any preloading of constant from random address */
-       r600_store_context_reg_seq(cb, R_028140_ALU_CONST_BUFFER_SIZE_PS_0, 8);
-       r600_store_value(cb, 0); /* R_028140_ALU_CONST_BUFFER_SIZE_PS_0 */
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_context_reg_seq(cb, R_028180_ALU_CONST_BUFFER_SIZE_VS_0, 8);
-       r600_store_value(cb, 0); /* R_028180_ALU_CONST_BUFFER_SIZE_VS_0 */
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-
        r600_store_context_reg(cb, R_028354_SX_SURFACE_SYNC, S_028354_SURFACE_SYNC_MASK(0xf));
 
        return;
@@ -2848,8 +2966,12 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
        r600_store_value(cb, 0x80000000);
        r600_store_value(cb, 0x80000000);
 
-       evergreen_init_common_regs(cb, rctx->chip_class
-                       , rctx->family, rctx->screen->info.drm_minor);
+       /* We're setting config registers here. */
+       r600_store_value(cb, PKT3(PKT3_EVENT_WRITE, 0, 0));
+       r600_store_value(cb, EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4));
+
+       evergreen_init_common_regs(cb, rctx->chip_class,
+                                  rctx->family, rctx->screen->info.drm_minor);
 
        family = rctx->family;
        switch (family) {
@@ -3059,50 +3181,23 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
 
        r600_store_config_reg(cb, R_008A14_PA_CL_ENHANCE, (3 << 1) | 1);
 
-       r600_store_context_reg_seq(cb, R_028380_SQ_VTX_SEMANTIC_0, 34);
-       r600_store_value(cb, 0); /* R_028380_SQ_VTX_SEMANTIC_0 */
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0);
-       r600_store_value(cb, 0); /* R_0283FC_SQ_VTX_SEMANTIC_31 */
+        r600_store_context_reg(cb, R_0288F0_SQ_VTX_SEMANTIC_CLEAR, ~0);
+
+        r600_store_context_reg_seq(cb, R_028400_VGT_MAX_VTX_INDX, 2);
        r600_store_value(cb, ~0); /* R_028400_VGT_MAX_VTX_INDX */
        r600_store_value(cb, 0); /* R_028404_VGT_MIN_VTX_INDX */
 
        r600_store_ctl_const(cb, R_03CFF0_SQ_VTX_BASE_VTX_LOC, 0);
 
-       r600_store_context_reg_seq(cb, R_028028_DB_STENCIL_CLEAR, 2);
-       r600_store_value(cb, 0); /* R_028028_DB_STENCIL_CLEAR */
-       r600_store_value(cb, 0x3F800000); /* R_02802C_DB_DEPTH_CLEAR */
+       r600_store_context_reg(cb, R_028028_DB_STENCIL_CLEAR, 0);
 
        r600_store_context_reg(cb, R_028200_PA_SC_WINDOW_OFFSET, 0);
        r600_store_context_reg(cb, R_02820C_PA_SC_CLIPRECT_RULE, 0xFFFF);
+       r600_store_context_reg(cb, R_028230_PA_SC_EDGERULE, 0xAAAAAAAA);
+
+       r600_store_context_reg_seq(cb, R_0282D0_PA_SC_VPORT_ZMIN_0, 2);
+       r600_store_value(cb, 0); /* R_0282D0_PA_SC_VPORT_ZMIN_0 */
+       r600_store_value(cb, 0x3F800000); /* R_0282D4_PA_SC_VPORT_ZMAX_0 */
 
        r600_store_context_reg(cb, R_0286DC_SPI_FOG_CNTL, 0);
        r600_store_context_reg(cb, R_028818_PA_CL_VTE_CNTL, 0x0000043F);
@@ -3127,8 +3222,51 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
        r600_store_value(cb, 0); /* R_028030_PA_SC_SCREEN_SCISSOR_TL */
        r600_store_value(cb, S_028034_BR_X(16384) | S_028034_BR_Y(16384)); /* R_028034_PA_SC_SCREEN_SCISSOR_BR */
 
+       r600_store_context_reg(cb, R_028848_SQ_PGM_RESOURCES_2_PS, S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
+       r600_store_context_reg(cb, R_028864_SQ_PGM_RESOURCES_2_VS, S_028864_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
        r600_store_context_reg(cb, R_0288A8_SQ_PGM_RESOURCES_FS, 0);
 
+       /* to avoid GPU doing any preloading of constant from random address */
+       r600_store_context_reg_seq(cb, R_028140_ALU_CONST_BUFFER_SIZE_PS_0, 16);
+       r600_store_value(cb, 0); /* R_028140_ALU_CONST_BUFFER_SIZE_PS_0 */
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+
+       r600_store_context_reg_seq(cb, R_028180_ALU_CONST_BUFFER_SIZE_VS_0, 16);
+       r600_store_value(cb, 0); /* R_028180_ALU_CONST_BUFFER_SIZE_VS_0 */
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+       r600_store_value(cb, 0);
+
+       r600_store_context_reg_seq(cb, R_028B94_VGT_STRMOUT_CONFIG, 2);
+       r600_store_value(cb, 0); /* R_028B94_VGT_STRMOUT_CONFIG */
+       r600_store_value(cb, 0); /* R_028B98_VGT_STRMOUT_BUFFER_CONFIG */
+
        if (rctx->screen->has_streamout) {
                r600_store_context_reg(cb, R_028B28_VGT_STRMOUT_DRAW_OPAQUE_OFFSET, 0);
        }
@@ -3142,16 +3280,16 @@ void evergreen_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_pipe_state *rstate = &shader->rstate;
        struct r600_shader *rshader = &shader->shader;
-       unsigned i, exports_ps, num_cout, spi_ps_in_control_0, spi_input_z, spi_ps_in_control_1, db_shader_control;
+       unsigned i, exports_ps, num_cout, spi_ps_in_control_0, spi_input_z, spi_ps_in_control_1, db_shader_control = 0;
        int pos_index = -1, face_index = -1;
        int ninterp = 0;
        boolean have_linear = FALSE, have_centroid = FALSE, have_perspective = FALSE;
        unsigned spi_baryc_cntl, sid, tmp, idx = 0;
        unsigned z_export = 0, stencil_export = 0;
+       unsigned sprite_coord_enable = rctx->rasterizer ? rctx->rasterizer->sprite_coord_enable : 0;
 
        rstate->nregs = 0;
 
-       db_shader_control = S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z);
        for (i = 0; i < rshader->ninput; i++) {
                /* evergreen NUM_INTERP only contains values interpolated into the LDS,
                   POSITION goes via GPRs from the SC so isn't counted */
@@ -3183,7 +3321,7 @@ void evergreen_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader
                        }
 
                        if (rshader->input[i].name == TGSI_SEMANTIC_GENERIC &&
-                                       (rctx->sprite_coord_enable & (1 << rshader->input[i].sid))) {
+                           (sprite_coord_enable & (1 << rshader->input[i].sid))) {
                                tmp |= S_028644_PT_SPRITE_TEX(1);
                        }
 
@@ -3281,7 +3419,7 @@ void evergreen_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader
        shader->db_shader_control = db_shader_control;
        shader->ps_depth_export = z_export | stencil_export;
 
-       shader->sprite_coord_enable = rctx->sprite_coord_enable;
+       shader->sprite_coord_enable = sprite_coord_enable;
        if (rctx->rasterizer)
                shader->flatshade = rctx->rasterizer->flatshade;
 }
@@ -3357,6 +3495,16 @@ void *evergreen_create_decompress_blend(struct r600_context *rctx)
        return evergreen_create_blend_state_mode(&rctx->context, &blend, V_028808_CB_DECOMPRESS);
 }
 
+void *evergreen_create_fmask_decompress_blend(struct r600_context *rctx)
+{
+       struct pipe_blend_state blend;
+
+       memset(&blend, 0, sizeof(blend));
+       blend.independent_blend_enable = true;
+       blend.rt[0].colormask = 0xf;
+       return evergreen_create_blend_state_mode(&rctx->context, &blend, V_028808_CB_FMASK_DECOMPRESS);
+}
+
 void *evergreen_create_db_flush_dsa(struct r600_context *rctx)
 {
        struct pipe_depth_stencil_alpha_state dsa = {{0}};
@@ -3364,26 +3512,223 @@ void *evergreen_create_db_flush_dsa(struct r600_context *rctx)
        return rctx->context.create_depth_stencil_alpha_state(&rctx->context, &dsa);
 }
 
-void evergreen_update_dual_export_state(struct r600_context * rctx)
+void evergreen_update_db_shader_control(struct r600_context * rctx)
 {
        bool dual_export = rctx->framebuffer.export_16bpc &&
                           !rctx->ps_shader->current->ps_depth_export;
 
-       unsigned db_source_format = dual_export ? V_02880C_EXPORT_DB_TWO :
-                                                 V_02880C_EXPORT_DB_FULL;
-
        unsigned db_shader_control = rctx->ps_shader->current->db_shader_control |
                        S_02880C_DUAL_EXPORT_ENABLE(dual_export) |
-                       S_02880C_DB_SOURCE_FORMAT(db_source_format) |
+                       S_02880C_DB_SOURCE_FORMAT(dual_export ? V_02880C_EXPORT_DB_TWO :
+                                                               V_02880C_EXPORT_DB_FULL) |
                        S_02880C_ALPHA_TO_MASK_DISABLE(rctx->framebuffer.cb0_is_integer);
 
-       if (db_shader_control != rctx->db_shader_control) {
-               struct r600_pipe_state rstate;
+       /* When alpha test is enabled we can't trust the hw to make the proper
+        * decision on the order in which ztest should be run related to fragment
+        * shader execution.
+        *
+        * If alpha test is enabled perform early z rejection (RE_Z) but don't early
+        * write to the zbuffer. Write to zbuffer is delayed after fragment shader
+        * execution and thus after alpha test so if discarded by the alpha test
+        * the z value is not written.
+        */
+       if (rctx->alphatest_state.sx_alpha_test_control) {
+               db_shader_control |= S_02880C_Z_ORDER(V_02880C_RE_Z);
+       } else {
+               db_shader_control |= S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z);
+       }
+
+       if (db_shader_control != rctx->db_misc_state.db_shader_control) {
+               rctx->db_misc_state.db_shader_control = db_shader_control;
+               rctx->db_misc_state.atom.dirty = true;
+       }
+}
+
+static void evergreen_dma_copy_tile(struct r600_context *rctx,
+                               struct pipe_resource *dst,
+                               unsigned dst_level,
+                               unsigned dst_x,
+                               unsigned dst_y,
+                               unsigned dst_z,
+                               struct pipe_resource *src,
+                               unsigned src_level,
+                               unsigned src_x,
+                               unsigned src_y,
+                               unsigned src_z,
+                               unsigned copy_height,
+                               unsigned pitch,
+                               unsigned bpp)
+{
+       struct radeon_winsys_cs *cs = rctx->rings.dma.cs;
+       struct r600_texture *rsrc = (struct r600_texture*)src;
+       struct r600_texture *rdst = (struct r600_texture*)dst;
+       unsigned array_mode, lbpp, pitch_tile_max, slice_tile_max, size;
+       unsigned ncopy, height, cheight, detile, i, x, y, z, src_mode, dst_mode;
+       unsigned sub_cmd, bank_h, bank_w, mt_aspect, nbanks, tile_split;
+       uint64_t base, addr;
+
+       /* make sure that the dma ring is only one active */
+       rctx->rings.gfx.flush(rctx, RADEON_FLUSH_ASYNC);
+
+       dst_mode = rdst->surface.level[dst_level].mode;
+       src_mode = rsrc->surface.level[src_level].mode;
+       /* downcast linear aligned to linear to simplify test */
+       src_mode = src_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : src_mode;
+       dst_mode = dst_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : dst_mode;
+       assert(dst_mode != src_mode);
+
+       y = 0;
+       sub_cmd = 0x8;
+       lbpp = util_logbase2(bpp);
+       pitch_tile_max = ((pitch / bpp) >> 3) - 1;
+       nbanks = eg_num_banks(rctx->screen->tiling_info.num_banks);
+
+       if (dst_mode == RADEON_SURF_MODE_LINEAR) {
+               /* T2L */
+               array_mode = evergreen_array_mode(src_mode);
+               slice_tile_max = (rsrc->surface.level[src_level].nblk_x * rsrc->surface.level[src_level].nblk_y) >> 6;
+               slice_tile_max = slice_tile_max ? slice_tile_max - 1 : 0;
+               /* linear height must be the same as the slice tile max height, it's ok even
+                * if the linear destination/source have smaller heigh as the size of the
+                * dma packet will be using the copy_height which is always smaller or equal
+                * to the linear height
+                */
+               height = rsrc->surface.level[src_level].npix_y;
+               detile = 1;
+               x = src_x;
+               y = src_y;
+               z = src_z;
+               base = rsrc->surface.level[src_level].offset;
+               addr = rdst->surface.level[dst_level].offset;
+               addr += rdst->surface.level[dst_level].slice_size * dst_z;
+               addr += dst_y * pitch + dst_x * bpp;
+               bank_h = eg_bank_wh(rsrc->surface.bankh);
+               bank_w = eg_bank_wh(rsrc->surface.bankw);
+               mt_aspect = eg_macro_tile_aspect(rsrc->surface.mtilea);
+               tile_split = eg_tile_split(rsrc->surface.tile_split);
+               base += r600_resource_va(&rctx->screen->screen, src);
+               addr += r600_resource_va(&rctx->screen->screen, dst);
+       } else {
+               /* L2T */
+               array_mode = evergreen_array_mode(dst_mode);
+               slice_tile_max = (rdst->surface.level[dst_level].nblk_x * rdst->surface.level[dst_level].nblk_y) >> 6;
+               slice_tile_max = slice_tile_max ? slice_tile_max - 1 : 0;
+               /* linear height must be the same as the slice tile max height, it's ok even
+                * if the linear destination/source have smaller heigh as the size of the
+                * dma packet will be using the copy_height which is always smaller or equal
+                * to the linear height
+                */
+               height = rdst->surface.level[dst_level].npix_y;
+               detile = 0;
+               x = dst_x;
+               y = dst_y;
+               z = dst_z;
+               base = rdst->surface.level[dst_level].offset;
+               addr = rsrc->surface.level[src_level].offset;
+               addr += rsrc->surface.level[src_level].slice_size * src_z;
+               addr += src_y * pitch + src_x * bpp;
+               bank_h = eg_bank_wh(rdst->surface.bankh);
+               bank_w = eg_bank_wh(rdst->surface.bankw);
+               mt_aspect = eg_macro_tile_aspect(rdst->surface.mtilea);
+               tile_split = eg_tile_split(rdst->surface.tile_split);
+               base += r600_resource_va(&rctx->screen->screen, dst);
+               addr += r600_resource_va(&rctx->screen->screen, src);
+       }
+
+       size = (copy_height * pitch) >> 2;
+       ncopy = (size / 0x000fffff) + !!(size % 0x000fffff);
+       r600_need_dma_space(rctx, ncopy * 9);
+
+       for (i = 0; i < ncopy; i++) {
+               cheight = copy_height;
+               if (((cheight * pitch) >> 2) > 0x000fffff) {
+                       cheight = (0x000fffff << 2) / pitch;
+               }
+               size = (cheight * pitch) >> 2;
+               /* emit reloc before writting cs so that cs is always in consistent state */
+               r600_context_bo_reloc(rctx, &rctx->rings.dma, &rsrc->resource, RADEON_USAGE_READ);
+               r600_context_bo_reloc(rctx, &rctx->rings.dma, &rdst->resource, RADEON_USAGE_WRITE);
+               cs->buf[cs->cdw++] = DMA_PACKET(DMA_PACKET_COPY, sub_cmd, size);
+               cs->buf[cs->cdw++] = base >> 8;
+               cs->buf[cs->cdw++] = (detile << 31) | (array_mode << 27) |
+                                       (lbpp << 24) | (bank_h << 21) |
+                                       (bank_w << 18) | (mt_aspect << 16);
+               cs->buf[cs->cdw++] = (pitch_tile_max << 0) | ((height - 1) << 16);
+               cs->buf[cs->cdw++] = (slice_tile_max << 0);
+               cs->buf[cs->cdw++] = (x << 0) | (z << 18);
+               cs->buf[cs->cdw++] = (y << 0) | (tile_split << 21) | (nbanks << 25);
+               cs->buf[cs->cdw++] = addr & 0xfffffffc;
+               cs->buf[cs->cdw++] = (addr >> 32UL) & 0xff;
+               copy_height -= cheight;
+               addr += cheight * pitch;
+               y += cheight;
+       }
+}
+
+boolean evergreen_dma_blit(struct pipe_context *ctx,
+                       struct pipe_resource *dst,
+                       unsigned dst_level,
+                       unsigned dst_x, unsigned dst_y, unsigned dst_z,
+                       struct pipe_resource *src,
+                       unsigned src_level,
+                       const struct pipe_box *src_box)
+{
+       struct r600_context *rctx = (struct r600_context *)ctx;
+       struct r600_texture *rsrc = (struct r600_texture*)src;
+       struct r600_texture *rdst = (struct r600_texture*)dst;
+       unsigned dst_pitch, src_pitch, bpp, dst_mode, src_mode, copy_height;
+       unsigned src_w, dst_w;
+
+       if (rctx->rings.dma.cs == NULL) {
+               return FALSE;
+       }
+       if (src->format != dst->format) {
+               return FALSE;
+       }
+
+       bpp = rdst->surface.bpe;
+       dst_pitch = rdst->surface.level[dst_level].pitch_bytes;
+       src_pitch = rsrc->surface.level[src_level].pitch_bytes;
+       src_w = rsrc->surface.level[src_level].npix_x;
+       dst_w = rdst->surface.level[dst_level].npix_x;
+       copy_height = src_box->height / rsrc->surface.blk_h;
+
+       dst_mode = rdst->surface.level[dst_level].mode;
+       src_mode = rsrc->surface.level[src_level].mode;
+       /* downcast linear aligned to linear to simplify test */
+       src_mode = src_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : src_mode;
+       dst_mode = dst_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : dst_mode;
 
-               rctx->db_shader_control = db_shader_control;
+       if (src_pitch != dst_pitch || src_box->x || dst_x || src_w != dst_w) {
+               /* FIXME evergreen can do partial blit */
+               return FALSE;
+       }
+       /* the x test here are currently useless (because we don't support partial blit)
+        * but keep them around so we don't forget about those
+        */
+       if ((src_pitch & 0x7) || (src_box->x & 0x7) || (dst_x & 0x7) || (src_box->y & 0x7) || (dst_y & 0x7)) {
+               return FALSE;
+       }
 
-               rstate.nregs = 0;
-               r600_pipe_state_add_reg(&rstate, R_02880C_DB_SHADER_CONTROL, db_shader_control);
-               r600_context_pipe_state_set(rctx, &rstate);
+       if (src_mode == dst_mode) {
+               uint64_t dst_offset, src_offset;
+               /* simple dma blit would do NOTE code here assume :
+                *   src_box.x/y == 0
+                *   dst_x/y == 0
+                *   dst_pitch == src_pitch
+                */
+               src_offset= rsrc->surface.level[src_level].offset;
+               src_offset += rsrc->surface.level[src_level].slice_size * src_box->z;
+               src_offset += src_box->y * src_pitch + src_box->x * bpp;
+               dst_offset = rdst->surface.level[dst_level].offset;
+               dst_offset += rdst->surface.level[dst_level].slice_size * dst_z;
+               dst_offset += dst_y * dst_pitch + dst_x * bpp;
+               evergreen_dma_copy(rctx, dst, src, dst_offset, src_offset,
+                                       src_box->height * src_pitch);
+       } else {
+               evergreen_dma_copy_tile(rctx, dst, dst_level, dst_x, dst_y, dst_z,
+                                       src, src_level, src_box->x, src_box->y, src_box->z,
+                                       copy_height, dst_pitch, bpp);
        }
+       return TRUE;
 }