radeonsi: clean up r600_surface
[mesa.git] / src / gallium / drivers / radeon / r600_pipe_common.h
index 2feca0172faf37b89b8ba0915d28004467983e05..f85e032230aa1323bd0f58c622ca234537e3a004 100644 (file)
@@ -19,9 +19,6 @@
  * 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: Marek Olšák <maraeo@gmail.com>
- *
  */
 
 /**
@@ -45,6 +42,9 @@
 #include "util/slab.h"
 #include "util/u_suballoc.h"
 #include "util/u_transfer.h"
+#include "util/u_threaded_context.h"
+
+struct u_log_context;
 
 #define ATI_VENDOR_ID 0x1002
 
 /* Pipeline & streamout query controls. */
 #define R600_CONTEXT_START_PIPELINE_STATS      (1u << 1)
 #define R600_CONTEXT_STOP_PIPELINE_STATS       (1u << 2)
-#define R600_CONTEXT_PRIVATE_FLAG              (1u << 3)
+#define R600_CONTEXT_FLUSH_FOR_RENDER_COND     (1u << 3)
+#define R600_CONTEXT_PRIVATE_FLAG              (1u << 4)
 
 /* special primitive types */
 #define R600_PRIM_RECTANGLE_LIST       PIPE_PRIM_MAX
 
+#define R600_NOT_QUERY         0xffffffff
+
 /* Debug flags. */
-/* logging */
-#define DBG_TEX                        (1 << 0)
-/* gap - reuse */
-#define DBG_COMPUTE            (1 << 2)
-#define DBG_VM                 (1 << 3)
-/* gap - reuse */
-/* shader logging */
-#define DBG_FS                 (1 << 5)
-#define DBG_VS                 (1 << 6)
-#define DBG_GS                 (1 << 7)
-#define DBG_PS                 (1 << 8)
-#define DBG_CS                 (1 << 9)
-#define DBG_TCS                        (1 << 10)
-#define DBG_TES                        (1 << 11)
-#define DBG_NO_IR              (1 << 12)
-#define DBG_NO_TGSI            (1 << 13)
-#define DBG_NO_ASM             (1 << 14)
-#define DBG_PREOPT_IR          (1 << 15)
-#define DBG_CHECK_IR           (1 << 16)
-#define DBG_NO_OPT_VARIANT     (1 << 17)
-/* gaps */
-#define DBG_TEST_DMA           (1 << 20)
-/* Bits 21-31 are reserved for the r600g driver. */
-/* features */
-#define DBG_NO_ASYNC_DMA       (1llu << 32)
-#define DBG_NO_HYPERZ          (1llu << 33)
-#define DBG_NO_DISCARD_RANGE   (1llu << 34)
-#define DBG_NO_2D_TILING       (1llu << 35)
-#define DBG_NO_TILING          (1llu << 36)
-#define DBG_SWITCH_ON_EOP      (1llu << 37)
-#define DBG_FORCE_DMA          (1llu << 38)
-#define DBG_PRECOMPILE         (1llu << 39)
-#define DBG_INFO               (1llu << 40)
-#define DBG_NO_WC              (1llu << 41)
-#define DBG_CHECK_VM           (1llu << 42)
-#define DBG_NO_DCC             (1llu << 43)
-#define DBG_NO_DCC_CLEAR       (1llu << 44)
-#define DBG_NO_RB_PLUS         (1llu << 45)
-#define DBG_SI_SCHED           (1llu << 46)
-#define DBG_MONOLITHIC_SHADERS (1llu << 47)
-#define DBG_NO_CE              (1llu << 48)
-#define DBG_UNSAFE_MATH                (1llu << 49)
-#define DBG_NO_DCC_FB          (1llu << 50)
+enum {
+       /* Shader logging options: */
+       DBG_VS = PIPE_SHADER_VERTEX,
+       DBG_PS = PIPE_SHADER_FRAGMENT,
+       DBG_GS = PIPE_SHADER_GEOMETRY,
+       DBG_TCS = PIPE_SHADER_TESS_CTRL,
+       DBG_TES = PIPE_SHADER_TESS_EVAL,
+       DBG_CS = PIPE_SHADER_COMPUTE,
+       DBG_NO_IR,
+       DBG_NO_TGSI,
+       DBG_NO_ASM,
+       DBG_PREOPT_IR,
+
+       /* Shader compiler options the shader cache should be aware of: */
+       DBG_FS_CORRECT_DERIVS_AFTER_KILL,
+       DBG_UNSAFE_MATH,
+       DBG_SI_SCHED,
+
+       /* Shader compiler options (with no effect on the shader cache): */
+       DBG_CHECK_IR,
+       DBG_PRECOMPILE,
+       DBG_NIR,
+       DBG_MONOLITHIC_SHADERS,
+       DBG_NO_OPT_VARIANT,
+
+       /* Information logging options: */
+       DBG_INFO,
+       DBG_TEX,
+       DBG_COMPUTE,
+       DBG_VM,
+
+       /* Driver options: */
+       DBG_FORCE_DMA,
+       DBG_NO_ASYNC_DMA,
+       DBG_NO_WC,
+       DBG_CHECK_VM,
+       DBG_RESERVE_VMID,
+
+       /* 3D engine options: */
+       DBG_SWITCH_ON_EOP,
+       DBG_NO_OUT_OF_ORDER,
+       DBG_NO_DPBB,
+       DBG_NO_DFSM,
+       DBG_DPBB,
+       DBG_DFSM,
+       DBG_NO_HYPERZ,
+       DBG_NO_RB_PLUS,
+       DBG_NO_2D_TILING,
+       DBG_NO_TILING,
+       DBG_NO_DCC,
+       DBG_NO_DCC_CLEAR,
+       DBG_NO_DCC_FB,
+
+       /* Tests: */
+       DBG_TEST_DMA,
+       DBG_TEST_VMFAULT_CP,
+       DBG_TEST_VMFAULT_SDMA,
+       DBG_TEST_VMFAULT_SHADER,
+};
+
+#define DBG_ALL_SHADERS                (((1 << (DBG_CS + 1)) - 1))
+#define DBG(name)              (1ull << DBG_##name)
 
 #define R600_MAP_BUFFER_ALIGNMENT 64
