r600g: atomize stencil ref state
[mesa.git] / src / gallium / drivers / r600 / evergreen_state.c
index 4f691e1f17ed2d8a6670c64863063b15b0db562c..fadaab0023070248e5cb308e90904b11da3eeb44 100644 (file)
@@ -635,9 +635,6 @@ boolean evergreen_is_format_supported(struct pipe_screen *screen,
                if (rscreen->info.drm_minor < 19)
                        return FALSE;
 
-               if (rscreen->chip_class != EVERGREEN)
-                       return FALSE;
-
                switch (sample_count) {
                case 2:
                case 4:
@@ -923,7 +920,8 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
                                        S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules));
        } else {
                r600_pipe_state_add_reg(rstate, R_028C08_PA_SU_VTX_CNTL,
-                                       S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules));
+                                       S_028C08_PIX_CENTER_HALF(state->gl_rasterization_rules) |
+                                       S_028C08_QUANT_MODE(V_028C08_X_1_4096TH));
        }
        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,
@@ -993,7 +991,7 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
 {
        struct r600_screen *rscreen = (struct r600_screen*)ctx->screen;
        struct r600_pipe_sampler_view *view = CALLOC_STRUCT(r600_pipe_sampler_view);
-       struct r600_resource_texture *tmp = (struct r600_resource_texture*)texture;
+       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;
@@ -1102,8 +1100,12 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
        view->tex_resource_words[5] = S_030014_BASE_ARRAY(state->u.tex.first_layer) |
                                      S_030014_LAST_ARRAY(state->u.tex.last_layer);
        if (texture->nr_samples > 1) {
+               unsigned log_samples = util_logbase2(texture->nr_samples);
+               if (rscreen->chip_class == CAYMAN) {
+                       view->tex_resource_words[4] |= S_030010_LOG2_NUM_FRAGMENTS(log_samples);
+               }
                /* LAST_LEVEL holds log2(nr_samples) for multisample textures */
-               view->tex_resource_words[5] |= S_030014_LAST_LEVEL(util_logbase2(texture->nr_samples));
+               view->tex_resource_words[5] |= S_030014_LAST_LEVEL(log_samples);
        } else {
                view->tex_resource_words[4] |= S_030010_BASE_LEVEL(state->u.tex.first_level);
                view->tex_resource_words[5] |= S_030014_LAST_LEVEL(state->u.tex.last_level);
@@ -1120,18 +1122,6 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
        return &view->base;
 }
 
-static void evergreen_set_vs_sampler_views(struct pipe_context *ctx, unsigned count,
-                                          struct pipe_sampler_view **views)
-{
-       r600_set_sampler_views(ctx, PIPE_SHADER_VERTEX, 0, count, views);
-}
-
-static void evergreen_set_ps_sampler_views(struct pipe_context *ctx, unsigned count,
-                                          struct pipe_sampler_view **views)
-{
-       r600_set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, count, views);
-}
-
 static void evergreen_set_clip_state(struct pipe_context *ctx,
                                const struct pipe_clip_state *state)
 {
@@ -1167,7 +1157,7 @@ static void evergreen_set_clip_state(struct pipe_context *ctx,
        cb.user_buffer = state->ucp;
        cb.buffer_offset = 0;
        cb.buffer_size = 4*4*8;
-       r600_set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 1, &cb);
+       ctx->set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 1, &cb);
        pipe_resource_reference(&cb.buffer, NULL);
 }
 
@@ -1217,41 +1207,18 @@ static void evergreen_set_scissor_state(struct pipe_context *ctx,
        r600_context_pipe_state_set(rctx, rstate);
 }
 
