gallium: remove PIPE_CAP_TEXTURE_SHADOW_MAP
[mesa.git] / src / gallium / drivers / radeonsi / si_state.c
index 5bbfbdd1ac1db2ab5b14522c0d57ebc98e231c04..f88bf29e2020edb58c90c6d7bacf62a5947f991b 100644 (file)
@@ -19,9 +19,6 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Christian König <christian.koenig@amd.com>
  */
 
 #include "si_pipe.h"
@@ -123,8 +120,25 @@ static void si_emit_cb_render_state(struct si_context *sctx, struct r600_atom *a
                radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_DFSM) | EVENT_INDEX(0));
        }
 
+       if (sctx->b.chip_class >= VI) {
+               /* DCC MSAA workaround for blending.
+                * Alternatively, we can set CB_COLORi_DCC_CONTROL.OVERWRITE_-
+                * COMBINER_DISABLE, but that would be more complicated.
+                */
+               bool oc_disable = (sctx->b.chip_class == VI ||
+                                  sctx->b.chip_class == GFX9) &&
+                                 blend &&
+                                 blend->blend_enable_4bit & cb_target_mask &&
+                                 sctx->framebuffer.nr_samples >= 2;
+
+               radeon_set_context_reg(cs, R_028424_CB_DCC_CONTROL,
+                                      S_028424_OVERWRITE_COMBINER_MRT_SHARING_DISABLE(1) |
+                                      S_028424_OVERWRITE_COMBINER_WATERMARK(4) |
+                                      S_028424_OVERWRITE_COMBINER_DISABLE(oc_disable));
+       }
+
        /* RB+ register settings. */
-       if (sctx->screen->b.rbplus_allowed) {
+       if (sctx->screen->rbplus_allowed) {
                unsigned spi_shader_col_format =
                        sctx->ps_shader.cso ?
                        sctx->ps_shader.current->key.part.ps.epilog.spi_shader_col_format : 0;
@@ -209,10 +223,10 @@ static void si_emit_cb_render_state(struct si_context *sctx, struct r600_atom *a
                                break;
 
                        case V_028C70_COLOR_32:
-                               if (swap == V_0280A0_SWAP_STD &&
+                               if (swap == V_028C70_SWAP_STD &&
                                    spi_format == V_028714_SPI_SHADER_32_R)
                                        sx_ps_downconvert |= V_028754_SX_RT_EXPORT_32_R << (i * 4);
-                               else if (swap == V_0280A0_SWAP_ALT_REV &&
+                               else if (swap == V_028C70_SWAP_ALT_REV &&
                                         spi_format == V_028714_SPI_SHADER_32_AR)
                                        sx_ps_downconvert |= V_028754_SX_RT_EXPORT_32_A << (i * 4);
                                break;
@@ -224,8 +238,8 @@ static void si_emit_cb_render_state(struct si_context *sctx, struct r600_atom *a
                                    spi_format == V_028714_SPI_SHADER_SNORM16_ABGR ||
                                    spi_format == V_028714_SPI_SHADER_UINT16_ABGR ||
                                    spi_format == V_028714_SPI_SHADER_SINT16_ABGR) {
-                                       if (swap == V_0280A0_SWAP_STD ||
-                                           swap == V_0280A0_SWAP_STD_REV)
+                                       if (swap == V_028C70_SWAP_STD ||
+                                           swap == V_028C70_SWAP_STD_REV)
                                                sx_ps_downconvert |= V_028754_SX_RT_EXPORT_16_16_GR << (i * 4);
                                        else
                                                sx_ps_downconvert |= V_028754_SX_RT_EXPORT_16_16_AR << (i * 4);
@@ -252,7 +266,7 @@ static void si_emit_cb_render_state(struct si_context *sctx, struct r600_atom *a
                radeon_emit(cs, sx_ps_downconvert);     /* R_028754_SX_PS_DOWNCONVERT */
                radeon_emit(cs, sx_blend_opt_epsilon);  /* R_028758_SX_BLEND_OPT_EPSILON */
                radeon_emit(cs, sx_blend_opt_control);  /* R_02875C_SX_BLEND_OPT_CONTROL */
-       } else if (sctx->screen->b.has_rbplus) {
+       } else if (sctx->screen->has_rbplus) {
                radeon_set_context_reg_seq(cs, R_028754_SX_PS_DOWNCONVERT, 3);
                radeon_emit(cs, 0);     /* R_028754_SX_PS_DOWNCONVERT */
                radeon_emit(cs, 0);     /* R_028758_SX_BLEND_OPT_EPSILON */
@@ -377,6 +391,48 @@ static uint32_t si_translate_blend_opt_factor(int blend_fact, bool is_alpha)
        }
 }
 
+static void si_blend_check_commutativity(struct si_screen *sscreen,
+                                        struct si_state_blend *blend,
+                                        enum pipe_blend_func func,
+                                        enum pipe_blendfactor src,
+                                        enum pipe_blendfactor dst,
+                                        unsigned chanmask)
+{
+       /* Src factor is allowed when it does not depend on Dst */
+       static const uint32_t src_allowed =
+               (1u << PIPE_BLENDFACTOR_ONE) |
+               (1u << PIPE_BLENDFACTOR_SRC_COLOR) |
+               (1u << PIPE_BLENDFACTOR_SRC_ALPHA) |
+               (1u << PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE) |
+               (1u << PIPE_BLENDFACTOR_CONST_COLOR) |
+               (1u << PIPE_BLENDFACTOR_CONST_ALPHA) |
+               (1u << PIPE_BLENDFACTOR_SRC1_COLOR) |
+               (1u << PIPE_BLENDFACTOR_SRC1_ALPHA) |
+               (1u << PIPE_BLENDFACTOR_ZERO) |
+               (1u << PIPE_BLENDFACTOR_INV_SRC_COLOR) |
+               (1u << PIPE_BLENDFACTOR_INV_SRC_ALPHA) |
+               (1u << PIPE_BLENDFACTOR_INV_CONST_COLOR) |
+               (1u << PIPE_BLENDFACTOR_INV_CONST_ALPHA) |
+               (1u << PIPE_BLENDFACTOR_INV_SRC1_COLOR) |
+               (1u << PIPE_BLENDFACTOR_INV_SRC1_ALPHA);
+
+       if (dst == PIPE_BLENDFACTOR_ONE &&
+           (src_allowed & (1u << src))) {
+               /* Addition is commutative, but floating point addition isn't
+                * associative: subtle changes can be introduced via different
+                * rounding.
+                *
+                * Out-of-order is also non-deterministic, which means that
+                * this breaks OpenGL invariance requirements. So only enable
+                * out-of-order additive blending if explicitly allowed by a
+                * setting.
+                */
+               if (func == PIPE_BLEND_MAX || func == PIPE_BLEND_MIN ||
+                   (func == PIPE_BLEND_ADD && sscreen->commutative_blend_add))
+                       blend->commutative_4bit |= chanmask;
+       }
+}
+
 /**
  * Get rid of DST in the blend factors by commuting the operands:
  *    func(src * DST, dst * 0) ---> func(src * 0, dst * SRC)
@@ -423,6 +479,7 @@ static void *si_create_blend_state_mode(struct pipe_context *ctx,
        blend->alpha_to_coverage = state->alpha_to_coverage;
        blend->alpha_to_one = state->alpha_to_one;
        blend->dual_src_blend = util_blend_state_is_dual(state, 0);
+       blend->logicop_enable = state->logicop_enable;
 
        if (state->logicop_enable) {
                color_control |= S_028808_ROP3(state->logicop_func | (state->logicop_func << 4));
@@ -492,6 +549,11 @@ static void *si_create_blend_state_mode(struct pipe_context *ctx,
                        continue;
                }
 
+               si_blend_check_commutativity(sctx->screen, blend,
+                                            eqRGB, srcRGB, dstRGB, 0x7 << (4 * i));
+               si_blend_check_commutativity(sctx->screen, blend,
+                                            eqA, srcA, dstA, 0x8 << (4 * i));
+
                /* Blending optimizations for RB+.
                 * These transformations don't change the behavior.
                 *
@@ -567,7 +629,7 @@ static void *si_create_blend_state_mode(struct pipe_context *ctx,
                color_control |= S_028808_MODE(V_028808_CB_DISABLE);
        }
 
-       if (sctx->screen->b.has_rbplus) {
+       if (sctx->screen->has_rbplus) {
                /* Disable RB+ blend optimizations for dual source blending.
                 * Vulkan does this.
                 */
@@ -608,13 +670,16 @@ static void si_bind_blend_state(struct pipe_context *ctx, void *state)
        if (!state)
                return;
 
+       si_pm4_bind_state(sctx, blend, state);
+
        if (!old_blend ||
-            old_blend->cb_target_mask != blend->cb_target_mask ||
-            old_blend->dual_src_blend != blend->dual_src_blend)
+           old_blend->cb_target_mask != blend->cb_target_mask ||
+           old_blend->dual_src_blend != blend->dual_src_blend ||
+           (old_blend->blend_enable_4bit != blend->blend_enable_4bit &&
+            sctx->framebuffer.nr_samples >= 2 &&
+            sctx->screen->dcc_msaa_allowed))
                si_mark_atom_dirty(sctx, &sctx->cb_render_state);
 
-       si_pm4_bind_state(sctx, blend, state);
-
        if (!old_blend ||
            old_blend->cb_target_mask != blend->cb_target_mask ||
            old_blend->alpha_to_coverage != blend->alpha_to_coverage ||
@@ -630,6 +695,14 @@ static void si_bind_blend_state(struct pipe_context *ctx, void *state)
             old_blend->blend_enable_4bit != blend->blend_enable_4bit ||
             old_blend->cb_target_enabled_4bit != blend->cb_target_enabled_4bit))
                si_mark_atom_dirty(sctx, &sctx->dpbb_state);
+
+       if (sctx->screen->has_out_of_order_rast &&
+           (!old_blend ||
+            (old_blend->blend_enable_4bit != blend->blend_enable_4bit ||
+             old_blend->cb_target_enabled_4bit != blend->cb_target_enabled_4bit ||
+             old_blend->commutative_4bit != blend->commutative_4bit ||
+             old_blend->logicop_enable != blend->logicop_enable)))
+               si_mark_atom_dirty(sctx, &sctx->msaa_config);
 }
 
 static void si_delete_blend_state(struct pipe_context *ctx, void *state)
@@ -802,6 +875,7 @@ static void *si_create_rs_state(struct pipe_context *ctx,
        rs->line_stipple_enable = state->line_stipple_enable;
        rs->poly_stipple_enable = state->poly_stipple_enable;
        rs->line_smooth = state->line_smooth;
+       rs->line_width = state->line_width;
        rs->poly_smooth = state->poly_smooth;
        rs->uses_poly_offset = state->offset_point || state->offset_line ||
                               state->offset_tri;
@@ -822,7 +896,7 @@ static void *si_create_rs_state(struct pipe_context *ctx,
 
        si_pm4_set_reg(pm4, R_0286D4_SPI_INTERP_CONTROL_0,
                S_0286D4_FLAT_SHADE_ENA(1) |
-               S_0286D4_PNT_SPRITE_ENA(1) |
+               S_0286D4_PNT_SPRITE_ENA(state->point_quad_rasterization) |
                S_0286D4_PNT_SPRITE_OVRD_X(V_0286D4_SPI_PNT_SPRITE_SEL_S) |
                S_0286D4_PNT_SPRITE_OVRD_Y(V_0286D4_SPI_PNT_SPRITE_SEL_T) |
                S_0286D4_PNT_SPRITE_OVRD_Z(V_0286D4_SPI_PNT_SPRITE_SEL_0) |
@@ -841,20 +915,22 @@ static void *si_create_rs_state(struct pipe_context *ctx,
                psize_min = state->point_size;
                psize_max = state->point_size;
        }
+       rs->max_point_size = psize_max;
+
        /* Divide by two, because 0.5 = 1 pixel. */
        si_pm4_set_reg(pm4, R_028A04_PA_SU_POINT_MINMAX,
                        S_028A04_MIN_SIZE(si_pack_float_12p4(psize_min/2)) |
                        S_028A04_MAX_SIZE(si_pack_float_12p4(psize_max/2)));
 
-       tmp = (unsigned)state->line_width * 8;
-       si_pm4_set_reg(pm4, R_028A08_PA_SU_LINE_CNTL, S_028A08_WIDTH(tmp));
+       si_pm4_set_reg(pm4, R_028A08_PA_SU_LINE_CNTL,
+                      S_028A08_WIDTH(si_pack_float_12p4(state->line_width/2)));
        si_pm4_set_reg(pm4, R_028A48_PA_SC_MODE_CNTL_0,
                       S_028A48_LINE_STIPPLE_ENABLE(state->line_stipple_enable) |
                       S_028A48_MSAA_ENABLE(state->multisample ||
                                            state->poly_smooth ||
                                            state->line_smooth) |
                       S_028A48_VPORT_SCISSOR_ENABLE(1) |
-                      S_028A48_ALTERNATE_RBS_PER_TILE(sscreen->b.chip_class >= GFX9));
+                      S_028A48_ALTERNATE_RBS_PER_TILE(sscreen->info.chip_class >= GFX9));
 
        si_pm4_set_reg(pm4, R_028BE4_PA_SU_VTX_CNTL,
                       S_028BE4_PIX_CENTER(state->half_pixel_center) |
@@ -947,11 +1023,23 @@ static void si_bind_rs_state(struct pipe_context *ctx, void *state)
        sctx->current_vs_state &= C_VS_STATE_CLAMP_VERTEX_COLOR;
        sctx->current_vs_state |= S_VS_STATE_CLAMP_VERTEX_COLOR(rs->clamp_vertex_color);
 
-       r600_viewport_set_rast_deps(&sctx->b, rs->scissor_enable, rs->clip_halfz);
-
        si_pm4_bind_state(sctx, rasterizer, rs);
        si_update_poly_offset_state(sctx);
 
+       if (!old_rs ||
+           (old_rs->scissor_enable != rs->scissor_enable ||
+            old_rs->line_width != rs->line_width ||
+            old_rs->max_point_size != rs->max_point_size)) {
+               sctx->scissors.dirty_mask = (1 << SI_MAX_VIEWPORTS) - 1;
+               si_mark_atom_dirty(sctx, &sctx->scissors.atom);
+       }
+
+       if (!old_rs ||
+           old_rs->clip_halfz != rs->clip_halfz) {
+               sctx->viewports.depth_range_dirty_mask = (1 << SI_MAX_VIEWPORTS) - 1;
+               si_mark_atom_dirty(sctx, &sctx->viewports.atom);
+       }
+
        if (!old_rs ||
            old_rs->clip_plane_enable != rs->clip_plane_enable ||
            old_rs->pa_cl_clip_cntl != rs->pa_cl_clip_cntl)
@@ -1059,9 +1147,34 @@ static bool si_dsa_writes_stencil(const struct pipe_stencil_state *s)
                s->zpass_op != PIPE_STENCIL_OP_KEEP);
 }
 
+static bool si_order_invariant_stencil_op(enum pipe_stencil_op op)
+{
+       /* REPLACE is normally order invariant, except when the stencil
+        * reference value is written by the fragment shader. Tracking this
+        * interaction does not seem worth the effort, so be conservative. */
+       return op != PIPE_STENCIL_OP_INCR &&
+              op != PIPE_STENCIL_OP_DECR &&
+              op != PIPE_STENCIL_OP_REPLACE;
+}
+
+/* Compute whether, assuming Z writes are disabled, this stencil state is order
+ * invariant in the sense that the set of passing fragments as well as the
+ * final stencil buffer result does not depend on the order of fragments. */
+static bool si_order_invariant_stencil_state(const struct pipe_stencil_state *state)
+{
+       return !state->enabled || !state->writemask ||
+              /* The following assumes that Z writes are disabled. */
+              (state->func == PIPE_FUNC_ALWAYS &&
+               si_order_invariant_stencil_op(state->zpass_op) &&
+               si_order_invariant_stencil_op(state->zfail_op)) ||
+              (state->func == PIPE_FUNC_NEVER &&
+               si_order_invariant_stencil_op(state->fail_op));
+}
+
 static void *si_create_dsa_state(struct pipe_context *ctx,
                                 const struct pipe_depth_stencil_alpha_state *state)
 {
+       struct si_context *sctx = (struct si_context *)ctx;
        struct si_state_dsa *dsa = CALLOC_STRUCT(si_state_dsa);
        struct si_pm4_state *pm4 = &dsa->pm4;
        unsigned db_depth_control;
@@ -1125,6 +1238,43 @@ static void *si_create_dsa_state(struct pipe_context *ctx,
                                      si_dsa_writes_stencil(&state->stencil[1]));
        dsa->db_can_write = dsa->depth_write_enabled ||
                            dsa->stencil_write_enabled;
+
+       bool zfunc_is_ordered =
+               state->depth.func == PIPE_FUNC_NEVER ||
+               state->depth.func == PIPE_FUNC_LESS ||
+               state->depth.func == PIPE_FUNC_LEQUAL ||
+               state->depth.func == PIPE_FUNC_GREATER ||
+               state->depth.func == PIPE_FUNC_GEQUAL;
+
+       bool nozwrite_and_order_invariant_stencil =
+               !dsa->db_can_write ||
+               (!dsa->depth_write_enabled &&
+                si_order_invariant_stencil_state(&state->stencil[0]) &&
+                si_order_invariant_stencil_state(&state->stencil[1]));
+
+       dsa->order_invariance[1].zs =
+               nozwrite_and_order_invariant_stencil ||
+               (!dsa->stencil_write_enabled && zfunc_is_ordered);
+       dsa->order_invariance[0].zs = !dsa->depth_write_enabled || zfunc_is_ordered;
+
+       dsa->order_invariance[1].pass_set =
+               nozwrite_and_order_invariant_stencil ||
+               (!dsa->stencil_write_enabled &&
+                (state->depth.func == PIPE_FUNC_ALWAYS ||
+                 state->depth.func == PIPE_FUNC_NEVER));
+       dsa->order_invariance[0].pass_set =
+               !dsa->depth_write_enabled ||
+               (state->depth.func == PIPE_FUNC_ALWAYS ||
+                state->depth.func == PIPE_FUNC_NEVER);
+
+       dsa->order_invariance[1].pass_last =
+               sctx->screen->assume_no_z_fights &&
+               !dsa->stencil_write_enabled &&
+               dsa->depth_write_enabled && zfunc_is_ordered;
+       dsa->order_invariance[0].pass_last =
+               sctx->screen->assume_no_z_fights &&
+               dsa->depth_write_enabled && zfunc_is_ordered;
+
        return dsa;
 }
 
@@ -1154,6 +1304,12 @@ static void si_bind_dsa_state(struct pipe_context *ctx, void *state)
              old_dsa->stencil_enabled != dsa->stencil_enabled ||
              old_dsa->db_can_write != dsa->db_can_write)))
                si_mark_atom_dirty(sctx, &sctx->dpbb_state);
