radeonsi: move si_destroy_saved_cs to si_debug.c
[mesa.git] / src / gallium / drivers / radeonsi / si_pipe.h
index 71a3e9834f318ae8663a45b213dad0a6540056c6..8973ad093c2eeb7c385b0cd68182f16b9b84be0a 100644 (file)
  * 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:
- *      Jerome Glisse
  */
 #ifndef SI_PIPE_H
 #define SI_PIPE_H
 
 #include "si_shader.h"
 
+#include "util/u_dynarray.h"
+#include "util/u_idalloc.h"
+
 #ifdef PIPE_ARCH_BIG_ENDIAN
 #define SI_BIG_ENDIAN 1
 #else
 #define SI_BIG_ENDIAN 0
 #endif
 
+#define ATI_VENDOR_ID 0x1002
+
+#define SI_NOT_QUERY           0xffffffff
+
 /* The base vertex and primitive restart can be any number, but we must pick
  * one which will mean "unknown" for the purpose of state tracking and
  * the number shouldn't be a commonly-used one. */
 /* Alignment for optimal CP DMA performance. */
 #define SI_CPDMA_ALIGNMENT     32
 
+/* Pipeline & streamout query controls. */
+#define SI_CONTEXT_START_PIPELINE_STATS        (1 << 0)
+#define SI_CONTEXT_STOP_PIPELINE_STATS (1 << 1)
+#define SI_CONTEXT_FLUSH_FOR_RENDER_COND (1 << 2)
 /* Instruction cache. */
-#define SI_CONTEXT_INV_ICACHE          (R600_CONTEXT_PRIVATE_FLAG << 0)
+#define SI_CONTEXT_INV_ICACHE          (1 << 3)
 /* SMEM L1, other names: KCACHE, constant cache, DCACHE, data cache */
-#define SI_CONTEXT_INV_SMEM_L1         (R600_CONTEXT_PRIVATE_FLAG << 1)
+#define SI_CONTEXT_INV_SMEM_L1         (1 << 4)
 /* VMEM L1 can optionally be bypassed (GLC=1). Other names: TC L1 */
-#define SI_CONTEXT_INV_VMEM_L1         (R600_CONTEXT_PRIVATE_FLAG << 2)
+#define SI_CONTEXT_INV_VMEM_L1         (1 << 5)
 /* Used by everything except CB/DB, can be bypassed (SLC=1). Other names: TC L2 */
-#define SI_CONTEXT_INV_GLOBAL_L2       (R600_CONTEXT_PRIVATE_FLAG << 3)
+#define SI_CONTEXT_INV_GLOBAL_L2       (1 << 6)
 /* Write dirty L2 lines back to memory (shader and CP DMA stores), but don't
  * invalidate L2. SI-CIK can't do it, so they will do complete invalidation. */
-#define SI_CONTEXT_WRITEBACK_GLOBAL_L2 (R600_CONTEXT_PRIVATE_FLAG << 4)
-/* gaps */
+#define SI_CONTEXT_WRITEBACK_GLOBAL_L2 (1 << 7)
+/* Writeback & invalidate the L2 metadata cache. It can only be coupled with
+ * a CB or DB flush. */
+#define SI_CONTEXT_INV_L2_METADATA     (1 << 8)
 /* Framebuffer caches. */
-#define SI_CONTEXT_FLUSH_AND_INV_DB    (R600_CONTEXT_PRIVATE_FLAG << 7)
-#define SI_CONTEXT_FLUSH_AND_INV_CB    (R600_CONTEXT_PRIVATE_FLAG << 8)
+#define SI_CONTEXT_FLUSH_AND_INV_DB    (1 << 9)
+#define SI_CONTEXT_FLUSH_AND_INV_DB_META (1 << 10)
+#define SI_CONTEXT_FLUSH_AND_INV_CB    (1 << 11)
 /* Engine synchronization. */