-static void evergreen_set_viewport_state(struct pipe_context *ctx,
-                                       const struct pipe_viewport_state *state)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-       struct r600_pipe_state *rstate = CALLOC_STRUCT(r600_pipe_state);
-
-       if (rstate == NULL)
-               return;
-
-       rctx->viewport = *state;
-       rstate->id = R600_PIPE_STATE_VIEWPORT;
-       r600_pipe_state_add_reg(rstate, R_02843C_PA_CL_VPORT_XSCALE_0, fui(state->scale[0]));
-       r600_pipe_state_add_reg(rstate, R_028444_PA_CL_VPORT_YSCALE_0, fui(state->scale[1]));
-       r600_pipe_state_add_reg(rstate, R_02844C_PA_CL_VPORT_ZSCALE_0, fui(state->scale[2]));
-       r600_pipe_state_add_reg(rstate, R_028440_PA_CL_VPORT_XOFFSET_0, fui(state->translate[0]));
-       r600_pipe_state_add_reg(rstate, R_028448_PA_CL_VPORT_YOFFSET_0, fui(state->translate[1]));
-       r600_pipe_state_add_reg(rstate, R_028450_PA_CL_VPORT_ZOFFSET_0, fui(state->translate[2]));
-
-       free(rctx->states[R600_PIPE_STATE_VIEWPORT]);
-       rctx->states[R600_PIPE_STATE_VIEWPORT] = rstate;
-       r600_context_pipe_state_set(rctx, rstate);
-}
-
 void evergreen_init_color_surface(struct r600_context *rctx,
                                  struct r600_surface *surf)
 {
        struct r600_screen *rscreen = rctx->screen;
-       struct r600_resource_texture *rtex = (struct r600_resource_texture*)surf->base.texture;
+       struct r600_texture *rtex = (struct r600_texture*)surf->base.texture;
        struct pipe_resource *pipe_tex = surf->base.texture;
        unsigned level = surf->base.u.tex.level;
        unsigned pitch, slice;
        unsigned color_info, color_attrib, color_dim = 0;
        unsigned format, swap, ntype, endian;
-       uint64_t offset;
-       unsigned tile_type, macro_aspect, tile_split, bankh, bankw, nbanks;
+       uint64_t offset, base_offset;
+       unsigned tile_type, macro_aspect, tile_split, bankh, bankw, fmask_bankh, nbanks;
        const struct util_format_description *desc;
        int i;
        bool blend_clamp = 0, blend_bypass = 0;
@@ -1296,10 +1263,12 @@ void evergreen_init_color_surface(struct r600_context *rctx,
        macro_aspect = rtex->surface.mtilea;
        bankw = rtex->surface.bankw;
        bankh = rtex->surface.bankh;
+       fmask_bankh = rtex->fmask_bank_height;
        tile_split = eg_tile_split(tile_split);
        macro_aspect = eg_macro_tile_aspect(macro_aspect);
        bankw = eg_bank_wh(bankw);
        bankh = eg_bank_wh(bankh);
+       fmask_bankh = eg_bank_wh(fmask_bankh);
 
        /* 128 bit formats require tile type = 1 */
        if (rscreen->chip_class == CAYMAN) {
@@ -1319,7 +1288,14 @@ 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(tile_type) |
+                       S_028C74_FMASK_BANK_HEIGHT(fmask_bankh);
+
+       if (rctx->chip_class == CAYMAN && rtex->resource.b.b.nr_samples > 1) {
+               unsigned log_samples = util_logbase2(rtex->resource.b.b.nr_samples);
+               color_attrib |= S_028C74_NUM_SAMPLES(log_samples) |
+                               S_028C74_NUM_FRAGMENTS(log_samples);
+       }
 
        ntype = V_028C70_NUMBER_UNORM;
        if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB)
@@ -1393,11 +1369,14 @@ void evergreen_init_color_surface(struct r600_context *rctx,
                surf->export_16bpc = true;
        }
 
-       offset += r600_resource_va(rctx->context.screen, pipe_tex);
-       offset >>= 8;
+       if (rtex->fmask_size && rtex->cmask_size) {
+               color_info |= S_028C70_COMPRESSION(1) | S_028C70_FAST_CLEAR(1);
+       }
+
+       base_offset = r600_resource_va(rctx->context.screen, pipe_tex);
 
        /* XXX handle enabling of CB beyond BASE8 which has different offset */
-       surf->cb_color_base = offset;
+       surf->cb_color_base = (base_offset + offset) >> 8;
        surf->cb_color_dim = color_dim;
        surf->cb_color_info = color_info;
        surf->cb_color_pitch = S_028C64_PITCH_TILE_MAX(pitch);
@@ -1409,6 +1388,15 @@ void evergreen_init_color_surface(struct r600_context *rctx,
                                      S_028C6C_SLICE_MAX(surf->base.u.tex.last_layer);
        }
        surf->cb_color_attrib = color_attrib;
+       if (rtex->fmask_size && rtex->cmask_size) {
+               surf->cb_color_fmask = (base_offset + rtex->fmask_offset) >> 8;
+               surf->cb_color_cmask = (base_offset + rtex->cmask_offset) >> 8;
+       } else {
+               surf->cb_color_fmask = surf->cb_color_base;
+               surf->cb_color_cmask = surf->cb_color_base;
+       }
+       surf->cb_color_fmask_slice = S_028C88_TILE_MAX(slice);
+       surf->cb_color_cmask_slice = S_028C80_TILE_MAX(rtex->cmask_slice_tile_max);
 
        surf->color_initialized = true;
 }
@@ -1418,7 +1406,7 @@ static void evergreen_init_depth_surface(struct r600_context *rctx,
 {
        struct r600_screen *rscreen = rctx->screen;
        struct pipe_screen *screen = &rscreen->screen;
-       struct r600_resource_texture *rtex = (struct r600_resource_texture*)surf->base.texture;
+       struct r600_texture *rtex = (struct r600_texture*)surf->base.texture;
        uint64_t offset;
        unsigned level, pitch, slice, format, array_mode;
        unsigned macro_aspect, tile_split, bankh, bankw, nbanks;
@@ -1463,6 +1451,9 @@ static void evergreen_init_depth_surface(struct r600_context *rctx,
                              S_028040_BANK_WIDTH(bankw) |
                              S_028040_BANK_HEIGHT(bankh) |
                              S_028040_MACRO_TILE_ASPECT(macro_aspect);
+       if (rscreen->chip_class == CAYMAN && rtex->resource.b.b.nr_samples > 1) {
+               surf->db_depth_info |= S_028040_NUM_SAMPLES(util_logbase2(rtex->resource.b.b.nr_samples));
+       }
        surf->db_depth_base = offset;
        surf->db_depth_view = S_028008_SLICE_START(surf->base.u.tex.first_layer) |
                              S_028008_SLICE_MAX(surf->base.u.tex.last_layer);
@@ -1515,29 +1506,79 @@ static uint32_t evergreen_set_ms_pos(struct pipe_context *ctx, struct r600_pipe_
        };
        static unsigned max_dist_4x = 6;
        /* 8xMSAA */
-       static uint32_t eg_sample_locs_8x[] = {
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
+       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),
+       };
+       static unsigned max_dist_8x = 8;
+       struct r600_context *rctx = (struct r600_context *)ctx;
+       unsigned i;
+
+       switch (nsample) {
+       case 2:
+               for (i = 0; i < Elements(sample_locs_2x); i++) {
+                       r600_pipe_state_add_reg(rstate, R_028C1C_PA_SC_AA_SAMPLE_LOCS_0 + i*4,
+                                               sample_locs_2x[i]);
+               }
+               return max_dist_2x;
+       case 4:
+               for (i = 0; i < Elements(sample_locs_4x); i++) {
+                       r600_pipe_state_add_reg(rstate, R_028C1C_PA_SC_AA_SAMPLE_LOCS_0 + i*4,
+                                               sample_locs_4x[i]);
+               }
+               return max_dist_4x;
+       case 8:
+               for (i = 0; i < Elements(sample_locs_8x); i++) {
+                       r600_pipe_state_add_reg(rstate, R_028C1C_PA_SC_AA_SAMPLE_LOCS_0 + i*4,
+                                               sample_locs_8x[i]);
+               }
+               return max_dist_8x;
+       default:
+               R600_ERR("Invalid nr_samples %i\n", nsample);
+               return 0;
+       }
+}
+
+static uint32_t cayman_set_ms_pos(struct pipe_context *ctx, struct r600_pipe_state *rstate, int nsample)
+{
+       /* 2xMSAA
+        * There are two locations (-4, 4), (4, -4). */
+       static uint32_t sample_locs_2x[] = {
+               FILL_SREG(-4, 4, 4, -4, -4, 4, 4, -4),
+               FILL_SREG(-4, 4, 4, -4, -4, 4, 4, -4),
+               FILL_SREG(-4, 4, 4, -4, -4, 4, 4, -4),
+               FILL_SREG(-4, 4, 4, -4, -4, 4, 4, -4),
+       };
+       static unsigned max_dist_2x = 4;
+       /* 4xMSAA
+        * There are 4 locations: (-2, -2), (2, 2), (-6, 6), (6, -6). */
+       static uint32_t sample_locs_4x[] = {
+               FILL_SREG(-2, -2, 2, 2, -6, 6, 6, -6),
+               FILL_SREG(-2, -2, 2, 2, -6, 6, 6, -6),
+               FILL_SREG(-2, -2, 2, 2, -6, 6, 6, -6),
+               FILL_SREG(-2, -2, 2, 2, -6, 6, 6, -6),
        };
-       static uint32_t cm_sample_locs_8x[] = {
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG(-2, -5, 4, -4,  1, 6, -6, -2),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
-               FILL_SREG( 6,  1, 0,  0, -5, 4,  7, -8),
+       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(-2, -5, 3, -4, -1, 5, -6, -2),
+               FILL_SREG(-2, -5, 3, -4, -1, 5, -6, -2),
+               FILL_SREG(-2, -5, 3, -4, -1, 5, -6, -2),
+               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
+               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
+               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
+               FILL_SREG( 6,  0, 0,  0, -5, 3,  4,  4),
        };
        static unsigned max_dist_8x = 8;
        /* 16xMSAA */
-       static uint32_t cm_sample_locs_16x[] = {
+       static uint32_t sample_locs_16x[] = {
                FILL_SREG(-7, -3, 7, 3, 1, -5, -5, 5),
                FILL_SREG(-7, -3, 7, 3, 1, -5, -5, 5),
                FILL_SREG(-7, -3, 7, 3, 1, -5, -5, 5),
@@ -1557,7 +1598,7 @@ static uint32_t evergreen_set_ms_pos(struct pipe_context *ctx, struct r600_pipe_
        };
        static unsigned max_dist_16x = 8;
        struct r600_context *rctx = (struct r600_context *)ctx;
-       uint32_t max_dist, num_regs, *sample_locs, i;
+       uint32_t max_dist, num_regs, *sample_locs;
 
        switch (nsample) {
        case 2:
@@ -1571,55 +1612,39 @@ static uint32_t evergreen_set_ms_pos(struct pipe_context *ctx, struct r600_pipe_
                max_dist = max_dist_4x;
                break;
        case 8:
-               if (rctx->chip_class == CAYMAN) {
-                       sample_locs = cm_sample_locs_8x;
-                       num_regs = Elements(cm_sample_locs_8x);
-               } else {
-                       sample_locs = eg_sample_locs_8x;
-                       num_regs = Elements(eg_sample_locs_8x);
-               }
+               sample_locs = sample_locs_8x;
+               num_regs = Elements(sample_locs_8x);
                max_dist = max_dist_8x;
                break;
        case 16:
-               if (rctx->chip_class == CAYMAN) {
-                       sample_locs = cm_sample_locs_16x;
-                       num_regs = Elements(cm_sample_locs_16x);
-                       max_dist = max_dist_16x;
-                       break;
-               }
-               /* fall through */
+               sample_locs = sample_locs_16x;
+               num_regs = Elements(sample_locs_16x);
+               max_dist = max_dist_16x;
+               break;
        default:
                R600_ERR("Invalid nr_samples %i\n", nsample);
                return 0;
        }
 
-       /* All the regs must be initialized. Otherwise weird rendering may occur. */
-       if (rctx->chip_class == CAYMAN) {
-               r600_pipe_state_add_reg(rstate, CM_R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, sample_locs[0]);
-               r600_pipe_state_add_reg(rstate, CM_R_028C08_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_0, sample_locs[1]);
-               r600_pipe_state_add_reg(rstate, CM_R_028C18_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_0, sample_locs[2]);
-               r600_pipe_state_add_reg(rstate, CM_R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, sample_locs[3]);
-               if (num_regs <= 8) {
-                       r600_pipe_state_add_reg(rstate, CM_R_028BFC_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_1, sample_locs[4]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C0C_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_1, sample_locs[5]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C1C_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_1, sample_locs[6]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C2C_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_1, sample_locs[7]);
-               }
-               if (num_regs <= 16) {
-                       r600_pipe_state_add_reg(rstate, CM_R_028C00_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_2, sample_locs[8]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C10_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_2, sample_locs[9]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C20_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_2, sample_locs[10]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C30_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_2, sample_locs[11]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C04_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_3, sample_locs[12]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C14_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_3, sample_locs[13]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C24_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_3, sample_locs[14]);
-                       r600_pipe_state_add_reg(rstate, CM_R_028C34_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_3, sample_locs[15]);
-               }
-       } else {
-               for (i = 0; i < num_regs; i++) {
-                       r600_pipe_state_add_reg(rstate, R_028C1C_PA_SC_AA_SAMPLE_LOCS_0 + i*4,
-                                               sample_locs[i]);
-               }
+       r600_pipe_state_add_reg(rstate, CM_R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, sample_locs[0]);
+       r600_pipe_state_add_reg(rstate, CM_R_028C08_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_0, sample_locs[1]);
+       r600_pipe_state_add_reg(rstate, CM_R_028C18_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_0, sample_locs[2]);
+       r600_pipe_state_add_reg(rstate, CM_R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, sample_locs[3]);
+       if (num_regs <= 8) {
+               r600_pipe_state_add_reg(rstate, CM_R_028BFC_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_1, sample_locs[4]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C0C_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_1, sample_locs[5]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C1C_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_1, sample_locs[6]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C2C_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_1, sample_locs[7]);
+       }
+       if (num_regs <= 16) {
+               r600_pipe_state_add_reg(rstate, CM_R_028C00_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_2, sample_locs[8]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C10_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_2, sample_locs[9]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C20_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_2, sample_locs[10]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C30_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_2, sample_locs[11]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C04_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_3, sample_locs[12]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C14_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_3, sample_locs[13]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C24_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_3, sample_locs[14]);
+               r600_pipe_state_add_reg(rstate, CM_R_028C34_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_3, sample_locs[15]);
        }
        return max_dist;
 }
@@ -1631,12 +1656,18 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
        struct r600_pipe_state *rstate = CALLOC_STRUCT(r600_pipe_state);
        struct r600_surface *surf;
        struct r600_resource *res;
-       uint32_t tl, br, i, nr_samples;
+       struct r600_texture *rtex;
+       uint32_t tl, br, i, nr_samples, log_samples;
 
        if (rstate == NULL)
                return;
 
-       r600_flush_framebuffer(rctx, false);
+       if (rctx->framebuffer.nr_cbufs) {
+               rctx->flags |= R600_CONTEXT_CB_FLUSH;
+       }
+       if (rctx->framebuffer.zsbuf) {
+               rctx->flags |= R600_CONTEXT_DB_FLUSH;
+       }
 
        /* unreference old buffer and reference new one */
        rstate->id = R600_PIPE_STATE_FRAMEBUFFER;
@@ -1648,10 +1679,12 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
        rctx->nr_cbufs = state->nr_cbufs;
        rctx->cb0_is_integer = state->nr_cbufs &&
                               util_format_is_pure_integer(state->cbufs[0]->format);
+       rctx->compressed_cb_mask = 0;
 
        for (i = 0; i < state->nr_cbufs; i++) {
                surf = (struct r600_surface*)state->cbufs[i];
                res = (struct r600_resource*)surf->base.texture;
+               rtex = (struct r600_texture*)res;
 
                if (!surf->color_initialized) {
                        evergreen_init_color_surface(rctx, surf);
@@ -1675,9 +1708,23 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                                        surf->cb_color_view);
                r600_pipe_state_add_reg_bo(rstate, R_028C74_CB_COLOR0_ATTRIB + i * 0x3C,
                                           surf->cb_color_attrib, res, RADEON_USAGE_READWRITE);
+               r600_pipe_state_add_reg_bo(rstate, R_028C7C_CB_COLOR0_CMASK + i * 0x3c,
+                                          surf->cb_color_cmask, res, RADEON_USAGE_READWRITE);
+               r600_pipe_state_add_reg(rstate, R_028C80_CB_COLOR0_CMASK_SLICE + i * 0x3c,
+                                       surf->cb_color_cmask_slice);
+               r600_pipe_state_add_reg_bo(rstate,  R_028C84_CB_COLOR0_FMASK + i * 0x3c,
+                                          surf->cb_color_fmask, res, RADEON_USAGE_READWRITE);
+               r600_pipe_state_add_reg(rstate, R_028C88_CB_COLOR0_FMASK_SLICE + i * 0x3c,
+                                       surf->cb_color_fmask_slice);
+
+               /* 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) {
+                       rctx->compressed_cb_mask |= 1 << i;
+               }
        }
        /* set CB_COLOR1_INFO for possible dual-src blending */
-       if (i == 1 && !((struct r600_resource_texture*)res)->is_rat) {
+       if (i == 1 && !((struct r600_texture*)res)->is_rat) {
                r600_pipe_state_add_reg_bo(rstate, R_028C70_CB_COLOR0_INFO + 1 * 0x3C,
                                           surf->cb_color_info, res, RADEON_USAGE_READWRITE);
                i++;
@@ -1745,27 +1792,43 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                nr_samples = 0;
 
        if (nr_samples > 1) {
-               unsigned log_samples = util_logbase2(nr_samples);
-               unsigned max_dist, line_cntl, aa_config;
-
-               max_dist = evergreen_set_ms_pos(ctx, rstate, nr_samples);
-
-               line_cntl = S_028C00_LAST_PIXEL(1) |
-                           S_028C00_EXPAND_LINE_WIDTH(1);
-               aa_config = S_028C04_MSAA_NUM_SAMPLES(log_samples) |
-                           S_028C04_MAX_SAMPLE_DIST(max_dist);
+               unsigned line_cntl = S_028C00_LAST_PIXEL(1) |
+                                    S_028C00_EXPAND_LINE_WIDTH(1);
+               log_samples = util_logbase2(nr_samples);
 
                if (rctx->chip_class == CAYMAN) {
+                       unsigned max_dist = cayman_set_ms_pos(ctx, rstate, nr_samples);
+
                        r600_pipe_state_add_reg(rstate, CM_R_028BDC_PA_SC_LINE_CNTL, line_cntl);
-                       r600_pipe_state_add_reg(rstate, CM_R_028BE0_PA_SC_AA_CONFIG, aa_config);
+                       r600_pipe_state_add_reg(rstate, CM_R_028BE0_PA_SC_AA_CONFIG,
+                                               S_028BE0_MSAA_NUM_SAMPLES(log_samples) |
+                                               S_028BE0_MAX_SAMPLE_DIST(max_dist) |
+                                               S_028BE0_MSAA_EXPOSED_SAMPLES(log_samples));
+                       r600_pipe_state_add_reg(rstate, CM_R_028804_DB_EQAA,
+                                               S_028804_MAX_ANCHOR_SAMPLES(log_samples) |
+                                               S_028804_PS_ITER_SAMPLES(log_samples) |
+                                               S_028804_MASK_EXPORT_NUM_SAMPLES(log_samples) |
+                                               S_028804_ALPHA_TO_MASK_NUM_SAMPLES(log_samples) |
+                                               S_028804_HIGH_QUALITY_INTERSECTIONS(1) |
+                                               S_028804_STATIC_ANCHOR_ASSOCIATIONS(1));
                } else {
+                       unsigned max_dist = evergreen_set_ms_pos(ctx, rstate, nr_samples);
+
                        r600_pipe_state_add_reg(rstate, R_028C00_PA_SC_LINE_CNTL, line_cntl);
-                       r600_pipe_state_add_reg(rstate, R_028C04_PA_SC_AA_CONFIG, aa_config);
+                       r600_pipe_state_add_reg(rstate, R_028C04_PA_SC_AA_CONFIG,
+                                               S_028C04_MSAA_NUM_SAMPLES(log_samples) |
+                                               S_028C04_MAX_SAMPLE_DIST(max_dist));
                }
        } else {
+               log_samples = 0;
+
                if (rctx->chip_class == CAYMAN) {
                        r600_pipe_state_add_reg(rstate, CM_R_028BDC_PA_SC_LINE_CNTL, S_028C00_LAST_PIXEL(1));
                        r600_pipe_state_add_reg(rstate, CM_R_028BE0_PA_SC_AA_CONFIG, 0);
+                       r600_pipe_state_add_reg(rstate, CM_R_028804_DB_EQAA,
+                                               S_028804_HIGH_QUALITY_INTERSECTIONS(1) |
+                                               S_028804_STATIC_ANCHOR_ASSOCIATIONS(1));
+
                } else {
                        r600_pipe_state_add_reg(rstate, R_028C00_PA_SC_LINE_CNTL, S_028C00_LAST_PIXEL(1));
                        r600_pipe_state_add_reg(rstate, R_028C04_PA_SC_AA_CONFIG, 0);
@@ -1789,6 +1852,11 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
                rctx->alphatest_state.bypass = false;
                r600_atom_dirty(rctx, &rctx->alphatest_state.atom);
        }
+
+       if (rctx->chip_class == CAYMAN && rctx->db_misc_state.log_samples != log_samples) {
+               rctx->db_misc_state.log_samples = log_samples;
+               r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
+       }
 }
 
 static void evergreen_emit_cb_misc_state(struct r600_context *rctx, struct r600_atom *atom)
@@ -1819,6 +1887,9 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_
 
        if (a->occlusion_query_enabled) {
                db_count_control |= S_028004_PERFECT_ZPASS_COUNTS(1);
+               if (rctx->chip_class == CAYMAN) {
+                       db_count_control |= S_028004_SAMPLE_RATE(a->log_samples);
+               }
                db_render_override |= S_02800C_NOOP_CULL_DISABLE(1);
        }
 
@@ -1951,14 +2022,21 @@ static void evergreen_emit_constant_buffers(struct r600_context *rctx,
 
 static void evergreen_emit_vs_constant_buffers(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_constant_buffers(rctx, &rctx->vs_constbuf_state, 176,
+       evergreen_emit_constant_buffers(rctx, &rctx->constbuf_state[PIPE_SHADER_VERTEX], 176,
                                        R_028180_ALU_CONST_BUFFER_SIZE_VS_0,
                                        R_028980_ALU_CONST_CACHE_VS_0);
 }
 
+static void evergreen_emit_gs_constant_buffers(struct r600_context *rctx, struct r600_atom *atom)
+{
+       evergreen_emit_constant_buffers(rctx, &rctx->constbuf_state[PIPE_SHADER_GEOMETRY], 336,
+                                       R_0281C0_ALU_CONST_BUFFER_SIZE_GS_0,
+                                       R_0289C0_ALU_CONST_CACHE_GS_0);
+}
+
 static void evergreen_emit_ps_constant_buffers(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_constant_buffers(rctx, &rctx->ps_constbuf_state, 0,
+       evergreen_emit_constant_buffers(rctx, &rctx->constbuf_state[PIPE_SHADER_FRAGMENT], 0,
                                       R_028140_ALU_CONST_BUFFER_SIZE_PS_0,
                                       R_028940_ALU_CONST_CACHE_PS_0);
 }
@@ -1995,47 +2073,60 @@ static void evergreen_emit_sampler_views(struct r600_context *rctx,
 
 static void evergreen_emit_vs_sampler_views(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_sampler_views(rctx, &rctx->vs_samplers.views, 176 + R600_MAX_CONST_BUFFERS);
+       evergreen_emit_sampler_views(rctx, &rctx->samplers[PIPE_SHADER_VERTEX].views, 176 + R600_MAX_CONST_BUFFERS);
+}
+
+static void evergreen_emit_gs_sampler_views(struct r600_context *rctx, struct r600_atom *atom)
+{
+       evergreen_emit_sampler_views(rctx, &rctx->samplers[PIPE_SHADER_GEOMETRY].views, 336 + R600_MAX_CONST_BUFFERS);
 }
 
 static void evergreen_emit_ps_sampler_views(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_sampler_views(rctx, &rctx->ps_samplers.views, R600_MAX_CONST_BUFFERS);
+       evergreen_emit_sampler_views(rctx, &rctx->samplers[PIPE_SHADER_FRAGMENT].views, R600_MAX_CONST_BUFFERS);
 }
 
-static void evergreen_emit_sampler(struct r600_context *rctx,
+static void evergreen_emit_sampler_states(struct r600_context *rctx,
                                struct r600_textures_info *texinfo,
                                unsigned resource_id_base,
                                unsigned border_index_reg)
 {
        struct radeon_winsys_cs *cs = rctx->cs;
-       unsigned i;
+       uint32_t dirty_mask = texinfo->states.dirty_mask;
 
-       for (i = 0; i < texinfo->n_samplers; i++) {
+       while (dirty_mask) {
+               struct r600_pipe_sampler_state *rstate;
+               unsigned i = u_bit_scan(&dirty_mask);
+
+               rstate = texinfo->states.states[i];
+               assert(rstate);
 
-               if (texinfo->samplers[i] == NULL) {
-                       continue;
-               }
                r600_write_value(cs, PKT3(PKT3_SET_SAMPLER, 3, 0));
                r600_write_value(cs, (resource_id_base + i) * 3);
-               r600_write_array(cs, 3, texinfo->samplers[i]->tex_sampler_words);
+               r600_write_array(cs, 3, rstate->tex_sampler_words);
 
-               if (texinfo->samplers[i]->border_color_use) {
+               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, texinfo->samplers[i]->border_color);
+                       r600_write_array(cs, 4, rstate->border_color);
                }
        }
+       texinfo->states.dirty_mask = 0;
+}
+
+static void evergreen_emit_vs_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
+{
+       evergreen_emit_sampler_states(rctx, &rctx->samplers[PIPE_SHADER_VERTEX], 18, R_00A414_TD_VS_SAMPLER0_BORDER_INDEX);
 }
 
-static void evergreen_emit_vs_sampler(struct r600_context *rctx, struct r600_atom *atom)
+static void evergreen_emit_gs_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_sampler(rctx, &rctx->vs_samplers, 18, R_00A414_TD_VS_SAMPLER0_BORDER_INDEX);
+       evergreen_emit_sampler_states(rctx, &rctx->samplers[PIPE_SHADER_GEOMETRY], 36, R_00A428_TD_GS_SAMPLER0_BORDER_INDEX);
 }
 
-static void evergreen_emit_ps_sampler(struct r600_context *rctx, struct r600_atom *atom)
+static void evergreen_emit_ps_sampler_states(struct r600_context *rctx, struct r600_atom *atom)
 {
-       evergreen_emit_sampler(rctx, &rctx->ps_samplers, 0, R_00A400_TD_PS_SAMPLER0_BORDER_INDEX);
+       evergreen_emit_sampler_states(rctx, &rctx->samplers[PIPE_SHADER_FRAGMENT], 0, R_00A400_TD_PS_SAMPLER0_BORDER_INDEX);
 }
 
 static void evergreen_emit_sample_mask(struct r600_context *rctx, struct r600_atom *a)
@@ -2060,68 +2151,56 @@ static void cayman_emit_sample_mask(struct r600_context *rctx, struct r600_atom
 
 void evergreen_init_state_functions(struct r600_context *rctx)
 {
-       r600_init_atom(&rctx->cb_misc_state.atom, evergreen_emit_cb_misc_state, 0, 0);
-       r600_atom_dirty(rctx, &rctx->cb_misc_state.atom);
-       r600_init_atom(&rctx->db_misc_state.atom, evergreen_emit_db_misc_state, 7, 0);
-       r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
-       r600_init_atom(&rctx->vertex_buffer_state.atom, evergreen_fs_emit_vertex_buffers, 0, 0);
-       r600_init_atom(&rctx->cs_vertex_buffer_state.atom, evergreen_cs_emit_vertex_buffers, 0, 0);
-       r600_init_atom(&rctx->vs_constbuf_state.atom, evergreen_emit_vs_constant_buffers, 0, 0);
-       r600_init_atom(&rctx->ps_constbuf_state.atom, evergreen_emit_ps_constant_buffers, 0, 0);
-       r600_init_atom(&rctx->vs_samplers.views.atom, evergreen_emit_vs_sampler_views, 0, 0);
-       r600_init_atom(&rctx->ps_samplers.views.atom, evergreen_emit_ps_sampler_views, 0, 0);
-       r600_init_atom(&rctx->cs_shader_state.atom, evergreen_emit_cs_shader, 0, 0);
-       r600_init_atom(&rctx->vs_samplers.atom_sampler, evergreen_emit_vs_sampler, 0, 0);
-       r600_init_atom(&rctx->ps_samplers.atom_sampler, evergreen_emit_ps_sampler, 0, 0);
-
-       if (rctx->chip_class == EVERGREEN)
-               r600_init_atom(&rctx->sample_mask.atom, evergreen_emit_sample_mask, 3, 0);
-       else
-               r600_init_atom(&rctx->sample_mask.atom, cayman_emit_sample_mask, 4, 0);
+       unsigned id = 4;
+
+       /* !!!
+        *  To avoid GPU lockup registers must be emited in a specific order
+        * (no kidding ...). The order below is important and have been
+        * partialy infered from analyzing fglrx command stream.
+        *
+        * Don't reorder atom without carefully checking the effect (GPU lockup
+        * or piglit regression).
+        * !!!
+        */
+
+       /* shader const */
+       r600_init_atom(rctx, &rctx->constbuf_state[PIPE_SHADER_VERTEX].atom, id++, evergreen_emit_vs_constant_buffers, 0);
+       r600_init_atom(rctx, &rctx->constbuf_state[PIPE_SHADER_GEOMETRY].atom, id++, evergreen_emit_gs_constant_buffers, 0);
+       r600_init_atom(rctx, &rctx->constbuf_state[PIPE_SHADER_FRAGMENT].atom, id++, evergreen_emit_ps_constant_buffers, 0);
+       /* shader program */
+       r600_init_atom(rctx, &rctx->cs_shader_state.atom, id++, evergreen_emit_cs_shader, 0);
+       /* sampler */
+       r600_init_atom(rctx, &rctx->samplers[PIPE_SHADER_VERTEX].states.atom, id++, evergreen_emit_vs_sampler_states, 0);
+       r600_init_atom(rctx, &rctx->samplers[PIPE_SHADER_GEOMETRY].states.atom, id++, evergreen_emit_gs_sampler_states, 0);
+       r600_init_atom(rctx, &rctx->samplers[PIPE_SHADER_FRAGMENT].states.atom, id++, evergreen_emit_ps_sampler_states, 0);
+       /* resources */
+       r600_init_atom(rctx, &rctx->vertex_buffer_state.atom, id++, evergreen_fs_emit_vertex_buffers, 0);
+       r600_init_atom(rctx, &rctx->cs_vertex_buffer_state.atom, id++, evergreen_cs_emit_vertex_buffers, 0);
+       r600_init_atom(rctx, &rctx->samplers[PIPE_SHADER_VERTEX].views.atom, id++, evergreen_emit_vs_sampler_views, 0);
+       r600_init_atom(rctx, &rctx->samplers[PIPE_SHADER_GEOMETRY].views.atom, id++, evergreen_emit_gs_sampler_views, 0);
+       r600_init_atom(rctx, &rctx->samplers[PIPE_SHADER_FRAGMENT].views.atom, id++, evergreen_emit_ps_sampler_views, 0);
+
+       if (rctx->chip_class == EVERGREEN) {
+               r600_init_atom(rctx, &rctx->sample_mask.atom, id++, evergreen_emit_sample_mask, 3);
+       } else {
+               r600_init_atom(rctx, &rctx->sample_mask.atom, id++, cayman_emit_sample_mask, 4);
+       }
        rctx->sample_mask.sample_mask = ~0;
-       r600_atom_dirty(rctx, &rctx->sample_mask.atom);
+
+       r600_init_atom(rctx, &rctx->cb_misc_state.atom, id++, evergreen_emit_cb_misc_state, 0);
+       r600_init_atom(rctx, &rctx->alphatest_state.atom, id++, r600_emit_alphatest_state, 6);
+       r600_init_atom(rctx, &rctx->db_misc_state.atom, id++, evergreen_emit_db_misc_state, 7);
+       r600_init_atom(rctx, &rctx->stencil_ref.atom, id++, r600_emit_stencil_ref, 4);
 
        rctx->context.create_blend_state = evergreen_create_blend_state;
        rctx->context.create_depth_stencil_alpha_state = evergreen_create_dsa_state;
-       rctx->context.create_fs_state = r600_create_shader_state_ps;
        rctx->context.create_rasterizer_state = evergreen_create_rs_state;
        rctx->context.create_sampler_state = evergreen_create_sampler_state;
        rctx->context.create_sampler_view = evergreen_create_sampler_view;
-       rctx->context.create_vertex_elements_state = r600_create_vertex_elements;
-       rctx->context.create_vs_state = r600_create_shader_state_vs;
-       rctx->context.bind_blend_state = r600_bind_blend_state;
-       rctx->context.bind_depth_stencil_alpha_state = r600_bind_dsa_state;
-       rctx->context.bind_fragment_sampler_states = r600_bind_ps_samplers;
-       rctx->context.bind_fs_state = r600_bind_ps_shader;
-       rctx->context.bind_rasterizer_state = r600_bind_rs_state;
-       rctx->context.bind_vertex_elements_state = r600_bind_vertex_elements;
-       rctx->context.bind_vertex_sampler_states = r600_bind_vs_samplers;
-       rctx->context.bind_vs_state = r600_bind_vs_shader;
-       rctx->context.delete_blend_state = r600_delete_state;
-       rctx->context.delete_depth_stencil_alpha_state = r600_delete_state;
-       rctx->context.delete_fs_state = r600_delete_ps_shader;
-       rctx->context.delete_rasterizer_state = r600_delete_rs_state;
-       rctx->context.delete_sampler_state = r600_delete_sampler;
-       rctx->context.delete_vertex_elements_state = r600_delete_vertex_element;
-       rctx->context.delete_vs_state = r600_delete_vs_shader;
-       rctx->context.set_blend_color = r600_set_blend_color;
        rctx->context.set_clip_state = evergreen_set_clip_state;
-       rctx->context.set_constant_buffer = r600_set_constant_buffer;
-       rctx->context.set_fragment_sampler_views = evergreen_set_ps_sampler_views;
        rctx->context.set_framebuffer_state = evergreen_set_framebuffer_state;
        rctx->context.set_polygon_stipple = evergreen_set_polygon_stipple;
-       rctx->context.set_sample_mask = r600_set_sample_mask;
        rctx->context.set_scissor_state = evergreen_set_scissor_state;
-       rctx->context.set_stencil_ref = r600_set_pipe_stencil_ref;
-       rctx->context.set_vertex_buffers = r600_set_vertex_buffers;
-       rctx->context.set_index_buffer = r600_set_index_buffer;
-       rctx->context.set_vertex_sampler_views = evergreen_set_vs_sampler_views;
-       rctx->context.set_viewport_state = evergreen_set_viewport_state;
-       rctx->context.sampler_view_destroy = r600_sampler_view_destroy;
-       rctx->context.texture_barrier = r600_texture_barrier;
-       rctx->context.create_stream_output_target = r600_create_so_target;
-       rctx->context.stream_output_target_destroy = r600_so_target_destroy;
-       rctx->context.set_stream_output_targets = r600_set_so_targets;
        evergreen_init_compute_state_functions(rctx);
 }
 
@@ -2129,7 +2208,7 @@ static void cayman_init_atom_start_cs(struct r600_context *rctx)
 {
        struct r600_command_buffer *cb = &rctx->start_cs_cmd;
 
-       r600_init_command_buffer(cb, 256, EMIT_EARLY);
+       r600_init_command_buffer(rctx, cb, 0, 256);
 
        /* This must be first. */
        r600_store_value(cb, PKT3(PKT3_CONTEXT_CONTROL, 1, 0));
@@ -2184,8 +2263,6 @@ 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(cb, CM_R_028804_DB_EQAA, 0x110000);
-
        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);
@@ -2274,14 +2351,20 @@ static void cayman_init_atom_start_cs(struct r600_context *rctx)
        eg_store_loop_const(cb, R_03A200_SQ_LOOP_CONST_0 + (32 * 4), 0x01000FFF);
 }
 
-void evergreen_init_atom_start_cs(struct r600_context *rctx)
+void evergreen_init_common_regs(struct r600_command_buffer *cb,
+       enum chip_class ctx_chip_class,
+       enum radeon_family ctx_family,
+       int ctx_drm_minor)
 {
-       struct r600_command_buffer *cb = &rctx->start_cs_cmd;
        int ps_prio;
        int vs_prio;
        int gs_prio;
        int es_prio;
-       int hs_prio, cs_prio, ls_prio;
+
+       int hs_prio;
+       int cs_prio;
+       int ls_prio;
+
        int num_ps_gprs;
        int num_vs_gprs;
        int num_gs_gprs;
@@ -2289,12 +2372,226 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
        int num_hs_gprs;
        int num_ls_gprs;
        int num_temp_gprs;
+
+       unsigned tmp;
+
+       ps_prio = 0;
+       vs_prio = 1;
+       gs_prio = 2;
+       es_prio = 3;
+       hs_prio = 0;
+       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;
+       }
+
+       tmp = 0;
+       switch (ctx_family) {
+       case CHIP_CEDAR:
+       case CHIP_PALM:
+       case CHIP_SUMO:
+       case CHIP_SUMO2:
+       case CHIP_CAICOS:
+               break;
+       default:
+               tmp |= S_008C00_VC_ENABLE(1);
+               break;
+       }
+       tmp |= S_008C00_EXPORT_SRC_C(1);
+       tmp |= S_008C00_CS_PRIO(cs_prio);
+       tmp |= S_008C00_LS_PRIO(ls_prio);
+       tmp |= S_008C00_HS_PRIO(hs_prio);
+       tmp |= S_008C00_PS_PRIO(ps_prio);
+       tmp |= S_008C00_VS_PRIO(vs_prio);
+       tmp |= S_008C00_GS_PRIO(gs_prio);
+       tmp |= S_008C00_ES_PRIO(es_prio);
+
+       /* enable dynamic GPR resource management */
+       if (ctx_drm_minor >= 7) {
+               r600_store_config_reg_seq(cb, R_008C00_SQ_CONFIG, 2);
+               r600_store_value(cb, tmp); /* R_008C00_SQ_CONFIG */
+               /* always set temp clauses */
+               r600_store_value(cb, S_008C04_NUM_CLAUSE_TEMP_GPRS(num_temp_gprs)); /* 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_028838_SQ_DYN_GPR_RESOURCE_LIMIT_1,
+                                       S_028838_PS_GPRS(0x1e) |
+                                       S_028838_VS_GPRS(0x1e) |
+                                       S_028838_GS_GPRS(0x1e) |
+                                       S_028838_ES_GPRS(0x1e) |
+                                       S_028838_HS_GPRS(0x1e) |
+                                       S_028838_LS_GPRS(0x1e)); /* workaround for hw issues with dyn gpr - must set all limits to 240 instead of 0, 0x1e == 240 / 8*/
+       } else {
+               r600_store_config_reg_seq(cb, R_008C00_SQ_CONFIG, 4);
+               r600_store_value(cb, tmp); /* R_008C00_SQ_CONFIG */
+
+               tmp = S_008C04_NUM_PS_GPRS(num_ps_gprs);
+               tmp |= S_008C04_NUM_VS_GPRS(num_vs_gprs);
+               tmp |= S_008C04_NUM_CLAUSE_TEMP_GPRS(num_temp_gprs);
+               r600_store_value(cb, tmp); /* R_008C04_SQ_GPR_RESOURCE_MGMT_1 */
+
+               tmp = S_008C08_NUM_GS_GPRS(num_gs_gprs);
+               tmp |= S_008C08_NUM_ES_GPRS(num_es_gprs);
+               r600_store_value(cb, tmp); /* R_008C08_SQ_GPR_RESOURCE_MGMT_2 */
+
+               tmp = S_008C0C_NUM_HS_GPRS(num_hs_gprs);
+               tmp |= S_008C0C_NUM_HS_GPRS(num_ls_gprs);
+               r600_store_value(cb, tmp); /* R_008C0C_SQ_GPR_RESOURCE_MGMT_3 */
+       }
+
+       r600_store_config_reg(cb, R_008E2C_SQ_LDS_RESOURCE_MGMT,
+                             S_008E2C_NUM_PS_LDS(0x1000) | S_008E2C_NUM_LS_LDS(0x1000));
+
+       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 */
+
+       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;
+}
+
+void evergreen_init_atom_start_cs(struct r600_context *rctx)
+{
+       struct r600_command_buffer *cb = &rctx->start_cs_cmd;
        int num_ps_threads;
        int num_vs_threads;
        int num_gs_threads;
        int num_es_threads;
        int num_hs_threads;
        int num_ls_threads;
+
        int num_ps_stack_entries;
        int num_vs_stack_entries;
        int num_gs_stack_entries;
@@ -2309,32 +2606,20 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                return;
        }
 
-       r600_init_command_buffer(cb, 256, EMIT_EARLY);
+       r600_init_command_buffer(rctx, cb, 0, 256);
 
        /* This must be first. */
        r600_store_value(cb, PKT3(PKT3_CONTEXT_CONTROL, 1, 0));
        r600_store_value(cb, 0x80000000);
        r600_store_value(cb, 0x80000000);
 
-       family = rctx->family;
-       ps_prio = 0;
-       vs_prio = 1;
-       gs_prio = 2;
-       es_prio = 3;
-       hs_prio = 0;
-       ls_prio = 0;
-       cs_prio = 0;
+       evergreen_init_common_regs(cb, rctx->chip_class
+                       , rctx->family, rctx->screen->info.drm_minor);
 
+       family = rctx->family;
        switch (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;
                num_ps_threads = 96;
                num_vs_threads = 16;
                num_gs_threads = 16;
@@ -2349,13 +2634,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 42;
                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;
                num_ps_threads = 128;
                num_vs_threads = 20;
                num_gs_threads = 20;
@@ -2370,13 +2648,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 42;
                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;
                num_ps_threads = 128;
                num_vs_threads = 20;
                num_gs_threads = 20;
@@ -2392,13 +2663,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                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;
                num_ps_threads = 128;
                num_vs_threads = 20;
                num_gs_threads = 20;
@@ -2413,13 +2677,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 85;
                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;
                num_ps_threads = 96;
                num_vs_threads = 16;
                num_gs_threads = 16;
@@ -2434,13 +2691,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 42;
                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;
                num_ps_threads = 96;
                num_vs_threads = 25;
                num_gs_threads = 25;
@@ -2455,13 +2705,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 42;
                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;
                num_ps_threads = 96;
                num_vs_threads = 25;
                num_gs_threads = 25;
@@ -2476,13 +2719,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 85;
                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;
                num_ps_threads = 128;
                num_vs_threads = 20;
                num_gs_threads = 20;
@@ -2497,13 +2733,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 85;
                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;
                num_ps_threads = 128;
                num_vs_threads = 20;
                num_gs_threads = 20;
@@ -2518,13 +2747,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                num_ls_stack_entries = 42;
                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;
                num_ps_threads = 128;
                num_vs_threads = 10;
                num_gs_threads = 10;
@@ -2540,66 +2762,11 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
                break;
        }
 
-       tmp = 0;
-       switch (family) {
-       case CHIP_CEDAR:
-       case CHIP_PALM:
-       case CHIP_SUMO:
-       case CHIP_SUMO2:
-       case CHIP_CAICOS:
-               break;
-       default:
-               tmp |= S_008C00_VC_ENABLE(1);
-               break;
-       }
-       tmp |= S_008C00_EXPORT_SRC_C(1);
-       tmp |= S_008C00_CS_PRIO(cs_prio);
-       tmp |= S_008C00_LS_PRIO(ls_prio);
-       tmp |= S_008C00_HS_PRIO(hs_prio);
-       tmp |= S_008C00_PS_PRIO(ps_prio);
-       tmp |= S_008C00_VS_PRIO(vs_prio);
-       tmp |= S_008C00_GS_PRIO(gs_prio);
-       tmp |= S_008C00_ES_PRIO(es_prio);
-
-       /* enable dynamic GPR resource management */
-       if (rctx->screen->info.drm_minor >= 7) {
-               r600_store_config_reg_seq(cb, R_008C00_SQ_CONFIG, 2);
-               r600_store_value(cb, tmp); /* R_008C00_SQ_CONFIG */
-               /* always set temp clauses */
-               r600_store_value(cb, S_008C04_NUM_CLAUSE_TEMP_GPRS(num_temp_gprs)); /* 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_028838_SQ_DYN_GPR_RESOURCE_LIMIT_1,
-                                       S_028838_PS_GPRS(0x1e) |
-                                       S_028838_VS_GPRS(0x1e) |
-                                       S_028838_GS_GPRS(0x1e) |
-                                       S_028838_ES_GPRS(0x1e) |
-                                       S_028838_HS_GPRS(0x1e) |
-                                       S_028838_LS_GPRS(0x1e)); /* workaround for hw issues with dyn gpr - must set all limits to 240 instead of 0, 0x1e == 240 / 8*/
-       } else {
-               r600_store_config_reg_seq(cb, R_008C00_SQ_CONFIG, 4);
-               r600_store_value(cb, tmp); /* R_008C00_SQ_CONFIG */
-
-               tmp = S_008C04_NUM_PS_GPRS(num_ps_gprs);
-               tmp |= S_008C04_NUM_VS_GPRS(num_vs_gprs);
-               tmp |= S_008C04_NUM_CLAUSE_TEMP_GPRS(num_temp_gprs);
-               r600_store_value(cb, tmp); /* R_008C04_SQ_GPR_RESOURCE_MGMT_1 */
-
-               tmp = S_008C08_NUM_GS_GPRS(num_gs_gprs);
-               tmp |= S_008C08_NUM_ES_GPRS(num_es_gprs);
-               r600_store_value(cb, tmp); /* R_008C08_SQ_GPR_RESOURCE_MGMT_2 */
-
-               tmp = S_008C0C_NUM_HS_GPRS(num_hs_gprs);
-               tmp |= S_008C0C_NUM_HS_GPRS(num_ls_gprs);
-               r600_store_value(cb, tmp); /* R_008C0C_SQ_GPR_RESOURCE_MGMT_3 */
-       }
-
        tmp = S_008C18_NUM_PS_THREADS(num_ps_threads);
        tmp |= S_008C18_NUM_VS_THREADS(num_vs_threads);
        tmp |= S_008C18_NUM_GS_THREADS(num_gs_threads);
        tmp |= S_008C18_NUM_ES_THREADS(num_es_threads);
+
        r600_store_config_reg_seq(cb, R_008C18_SQ_THREAD_RESOURCE_MGMT_1, 5);
        r600_store_value(cb, tmp); /* R_008C18_SQ_THREAD_RESOURCE_MGMT_1 */
 
@@ -2619,14 +2786,9 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
        tmp |= S_008C28_NUM_LS_STACK_ENTRIES(num_ls_stack_entries);
        r600_store_value(cb, tmp); /* R_008C28_SQ_STACK_RESOURCE_MGMT_3 */
 
-       r600_store_config_reg(cb, R_008E2C_SQ_LDS_RESOURCE_MGMT,
-                             S_008E2C_NUM_PS_LDS(0x1000) | S_008E2C_NUM_LS_LDS(0x1000));
-
        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 */
@@ -2656,10 +2818,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
        r600_store_value(cb, 0); /* R_028A3C_VGT_GROUP_VECT_1_FMT_CNTL */
        r600_store_value(cb, 0); /* R_028A40_VGT_GS_MODE */
 
-       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_seq(cb, R_028AB4_VGT_REUSE_OFF, 2);
        r600_store_value(cb, 0); /* R_028AB4_VGT_REUSE_OFF */
        r600_store_value(cb, 0); /* R_028AB8_VGT_VTX_CNT_EN */
@@ -2710,11 +2868,6 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx)
 
        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);
@@ -2739,11 +2892,8 @@ 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);
 
-       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);
        if (rctx->screen->has_streamout) {
                r600_store_context_reg(cb, R_028B28_VGT_STRMOUT_DRAW_OPAQUE_OFFSET, 0);
@@ -3021,11 +3171,24 @@ void *evergreen_create_resolve_blend(struct r600_context *rctx)
        struct r600_pipe_state *rstate;
 
        memset(&blend, 0, sizeof(blend));
+       blend.independent_blend_enable = true;
        blend.rt[0].colormask = 0xf;
        rstate = evergreen_create_blend_state_mode(&rctx->context, &blend, V_028808_CB_RESOLVE);
        return rstate;
 }
 
+void *evergreen_create_decompress_blend(struct r600_context *rctx)
+{
+       struct pipe_blend_state blend;
+       struct r600_pipe_state *rstate;
+
+       memset(&blend, 0, sizeof(blend));
+       blend.independent_blend_enable = true;
+       blend.rt[0].colormask = 0xf;
+       rstate = evergreen_create_blend_state_mode(&rctx->context, &blend, V_028808_CB_DECOMPRESS);
+       return rstate;
+}
+
 void *evergreen_create_db_flush_dsa(struct r600_context *rctx)
 {
        struct pipe_depth_stencil_alpha_state dsa = {{0}};