+
+       if (sctx->screen->has_out_of_order_rast &&
+           (!old_dsa ||
+            memcmp(old_dsa->order_invariance, dsa->order_invariance,
+                   sizeof(old_dsa->order_invariance))))
+               si_mark_atom_dirty(sctx, &sctx->msaa_config);
 }
 
 static void si_delete_dsa_state(struct pipe_context *ctx, void *state)
@@ -1177,11 +1333,11 @@ static void si_set_active_query_state(struct pipe_context *ctx, boolean enable)
 
        /* Pipeline stat & streamout queries. */
        if (enable) {
-               sctx->b.flags &= ~R600_CONTEXT_STOP_PIPELINE_STATS;
-               sctx->b.flags |= R600_CONTEXT_START_PIPELINE_STATS;
+               sctx->b.flags &= ~SI_CONTEXT_STOP_PIPELINE_STATS;
+               sctx->b.flags |= SI_CONTEXT_START_PIPELINE_STATS;
        } else {
-               sctx->b.flags &= ~R600_CONTEXT_START_PIPELINE_STATS;
-               sctx->b.flags |= R600_CONTEXT_STOP_PIPELINE_STATS;
+               sctx->b.flags &= ~SI_CONTEXT_START_PIPELINE_STATS;
+               sctx->b.flags |= SI_CONTEXT_STOP_PIPELINE_STATS;
        }
 
        /* Occlusion queries. */
@@ -1191,11 +1347,18 @@ static void si_set_active_query_state(struct pipe_context *ctx, boolean enable)
        }
 }
 
-static void si_set_occlusion_query_state(struct pipe_context *ctx, bool enable)
+static void si_set_occlusion_query_state(struct pipe_context *ctx,
+                                        bool old_enable,
+                                        bool old_perfect_enable)
 {
        struct si_context *sctx = (struct si_context*)ctx;
 
        si_mark_atom_dirty(sctx, &sctx->db_render_state);
+
+       bool perfect_enable = sctx->b.num_perfect_occlusion_queries != 0;
+
+       if (perfect_enable != old_perfect_enable)
+               si_mark_atom_dirty(sctx, &sctx->msaa_config);
 }
 
 static void si_save_qbo_state(struct pipe_context *ctx, struct r600_qbo_state *st)