-#define SI_CONTEXT_VS_PARTIAL_FLUSH    (R600_CONTEXT_PRIVATE_FLAG << 9)
-#define SI_CONTEXT_PS_PARTIAL_FLUSH    (R600_CONTEXT_PRIVATE_FLAG << 10)
-#define SI_CONTEXT_CS_PARTIAL_FLUSH    (R600_CONTEXT_PRIVATE_FLAG << 11)
-#define SI_CONTEXT_VGT_FLUSH           (R600_CONTEXT_PRIVATE_FLAG << 12)
-#define SI_CONTEXT_VGT_STREAMOUT_SYNC  (R600_CONTEXT_PRIVATE_FLAG << 13)
+#define SI_CONTEXT_VS_PARTIAL_FLUSH    (1 << 12)
+#define SI_CONTEXT_PS_PARTIAL_FLUSH    (1 << 13)
+#define SI_CONTEXT_CS_PARTIAL_FLUSH    (1 << 14)
+#define SI_CONTEXT_VGT_FLUSH           (1 << 15)
+#define SI_CONTEXT_VGT_STREAMOUT_SYNC  (1 << 16)
+
+#define SI_PREFETCH_VBO_DESCRIPTORS    (1 << 0)
+#define SI_PREFETCH_LS                 (1 << 1)
+#define SI_PREFETCH_HS                 (1 << 2)
+#define SI_PREFETCH_ES                 (1 << 3)
+#define SI_PREFETCH_GS                 (1 << 4)
+#define SI_PREFETCH_VS                 (1 << 5)
+#define SI_PREFETCH_PS                 (1 << 6)
 
 #define SI_MAX_BORDER_COLORS   4096