-#define R600_MAX_VIEWPORTS        16
 
 #define SI_MAX_VARIABLE_THREADS_PER_BLOCK 1024
 
@@ -130,14 +151,14 @@ struct r600_perfcounters;
 struct tgsi_shader_info;
 struct r600_qbo_state;
 
-void radeon_shader_binary_init(struct ac_shader_binary *b);
-void radeon_shader_binary_clean(struct ac_shader_binary *b);
+void si_radeon_shader_binary_init(struct ac_shader_binary *b);
+void si_radeon_shader_binary_clean(struct ac_shader_binary *b);
 
 /* Only 32-bit buffer allocations are supported, gallium doesn't support more
  * at the moment.
  */
 struct r600_resource {
-       struct u_resource               b;
+       struct threaded_resource        b;
 
        /* Winsys objects. */
        struct pb_buffer                *buf;
@@ -152,6 +173,7 @@ struct r600_resource {
        enum radeon_bo_domain           domains;
        enum radeon_bo_flag             flags;
        unsigned                        bind_history;
+       int                             max_forced_staging_uploads;
 
        /* The buffer range which is initialized (with a write transfer,
         * streamout, DMA, or as a random access target). The rest of
@@ -176,12 +198,15 @@ struct r600_resource {
        bool                            TC_L2_dirty;
 
        /* Whether the resource has been exported via resource_get_handle. */
-       bool                            is_shared;
        unsigned                        external_usage; /* PIPE_HANDLE_USAGE_* */
+
+       /* Whether this resource is referenced by bindless handles. */
+       bool                            texture_handle_allocated;
+       bool                            image_handle_allocated;
 };
 
 struct r600_transfer {
-       struct pipe_transfer            transfer;
+       struct threaded_transfer        b;
        struct r600_resource            *staging;
        unsigned                        offset;
 };
@@ -194,6 +219,7 @@ struct r600_fmask_info {
        unsigned bank_height;
        unsigned slice_tile_max;
        unsigned tile_mode_index;
+       unsigned tile_swizzle;
 };
 
 struct r600_cmask_info {
@@ -229,14 +255,13 @@ struct r600_texture {
        unsigned                        last_msaa_resolve_target_micro_mode;
 
        /* Depth buffer compression and fast clear. */
-       struct r600_resource            *htile_buffer;
+       uint64_t                        htile_offset;
        bool                            tc_compatible_htile;
        bool                            depth_cleared; /* if it was cleared at least once */
        float                           depth_clear_value;
        bool                            stencil_cleared; /* if it was cleared at least once */
        uint8_t                         stencil_clear_value;
-
-       bool                            non_disp_tiling; /* R600-Cayman only */
+       bool                            upgraded_depth; /* upgraded from unorm to Z32_FLOAT */
 
        /* Whether the texture is a displayable back buffer and needs DCC
         * decompression, which is expensive. Therefore, it's enabled only
@@ -283,48 +308,34 @@ struct r600_surface {
        bool depth_initialized;
 
        /* Misc. color flags. */
-       bool alphatest_bypass;
-       bool export_16bpc;
        bool color_is_int8;
        bool color_is_int10;
+       bool dcc_incompatible;
 
        /* Color registers. */
        unsigned cb_color_info;
-       unsigned cb_color_base;
        unsigned cb_color_view;
-       unsigned cb_color_size;         /* R600 only */
-       unsigned cb_color_dim;          /* EG only */
-       unsigned cb_color_pitch;        /* EG and later */
-       unsigned cb_color_slice;        /* EG and later */
-       unsigned cb_color_attrib;       /* EG and later */
+       unsigned cb_color_attrib;
        unsigned cb_color_attrib2;      /* GFX9 and later */
        unsigned cb_dcc_control;        /* VI and later */
-       unsigned cb_color_fmask;        /* CB_COLORn_FMASK (EG and later) or CB_COLORn_FRAG (r600) */
-       unsigned cb_color_fmask_slice;  /* EG and later */
-       unsigned cb_color_cmask;        /* CB_COLORn_TILE (r600 only) */
-       unsigned cb_color_mask;         /* R600 only */
-       unsigned spi_shader_col_format;         /* SI+, no blending, no alpha-to-coverage. */
-       unsigned spi_shader_col_format_alpha;   /* SI+, alpha-to-coverage */
-       unsigned spi_shader_col_format_blend;   /* SI+, blending without alpha. */
-       unsigned spi_shader_col_format_blend_alpha; /* SI+, blending with alpha. */
-       struct r600_resource *cb_buffer_fmask; /* Used for FMASK relocations. R600 only */
-       struct r600_resource *cb_buffer_cmask; /* Used for CMASK relocations. R600 only */
+       unsigned spi_shader_col_format;         /* no blending, no alpha-to-coverage. */
+       unsigned spi_shader_col_format_alpha;   /* alpha-to-coverage */
+       unsigned spi_shader_col_format_blend;   /* blending without alpha. */
+       unsigned spi_shader_col_format_blend_alpha; /* blending with alpha. */
 
        /* DB registers. */
-       uint64_t db_depth_base;         /* DB_Z_READ/WRITE_BASE (EG and later) or DB_DEPTH_BASE (r600) */
-       uint64_t db_stencil_base;       /* EG and later */
+       uint64_t db_depth_base;         /* DB_Z_READ/WRITE_BASE */
+       uint64_t db_stencil_base;
        uint64_t db_htile_data_base;
-       unsigned db_depth_info;         /* R600 only, then SI and later */
-       unsigned db_z_info;             /* EG and later */
+       unsigned db_depth_info;
+       unsigned db_z_info;
        unsigned db_z_info2;            /* GFX9+ */
        unsigned db_depth_view;
        unsigned db_depth_size;
-       unsigned db_depth_slice;        /* EG and later */
-       unsigned db_stencil_info;       /* EG and later */
+       unsigned db_depth_slice;
+       unsigned db_stencil_info;
        unsigned db_stencil_info2;      /* GFX9+ */
-       unsigned db_prefetch_limit;     /* R600 only */
        unsigned db_htile_surface;
-       unsigned db_preload_control;    /* EG and later */
 };
 
 struct r600_mmio_counter {
@@ -361,13 +372,19 @@ union r600_mmio_counters {
                struct r600_mmio_counter meq;
                struct r600_mmio_counter me;
                struct r600_mmio_counter surf_sync;
-               struct r600_mmio_counter dma;
+               struct r600_mmio_counter cp_dma;
                struct r600_mmio_counter scratch_ram;
-               struct r600_mmio_counter ce;
        } named;
        unsigned array[0];
 };
 
+struct r600_memory_object {
+       struct pipe_memory_object       b;
+       struct pb_buffer                *buf;
+       uint32_t                        stride;
+       uint32_t                        offset;
+};
+
 struct r600_common_screen {
        struct pipe_screen              b;
        struct radeon_winsys            *ws;
@@ -434,6 +451,11 @@ struct r600_common_screen {
                 */
                unsigned cp_to_L2;
 
+               /* Context flags to set so that all writes from earlier jobs
+                * that end in L2 are seen by CP.
+                */
+               unsigned L2_to_cp;
+
                /* Context flags to set so that all writes from earlier
                 * compute jobs are seen by L2 clients.
                 */
@@ -453,69 +475,9 @@ struct r600_common_screen {
  * command stream. */
 struct r600_atom {
        void (*emit)(struct r600_common_context *ctx, struct r600_atom *state);
-       unsigned                num_dw;
        unsigned short          id;
 };
 
-struct r600_so_target {
-       struct pipe_stream_output_target b;
-
-       /* The buffer where BUFFER_FILLED_SIZE is stored. */
-       struct r600_resource    *buf_filled_size;
-       unsigned                buf_filled_size_offset;
-       bool                    buf_filled_size_valid;
-
-       unsigned                stride_in_dw;
-};
-
-struct r600_streamout {
-       struct r600_atom                begin_atom;
-       bool                            begin_emitted;
-       unsigned                        num_dw_for_end;
-
-       unsigned                        enabled_mask;
-       unsigned                        num_targets;
-       struct r600_so_target           *targets[PIPE_MAX_SO_BUFFERS];
-
-       unsigned                        append_bitmask;
-       bool                            suspended;
-
-       /* External state which comes from the vertex shader,
-        * it must be set explicitly when binding a shader. */
-       unsigned                        *stride_in_dw;
-       unsigned                        enabled_stream_buffers_mask; /* stream0 buffers0-3 in 4 LSB */
-
-       /* The state of VGT_STRMOUT_BUFFER_(CONFIG|EN). */
-       unsigned                        hw_enabled_mask;
-
-       /* The state of VGT_STRMOUT_(CONFIG|EN). */
-       struct r600_atom                enable_atom;
-       bool                            streamout_enabled;
-       bool                            prims_gen_query_enabled;
-       int                             num_prims_gen_queries;
-};
-
-struct r600_signed_scissor {
-       int minx;
-       int miny;
-       int maxx;
-       int maxy;
-};
-
-struct r600_scissors {
-       struct r600_atom                atom;
-       unsigned                        dirty_mask;
-       struct pipe_scissor_state       states[R600_MAX_VIEWPORTS];
-};
-
-struct r600_viewports {
-       struct r600_atom                atom;
-       unsigned                        dirty_mask;
-       unsigned                        depth_range_dirty_mask;
-       struct pipe_viewport_state      states[R600_MAX_VIEWPORTS];
-       struct r600_signed_scissor      as_scissor[R600_MAX_VIEWPORTS];
-};
-
 struct r600_ring {
        struct radeon_winsys_cs         *cs;
        void (*flush)(void *ctx, unsigned flags,
@@ -543,28 +505,23 @@ struct r600_common_context {
        struct r600_ring                dma;
        struct pipe_fence_handle        *last_gfx_fence;
        struct pipe_fence_handle        *last_sdma_fence;
+       struct r600_resource            *eop_bug_scratch;
        unsigned                        num_gfx_cs_flushes;
        unsigned                        initial_gfx_cs_size;
        unsigned                        gpu_reset_counter;
        unsigned                        last_dirty_tex_counter;
        unsigned                        last_compressed_colortex_counter;
+       unsigned                        last_num_draw_calls;
 
+       struct threaded_context         *tc;
        struct u_suballocator           *allocator_zeroed_memory;
        struct slab_child_pool          pool_transfers;
+       struct slab_child_pool          pool_transfers_unsync; /* for threaded_context */
 
        /* Current unaccounted memory usage. */
        uint64_t                        vram;
        uint64_t                        gtt;
 
-       /* States. */
-       struct r600_streamout           streamout;
-       struct r600_scissors            scissors;
-       struct r600_viewports           viewports;
-       bool                            scissor_enabled;
-       bool                            clip_halfz;
-       bool                            vs_writes_viewport_index;
-       bool                            vs_disables_clipping_viewport;
-
        /* Additional context states. */
        unsigned flags; /* flush flags */
 
@@ -576,6 +533,9 @@ struct r600_common_context {
        unsigned                        num_cs_dw_queries_suspend;
        /* Misc stats. */
        unsigned                        num_draw_calls;
+       unsigned                        num_decompress_calls;
+       unsigned                        num_mrt_draw_calls;
+       unsigned                        num_prim_restart_calls;
        unsigned                        num_spill_draw_calls;
        unsigned                        num_compute_calls;
        unsigned                        num_spill_compute_calls;
@@ -584,9 +544,11 @@ struct r600_common_context {
        unsigned                        num_vs_flushes;
        unsigned                        num_ps_flushes;
        unsigned                        num_cs_flushes;
-       unsigned                        num_fb_cache_flushes;
+       unsigned                        num_cb_cache_flushes;
+       unsigned                        num_db_cache_flushes;
        unsigned                        num_L2_invalidates;
        unsigned                        num_L2_writebacks;
+       unsigned                        num_resident_handles;
        uint64_t                        num_alloc_tex_transfer_bytes;
        unsigned                        last_tex_ps_draw_ratio; /* for query */
 
@@ -597,15 +559,6 @@ struct r600_common_context {
        bool                            render_cond_invert;
        bool                            render_cond_force_off; /* for u_blitter */
 
-       /* MSAA sample locations.
-        * The first index is the sample index.
-        * The second index is the coordinate: X, Y. */
-       float                           sample_locations_1x[1][2];
-       float                           sample_locations_2x[2][2];
-       float                           sample_locations_4x[4][2];
-       float                           sample_locations_8x[8][2];
-       float                           sample_locations_16x[16][2];
-
        /* Statistics gathering for the DCC enablement heuristic. It can't be
         * in r600_texture because r600_texture can be shared by multiple
         * contexts. This is for back buffers only. We shouldn't get too many
@@ -625,8 +578,8 @@ struct r600_common_context {
                bool                            query_active;
        } dcc_stats[5];
 
-       struct pipe_debug_callback      debug;
        struct pipe_device_reset_callback device_reset_callback;
+       struct u_log_context            *log;
 
        void                            *query_result_shader;
 
@@ -660,8 +613,16 @@ struct r600_common_context {
         * the buffer is bound, including all resource descriptors. */
        void (*invalidate_buffer)(struct pipe_context *ctx, struct pipe_resource *buf);
 
+       /* Update all resource bindings where the buffer is bound, including
+        * all resource descriptors. This is invalidate_buffer without
+        * the invalidation. */
+       void (*rebind_buffer)(struct pipe_context *ctx, struct pipe_resource *buf,
+                             uint64_t old_gpu_address);
+
        /* Enable or disable occlusion queries. */
-       void (*set_occlusion_query_state)(struct pipe_context *ctx, bool enable);
+       void (*set_occlusion_query_state)(struct pipe_context *ctx,
+                                         bool old_enable,
+                                         bool old_perfect_enable);
 
        void (*save_qbo_state)(struct pipe_context *ctx, struct r600_qbo_state *st);
 
@@ -677,140 +638,125 @@ struct r600_common_context {
                                enum ring_type ring);
 };
 
-/* r600_buffer.c */
-bool r600_rings_is_buffer_referenced(struct r600_common_context *ctx,
-                                    struct pb_buffer *buf,
-                                    enum radeon_bo_usage usage);
-void *r600_buffer_map_sync_with_rings(struct r600_common_context *ctx,
-                                      struct r600_resource *resource,
-                                      unsigned usage);
-void r600_buffer_subdata(struct pipe_context *ctx,
-                        struct pipe_resource *buffer,
-                        unsigned usage, unsigned offset,
-                        unsigned size, const void *data);
-void r600_init_resource_fields(struct r600_common_screen *rscreen,
-                              struct r600_resource *res,
-                              uint64_t size, unsigned alignment);
-bool r600_alloc_resource(struct r600_common_screen *rscreen,
-                        struct r600_resource *res);
-struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
-                                        const struct pipe_resource *templ,
-                                        unsigned alignment);
-struct pipe_resource * r600_aligned_buffer_create(struct pipe_screen *screen,
-                                                 unsigned flags,
-                                                 unsigned usage,
-                                                 unsigned size,
-                                                 unsigned alignment);
+/* r600_buffer_common.c */
+bool si_rings_is_buffer_referenced(struct r600_common_context *ctx,
+                                  struct pb_buffer *buf,
+                                  enum radeon_bo_usage usage);
+void *si_buffer_map_sync_with_rings(struct r600_common_context *ctx,
+                                   struct r600_resource *resource,
+                                   unsigned usage);
+void si_buffer_subdata(struct pipe_context *ctx,
+                      struct pipe_resource *buffer,
+                      unsigned usage, unsigned offset,
+                      unsigned size, const void *data);
+void si_init_resource_fields(struct r600_common_screen *rscreen,
+                            struct r600_resource *res,
+                            uint64_t size, unsigned alignment);
+bool si_alloc_resource(struct r600_common_screen *rscreen,
+                      struct r600_resource *res);
+struct pipe_resource *si_buffer_create(struct pipe_screen *screen,
+                                      const struct pipe_resource *templ,
+                                      unsigned alignment);
+struct pipe_resource *si_aligned_buffer_create(struct pipe_screen *screen,
+                                              unsigned flags,
+                                              unsigned usage,
+                                              unsigned size,
+                                              unsigned alignment);
 struct pipe_resource *
-r600_buffer_from_user_memory(struct pipe_screen *screen,
-                            const struct pipe_resource *templ,
-                            void *user_memory);
-void
-r600_invalidate_resource(struct pipe_context *ctx,
-                        struct pipe_resource *resource);
+si_buffer_from_user_memory(struct pipe_screen *screen,
+                          const struct pipe_resource *templ,
+                          void *user_memory);
+void si_invalidate_resource(struct pipe_context *ctx,
+                           struct pipe_resource *resource);
+void si_replace_buffer_storage(struct pipe_context *ctx,
+                              struct pipe_resource *dst,
+                              struct pipe_resource *src);
 
 /* r600_common_pipe.c */
-void r600_gfx_write_event_eop(struct r600_common_context *ctx,
-                             unsigned event, unsigned event_flags,
-                             unsigned data_sel,
-                             struct r600_resource *buf, uint64_t va,
-                             uint32_t old_fence, uint32_t new_fence);
-unsigned r600_gfx_write_fence_dwords(struct r600_common_screen *screen);
-void r600_gfx_wait_fence(struct r600_common_context *ctx,
-                        uint64_t va, uint32_t ref, uint32_t mask);
-void r600_draw_rectangle(struct blitter_context *blitter,
-                        int x1, int y1, int x2, int y2, float depth,
-                        enum blitter_attrib_type type,
-                        const union pipe_color_union *attrib);
-bool r600_common_screen_init(struct r600_common_screen *rscreen,
-                            struct radeon_winsys *ws);
-void r600_destroy_common_screen(struct r600_common_screen *rscreen);
-void r600_preflush_suspend_features(struct r600_common_context *ctx);
-void r600_postflush_resume_features(struct r600_common_context *ctx);
-bool r600_common_context_init(struct r600_common_context *rctx,
-                             struct r600_common_screen *rscreen,
-                             unsigned context_flags);
-void r600_common_context_cleanup(struct r600_common_context *rctx);
-bool r600_can_dump_shader(struct r600_common_screen *rscreen,
-                         unsigned processor);
-bool r600_extra_shader_checks(struct r600_common_screen *rscreen,
-                             unsigned processor);
-void r600_screen_clear_buffer(struct r600_common_screen *rscreen, struct pipe_resource *dst,
-                             uint64_t offset, uint64_t size, unsigned value);
-struct pipe_resource *r600_resource_create_common(struct pipe_screen *screen,
-                                                 const struct pipe_resource *templ);
-const char *r600_get_llvm_processor_name(enum radeon_family family);
-void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
-                        struct r600_resource *dst, struct r600_resource *src);
-void radeon_save_cs(struct radeon_winsys *ws, struct radeon_winsys_cs *cs,
-                   struct radeon_saved_cs *saved);
-void radeon_clear_saved_cs(struct radeon_saved_cs *saved);
-bool r600_check_device_reset(struct r600_common_context *rctx);
+void si_gfx_write_event_eop(struct r600_common_context *ctx,
+                           unsigned event, unsigned event_flags,
+                           unsigned data_sel,
+                           struct r600_resource *buf, uint64_t va,
+                           uint32_t new_fence, unsigned query_type);
+unsigned si_gfx_write_fence_dwords(struct r600_common_screen *screen);
+void si_gfx_wait_fence(struct r600_common_context *ctx,
+                      uint64_t va, uint32_t ref, uint32_t mask);
+bool si_common_screen_init(struct r600_common_screen *rscreen,
+                          struct radeon_winsys *ws);
+void si_destroy_common_screen(struct r600_common_screen *rscreen);
+void si_preflush_suspend_features(struct r600_common_context *ctx);
+void si_postflush_resume_features(struct r600_common_context *ctx);
+bool si_common_context_init(struct r600_common_context *rctx,
+                           struct r600_common_screen *rscreen,
+                           unsigned context_flags);
+void si_common_context_cleanup(struct r600_common_context *rctx);
+bool si_can_dump_shader(struct r600_common_screen *rscreen,
+                       unsigned processor);
+bool si_extra_shader_checks(struct r600_common_screen *rscreen,
+                           unsigned processor);
+void si_screen_clear_buffer(struct r600_common_screen *rscreen, struct pipe_resource *dst,
+                           uint64_t offset, uint64_t size, unsigned value);
+struct pipe_resource *si_resource_create_common(struct pipe_screen *screen,
+                                               const struct pipe_resource *templ);
+void si_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
+                      struct r600_resource *dst, struct r600_resource *src);
+void si_save_cs(struct radeon_winsys *ws, struct radeon_winsys_cs *cs,
+               struct radeon_saved_cs *saved, bool get_buffer_list);
+void si_clear_saved_cs(struct radeon_saved_cs *saved);
+bool si_check_device_reset(struct r600_common_context *rctx);
 
 /* r600_gpu_load.c */
-void r600_gpu_load_kill_thread(struct r600_common_screen *rscreen);
-uint64_t r600_begin_counter(struct r600_common_screen *rscreen, unsigned type);
-unsigned r600_end_counter(struct r600_common_screen *rscreen, unsigned type,
-                         uint64_t begin);
+void si_gpu_load_kill_thread(struct r600_common_screen *rscreen);
+uint64_t si_begin_counter(struct r600_common_screen *rscreen, unsigned type);
+unsigned si_end_counter(struct r600_common_screen *rscreen, unsigned type,
+                       uint64_t begin);
 
 /* r600_perfcounters.c */
-void r600_perfcounters_destroy(struct r600_common_screen *rscreen);
+void si_perfcounters_destroy(struct r600_common_screen *rscreen);
 
 /* r600_query.c */
-void r600_init_screen_query_functions(struct r600_common_screen *rscreen);
-void r600_query_init(struct r600_common_context *rctx);
-void r600_suspend_queries(struct r600_common_context *ctx);
-void r600_resume_queries(struct r600_common_context *ctx);
-void r600_query_fix_enabled_rb_mask(struct r600_common_screen *rscreen);
-
-/* r600_streamout.c */
-void r600_streamout_buffers_dirty(struct r600_common_context *rctx);
-void r600_set_streamout_targets(struct pipe_context *ctx,
-                               unsigned num_targets,
-                               struct pipe_stream_output_target **targets,
-                               const unsigned *offset);
-void r600_emit_streamout_end(struct r600_common_context *rctx);
-void r600_update_prims_generated_query_state(struct r600_common_context *rctx,
-                                            unsigned type, int diff);
-void r600_streamout_init(struct r600_common_context *rctx);
+void si_init_screen_query_functions(struct r600_common_screen *rscreen);
+void si_init_query_functions(struct r600_common_context *rctx);
+void si_suspend_queries(struct r600_common_context *ctx);
+void si_resume_queries(struct r600_common_context *ctx);
 
 /* r600_test_dma.c */
-void r600_test_dma(struct r600_common_screen *rscreen);
+void si_test_dma(struct r600_common_screen *rscreen);
 
 /* r600_texture.c */
-bool r600_prepare_for_dma_blit(struct r600_common_context *rctx,
-                               struct r600_texture *rdst,
-                               unsigned dst_level, unsigned dstx,
-                               unsigned dsty, unsigned dstz,
-                               struct r600_texture *rsrc,
-                               unsigned src_level,
-                               const struct pipe_box *src_box);
-void r600_texture_get_fmask_info(struct r600_common_screen *rscreen,
-                                struct r600_texture *rtex,
-                                unsigned nr_samples,
-                                struct r600_fmask_info *out);
-void r600_texture_get_cmask_info(struct r600_common_screen *rscreen,
-                                struct r600_texture *rtex,
-                                struct r600_cmask_info *out);
-bool r600_init_flushed_depth_texture(struct pipe_context *ctx,
-                                    struct pipe_resource *texture,
-                                    struct r600_texture **staging);
-void r600_print_texture_info(struct r600_common_screen *rscreen,
-                            struct r600_texture *rtex, FILE *f);
-struct pipe_resource *r600_texture_create(struct pipe_screen *screen,
+bool si_prepare_for_dma_blit(struct r600_common_context *rctx,
+                            struct r600_texture *rdst,
+                            unsigned dst_level, unsigned dstx,
+                            unsigned dsty, unsigned dstz,
+                            struct r600_texture *rsrc,
+                            unsigned src_level,
+                            const struct pipe_box *src_box);
+void si_texture_get_fmask_info(struct r600_common_screen *rscreen,
+                              struct r600_texture *rtex,
+                              unsigned nr_samples,
+                              struct r600_fmask_info *out);
+bool si_init_flushed_depth_texture(struct pipe_context *ctx,
+                                  struct pipe_resource *texture,
+                                  struct r600_texture **staging);
+void si_print_texture_info(struct r600_common_screen *rscreen,
+                          struct r600_texture *rtex, struct u_log_context *log);
+struct pipe_resource *si_texture_create(struct pipe_screen *screen,
                                        const struct pipe_resource *templ);
 bool vi_dcc_formats_compatible(enum pipe_format format1,
                               enum pipe_format format2);
+bool vi_dcc_formats_are_incompatible(struct pipe_resource *tex,
+                                    unsigned level,
+                                    enum pipe_format view_format);
 void vi_disable_dcc_if_incompatible_format(struct r600_common_context *rctx,
                                           struct pipe_resource *tex,
                                           unsigned level,
                                           enum pipe_format view_format);
-struct pipe_surface *r600_create_surface_custom(struct pipe_context *pipe,
-                                               struct pipe_resource *texture,
-                                               const struct pipe_surface *templ,
-                                               unsigned width0, unsigned height0,
-                                               unsigned width, unsigned height);
-unsigned r600_translate_colorswap(enum pipe_format format, bool do_endian_swap);
+struct pipe_surface *si_create_surface_custom(struct pipe_context *pipe,
+                                             struct pipe_resource *texture,
+                                             const struct pipe_surface *templ,
+                                             unsigned width0, unsigned height0,
+                                             unsigned width, unsigned height);
+unsigned si_translate_colorswap(enum pipe_format format, bool do_endian_swap);
 void vi_separate_dcc_start_query(struct pipe_context *ctx,
                                 struct r600_texture *tex);
 void vi_separate_dcc_stop_query(struct pipe_context *ctx,
@@ -820,37 +766,15 @@ void vi_separate_dcc_process_and_reset_stats(struct pipe_context *ctx,
 void vi_dcc_clear_level(struct r600_common_context *rctx,
                        struct r600_texture *rtex,
                        unsigned level, unsigned clear_value);
-void evergreen_do_fast_color_clear(struct r600_common_context *rctx,
-                                  struct pipe_framebuffer_state *fb,
-                                  struct r600_atom *fb_state,
-                                  unsigned *buffers, unsigned *dirty_cbufs,
-                                  const union pipe_color_union *color);
-bool r600_texture_disable_dcc(struct r600_common_context *rctx,
-                             struct r600_texture *rtex);
-void r600_init_screen_texture_functions(struct r600_common_screen *rscreen);
-void r600_init_context_texture_functions(struct r600_common_context *rctx);
-
-/* r600_viewport.c */
-void evergreen_apply_scissor_bug_workaround(struct r600_common_context *rctx,
-                                           struct pipe_scissor_state *scissor);
-void r600_viewport_set_rast_deps(struct r600_common_context *rctx,
-                                bool scissor_enable, bool clip_halfz);
-void r600_update_vs_writes_viewport_index(struct r600_common_context *rctx,
-                                         struct tgsi_shader_info *info);
-void r600_init_viewport_functions(struct r600_common_context *rctx);
-
-/* cayman_msaa.c */
-extern const uint32_t eg_sample_locs_2x[4];
-extern const unsigned eg_max_dist_2x;
-extern const uint32_t eg_sample_locs_4x[4];
-extern const unsigned eg_max_dist_4x;
-void cayman_get_sample_position(struct pipe_context *ctx, unsigned sample_count,
-                               unsigned sample_index, float *out_value);
-void cayman_init_msaa(struct pipe_context *ctx);
-void cayman_emit_msaa_sample_locs(struct radeon_winsys_cs *cs, int nr_samples);
-void cayman_emit_msaa_config(struct radeon_winsys_cs *cs, int nr_samples,
-                            int ps_iter_samples, int overrast_samples,
-                            unsigned sc_mode_cntl_1);
+void si_do_fast_color_clear(struct r600_common_context *rctx,
+                           struct pipe_framebuffer_state *fb,
+                           struct r600_atom *fb_state,
+                           unsigned *buffers, ubyte *dirty_cbufs,
+                           const union pipe_color_union *color);
+bool si_texture_disable_dcc(struct r600_common_context *rctx,
+                           struct r600_texture *rtex);
+void si_init_screen_texture_functions(struct r600_common_screen *rscreen);
+void si_init_context_texture_functions(struct r600_common_context *rctx);
 
 
 /* Inline helpers. */
@@ -886,12 +810,6 @@ r600_context_add_resource_size(struct pipe_context *ctx, struct pipe_resource *r
        }
 }
 
-static inline bool r600_get_strmout_en(struct r600_common_context *rctx)
-{
-       return rctx->streamout.streamout_enabled ||
-              rctx->streamout.prims_gen_query_enabled;
-}
-
 #define     SQ_TEX_XY_FILTER_POINT                         0x00
 #define     SQ_TEX_XY_FILTER_BILINEAR                      0x01
 #define     SQ_TEX_XY_FILTER_ANISO_POINT                   0x02
@@ -920,26 +838,6 @@ static inline unsigned r600_tex_aniso_filter(unsigned filter)
        return 4;
 }
 
-static inline unsigned r600_wavefront_size(enum radeon_family family)
-{
-       switch (family) {
-       case CHIP_RV610:
-       case CHIP_RS780:
-       case CHIP_RV620:
-       case CHIP_RS880:
-               return 16;
-       case CHIP_RV630:
-       case CHIP_RV635:
-       case CHIP_RV730:
-       case CHIP_RV710:
-       case CHIP_PALM:
-       case CHIP_CEDAR:
-               return 32;
-       default:
-               return 64;
-       }
-}
-
 static inline enum radeon_bo_priority
 r600_get_sampler_view_priority(struct r600_resource *res)
 {
@@ -965,19 +863,30 @@ vi_dcc_enabled(struct r600_texture *tex, unsigned level)
        return tex->dcc_offset && level < tex->surface.num_dcc_levels;
 }
 
+static inline bool
+r600_htile_enabled(struct r600_texture *tex, unsigned level)
+{
+       return tex->htile_offset && level == 0;
+}
+
+static inline bool
+vi_tc_compat_htile_enabled(struct r600_texture *tex, unsigned level)
+{
+       assert(!tex->tc_compatible_htile || tex->htile_offset);
+       return tex->tc_compatible_htile && level == 0;
+}
+
 #define COMPUTE_DBG(rscreen, fmt, args...) \
        do { \
-               if ((rscreen->b.debug_flags & DBG_COMPUTE)) fprintf(stderr, fmt, ##args); \
+               if ((rscreen->b.debug_flags & DBG(COMPUTE))) fprintf(stderr, fmt, ##args); \
        } while (0);
 
 #define R600_ERR(fmt, args...) \
        fprintf(stderr, "EE %s:%d %s - " fmt, __FILE__, __LINE__, __func__, ##args)
 
-/* For MSAA sample positions. */
-#define FILL_SREG(s0x, s0y, s1x, s1y, s2x, s2y, s3x, s3y)  \
-       (((s0x) & 0xf) | (((unsigned)(s0y) & 0xf) << 4) |                  \
-       (((unsigned)(s1x) & 0xf) << 8) | (((unsigned)(s1y) & 0xf) << 12) |         \
-       (((unsigned)(s2x) & 0xf) << 16) | (((unsigned)(s2y) & 0xf) << 20) |        \
-        (((unsigned)(s3x) & 0xf) << 24) | (((unsigned)(s3y) & 0xf) << 28))
+static inline int S_FIXED(float value, unsigned frac_bits)
+{
+       return value * (1 << frac_bits);
+}
 
 #endif