@@ -1278,8 +1441,8 @@ static void si_emit_db_render_state(struct si_context *sctx, struct r600_atom *s
        if (!rs || !rs->multisample_enable)
                db_shader_control &= C_02880C_MASK_EXPORT_ENABLE;
 
-       if (sctx->screen->b.has_rbplus &&
-           !sctx->screen->b.rbplus_allowed)
+       if (sctx->screen->has_rbplus &&
+           !sctx->screen->rbplus_allowed)
                db_shader_control |= S_02880C_DUAL_QUAD_DISABLE(1);
 
        radeon_set_context_reg(cs, R_02880C_DB_SHADER_CONTROL,
@@ -1292,6 +1455,8 @@ static void si_emit_db_render_state(struct si_context *sctx, struct r600_atom *s
 static uint32_t si_translate_colorformat(enum pipe_format format)
 {
        const struct util_format_description *desc = util_format_description(format);
+       if (!desc)
+               return V_028C70_COLOR_INVALID;
 
 #define HAS_SIZE(x,y,z,w) \
        (desc->channel[0].size == (x) && desc->channel[1].size == (y) && \
@@ -1358,6 +1523,8 @@ static uint32_t si_translate_colorformat(enum pipe_format format)
                        }
                } else if (HAS_SIZE(5,5,5,1)) {
                        return V_028C70_COLOR_1_5_5_5;
+               } else if (HAS_SIZE(1,5,5,5)) {
+                       return V_028C70_COLOR_5_5_5_1;
                } else if (HAS_SIZE(10,10,10,2)) {
                        return V_028C70_COLOR_2_10_10_10;
                }
@@ -1436,9 +1603,9 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen,
                                       int first_non_void)
 {
        struct si_screen *sscreen = (struct si_screen*)screen;
-       bool enable_compressed_formats = (sscreen->b.info.drm_major == 2 &&
-                                         sscreen->b.info.drm_minor >= 31) ||
-                                        sscreen->b.info.drm_major == 3;
+       bool enable_compressed_formats = (sscreen->info.drm_major == 2 &&
+                                         sscreen->info.drm_minor >= 31) ||
+                                        sscreen->info.drm_major == 3;
        bool uniform = true;
        int i;
 
@@ -1507,8 +1674,8 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen,
        }
 
        if (desc->layout == UTIL_FORMAT_LAYOUT_ETC &&
-           (sscreen->b.family == CHIP_STONEY ||
-            sscreen->b.chip_class >= GFX9)) {
+           (sscreen->info.family == CHIP_STONEY ||
+            sscreen->info.chip_class >= GFX9)) {
                switch (format) {
                case PIPE_FORMAT_ETC1_RGB8:
                case PIPE_FORMAT_ETC2_RGB8:
@@ -1564,10 +1731,6 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen,
                if (!enable_compressed_formats)
                        goto out_unknown;
 
-               if (!util_format_s3tc_enabled) {
-                       goto out_unknown;
-               }
-
                switch (format) {
                case PIPE_FORMAT_DXT1_RGB:
                case PIPE_FORMAT_DXT1_RGBA:
@@ -1620,6 +1783,12 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen,
                            desc->channel[3].size == 1) {
                                return V_008F14_IMG_DATA_FORMAT_1_5_5_5;
                        }
+                       if (desc->channel[0].size == 1 &&
+                           desc->channel[1].size == 5 &&
+                           desc->channel[2].size == 5 &&
+                           desc->channel[3].size == 5) {
+                               return V_008F14_IMG_DATA_FORMAT_5_5_5_1;
+                       }
                        if (desc->channel[0].size == 10 &&
                            desc->channel[1].size == 10 &&
                            desc->channel[2].size == 10 &&
@@ -1761,7 +1930,7 @@ static unsigned si_tex_dim(struct si_screen *sscreen, struct r600_texture *rtex,
        /* GFX9 allocates 1D textures as 2D. */
        if ((res_target == PIPE_TEXTURE_1D ||
             res_target == PIPE_TEXTURE_1D_ARRAY) &&
-           sscreen->b.chip_class >= GFX9 &&
+           sscreen->info.chip_class >= GFX9 &&
            rtex->surface.u.gfx9.resource_type == RADEON_RESOURCE_2D) {
                if (res_target == PIPE_TEXTURE_1D)
                        res_target = PIPE_TEXTURE_2D;
@@ -1796,7 +1965,11 @@ static unsigned si_tex_dim(struct si_screen *sscreen, struct r600_texture *rtex,
 
 static bool si_is_sampler_format_supported(struct pipe_screen *screen, enum pipe_format format)
 {
-       return si_translate_texformat(screen, format, util_format_description(format),
+       const struct util_format_description *desc = util_format_description(format);
+       if (!desc)
+               return false;
+
+       return si_translate_texformat(screen, format, desc,
                                      util_format_get_first_non_void_channel(format)) != ~0U;
 }
 
@@ -1925,6 +2098,8 @@ static unsigned si_is_vertex_format_supported(struct pipe_screen *screen,
                          PIPE_BIND_VERTEX_BUFFER)) == 0);
 
        desc = util_format_description(format);
+       if (!desc)
+               return 0;
 
        /* There are no native 8_8_8 or 16_16_16 data formats, and we currently
         * select 8_8_8_8 and 16_16_16_16 instead. This works reasonably well
@@ -1954,7 +2129,7 @@ static unsigned si_is_vertex_format_supported(struct pipe_screen *screen,
 static bool si_is_colorbuffer_format_supported(enum pipe_format format)
 {
        return si_translate_colorformat(format) != V_028C70_COLOR_INVALID &&
-               r600_translate_colorswap(format, false) != ~0U;
+               si_translate_colorswap(format, false) != ~0U;
 }
 
 static bool si_is_zs_format_supported(enum pipe_format format)
@@ -2172,39 +2347,36 @@ static void si_initialize_color_surface(struct si_context *sctx,
                                        struct r600_surface *surf)
 {
        struct r600_texture *rtex = (struct r600_texture*)surf->base.texture;
-       unsigned color_info, color_attrib, color_view;
+       unsigned color_info, color_attrib;
        unsigned format, swap, ntype, endian;
        const struct util_format_description *desc;
-       int i;
+       int firstchan;
        unsigned blend_clamp = 0, blend_bypass = 0;
 
-       color_view = S_028C6C_SLICE_START(surf->base.u.tex.first_layer) |
-                    S_028C6C_SLICE_MAX(surf->base.u.tex.last_layer);
-
        desc = util_format_description(surf->base.format);
-       for (i = 0; i < 4; i++) {
-               if (desc->channel[i].type != UTIL_FORMAT_TYPE_VOID) {
+       for (firstchan = 0; firstchan < 4; firstchan++) {
+               if (desc->channel[firstchan].type != UTIL_FORMAT_TYPE_VOID) {
                        break;
                }
        }
-       if (i == 4 || desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT) {
+       if (firstchan == 4 || desc->channel[firstchan].type == UTIL_FORMAT_TYPE_FLOAT) {
                ntype = V_028C70_NUMBER_FLOAT;
        } else {
                ntype = V_028C70_NUMBER_UNORM;
                if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB)
                        ntype = V_028C70_NUMBER_SRGB;
-               else if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) {
-                       if (desc->channel[i].pure_integer) {
+               else if (desc->channel[firstchan].type == UTIL_FORMAT_TYPE_SIGNED) {
+                       if (desc->channel[firstchan].pure_integer) {
                                ntype = V_028C70_NUMBER_SINT;
                        } else {
-                               assert(desc->channel[i].normalized);
+                               assert(desc->channel[firstchan].normalized);
                                ntype = V_028C70_NUMBER_SNORM;
                        }
-               } else if (desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED) {
-                       if (desc->channel[i].pure_integer) {
+               } else if (desc->channel[firstchan].type == UTIL_FORMAT_TYPE_UNSIGNED) {
+                       if (desc->channel[firstchan].pure_integer) {
                                ntype = V_028C70_NUMBER_UINT;
                        } else {
-                               assert(desc->channel[i].normalized);
+                               assert(desc->channel[firstchan].normalized);
                                ntype = V_028C70_NUMBER_UNORM;
                        }
                }
@@ -2215,7 +2387,7 @@ static void si_initialize_color_surface(struct si_context *sctx,
                R600_ERR("Invalid CB format: %d, disabling CB.\n", surf->base.format);
        }
        assert(format != V_028C70_COLOR_INVALID);
-       swap = r600_translate_colorswap(surf->base.format, false);
+       swap = si_translate_colorswap(surf->base.format, false);
        endian = si_colorformat_endian_swap(format);
 
        /* blend clamp should be set for all NORM/SRGB types */
@@ -2277,41 +2449,53 @@ static void si_initialize_color_surface(struct si_context *sctx,
                }
        }
 
-       surf->cb_color_view = color_view;
-       surf->cb_color_info = color_info;
-       surf->cb_color_attrib = color_attrib;
-
        if (sctx->b.chip_class >= VI) {
-               unsigned max_uncompressed_block_size = 2;
+               unsigned max_uncompressed_block_size = V_028C78_MAX_BLOCK_SIZE_256B;
+               unsigned min_compressed_block_size = V_028C78_MIN_BLOCK_SIZE_32B;
+
+               /* amdvlk: [min-compressed-block-size] should be set to 32 for dGPU and
+                  64 for APU because all of our APUs to date use DIMMs which have
+                  a request granularity size of 64B while all other chips have a
+                  32B request size */
+               if (!sctx->screen->info.has_dedicated_vram)
+                       min_compressed_block_size = V_028C78_MIN_BLOCK_SIZE_64B;
 
                if (rtex->resource.b.b.nr_samples > 1) {
                        if (rtex->surface.bpe == 1)
-                               max_uncompressed_block_size = 0;
+                               max_uncompressed_block_size = V_028C78_MAX_BLOCK_SIZE_64B;
                        else if (rtex->surface.bpe == 2)
-                               max_uncompressed_block_size = 1;
+                               max_uncompressed_block_size = V_028C78_MAX_BLOCK_SIZE_128B;
                }
 
                surf->cb_dcc_control = S_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE(max_uncompressed_block_size) |
+                                      S_028C78_MIN_COMPRESSED_BLOCK_SIZE(min_compressed_block_size) |
                                       S_028C78_INDEPENDENT_64B_BLOCKS(1);
        }
 
        /* This must be set for fast clear to work without FMASK. */
        if (!rtex->fmask.size && sctx->b.chip_class == SI) {
                unsigned bankh = util_logbase2(rtex->surface.u.legacy.bankh);
-               surf->cb_color_attrib |= S_028C74_FMASK_BANK_HEIGHT(bankh);
+               color_attrib |= S_028C74_FMASK_BANK_HEIGHT(bankh);
        }
 
+       unsigned color_view = S_028C6C_SLICE_START(surf->base.u.tex.first_layer) |
+                             S_028C6C_SLICE_MAX(surf->base.u.tex.last_layer);
+
        if (sctx->b.chip_class >= GFX9) {
                unsigned mip0_depth = util_max_layer(&rtex->resource.b.b, 0);
 
-               surf->cb_color_view |= S_028C6C_MIP_LEVEL(surf->base.u.tex.level);
-               surf->cb_color_attrib |= S_028C74_MIP0_DEPTH(mip0_depth) |
-                                        S_028C74_RESOURCE_TYPE(rtex->surface.u.gfx9.resource_type);
+               color_view |= S_028C6C_MIP_LEVEL(surf->base.u.tex.level);
+               color_attrib |= S_028C74_MIP0_DEPTH(mip0_depth) |
+                               S_028C74_RESOURCE_TYPE(rtex->surface.u.gfx9.resource_type);
                surf->cb_color_attrib2 = S_028C68_MIP0_WIDTH(surf->width0 - 1) |
                                         S_028C68_MIP0_HEIGHT(surf->height0 - 1) |
                                         S_028C68_MAX_MIP(rtex->resource.b.b.last_level);
        }
 
+       surf->cb_color_view = color_view;
+       surf->cb_color_info = color_info;
+       surf->cb_color_attrib = color_attrib;
+
        /* Determine pixel shader export format */
        si_choose_spi_color_formats(surf, format, swap, ntype, rtex->is_depth);
 
@@ -2327,7 +2511,7 @@ static void si_init_depth_surface(struct si_context *sctx,
        uint32_t z_info, s_info;
 
        format = si_translate_dbformat(rtex->db_render_format);
-       stencil_format = rtex->surface.flags & RADEON_SURF_SBUFFER ?
+       stencil_format = rtex->surface.has_stencil ?
                                 V_028044_STENCIL_8 : V_028044_STENCIL_INVALID;
 
        assert(format != V_028040_Z_INVALID);
@@ -2356,7 +2540,7 @@ static void si_init_depth_surface(struct si_context *sctx,
                surf->db_depth_size = S_02801C_X_MAX(rtex->resource.b.b.width0 - 1) |
                                      S_02801C_Y_MAX(rtex->resource.b.b.height0 - 1);
 
-               if (r600_htile_enabled(rtex, level)) {
+               if (si_htile_enabled(rtex, level)) {
                        z_info |= S_028038_TILE_SURFACE_ENABLE(1) |
                                  S_028038_ALLOW_EXPCLEAR(1);
 
@@ -2372,7 +2556,7 @@ static void si_init_depth_surface(struct si_context *sctx,
                                s_info |= S_02803C_ITERATE_FLUSH(1);
                        }
 
-                       if (rtex->surface.flags & RADEON_SURF_SBUFFER) {
+                       if (rtex->surface.has_stencil) {
                                /* Stencil buffer workaround ported from the SI-CI-VI code.
                                 * See that for explanation.
                                 */
@@ -2405,7 +2589,7 @@ static void si_init_depth_surface(struct si_context *sctx,
                surf->db_depth_info = S_02803C_ADDR5_SWIZZLE_MASK(!rtex->tc_compatible_htile);
 
                if (sctx->b.chip_class >= CIK) {
-                       struct radeon_info *info = &sctx->screen->b.info;
+                       struct radeon_info *info = &sctx->screen->info;
                        unsigned index = rtex->surface.u.legacy.tiling_index[level];
                        unsigned stencil_index = rtex->surface.u.legacy.stencil_tiling_index[level];
                        unsigned macro_index = rtex->surface.u.legacy.macro_tile_index;
@@ -2434,11 +2618,11 @@ static void si_init_depth_surface(struct si_context *sctx,
                surf->db_depth_slice = S_02805C_SLICE_TILE_MAX((levelinfo->nblk_x *
                                                                levelinfo->nblk_y) / 64 - 1);
 
-               if (r600_htile_enabled(rtex, level)) {
+               if (si_htile_enabled(rtex, level)) {
                        z_info |= S_028040_TILE_SURFACE_ENABLE(1) |
                                  S_028040_ALLOW_EXPCLEAR(1);
 
-                       if (rtex->surface.flags & RADEON_SURF_SBUFFER) {
+                       if (rtex->surface.has_stencil) {
                                /* Workaround: For a not yet understood reason, the
                                 * combination of MSAA, fast stencil clear and stencil
                                 * decompress messes with subsequent stencil buffer
@@ -2494,24 +2678,20 @@ void si_update_fb_dirtiness_after_rendering(struct si_context *sctx)
 
                rtex->dirty_level_mask |= 1 << surf->u.tex.level;
 
-               if (rtex->surface.flags & RADEON_SURF_SBUFFER)
+               if (rtex->surface.has_stencil)
                        rtex->stencil_dirty_level_mask |= 1 << surf->u.tex.level;
        }
-       if (sctx->framebuffer.compressed_cb_mask) {
-               struct pipe_surface *surf;
-               struct r600_texture *rtex;
-               unsigned mask = sctx->framebuffer.compressed_cb_mask;
 
-               do {
-                       unsigned i = u_bit_scan(&mask);
-                       surf = sctx->framebuffer.state.cbufs[i];
-                       rtex = (struct r600_texture*)surf->texture;
+       unsigned compressed_cb_mask = sctx->framebuffer.compressed_cb_mask;
+       while (compressed_cb_mask) {
+               unsigned i = u_bit_scan(&compressed_cb_mask);
+               struct pipe_surface *surf = sctx->framebuffer.state.cbufs[i];
+               struct r600_texture *rtex = (struct r600_texture*)surf->texture;
 
-                       if (rtex->fmask.size)
-                               rtex->dirty_level_mask |= 1 << surf->u.tex.level;
-                       if (rtex->dcc_gather_statistics)
-                               rtex->separate_dcc_dirty = true;
-               } while (mask);
+               if (rtex->fmask.size)
+                       rtex->dirty_level_mask |= 1 << surf->u.tex.level;
+               if (rtex->dcc_gather_statistics)
+                       rtex->separate_dcc_dirty = true;
        }
 }
 
@@ -2539,6 +2719,11 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
        struct r600_texture *rtex;
        bool old_any_dst_linear = sctx->framebuffer.any_dst_linear;
        unsigned old_nr_samples = sctx->framebuffer.nr_samples;
+       unsigned old_colorbuf_enabled_4bit = sctx->framebuffer.colorbuf_enabled_4bit;
+       bool old_has_zsbuf = !!sctx->framebuffer.state.zsbuf;
+       bool old_has_stencil =
+               old_has_zsbuf &&
+               ((struct r600_texture*)sctx->framebuffer.state.zsbuf->texture)->surface.has_stencil;
        bool unbound = false;
        int i;
 
@@ -2575,7 +2760,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
                }
 
                if (vi_dcc_enabled(rtex, surf->base.u.tex.level))
-                       if (!r600_texture_disable_dcc(&sctx->b, rtex))
+                       if (!si_texture_disable_dcc(&sctx->b, rtex))
                                sctx->b.decompress_dcc(ctx, rtex);
 
                surf->dcc_incompatible = false;
@@ -2611,9 +2796,18 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
         * individual generate_mipmap blits.
         * Note that lower mipmap levels aren't compressed.
         */
-       if (sctx->generate_mipmap_for_depth)
+       if (sctx->generate_mipmap_for_depth) {
                si_make_DB_shader_coherent(sctx, 1, false,
                                           sctx->framebuffer.DB_has_shader_readable_metadata);
+       } else if (sctx->b.chip_class == GFX9) {
+               /* It appears that DB metadata "leaks" in a sequence of:
+                *  - depth clear
+                *  - DCC decompress for shader image writes (with DB disabled)
+                *  - render with DEPTH_BEFORE_SHADER=1
+                * Flushing DB metadata works around the problem.
+                */
+               sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_DB_META;
+       }
 
        /* Take the maximum of the old and new count. If the new count is lower,
         * dirtying is needed to disable the unbound colorbuffers.
@@ -2676,7 +2870,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
                if (vi_dcc_enabled(rtex, surf->base.u.tex.level))
                        sctx->framebuffer.CB_has_shader_readable_metadata = true;
 
-               r600_context_add_resource_size(ctx, surf->base.texture);
+               si_context_add_resource_size(ctx, surf->base.texture);
 
                p_atomic_inc(&rtex->framebuffers_bound);
 
@@ -2687,18 +2881,20 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
                }
        }
 
+       struct r600_texture *zstex = NULL;
+
        if (state->zsbuf) {
                surf = (struct r600_surface*)state->zsbuf;
-               rtex = (struct r600_texture*)surf->base.texture;
+               zstex = (struct r600_texture*)surf->base.texture;
 
                if (!surf->depth_initialized) {
                        si_init_depth_surface(sctx, surf);
                }
 
-               if (vi_tc_compat_htile_enabled(rtex, surf->base.u.tex.level))
+               if (vi_tc_compat_htile_enabled(zstex, surf->base.u.tex.level))
                        sctx->framebuffer.DB_has_shader_readable_metadata = true;
 
-               r600_context_add_resource_size(ctx, surf->base.texture);
+               si_context_add_resource_size(ctx, surf->base.texture);
        }
 
        si_update_poly_offset_state(sctx);
@@ -2711,6 +2907,12 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
        if (sctx->framebuffer.any_dst_linear != old_any_dst_linear)
                si_mark_atom_dirty(sctx, &sctx->msaa_config);
 
+       if (sctx->screen->has_out_of_order_rast &&
+           (sctx->framebuffer.colorbuf_enabled_4bit != old_colorbuf_enabled_4bit ||
+            !!sctx->framebuffer.state.zsbuf != old_has_zsbuf ||
+            (zstex && zstex->surface.has_stencil != old_has_stencil)))
+               si_mark_atom_dirty(sctx, &sctx->msaa_config);
+
        if (sctx->framebuffer.nr_samples != old_nr_samples) {
                si_mark_atom_dirty(sctx, &sctx->msaa_config);
                si_mark_atom_dirty(sctx, &sctx->db_render_state);
@@ -2718,19 +2920,19 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
                /* Set sample locations as fragment shader constants. */
                switch (sctx->framebuffer.nr_samples) {
                case 1:
-                       constbuf.user_buffer = sctx->b.sample_locations_1x;
+                       constbuf.user_buffer = sctx->sample_locations_1x;
                        break;
                case 2:
-                       constbuf.user_buffer = sctx->b.sample_locations_2x;
+                       constbuf.user_buffer = sctx->sample_locations_2x;
                        break;
                case 4:
-                       constbuf.user_buffer = sctx->b.sample_locations_4x;
+                       constbuf.user_buffer = sctx->sample_locations_4x;
                        break;
                case 8:
-                       constbuf.user_buffer = sctx->b.sample_locations_8x;
+                       constbuf.user_buffer = sctx->sample_locations_8x;
                        break;
                case 16:
-                       constbuf.user_buffer = sctx->b.sample_locations_16x;
+                       constbuf.user_buffer = sctx->sample_locations_16x;
                        break;
                default:
                        R600_ERR("Requested an invalid number of samples %i.\n",
@@ -3023,7 +3225,7 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx,
 
        if (nr_samples != sctx->msaa_sample_locs.nr_samples) {
                sctx->msaa_sample_locs.nr_samples = nr_samples;
-               cayman_emit_msaa_sample_locs(cs, nr_samples);
+               si_emit_sample_locations(cs, nr_samples);
        }
 
        if (sctx->b.family >= CHIP_POLARIS10) {
@@ -3047,16 +3249,86 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx,
        }
 }
 
+static bool si_out_of_order_rasterization(struct si_context *sctx)
+{
+       struct si_state_blend *blend = sctx->queued.named.blend;
+       struct si_state_dsa *dsa = sctx->queued.named.dsa;
+
+       if (!sctx->screen->has_out_of_order_rast)
+               return false;
+
+       unsigned colormask = sctx->framebuffer.colorbuf_enabled_4bit;
+
+       if (blend) {
+               colormask &= blend->cb_target_enabled_4bit;
+       } else {
+               colormask = 0;
+       }
+
+       /* Conservative: No logic op. */
+       if (colormask && blend->logicop_enable)
+               return false;
+
+       struct si_dsa_order_invariance dsa_order_invariant = {
+               .zs = true, .pass_set = true, .pass_last = false
+       };
+
+       if (sctx->framebuffer.state.zsbuf) {
+               struct r600_texture *zstex =
+                       (struct r600_texture*)sctx->framebuffer.state.zsbuf->texture;
+               bool has_stencil = zstex->surface.has_stencil;
+               dsa_order_invariant = dsa->order_invariance[has_stencil];
+               if (!dsa_order_invariant.zs)
+                       return false;
+
+               /* The set of PS invocations is always order invariant,
+                * except when early Z/S tests are requested. */
+               if (sctx->ps_shader.cso &&
+                   sctx->ps_shader.cso->info.writes_memory &&
+                   sctx->ps_shader.cso->info.properties[TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL] &&
+                   !dsa_order_invariant.pass_set)
+                       return false;
+
+               if (sctx->b.num_perfect_occlusion_queries != 0 &&
+                   !dsa_order_invariant.pass_set)
+                       return false;
+       }
+
+       if (!colormask)
+               return true;
+
+       unsigned blendmask = colormask & blend->blend_enable_4bit;
+
+       if (blendmask) {
+               /* Only commutative blending. */
+               if (blendmask & ~blend->commutative_4bit)
+                       return false;
+
+               if (!dsa_order_invariant.pass_set)
+                       return false;
+       }
+
+       if (colormask & ~blendmask) {
+               if (!dsa_order_invariant.pass_last)
+                       return false;
+       }
+
+       return true;
+}
+
 static void si_emit_msaa_config(struct si_context *sctx, struct r600_atom *atom)
 {
        struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
-       unsigned num_tile_pipes = sctx->screen->b.info.num_tile_pipes;
+       unsigned num_tile_pipes = sctx->screen->info.num_tile_pipes;
        /* 33% faster rendering to linear color buffers */
        bool dst_is_linear = sctx->framebuffer.any_dst_linear;
+       bool out_of_order_rast = si_out_of_order_rasterization(sctx);
        unsigned sc_mode_cntl_1 =
                S_028A4C_WALK_SIZE(dst_is_linear) |
                S_028A4C_WALK_FENCE_ENABLE(!dst_is_linear) |
                S_028A4C_WALK_FENCE_SIZE(num_tile_pipes == 2 ? 2 : 3) |
+               S_028A4C_OUT_OF_ORDER_PRIMITIVE_ENABLE(out_of_order_rast) |
+               S_028A4C_OUT_OF_ORDER_WATER_MARK(0x7) |
                /* always 1: */
                S_028A4C_WALK_ALIGN8_PRIM_FITS_ST(1) |
                S_028A4C_SUPERTILE_WALK_ORDER_ENABLE(1) |
@@ -3065,10 +3337,68 @@ static void si_emit_msaa_config(struct si_context *sctx, struct r600_atom *atom)
                S_028A4C_FORCE_EOV_CNTDWN_ENABLE(1) |
                S_028A4C_FORCE_EOV_REZ_ENABLE(1);
 
-       cayman_emit_msaa_config(cs, sctx->framebuffer.nr_samples,
-                               sctx->ps_iter_samples,
-                               sctx->smoothing_enabled ? SI_NUM_SMOOTH_AA_SAMPLES : 0,
-                               sc_mode_cntl_1);
+       int setup_samples = sctx->framebuffer.nr_samples > 1 ? sctx->framebuffer.nr_samples :
+                           sctx->smoothing_enabled ? SI_NUM_SMOOTH_AA_SAMPLES : 0;
+
+       /* Required by OpenGL line rasterization.
+        *
+        * TODO: We should also enable perpendicular endcaps for AA lines,
+        *       but that requires implementing line stippling in the pixel
+        *       shader. SC can only do line stippling with axis-aligned
+        *       endcaps.
+        */
+       unsigned sc_line_cntl = S_028BDC_DX10_DIAMOND_TEST_ENA(1);
+
+       if (setup_samples > 1) {
+               /* distance from the pixel center, indexed by log2(nr_samples) */
+               static unsigned max_dist[] = {
+                       0, /* unused */
+                       4, /* 2x MSAA */
+                       6, /* 4x MSAA */
+                       7, /* 8x MSAA */
+                       8, /* 16x MSAA */
+               };
+               unsigned log_samples = util_logbase2(setup_samples);
+               unsigned log_ps_iter_samples =
+                       util_logbase2(util_next_power_of_two(sctx->ps_iter_samples));
+
+               radeon_set_context_reg_seq(cs, R_028BDC_PA_SC_LINE_CNTL, 2);
+               radeon_emit(cs, sc_line_cntl |
+                           S_028BDC_EXPAND_LINE_WIDTH(1)); /* CM_R_028BDC_PA_SC_LINE_CNTL */
+               radeon_emit(cs, S_028BE0_MSAA_NUM_SAMPLES(log_samples) |
+                           S_028BE0_MAX_SAMPLE_DIST(max_dist[log_samples]) |
+                           S_028BE0_MSAA_EXPOSED_SAMPLES(log_samples)); /* CM_R_028BE0_PA_SC_AA_CONFIG */
+
+               if (sctx->framebuffer.nr_samples > 1) {
+                       radeon_set_context_reg(cs, R_028804_DB_EQAA,
+                                              S_028804_MAX_ANCHOR_SAMPLES(log_samples) |
+                                              S_028804_PS_ITER_SAMPLES(log_ps_iter_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));
+                       radeon_set_context_reg(cs, R_028A4C_PA_SC_MODE_CNTL_1,
+                                              S_028A4C_PS_ITER_SAMPLE(sctx->ps_iter_samples > 1) |
+                                              sc_mode_cntl_1);
+               } else if (sctx->smoothing_enabled) {
+                       radeon_set_context_reg(cs, R_028804_DB_EQAA,
+                                              S_028804_HIGH_QUALITY_INTERSECTIONS(1) |
+                                              S_028804_STATIC_ANCHOR_ASSOCIATIONS(1) |
+                                              S_028804_OVERRASTERIZATION_AMOUNT(log_samples));
+                       radeon_set_context_reg(cs, R_028A4C_PA_SC_MODE_CNTL_1,
+                                              sc_mode_cntl_1);
+               }
+       } else {
+               radeon_set_context_reg_seq(cs, R_028BDC_PA_SC_LINE_CNTL, 2);
+               radeon_emit(cs, sc_line_cntl); /* CM_R_028BDC_PA_SC_LINE_CNTL */
+               radeon_emit(cs, 0); /* CM_R_028BE0_PA_SC_AA_CONFIG */
+
+               radeon_set_context_reg(cs, R_028804_DB_EQAA,
+                                      S_028804_HIGH_QUALITY_INTERSECTIONS(1) |
+                                      S_028804_STATIC_ANCHOR_ASSOCIATIONS(1));
+               radeon_set_context_reg(cs, R_028A4C_PA_SC_MODE_CNTL_1,
+                                      sc_mode_cntl_1);
+       }
 
        /* GFX9: Flush DFSM when the AA mode changes. */
        if (sctx->screen->dfsm_allowed) {
@@ -3116,8 +3446,8 @@ si_make_buffer_descriptor(struct si_screen *screen, struct r600_resource *buf,
        desc = util_format_description(format);
        first_non_void = util_format_get_first_non_void_channel(format);
        stride = desc->block.bits / 8;
-       num_format = si_translate_buffer_numformat(&screen->b.b, desc, first_non_void);
-       data_format = si_translate_buffer_dataformat(&screen->b.b, desc, first_non_void);
+       num_format = si_translate_buffer_numformat(&screen->b, desc, first_non_void);
+       data_format = si_translate_buffer_dataformat(&screen->b, desc, first_non_void);
 
        num_records = size / stride;
        num_records = MIN2(num_records, (buf->b.b.width0 - offset) / stride);
@@ -3145,7 +3475,7 @@ si_make_buffer_descriptor(struct si_screen *screen, struct r600_resource *buf,
         * - For VMEM and inst.IDXEN == 0 or STRIDE == 0, it's in byte units.
         * - For VMEM and inst.IDXEN == 1 and STRIDE != 0, it's in units of STRIDE.
         */
-       if (screen->b.chip_class >= GFX9)
+       if (screen->info.chip_class >= GFX9)
                /* When vindex == 0, LLVM sets IDXEN = 0, thus changing units
                 * from STRIDE to bytes. This works around it by setting
                 * NUM_RECORDS to at least the size of one element, so that
@@ -3155,7 +3485,7 @@ si_make_buffer_descriptor(struct si_screen *screen, struct r600_resource *buf,
                 *       IDXEN is enforced?
                 */
                num_records = num_records ? MAX2(num_records, stride) : 0;
-       else if (screen->b.chip_class == VI)
+       else if (screen->info.chip_class == VI)
                num_records *= stride;
 
        state[4] = 0;
@@ -3317,13 +3647,13 @@ si_make_texture_descriptor(struct si_screen *screen,
                }
        }
 
-       data_format = si_translate_texformat(&screen->b.b, pipe_format, desc, first_non_void);
+       data_format = si_translate_texformat(&screen->b, pipe_format, desc, first_non_void);
        if (data_format == ~0) {
                data_format = 0;
        }
 
        /* S8 with Z32 HTILE needs a special format. */
-       if (screen->b.chip_class >= GFX9 &&
+       if (screen->info.chip_class >= GFX9 &&
            pipe_format == PIPE_FORMAT_S8_UINT &&
            tex->tc_compatible_htile)
                data_format = V_008F14_IMG_DATA_FORMAT_S8_32;
@@ -3331,7 +3661,7 @@ si_make_texture_descriptor(struct si_screen *screen,
        if (!sampler &&
            (res->target == PIPE_TEXTURE_CUBE ||
             res->target == PIPE_TEXTURE_CUBE_ARRAY ||
-            (screen->b.chip_class <= VI &&
+            (screen->info.chip_class <= VI &&
              res->target == PIPE_TEXTURE_3D))) {
                /* For the purpose of shader images, treat cube maps and 3D
                 * textures as 2D arrays. For 3D textures, the address
@@ -3376,7 +3706,7 @@ si_make_texture_descriptor(struct si_screen *screen,
        state[6] = 0;
        state[7] = 0;
 
-       if (screen->b.chip_class >= GFX9) {
+       if (screen->info.chip_class >= GFX9) {
                unsigned bc_swizzle = gfx9_border_color_swizzle(desc->swizzle);
 
                /* Depth is the the last accessible layer on Gfx9.
@@ -3398,14 +3728,14 @@ si_make_texture_descriptor(struct si_screen *screen,
        }
 
        if (tex->dcc_offset) {
-               unsigned swap = r600_translate_colorswap(pipe_format, false);
+               unsigned swap = si_translate_colorswap(pipe_format, false);
 
                state[6] = S_008F28_ALPHA_IS_ON_MSB(swap <= 1);
        } else {
                /* The last dword is unused by hw. The shader uses it to clear
                 * bits in the first dword of sampler state.
                 */
-               if (screen->b.chip_class <= CIK && res->nr_samples <= 1) {
+               if (screen->info.chip_class <= CIK && res->nr_samples <= 1) {
                        if (first_level == last_level)
                                state[7] = C_008F30_MAX_ANISO_RATIO;
                        else
@@ -3419,7 +3749,7 @@ si_make_texture_descriptor(struct si_screen *screen,
 
                va = tex->resource.gpu_address + tex->fmask.offset;
 
-               if (screen->b.chip_class >= GFX9) {
+               if (screen->info.chip_class >= GFX9) {
                        data_format = V_008F14_IMG_DATA_FORMAT_FMASK;
                        switch (res->nr_samples) {
                        case 2:
@@ -3467,7 +3797,7 @@ si_make_texture_descriptor(struct si_screen *screen,
                fmask_state[6] = 0;
                fmask_state[7] = 0;
 
-               if (screen->b.chip_class >= GFX9) {
+               if (screen->info.chip_class >= GFX9) {
                        fmask_state[3] |= S_008F1C_SW_MODE(tex->surface.u.gfx9.fmask.swizzle_mode);
                        fmask_state[4] |= S_008F20_DEPTH(last_layer) |
                                          S_008F20_PITCH_GFX9(tex->surface.u.gfx9.fmask.epitch);
@@ -3572,9 +3902,9 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
        pipe_format = state->format;
 
        /* Depth/stencil texturing sometimes needs separate texture. */
-       if (tmp->is_depth && !r600_can_sample_zs(tmp, view->is_stencil_sampler)) {
+       if (tmp->is_depth && !si_can_sample_zs(tmp, view->is_stencil_sampler)) {
                if (!tmp->flushed_depth_texture &&
-                   !r600_init_flushed_depth_texture(ctx, texture, NULL)) {
+                   !si_init_flushed_depth_texture(ctx, texture, NULL)) {
                        pipe_resource_reference(&view->base.texture, NULL);
                        FREE(view);
                        return NULL;
@@ -3630,6 +3960,12 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
                                   width, height, depth,
                                   view->state, view->fmask_state);
 
+       unsigned num_format = G_008F14_NUM_FORMAT_GFX6(view->state[1]);
+       view->is_integer =
+               num_format == V_008F14_IMG_NUM_FORMAT_USCALED ||
+               num_format == V_008F14_IMG_NUM_FORMAT_SSCALED ||
+               num_format == V_008F14_IMG_NUM_FORMAT_UINT ||
+               num_format == V_008F14_IMG_NUM_FORMAT_SINT;
        view->base_level_info = &surflevel[base_level];
        view->base_level = base_level;
        view->block_width = util_format_get_blockwidth(pipe_format);
@@ -3664,82 +4000,111 @@ static bool wrap_mode_uses_border_color(unsigned wrap, bool linear_filter)
                 wrap == PIPE_TEX_WRAP_MIRROR_CLAMP));
 }
 
-static bool sampler_state_needs_border_color(const struct pipe_sampler_state *state)
+static uint32_t si_translate_border_color(struct si_context *sctx,
+                                         const struct pipe_sampler_state *state,
+                                         const union pipe_color_union *color,
+                                         bool is_integer)
 {
        bool linear_filter = state->min_img_filter != PIPE_TEX_FILTER_NEAREST ||
                             state->mag_img_filter != PIPE_TEX_FILTER_NEAREST;
 
-       return (state->border_color.ui[0] || state->border_color.ui[1] ||
-               state->border_color.ui[2] || state->border_color.ui[3]) &&
-              (wrap_mode_uses_border_color(state->wrap_s, linear_filter) ||
-               wrap_mode_uses_border_color(state->wrap_t, linear_filter) ||
-               wrap_mode_uses_border_color(state->wrap_r, linear_filter));
+       if (!wrap_mode_uses_border_color(state->wrap_s, linear_filter) &&
+           !wrap_mode_uses_border_color(state->wrap_t, linear_filter) &&
+           !wrap_mode_uses_border_color(state->wrap_r, linear_filter))
+               return S_008F3C_BORDER_COLOR_TYPE(V_008F3C_SQ_TEX_BORDER_COLOR_TRANS_BLACK);
+
+#define simple_border_types(elt) \
+do { \
+       if (color->elt[0] == 0 && color->elt[1] == 0 &&                         \
+           color->elt[2] == 0 && color->elt[3] == 0)                           \
+               return S_008F3C_BORDER_COLOR_TYPE(V_008F3C_SQ_TEX_BORDER_COLOR_TRANS_BLACK); \
+       if (color->elt[0] == 0 && color->elt[1] == 0 &&                         \
+           color->elt[2] == 0 && color->elt[3] == 1)                           \
+               return S_008F3C_BORDER_COLOR_TYPE(V_008F3C_SQ_TEX_BORDER_COLOR_OPAQUE_BLACK); \
+       if (color->elt[0] == 1 && color->elt[1] == 1 &&                         \
+           color->elt[2] == 1 && color->elt[3] == 1)                           \
+               return S_008F3C_BORDER_COLOR_TYPE(V_008F3C_SQ_TEX_BORDER_COLOR_OPAQUE_WHITE); \
+} while (false)
+
+       if (is_integer)
+               simple_border_types(ui);
+       else
+               simple_border_types(f);
+
+#undef simple_border_types
+
+       int i;
+
+       /* Check if the border has been uploaded already. */
+       for (i = 0; i < sctx->border_color_count; i++)
+               if (memcmp(&sctx->border_color_table[i], color,
+                          sizeof(*color)) == 0)
+                       break;
+
+       if (i >= SI_MAX_BORDER_COLORS) {
+               /* Getting 4096 unique border colors is very unlikely. */
+               fprintf(stderr, "radeonsi: The border color table is full. "
+                       "Any new border colors will be just black. "
+                       "Please file a bug.\n");
+               return S_008F3C_BORDER_COLOR_TYPE(V_008F3C_SQ_TEX_BORDER_COLOR_TRANS_BLACK);
+       }
+
+       if (i == sctx->border_color_count) {
+               /* Upload a new border color. */
+               memcpy(&sctx->border_color_table[i], color,
+                      sizeof(*color));
+               util_memcpy_cpu_to_le32(&sctx->border_color_map[i],
+                                       color, sizeof(*color));
+               sctx->border_color_count++;
+       }
+
+       return S_008F3C_BORDER_COLOR_PTR(i) |
+              S_008F3C_BORDER_COLOR_TYPE(V_008F3C_SQ_TEX_BORDER_COLOR_REGISTER);
+}
+
+static inline int S_FIXED(float value, unsigned frac_bits)
+{
+       return value * (1 << frac_bits);
+}
+
+static inline unsigned si_tex_filter(unsigned filter, unsigned max_aniso)
+{
+       if (filter == PIPE_TEX_FILTER_LINEAR)
+               return max_aniso > 1 ? V_008F38_SQ_TEX_XY_FILTER_ANISO_BILINEAR
+                                    : V_008F38_SQ_TEX_XY_FILTER_BILINEAR;
+       else
+               return max_aniso > 1 ? V_008F38_SQ_TEX_XY_FILTER_ANISO_POINT
+                                    : V_008F38_SQ_TEX_XY_FILTER_POINT;
+}
+
+static inline unsigned si_tex_aniso_filter(unsigned filter)
+{
+       if (filter < 2)
+               return 0;
+       if (filter < 4)
+               return 1;
+       if (filter < 8)
+               return 2;
+       if (filter < 16)
+               return 3;
+       return 4;
 }
 
 static void *si_create_sampler_state(struct pipe_context *ctx,
                                     const struct pipe_sampler_state *state)
 {
        struct si_context *sctx = (struct si_context *)ctx;
-       struct r600_common_screen *rscreen = sctx->b.screen;
+       struct si_screen *sscreen = sctx->screen;
        struct si_sampler_state *rstate = CALLOC_STRUCT(si_sampler_state);
-       unsigned border_color_type, border_color_index = 0;
-       unsigned max_aniso = rscreen->force_aniso >= 0 ? rscreen->force_aniso
+       unsigned max_aniso = sscreen->force_aniso >= 0 ? sscreen->force_aniso
                                                       : state->max_anisotropy;
-       unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso);
+       unsigned max_aniso_ratio = si_tex_aniso_filter(max_aniso);
+       union pipe_color_union clamped_border_color;
 
        if (!rstate) {
                return NULL;
        }
 
-       if (!sampler_state_needs_border_color(state))
-               border_color_type = V_008F3C_SQ_TEX_BORDER_COLOR_TRANS_BLACK;
-       else if (state->border_color.f[0] == 0 &&
-                state->border_color.f[1] == 0 &&
-                state->border_color.f[2] == 0 &&
-                state->border_color.f[3] == 0)
-               border_color_type = V_008F3C_SQ_TEX_BORDER_COLOR_TRANS_BLACK;
-       else if (state->border_color.f[0] == 0 &&
-                state->border_color.f[1] == 0 &&
-                state->border_color.f[2] == 0 &&
-                state->border_color.f[3] == 1)
-               border_color_type = V_008F3C_SQ_TEX_BORDER_COLOR_OPAQUE_BLACK;
-       else if (state->border_color.f[0] == 1 &&
-                state->border_color.f[1] == 1 &&
-                state->border_color.f[2] == 1 &&
-                state->border_color.f[3] == 1)
-               border_color_type = V_008F3C_SQ_TEX_BORDER_COLOR_OPAQUE_WHITE;
-       else {
-               int i;
-
-               border_color_type = V_008F3C_SQ_TEX_BORDER_COLOR_REGISTER;
-
-               /* Check if the border has been uploaded already. */
-               for (i = 0; i < sctx->border_color_count; i++)
-                       if (memcmp(&sctx->border_color_table[i], &state->border_color,
-                                  sizeof(state->border_color)) == 0)
-                               break;
-
-               if (i >= SI_MAX_BORDER_COLORS) {
-                       /* Getting 4096 unique border colors is very unlikely. */
-                       fprintf(stderr, "radeonsi: The border color table is full. "
-                               "Any new border colors will be just black. "
-                               "Please file a bug.\n");
-                       border_color_type = V_008F3C_SQ_TEX_BORDER_COLOR_TRANS_BLACK;
-               } else {
-                       if (i == sctx->border_color_count) {
-                               /* Upload a new border color. */
-                               memcpy(&sctx->border_color_table[i], &state->border_color,
-                                      sizeof(state->border_color));
-                               util_memcpy_cpu_to_le32(&sctx->border_color_map[i],
-                                                       &state->border_color,
-                                                       sizeof(state->border_color));
-                               sctx->border_color_count++;
-                       }
-
-                       border_color_index = i;
-               }
-       }
-
 #ifdef DEBUG
        rstate->magic = SI_SAMPLER_STATE_MAGIC;
 #endif
@@ -3757,15 +4122,35 @@ static void *si_create_sampler_state(struct pipe_context *ctx,
                          S_008F34_MAX_LOD(S_FIXED(CLAMP(state->max_lod, 0, 15), 8)) |
                          S_008F34_PERF_MIP(max_aniso_ratio ? max_aniso_ratio + 6 : 0));
        rstate->val[2] = (S_008F38_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16, 16), 8)) |
-                         S_008F38_XY_MAG_FILTER(eg_tex_filter(state->mag_img_filter, max_aniso)) |
-                         S_008F38_XY_MIN_FILTER(eg_tex_filter(state->min_img_filter, max_aniso)) |
+                         S_008F38_XY_MAG_FILTER(si_tex_filter(state->mag_img_filter, max_aniso)) |
+                         S_008F38_XY_MIN_FILTER(si_tex_filter(state->min_img_filter, max_aniso)) |
                          S_008F38_MIP_FILTER(si_tex_mipfilter(state->min_mip_filter)) |
-                         S_008F38_MIP_POINT_PRECLAMP(1) |
+                         S_008F38_MIP_POINT_PRECLAMP(0) |
                          S_008F38_DISABLE_LSB_CEIL(sctx->b.chip_class <= VI) |
                          S_008F38_FILTER_PREC_FIX(1) |
                          S_008F38_ANISO_OVERRIDE(sctx->b.chip_class >= VI));
-       rstate->val[3] = S_008F3C_BORDER_COLOR_PTR(border_color_index) |
-                        S_008F3C_BORDER_COLOR_TYPE(border_color_type);
+       rstate->val[3] = si_translate_border_color(sctx, state, &state->border_color, false);
+
+       /* Create sampler resource for integer textures. */
+       memcpy(rstate->integer_val, rstate->val, sizeof(rstate->val));
+       rstate->integer_val[3] = si_translate_border_color(sctx, state, &state->border_color, true);
+
+       /* Create sampler resource for upgraded depth textures. */
+       memcpy(rstate->upgraded_depth_val, rstate->val, sizeof(rstate->val));
+
+       for (unsigned i = 0; i < 4; ++i) {
+               /* Use channel 0 on purpose, so that we can use OPAQUE_WHITE
+                * when the border color is 1.0. */
+               clamped_border_color.f[i] = CLAMP(state->border_color.f[0], 0, 1);
+       }
+
+       if (memcmp(&state->border_color, &clamped_border_color, sizeof(clamped_border_color)) == 0)
+               rstate->upgraded_depth_val[3] |= S_008F3C_UPGRADED_DEPTH(1);
+       else
+               rstate->upgraded_depth_val[3] =
+                       si_translate_border_color(sctx, state, &clamped_border_color, false) |
+                       S_008F3C_UPGRADED_DEPTH(1);
+
        return rstate;
 }
 
@@ -3872,8 +4257,8 @@ static void *si_create_vertex_elements(struct pipe_context *ctx,
                 * chips are VI and older except Stoney (GFX8.1).
                 */
                if (data_format == V_008F0C_BUF_DATA_FORMAT_2_10_10_10 &&
-                   sscreen->b.chip_class <= VI &&
-                   sscreen->b.family != CHIP_STONEY) {
+                   sscreen->info.chip_class <= VI &&
+                   sscreen->info.family != CHIP_STONEY) {
                        if (num_format == V_008F0C_BUF_NUM_FORMAT_SNORM) {
                                v->fix_fetch[i] = SI_FIX_FETCH_A2_SNORM;
                        } else if (num_format == V_008F0C_BUF_NUM_FORMAT_SSCALED) {
@@ -4017,7 +4402,7 @@ static void si_set_vertex_buffers(struct pipe_context *ctx,
                        pipe_resource_reference(&dsti->buffer.resource, buf);
                        dsti->buffer_offset = src->buffer_offset;
                        dsti->stride = src->stride;
-                       r600_context_add_resource_size(ctx, buf);
+                       si_context_add_resource_size(ctx, buf);
                        if (buf)
                                r600_resource(buf)->bind_history |= PIPE_BIND_VERTEX_BUFFER;
                }
@@ -4099,7 +4484,7 @@ static void si_memory_barrier(struct pipe_context *ctx, unsigned flags)
                /* Indices are read through TC L2 since VI.
                 * L1 isn't used.
                 */
-               if (sctx->screen->b.chip_class <= CIK)
+               if (sctx->screen->info.chip_class <= CIK)
                        sctx->b.flags |= SI_CONTEXT_WRITEBACK_GLOBAL_L2;
        }
 
@@ -4116,7 +4501,7 @@ static void si_memory_barrier(struct pipe_context *ctx, unsigned flags)
        }
 
        /* Indirect buffers use TC L2 on GFX9, but not older hw. */
-       if (sctx->screen->b.chip_class <= VI &&
+       if (sctx->screen->info.chip_class <= VI &&
            flags & PIPE_BARRIER_INDIRECT_BUFFER)
                sctx->b.flags |= SI_CONTEXT_WRITEBACK_GLOBAL_L2;
 }
@@ -4142,10 +4527,10 @@ static void si_init_config(struct si_context *sctx);
 void si_init_state_functions(struct si_context *sctx)
 {
        si_init_external_atom(sctx, &sctx->b.render_cond_atom, &sctx->atoms.s.render_cond);
-       si_init_external_atom(sctx, &sctx->b.streamout.begin_atom, &sctx->atoms.s.streamout_begin);
-       si_init_external_atom(sctx, &sctx->b.streamout.enable_atom, &sctx->atoms.s.streamout_enable);
-       si_init_external_atom(sctx, &sctx->b.scissors.atom, &sctx->atoms.s.scissors);
-       si_init_external_atom(sctx, &sctx->b.viewports.atom, &sctx->atoms.s.viewports);
+       si_init_external_atom(sctx, &sctx->streamout.begin_atom, &sctx->atoms.s.streamout_begin);
+       si_init_external_atom(sctx, &sctx->streamout.enable_atom, &sctx->atoms.s.streamout_enable);
+       si_init_external_atom(sctx, &sctx->scissors.atom, &sctx->atoms.s.scissors);
+       si_init_external_atom(sctx, &sctx->viewports.atom, &sctx->atoms.s.viewports);
 
        si_init_atom(sctx, &sctx->framebuffer.atom, &sctx->atoms.s.framebuffer, si_emit_framebuffer_state);
        si_init_atom(sctx, &sctx->msaa_sample_locs.atom, &sctx->atoms.s.msaa_sample_locs, si_emit_msaa_sample_locs);
@@ -4182,7 +4567,6 @@ void si_init_state_functions(struct si_context *sctx)
        sctx->b.b.set_stencil_ref = si_set_stencil_ref;
 
        sctx->b.b.set_framebuffer_state = si_set_framebuffer_state;
-       sctx->b.b.get_sample_position = cayman_get_sample_position;
 
        sctx->b.b.create_sampler_state = si_create_sampler_state;
        sctx->b.b.delete_sampler_state = si_delete_sampler_state;
@@ -4212,121 +4596,23 @@ void si_init_state_functions(struct si_context *sctx)
        si_init_config(sctx);
 }
 
-static uint32_t si_get_bo_metadata_word1(struct r600_common_screen *rscreen)
-{
-       return (ATI_VENDOR_ID << 16) | rscreen->info.pci_id;
-}
-
-static void si_query_opaque_metadata(struct r600_common_screen *rscreen,
-                                    struct r600_texture *rtex,
-                                    struct radeon_bo_metadata *md)
-{
-       struct si_screen *sscreen = (struct si_screen*)rscreen;
-       struct pipe_resource *res = &rtex->resource.b.b;
-       static const unsigned char swizzle[] = {
-               PIPE_SWIZZLE_X,
-               PIPE_SWIZZLE_Y,
-               PIPE_SWIZZLE_Z,
-               PIPE_SWIZZLE_W
-       };
-       uint32_t desc[8], i;
-       bool is_array = util_resource_is_array_texture(res);
-
-       /* DRM 2.x.x doesn't support this. */
-       if (rscreen->info.drm_major != 3)
-               return;
-
-       assert(rtex->dcc_separate_buffer == NULL);
-       assert(rtex->fmask.size == 0);
-
-       /* Metadata image format format version 1:
-        * [0] = 1 (metadata format identifier)
-        * [1] = (VENDOR_ID << 16) | PCI_ID
-        * [2:9] = image descriptor for the whole resource
-        *         [2] is always 0, because the base address is cleared
-        *         [9] is the DCC offset bits [39:8] from the beginning of
-        *             the buffer
-        * [10:10+LAST_LEVEL] = mipmap level offset bits [39:8] for each level
-        */
-
-       md->metadata[0] = 1; /* metadata image format version 1 */
-
-       /* TILE_MODE_INDEX is ambiguous without a PCI ID. */
-       md->metadata[1] = si_get_bo_metadata_word1(rscreen);
-
-       si_make_texture_descriptor(sscreen, rtex, true,
-                                  res->target, res->format,
-                                  swizzle, 0, res->last_level, 0,
-                                  is_array ? res->array_size - 1 : 0,
-                                  res->width0, res->height0, res->depth0,
-                                  desc, NULL);
-
-       si_set_mutable_tex_desc_fields(sscreen, rtex, &rtex->surface.u.legacy.level[0],
-                                      0, 0, rtex->surface.blk_w, false, desc);
-
-       /* Clear the base address and set the relative DCC offset. */
-       desc[0] = 0;
-       desc[1] &= C_008F14_BASE_ADDRESS_HI;
-       desc[7] = rtex->dcc_offset >> 8;
-
-       /* Dwords [2:9] contain the image descriptor. */
-       memcpy(&md->metadata[2], desc, sizeof(desc));
-       md->size_metadata = 10 * 4;
-
-       /* Dwords [10:..] contain the mipmap level offsets. */
-       if (rscreen->chip_class <= VI) {
-               for (i = 0; i <= res->last_level; i++)
-                       md->metadata[10+i] = rtex->surface.u.legacy.level[i].offset >> 8;
-
-               md->size_metadata += (1 + res->last_level) * 4;
-       }
-}
-
-static void si_apply_opaque_metadata(struct r600_common_screen *rscreen,
-                                    struct r600_texture *rtex,
-                                    struct radeon_bo_metadata *md)
-{
-       uint32_t *desc = &md->metadata[2];
-
-       if (rscreen->chip_class < VI)
-               return;
-
-       /* Return if DCC is enabled. The texture should be set up with it
-        * already.
-        */
-       if (md->size_metadata >= 11 * 4 &&
-           md->metadata[0] != 0 &&
-           md->metadata[1] == si_get_bo_metadata_word1(rscreen) &&
-           G_008F28_COMPRESSION_EN(desc[6])) {
-               assert(rtex->dcc_offset == ((uint64_t)desc[7] << 8));
-               return;
-       }
-
-       /* Disable DCC. These are always set by texture_from_handle and must
-        * be cleared here.
-        */
-       rtex->dcc_offset = 0;
-}
-
 void si_init_screen_state_functions(struct si_screen *sscreen)
 {
-       sscreen->b.b.is_format_supported = si_is_format_supported;
-       sscreen->b.query_opaque_metadata = si_query_opaque_metadata;
-       sscreen->b.apply_opaque_metadata = si_apply_opaque_metadata;
+       sscreen->b.is_format_supported = si_is_format_supported;
 }
 
 static void si_set_grbm_gfx_index(struct si_context *sctx,
                                  struct si_pm4_state *pm4,  unsigned value)
 {
        unsigned reg = sctx->b.chip_class >= CIK ? R_030800_GRBM_GFX_INDEX :
-                                                  GRBM_GFX_INDEX;
+                                                  R_00802C_GRBM_GFX_INDEX;
        si_pm4_set_reg(pm4, reg, value);
 }
 
 static void si_set_grbm_gfx_index_se(struct si_context *sctx,
                                     struct si_pm4_state *pm4, unsigned se)
 {
-       assert(se == ~0 || se < sctx->screen->b.info.max_se);
+       assert(se == ~0 || se < sctx->screen->info.max_se);
        si_set_grbm_gfx_index(sctx, pm4,
                              (se == ~0 ? S_030800_SE_BROADCAST_WRITES(1) :
                                          S_030800_SE_INDEX(se)) |
@@ -4340,10 +4626,10 @@ si_write_harvested_raster_configs(struct si_context *sctx,
                                  unsigned raster_config,
                                  unsigned raster_config_1)
 {
-       unsigned sh_per_se = MAX2(sctx->screen->b.info.max_sh_per_se, 1);
-       unsigned num_se = MAX2(sctx->screen->b.info.max_se, 1);
-       unsigned rb_mask = sctx->screen->b.info.enabled_rb_mask;
-       unsigned num_rb = MIN2(sctx->screen->b.info.num_render_backends, 16);
+       unsigned sh_per_se = MAX2(sctx->screen->info.max_sh_per_se, 1);
+       unsigned num_se = MAX2(sctx->screen->info.max_se, 1);
+       unsigned rb_mask = sctx->screen->info.enabled_rb_mask;
+       unsigned num_rb = MIN2(sctx->screen->info.num_render_backends, 16);
        unsigned rb_per_pkr = MIN2(num_rb / num_se / sh_per_se, 2);
        unsigned rb_per_se = num_rb / num_se;
        unsigned se_mask[4];
@@ -4462,8 +4748,8 @@ si_write_harvested_raster_configs(struct si_context *sctx,
 static void si_set_raster_config(struct si_context *sctx, struct si_pm4_state *pm4)
 {
        struct si_screen *sscreen = sctx->screen;
-       unsigned num_rb = MIN2(sctx->screen->b.info.num_render_backends, 16);
-       unsigned rb_mask = sctx->screen->b.info.enabled_rb_mask;
+       unsigned num_rb = MIN2(sctx->screen->info.num_render_backends, 16);
+       unsigned rb_mask = sctx->screen->info.enabled_rb_mask;
        unsigned raster_config, raster_config_1;
 
        switch (sctx->b.family) {
@@ -4493,7 +4779,7 @@ static void si_set_raster_config(struct si_context *sctx, struct si_pm4_state *p
                raster_config_1 = 0x0000002e;
                break;
        case CHIP_FIJI:
-               if (sscreen->b.info.cik_macrotile_mode_array[0] == 0x000000e8) {
+               if (sscreen->info.cik_macrotile_mode_array[0] == 0x000000e8) {
                        /* old kernels with old tiling config */
                        raster_config = 0x16000012;
                        raster_config_1 = 0x0000002a;
@@ -4566,7 +4852,7 @@ static void si_init_config(struct si_context *sctx)
        struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state);
 
        /* Only SI can disable CLEAR_STATE for now. */
-       assert(has_clear_state || sscreen->b.chip_class == SI);
+       assert(has_clear_state || sscreen->info.chip_class == SI);
 
        if (!pm4)
                return;
@@ -4664,11 +4950,15 @@ static void si_init_config(struct si_context *sctx)
 
        if (sctx->b.chip_class >= CIK) {
                if (sctx->b.chip_class >= GFX9) {
-                       si_pm4_set_reg(pm4, R_00B41C_SPI_SHADER_PGM_RSRC3_HS, S_00B41C_CU_EN(0xffff));
+                       si_pm4_set_reg(pm4, R_00B41C_SPI_SHADER_PGM_RSRC3_HS,
+                                      S_00B41C_CU_EN(0xffff) | S_00B41C_WAVE_LIMIT(0x3F));
                } else {
-                       si_pm4_set_reg(pm4, R_00B51C_SPI_SHADER_PGM_RSRC3_LS, S_00B51C_CU_EN(0xffff));
-                       si_pm4_set_reg(pm4, R_00B41C_SPI_SHADER_PGM_RSRC3_HS, 0);
-                       si_pm4_set_reg(pm4, R_00B31C_SPI_SHADER_PGM_RSRC3_ES, S_00B31C_CU_EN(0xffff));
+                       si_pm4_set_reg(pm4, R_00B51C_SPI_SHADER_PGM_RSRC3_LS,
+                                      S_00B51C_CU_EN(0xffff) | S_00B51C_WAVE_LIMIT(0x3F));
+                       si_pm4_set_reg(pm4, R_00B41C_SPI_SHADER_PGM_RSRC3_HS,
+                                      S_00B41C_WAVE_LIMIT(0x3F));
+                       si_pm4_set_reg(pm4, R_00B31C_SPI_SHADER_PGM_RSRC3_ES,
+                                      S_00B31C_CU_EN(0xffff) | S_00B31C_WAVE_LIMIT(0x3F));
 
                        /* If this is 0, Bonaire can hang even if GS isn't being used.
                         * Other chips are unaffected. These are suboptimal values,
@@ -4678,12 +4968,13 @@ static void si_init_config(struct si_context *sctx)
                                       S_028A44_ES_VERTS_PER_SUBGRP(64) |
                                       S_028A44_GS_PRIMS_PER_SUBGRP(4));
                }
-               si_pm4_set_reg(pm4, R_00B21C_SPI_SHADER_PGM_RSRC3_GS, S_00B21C_CU_EN(0xffff));
+               si_pm4_set_reg(pm4, R_00B21C_SPI_SHADER_PGM_RSRC3_GS,
+                              S_00B21C_CU_EN(0xffff) | S_00B21C_WAVE_LIMIT(0x3F));
 
                /* Compute LATE_ALLOC_VS.LIMIT. */
-               unsigned num_cu_per_sh = sscreen->b.info.num_good_compute_units /
-                                        (sscreen->b.info.max_se *
-                                         sscreen->b.info.max_sh_per_se);
+               unsigned num_cu_per_sh = sscreen->info.num_good_compute_units /
+                                        (sscreen->info.max_se *
+                                         sscreen->info.max_sh_per_se);
                unsigned late_alloc_limit; /* The limit is per SH. */
 
                if (sctx->b.family == CHIP_KABINI) {
@@ -4710,19 +5001,17 @@ static void si_init_config(struct si_context *sctx)
 
                /* VS can't execute on one CU if the limit is > 2. */
                si_pm4_set_reg(pm4, R_00B118_SPI_SHADER_PGM_RSRC3_VS,
-                              S_00B118_CU_EN(late_alloc_limit > 2 ? 0xfffe : 0xffff));
+                              S_00B118_CU_EN(late_alloc_limit > 2 ? 0xfffe : 0xffff) |
+                              S_00B118_WAVE_LIMIT(0x3F));
                si_pm4_set_reg(pm4, R_00B11C_SPI_SHADER_LATE_ALLOC_VS,
                               S_00B11C_LIMIT(late_alloc_limit));
-               si_pm4_set_reg(pm4, R_00B01C_SPI_SHADER_PGM_RSRC3_PS, S_00B01C_CU_EN(0xffff));
+               si_pm4_set_reg(pm4, R_00B01C_SPI_SHADER_PGM_RSRC3_PS,
+                              S_00B01C_CU_EN(0xffff) | S_00B01C_WAVE_LIMIT(0x3F));
        }
 
        if (sctx->b.chip_class >= VI) {
                unsigned vgt_tess_distribution;
 
-               si_pm4_set_reg(pm4, R_028424_CB_DCC_CONTROL,
-                              S_028424_OVERWRITE_COMBINER_MRT_SHARING_DISABLE(1) |
-                              S_028424_OVERWRITE_COMBINER_WATERMARK(4));
-
                vgt_tess_distribution =
                        S_028B50_ACCUM_ISOLINE(32) |
                        S_028B50_ACCUM_TRI(11) |
@@ -4749,7 +5038,7 @@ static void si_init_config(struct si_context *sctx)
                      RADEON_PRIO_BORDER_COLORS);
 
        if (sctx->b.chip_class >= GFX9) {
-               unsigned num_se = sscreen->b.info.max_se;
+               unsigned num_se = sscreen->info.max_se;
                unsigned pc_lines = 0;
 
                switch (sctx->b.family) {