+#define SI_MAX_VIEWPORTS        16
+#define SIX_BITS               0x3F
 
 struct si_compute;
 struct hash_table;
 struct u_suballocator;
 
 struct si_screen {
-       struct r600_common_screen       b;
+       struct pipe_screen              b;
+       struct radeon_winsys            *ws;
+       struct disk_cache               *disk_shader_cache;
+
+       struct radeon_info              info;
+       uint64_t                        debug_flags;
+       char                            renderer_string[100];
+
        unsigned                        gs_table_depth;
        unsigned                        tess_offchip_block_dw_size;
+       unsigned                        tess_offchip_ring_size;
+       unsigned                        tess_factor_ring_size;
+       unsigned                        vgt_hs_offchip_param;
+       bool                            has_clear_state;
        bool                            has_distributed_tess;
        bool                            has_draw_indirect_multi;
-       bool                            has_ds_bpermute;
+       bool                            has_out_of_order_rast;
+       bool                            assume_no_z_fights;
+       bool                            commutative_blend_add;
+       bool                            clear_db_cache_before_clear;
        bool                            has_msaa_sample_loc_bug;
+       bool                            has_ls_vgpr_init_bug;
+       bool                            dpbb_allowed;
+       bool                            dfsm_allowed;
+       bool                            llvm_has_working_vgpr_indexing;
 
        /* Whether shaders are monolithic (1-part) or separate (3-part). */
        bool                            use_monolithic_shaders;
        bool                            record_llvm_ir;
+       bool                            has_rbplus;     /* if RB+ registers exist */
+       bool                            rbplus_allowed; /* if RB+ is allowed */
+       bool                            dcc_msaa_allowed;
+       bool                            cpdma_prefetch_writes_memory;
+
+       struct slab_parent_pool         pool_transfers;
+
+       /* Texture filter settings. */
+       int                             force_aniso; /* -1 = disabled */
+
+       /* Auxiliary context. Mainly used to initialize resources.
+        * It must be locked prior to using and flushed before unlocking. */
+       struct pipe_context             *aux_context;
+       mtx_t                           aux_context_lock;
+
+       /* This must be in the screen, because UE4 uses one context for
+        * compilation and another one for rendering.
+        */
+       unsigned                        num_compilations;
+       /* Along with ST_DEBUG=precompile, this should show if applications
+        * are loading shaders on demand. This is a monotonic counter.
+        */
+       unsigned                        num_shaders_created;
+       unsigned                        num_shader_cache_hits;
+
+       /* GPU load thread. */
+       mtx_t                           gpu_load_mutex;
+       thrd_t                          gpu_load_thread;
+       union r600_mmio_counters        mmio_counters;
+       volatile unsigned               gpu_load_stop_thread; /* bool */
+
+       /* Performance counters. */
+       struct r600_perfcounters        *perfcounters;
+
+       /* If pipe_screen wants to recompute and re-emit the framebuffer,
+        * sampler, and image states of all contexts, it should atomically
+        * increment this.
+        *
+        * Each context will compare this with its own last known value of
+        * the counter before drawing and re-emit the states accordingly.
+        */
+       unsigned                        dirty_tex_counter;
+
+       /* Atomically increment this counter when an existing texture's
+        * metadata is enabled or disabled in a way that requires changing
+        * contexts' compressed texture binding masks.
+        */
+       unsigned                        compressed_colortex_counter;
+
+       struct {
+               /* Context flags to set so that all writes from earlier jobs
+                * in the CP are seen by L2 clients.
+                */
+               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;
+       } barrier_flags;
 
        mtx_t                   shader_parts_mutex;
        struct si_shader_part           *vs_prologs;
@@ -109,12 +208,21 @@ struct si_screen {
 
        /* Shader compiler queue for multithreaded compilation. */
        struct util_queue               shader_compiler_queue;
-       LLVMTargetMachineRef            tm[4]; /* used by the queue only */
+       /* Use at most 3 normal compiler threads on quadcore and better.
+        * Hyperthreaded CPUs report the number of threads, but we want
+        * the number of cores. */
+       LLVMTargetMachineRef            tm[3]; /* used by the queue only */
+
+       struct util_queue               shader_compiler_queue_low_priority;
+       /* Use at most 2 low priority threads on quadcore and better.
+        * We want to minimize the impact on multithreaded Mesa. */
+       LLVMTargetMachineRef            tm_low_priority[2]; /* at most 2 threads */
 };
 
 struct si_blend_color {
        struct r600_atom                atom;
        struct pipe_blend_color         state;
+       bool                            any_nonzeros;
 };
 
 struct si_sampler_view {
@@ -124,9 +232,10 @@ struct si_sampler_view {
        uint32_t                        state[8];
        uint32_t                        fmask_state[8];
        const struct legacy_surf_level  *base_level_info;
-       unsigned                        base_level;
-       unsigned                        block_width;
+       ubyte                           base_level;
+       ubyte                           block_width;
        bool is_stencil_sampler;
+       bool is_integer;
        bool dcc_incompatible;
 };
 
@@ -137,6 +246,8 @@ struct si_sampler_state {
        unsigned                        magic;
 #endif
        uint32_t                        val[4];
+       uint32_t                        integer_val[4];
+       uint32_t                        upgraded_depth_val[4];
 };
 
 struct si_cs_shader_state {
@@ -147,40 +258,68 @@ struct si_cs_shader_state {
        bool                            uses_scratch;
 };
 
-struct si_textures_info {
-       struct si_sampler_views         views;
-       uint32_t                        depth_texture_mask; /* which textures are depth */
-       uint32_t                        compressed_colortex_mask;
+struct si_samplers {
+       struct pipe_sampler_view        *views[SI_NUM_SAMPLERS];
+       struct si_sampler_state         *sampler_states[SI_NUM_SAMPLERS];
+
+       /* The i-th bit is set if that element is enabled (non-NULL resource). */
+       unsigned                        enabled_mask;
+       uint32_t                        needs_depth_decompress_mask;
+       uint32_t                        needs_color_decompress_mask;
 };
 
-struct si_images_info {
+struct si_images {
        struct pipe_image_view          views[SI_NUM_IMAGES];
-       uint32_t                        compressed_colortex_mask;
+       uint32_t                        needs_color_decompress_mask;
        unsigned                        enabled_mask;
 };
 
 struct si_framebuffer {
        struct r600_atom                atom;
        struct pipe_framebuffer_state   state;
-       unsigned                        nr_samples;
-       unsigned                        log_samples;
-       unsigned                        compressed_cb_mask;
        unsigned                        colorbuf_enabled_4bit;
        unsigned                        spi_shader_col_format;
        unsigned                        spi_shader_col_format_alpha;
        unsigned                        spi_shader_col_format_blend;
        unsigned                        spi_shader_col_format_blend_alpha;
-       unsigned                        color_is_int8;
-       unsigned                        color_is_int10;
-       unsigned                        dirty_cbufs;
+       ubyte                           nr_samples:5; /* at most 16xAA */
+       ubyte                           log_samples:3; /* at most 4 = 16xAA */
+       ubyte                           compressed_cb_mask;
+       ubyte                           uncompressed_cb_mask;
+       ubyte                           color_is_int8;
+       ubyte                           color_is_int10;
+       ubyte                           dirty_cbufs;
        bool                            dirty_zsbuf;
        bool                            any_dst_linear;
-       bool                            do_update_surf_dirtiness;
+       bool                            CB_has_shader_readable_metadata;
+       bool                            DB_has_shader_readable_metadata;
+};
+
+struct si_signed_scissor {
+       int minx;
+       int miny;
+       int maxx;
+       int maxy;
+};
+
+struct si_scissors {
+       struct r600_atom                atom;
+       unsigned                        dirty_mask;
+       struct pipe_scissor_state       states[SI_MAX_VIEWPORTS];
+};
+
+struct si_viewports {
+       struct r600_atom                atom;
+       unsigned                        dirty_mask;
+       unsigned                        depth_range_dirty_mask;
+       struct pipe_viewport_state      states[SI_MAX_VIEWPORTS];
+       struct si_signed_scissor        as_scissor[SI_MAX_VIEWPORTS];
 };
 
 struct si_clip_state {
        struct r600_atom                atom;
        struct pipe_clip_state          state;
+       bool                            any_nonzeros;
 };
 
 struct si_sample_locs {
@@ -193,6 +332,43 @@ struct si_sample_mask {
        uint16_t                sample_mask;
 };
 
+struct si_streamout_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 si_streamout {
+       struct r600_atom                begin_atom;
+       bool                            begin_emitted;
+
+       unsigned                        enabled_mask;
+       unsigned                        num_targets;
+       struct si_streamout_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. */
+       uint16_t                        *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;
+};
+
 /* A shader state consists of the shader selector, which is a constant state
  * object shared by multiple contexts and shouldn't be modified, and
  * the current shader variant selected for this context.
@@ -217,32 +393,63 @@ union si_vgt_param_key {
                unsigned count_from_stream_output:1;
                unsigned line_stipple_enabled:1;
                unsigned uses_tess:1;
-               unsigned tcs_tes_uses_prim_id:1;
+               unsigned tess_uses_prim_id:1;
                unsigned uses_gs:1;
                unsigned _pad:32 - SI_NUM_VGT_PARAM_KEY_BITS;
        } u;
        uint32_t index;
 };
 
+struct si_texture_handle
+{
+       unsigned                        desc_slot;
+       bool                            desc_dirty;
+       struct pipe_sampler_view        *view;
+       struct si_sampler_state         sstate;
+};
+
+struct si_image_handle
+{
+       unsigned                        desc_slot;
+       bool                            desc_dirty;
+       struct pipe_image_view          view;
+};
+
+struct si_saved_cs {
+       struct pipe_reference   reference;
+       struct si_context       *ctx;
+       struct radeon_saved_cs  gfx;
+       struct r600_resource    *trace_buf;
+       unsigned                trace_id;
+
+       unsigned                gfx_last_dw;
+       bool                    flushed;
+       int64_t                 time_flush;
+};
+
 struct si_context {
        struct r600_common_context      b;
        struct blitter_context          *blitter;
        void                            *custom_dsa_flush;
        void                            *custom_blend_resolve;
-       void                            *custom_blend_decompress;
-       void                            *custom_blend_fastclear;
+       void                            *custom_blend_fmask_decompress;
+       void                            *custom_blend_eliminate_fastclear;
        void                            *custom_blend_dcc_decompress;
+       void                            *vs_blit_pos;
+       void                            *vs_blit_pos_layered;
+       void                            *vs_blit_color;
+       void                            *vs_blit_color_layered;
+       void                            *vs_blit_texcoord;
        struct si_screen                *screen;
-
-       struct radeon_winsys_cs         *ce_ib;
-       struct radeon_winsys_cs         *ce_preamble_ib;
-       bool                            ce_need_synchronization;
-       struct u_suballocator           *ce_suballocator;
-
-       struct si_shader_ctx_state      fixed_func_tcs_shader;
+       struct pipe_debug_callback      debug;
        LLVMTargetMachineRef            tm; /* only non-threaded compilation */
-       bool                            gfx_flush_in_progress;
-       bool                            compute_is_busy;
+       struct si_shader_ctx_state      fixed_func_tcs_shader;
+       struct r600_resource            *wait_mem_scratch;
+       unsigned                        wait_mem_number;
+       uint16_t                        prefetch_L2_mask;
+
+       bool                            gfx_flush_in_progress:1;
+       bool                            compute_is_busy:1;
 
        /* Atoms (direct states). */
        union si_state_atoms            atoms;
@@ -253,10 +460,10 @@ struct si_context {
        union si_state                  emitted;
 
        /* Atom declarations. */
-       struct r600_atom                prefetch_L2;
        struct si_framebuffer           framebuffer;
        struct si_sample_locs           msaa_sample_locs;
        struct r600_atom                db_render_state;
+       struct r600_atom                dpbb_state;
        struct r600_atom                msaa_config;
        struct si_sample_mask           sample_mask;
        struct r600_atom                cb_render_state;
@@ -264,9 +471,12 @@ struct si_context {
        struct si_blend_color           blend_color;
        struct r600_atom                clip_regs;
        struct si_clip_state            clip_state;
-       struct si_shader_data           shader_userdata;
+       struct si_shader_data           shader_pointers;
        struct si_stencil_ref           stencil_ref;
        struct r600_atom                spi_map;
+       struct si_scissors              scissors;
+       struct si_streamout             streamout;
+       struct si_viewports             viewports;
 
        /* Precomputed states. */
        struct si_pm4_state             *init_config;
@@ -283,33 +493,37 @@ struct si_context {
        struct si_cs_shader_state       cs_shader_state;
 
        /* shader information */
-       struct si_vertex_element        *vertex_elements;
+       struct si_vertex_elements       *vertex_elements;
        unsigned                        sprite_coord_enable;
        bool                            flatshade;
        bool                            do_update_shaders;
 
+       /* vertex buffer descriptors */
+       uint32_t *vb_descriptors_gpu_list;
+       struct r600_resource *vb_descriptors_buffer;
+       unsigned vb_descriptors_offset;
+
        /* shader descriptors */
-       struct si_descriptors           vertex_buffers;
        struct si_descriptors           descriptors[SI_NUM_DESCS];
        unsigned                        descriptors_dirty;
        unsigned                        shader_pointers_dirty;
-       unsigned                        compressed_tex_shader_mask;
+       unsigned                        shader_needs_decompress_mask;
        struct si_buffer_resources      rw_buffers;
-       struct si_buffer_resources      const_buffers[SI_NUM_SHADERS];
-       struct si_buffer_resources      shader_buffers[SI_NUM_SHADERS];
-       struct si_textures_info         samplers[SI_NUM_SHADERS];
-       struct si_images_info           images[SI_NUM_SHADERS];
+       struct si_buffer_resources      const_and_shader_buffers[SI_NUM_SHADERS];
+       struct si_samplers              samplers[SI_NUM_SHADERS];
+       struct si_images                images[SI_NUM_SHADERS];
 
        /* other shader resources */
        struct pipe_constant_buffer     null_const_buf; /* used for set_constant_buffer(NULL) on CIK */
        struct pipe_resource            *esgs_ring;
        struct pipe_resource            *gsvs_ring;
-       struct pipe_resource            *tf_ring;
-       struct pipe_resource            *tess_offchip_ring;
+       struct pipe_resource            *tess_rings;
        union pipe_color_union          *border_color_table; /* in CPU memory, any endian */
        struct r600_resource            *border_color_buffer;
        union pipe_color_union          *border_color_map; /* in VRAM (slow access), little endian */
        unsigned                        border_color_count;
+       unsigned                        num_vs_blit_sgprs;
+       uint32_t                        vs_blit_sh_data[SI_VS_BLIT_SGPRS_POS_TEXCOORD];
 
        /* Vertex and index buffers. */
        bool                            vertex_buffers_dirty;
@@ -318,22 +532,26 @@ struct si_context {
 
        /* MSAA config state. */
        int                             ps_iter_samples;
+       bool                            ps_uses_fbfetch;
        bool                            smoothing_enabled;
 
        /* DB render state. */
-       bool                    dbcb_depth_copy_enabled;
-       bool                    dbcb_stencil_copy_enabled;
-       unsigned                dbcb_copy_sample;
-       bool                    db_flush_depth_inplace;
-       bool                    db_flush_stencil_inplace;
-       bool                    db_depth_clear;
-       bool                    db_depth_disable_expclear;
-       bool                    db_stencil_clear;
-       bool                    db_stencil_disable_expclear;
        unsigned                ps_db_shader_control;
-       bool                    occlusion_queries_disabled;
+       unsigned                dbcb_copy_sample;
+       bool                    dbcb_depth_copy_enabled:1;
+       bool                    dbcb_stencil_copy_enabled:1;
+       bool                    db_flush_depth_inplace:1;
+       bool                    db_flush_stencil_inplace:1;
+       bool                    db_depth_clear:1;
+       bool                    db_depth_disable_expclear:1;
+       bool                    db_stencil_clear:1;
+       bool                    db_stencil_disable_expclear:1;
+       bool                    occlusion_queries_disabled:1;
+       bool                    generate_mipmap_for_depth:1;
 
        /* Emitted draw state. */
+       bool                    gs_tri_strip_adj_fix:1;
+       bool                    ls_vgpr_fix:1;
        int                     last_index_size;
        int                     last_base_vertex;
        int                     last_start_instance;
@@ -349,7 +567,6 @@ struct si_context {
        unsigned                current_vs_state;
        unsigned                last_vs_state;
        enum pipe_prim_type     current_rast_prim; /* primitive type after TES, GS */
-       bool                    gs_tri_strip_adj_fix;
 
        /* Scratch buffer */
        struct r600_atom        scratch_state;
@@ -365,32 +582,77 @@ struct si_context {
        struct si_shader_selector *last_tcs;
        int                     last_num_tcs_input_cp;
        int                     last_tes_sh_base;
+       bool                    last_tess_uses_primid;
        unsigned                last_num_patches;
 
        /* Debug state. */
        bool                    is_debug;
-       struct radeon_saved_cs  last_gfx;
-       struct r600_resource    *last_trace_buf;
-       struct r600_resource    *trace_buf;
-       unsigned                trace_id;
+       struct si_saved_cs      *current_saved_cs;
        uint64_t                dmesg_timestamp;
        unsigned                apitrace_call_number;
 
        /* Other state */
        bool need_check_render_feedback;
+       bool                    decompression_enabled;
+
+       bool                    vs_writes_viewport_index;
+       bool                    vs_disables_clipping_viewport;
 
        /* Precomputed IA_MULTI_VGT_PARAM */
        union si_vgt_param_key  ia_multi_vgt_param_key;
        unsigned                ia_multi_vgt_param[SI_NUM_VGT_PARAM_STATES];
+
+       /* Bindless descriptors. */
+       struct si_descriptors   bindless_descriptors;
+       struct util_idalloc     bindless_used_slots;
+       unsigned                num_bindless_descriptors;
+       bool                    bindless_descriptors_dirty;
+       bool                    graphics_bindless_pointer_dirty;
+       bool                    compute_bindless_pointer_dirty;
+
+       /* Allocated bindless handles */
+       struct hash_table       *tex_handles;
+       struct hash_table       *img_handles;
+
+       /* Resident bindless handles */
+       struct util_dynarray    resident_tex_handles;
+       struct util_dynarray    resident_img_handles;
+
+       /* Resident bindless handles which need decompression */
+       struct util_dynarray    resident_tex_needs_color_decompress;
+       struct util_dynarray    resident_img_needs_color_decompress;
+       struct util_dynarray    resident_tex_needs_depth_decompress;
+
+       /* Bindless state */
+       bool                    uses_bindless_samplers;
+       bool                    uses_bindless_images;
+
+       /* 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];
 };
 
 /* cik_sdma.c */
 void cik_init_sdma_functions(struct si_context *sctx);
 
 /* si_blit.c */
+enum si_blitter_op /* bitmask */
+{
+       SI_SAVE_TEXTURES      = 1,
+       SI_SAVE_FRAMEBUFFER   = 2,
+       SI_SAVE_FRAGMENT_STATE = 4,
+       SI_DISABLE_RENDER_COND = 8,
+};
+
+void si_blitter_begin(struct pipe_context *ctx, enum si_blitter_op op);
+void si_blitter_end(struct pipe_context *ctx);
 void si_init_blit_functions(struct si_context *sctx);
-void si_decompress_graphics_textures(struct si_context *sctx);
-void si_decompress_compute_textures(struct si_context *sctx);
+void si_decompress_textures(struct si_context *sctx, unsigned shader_mask);
 void si_resource_copy_region(struct pipe_context *ctx,
                             struct pipe_resource *dst,
                             unsigned dst_level,
@@ -398,6 +660,19 @@ void si_resource_copy_region(struct pipe_context *ctx,
                             struct pipe_resource *src,
                             unsigned src_level,
                             const struct pipe_box *src_box);
+void si_decompress_dcc(struct pipe_context *ctx, struct r600_texture *rtex);
+void si_blit_decompress_depth(struct pipe_context *ctx,
+                             struct r600_texture *texture,
+                             struct r600_texture *staging,
+                             unsigned first_level, unsigned last_level,
+                             unsigned first_layer, unsigned last_layer,
+                             unsigned first_sample, unsigned last_sample);
+
+/* si_clear.c */
+void vi_dcc_clear_level(struct si_context *sctx,
+                       struct r600_texture *rtex,
+                       unsigned level, unsigned clear_value);
+void si_init_clear_functions(struct si_context *sctx);
 
 /* si_cp_dma.c */
 #define SI_CPDMA_SKIP_CHECK_CS_SPACE   (1 << 0) /* don't call need_cs_space */
@@ -411,15 +686,30 @@ void si_resource_copy_region(struct pipe_context *ctx,
                           SI_CPDMA_SKIP_GFX_SYNC | \
                           SI_CPDMA_SKIP_BO_LIST_UPDATE)
 
+enum r600_coherency {
+       R600_COHERENCY_NONE, /* no cache flushes needed */
+       R600_COHERENCY_SHADER,
+       R600_COHERENCY_CB_META,
+};
+
+void si_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst,
+                    uint64_t offset, uint64_t size, unsigned value,
+                    enum r600_coherency coher);
 void si_copy_buffer(struct si_context *sctx,
                    struct pipe_resource *dst, struct pipe_resource *src,
                    uint64_t dst_offset, uint64_t src_offset, unsigned size,
                    unsigned user_flags);
 void cik_prefetch_TC_L2_async(struct si_context *sctx, struct pipe_resource *buf,
                              uint64_t offset, unsigned size);
+void cik_emit_prefetch_L2(struct si_context *sctx);
 void si_init_cp_dma_functions(struct si_context *sctx);
 
 /* si_debug.c */
+void si_destroy_saved_cs(struct si_saved_cs *scs);
+void si_auto_log_cs(void *data, struct u_log_context *log);
+void si_log_hw_flush(struct si_context *sctx);
+void si_log_draw_state(struct si_context *sctx, struct u_log_context *log);
+void si_log_compute_state(struct si_context *sctx, struct u_log_context *log);
 void si_init_debug_functions(struct si_context *sctx);
 void si_check_vm_faults(struct r600_common_context *ctx,
                        struct radeon_saved_cs *saved, enum ring_type ring);
@@ -428,11 +718,21 @@ bool si_replace_shader(unsigned num, struct ac_shader_binary *binary);
 /* si_dma.c */
 void si_init_dma_functions(struct si_context *sctx);
 
+/* si_fence.c */
+void si_init_fence_functions(struct si_context *ctx);
+void si_init_screen_fence_functions(struct si_screen *screen);
+struct pipe_fence_handle *si_create_fence(struct pipe_context *ctx,
+                                         struct tc_unflushed_batch_token *tc_token);
+
+/* si_get.c */
+const char *si_get_family_name(const struct si_screen *sscreen);
+void si_init_screen_get_functions(struct si_screen *sscreen);
+
 /* si_hw_context.c */
-void si_context_gfx_flush(void *context, unsigned flags,
-                         struct pipe_fence_handle **fence);
-void si_begin_new_cs(struct si_context *ctx);
-void si_need_cs_space(struct si_context *ctx);
+void si_flush_gfx_cs(void *context, unsigned flags,
+                    struct pipe_fence_handle **fence);
+void si_begin_new_gfx_cs(struct si_context *ctx);
+void si_need_gfx_cs_space(struct si_context *ctx);
 
 /* si_compute.c */
 void si_init_compute_functions(struct si_context *sctx);
@@ -440,6 +740,9 @@ void si_init_compute_functions(struct si_context *sctx);
 /* si_perfcounters.c */
 void si_init_perfcounters(struct si_screen *screen);
 
+/* si_test_dma.c */
+void si_test_dma(struct si_screen *sscreen);
+
 /* si_uvd.c */
 struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context,
                                               const struct pipe_video_codec *templ);
@@ -447,10 +750,28 @@ struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context,
 struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
                                                 const struct pipe_video_buffer *tmpl);
 
+/* si_viewport.c */
+void si_update_vs_viewport_state(struct si_context *ctx);
+void si_init_viewport_functions(struct si_context *ctx);
+
+
 /*
  * common helpers
  */
 
+static inline void
+si_context_add_resource_size(struct pipe_context *ctx, struct pipe_resource *r)
+{
+       struct r600_common_context *rctx = (struct r600_common_context *)ctx;
+       struct r600_resource *res = (struct r600_resource *)r;
+
+       if (res) {
+               /* Add memory usage for need_gfx_cs_space */
+               rctx->vram += res->vram_usage;
+               rctx->gtt += res->gart_usage;
+       }
+}
+
 static inline void
 si_invalidate_draw_sh_constants(struct si_context *sctx)
 {
@@ -485,26 +806,49 @@ si_mark_atom_dirty(struct si_context *sctx,
        si_set_atom_dirty(sctx, atom, true);
 }
 
-static inline struct tgsi_shader_info *si_get_vs_info(struct si_context *sctx)
+static inline struct si_shader_ctx_state *si_get_vs(struct si_context *sctx)
 {
        if (sctx->gs_shader.cso)
-               return &sctx->gs_shader.cso->info;
-       else if (sctx->tes_shader.cso)
-               return &sctx->tes_shader.cso->info;
-       else if (sctx->vs_shader.cso)
-               return &sctx->vs_shader.cso->info;
-       else
-               return NULL;
+               return &sctx->gs_shader;
+       if (sctx->tes_shader.cso)
+               return &sctx->tes_shader;
+
+       return &sctx->vs_shader;
+}
+
+static inline struct tgsi_shader_info *si_get_vs_info(struct si_context *sctx)
+{
+       struct si_shader_ctx_state *vs = si_get_vs(sctx);
+
+       return vs->cso ? &vs->cso->info : NULL;
 }
 
 static inline struct si_shader* si_get_vs_state(struct si_context *sctx)
 {
-       if (sctx->gs_shader.current)
+       if (sctx->gs_shader.cso)
                return sctx->gs_shader.cso->gs_copy_shader;
-       else if (sctx->tes_shader.current)
-               return sctx->tes_shader.current;
-       else
-               return sctx->vs_shader.current;
+
+       struct si_shader_ctx_state *vs = si_get_vs(sctx);
+       return vs->current ? vs->current : NULL;
+}
+
+static inline bool si_can_dump_shader(struct si_screen *sscreen,
+                                     unsigned processor)
+{
+       return sscreen->debug_flags & (1 << processor);
+}
+
+static inline bool si_extra_shader_checks(struct si_screen *sscreen,
+                                         unsigned processor)
+{
+       return (sscreen->debug_flags & DBG(CHECK_IR)) ||
+              si_can_dump_shader(sscreen, processor);
+}
+
+static inline bool si_get_strmout_en(struct si_context *sctx)
+{
+       return sctx->streamout.streamout_enabled ||
+              sctx->streamout.prims_gen_query_enabled;
 }
 
 static inline unsigned
@@ -518,8 +862,106 @@ si_optimal_tcc_alignment(struct si_context *sctx, unsigned upload_size)
         * If the upload size is greater, align it to the cache line size.
         */
        alignment = util_next_power_of_two(upload_size);
-       tcc_cache_line_size = sctx->screen->b.info.tcc_cache_line_size;
+       tcc_cache_line_size = sctx->screen->info.tcc_cache_line_size;
        return MIN2(alignment, tcc_cache_line_size);
 }
 
+static inline void
+si_saved_cs_reference(struct si_saved_cs **dst, struct si_saved_cs *src)
+{
+       if (pipe_reference(&(*dst)->reference, &src->reference))
+               si_destroy_saved_cs(*dst);
+
+       *dst = src;
+}
+
+static inline void
+si_make_CB_shader_coherent(struct si_context *sctx, unsigned num_samples,
+                          bool shaders_read_metadata)
+{
+       sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB |
+                        SI_CONTEXT_INV_VMEM_L1;
+
+       if (sctx->b.chip_class >= GFX9) {
+               /* Single-sample color is coherent with shaders on GFX9, but
+                * L2 metadata must be flushed if shaders read metadata.
+                * (DCC, CMASK).
+                */
+               if (num_samples >= 2)
+                       sctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2;
+               else if (shaders_read_metadata)
+                       sctx->b.flags |= SI_CONTEXT_INV_L2_METADATA;
+       } else {
+               /* SI-CI-VI */
+               sctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2;
+       }
+}
+
+static inline void
+si_make_DB_shader_coherent(struct si_context *sctx, unsigned num_samples,
+                          bool include_stencil, bool shaders_read_metadata)
+{
+       sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_DB |
+                        SI_CONTEXT_INV_VMEM_L1;
+
+       if (sctx->b.chip_class >= GFX9) {
+               /* Single-sample depth (not stencil) is coherent with shaders
+                * on GFX9, but L2 metadata must be flushed if shaders read
+                * metadata.
+                */
+               if (num_samples >= 2 || include_stencil)
+                       sctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2;
+               else if (shaders_read_metadata)
+                       sctx->b.flags |= SI_CONTEXT_INV_L2_METADATA;
+       } else {
+               /* SI-CI-VI */
+               sctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2;
+       }
+}
+
+static inline bool
+si_can_sample_zs(struct r600_texture *tex, bool stencil_sampler)
+{
+       return (stencil_sampler && tex->can_sample_s) ||
+              (!stencil_sampler && tex->can_sample_z);
+}
+
+static inline bool
+si_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;
+}
+
+static inline unsigned si_get_ps_iter_samples(struct si_context *sctx)
+{
+       if (sctx->ps_uses_fbfetch)
+               return sctx->framebuffer.nr_samples;
+
+       return sctx->ps_iter_samples;
+}
+
+static inline unsigned si_get_total_colormask(struct si_context *sctx)
+{
+       if (sctx->queued.named.rasterizer->rasterizer_discard)
+               return 0;
+
+       struct si_shader_selector *ps = sctx->ps_shader.cso;
+       unsigned colormask = sctx->framebuffer.colorbuf_enabled_4bit &
+                            sctx->queued.named.blend->cb_target_mask;
+
+       if (!ps->info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS])
+               colormask &= ps->colors_written_4bit;
+       else if (!ps->colors_written_4bit)
+               colormask = 0; /* color0 writes all cbufs, but it's not written */
+
+       return colormask;
+}
+
 #endif