radeonsi: remove r600_pipe_common::set_atom_dirty
[mesa.git] / src / gallium / drivers / radeon / r600_pipe_common.c
index f410b277c25d22fedb7beeb37a8b7e304a10b472..8344a557f058ee8fd5790cb3d1a63723c57f0051 100644 (file)
 
 #include "r600_pipe_common.h"
 #include "r600_cs.h"
-#include "tgsi/tgsi_parse.h"
-#include "util/list.h"
-#include "util/u_draw_quad.h"
 #include "util/u_memory.h"
-#include "util/u_format_s3tc.h"
 #include "util/u_upload_mgr.h"
-#include "util/os_time.h"
-#include "vl/vl_decoder.h"
-#include "vl/vl_video_buffer.h"
 #include "radeon/radeon_video.h"
-#include "amd/common/ac_llvm_util.h"
-#include "amd/common/sid.h"
-#include <inttypes.h>
-#include <sys/utsname.h>
-
-#include <llvm-c/TargetMachine.h>
-
-
-/*
- * shader binary helpers.
- */
-void si_radeon_shader_binary_init(struct ac_shader_binary *b)
-{
-       memset(b, 0, sizeof(*b));
-}
-
-void si_radeon_shader_binary_clean(struct ac_shader_binary *b)
-{
-       if (!b)
-               return;
-       FREE(b->code);
-       FREE(b->config);
-       FREE(b->rodata);
-       FREE(b->global_symbol_offsets);
-       FREE(b->relocs);
-       FREE(b->disasm_string);
-       FREE(b->llvm_ir_string);
-}
 
 /*
  * pipe_context
@@ -162,17 +127,14 @@ void si_gfx_write_event_eop(struct r600_common_context *ctx,
        }
 }
 
-unsigned si_gfx_write_fence_dwords(struct r600_common_screen *screen)
+unsigned si_gfx_write_fence_dwords(struct si_screen *screen)
 {
        unsigned dwords = 6;
 
-       if (screen->chip_class == CIK ||
-           screen->chip_class == VI)
+       if (screen->info.chip_class == CIK ||
+           screen->info.chip_class == VI)
                dwords *= 2;
 
-       if (!screen->info.has_virtual_memory)
-               dwords += 2;
-
        return dwords;
 }
 
@@ -224,7 +186,7 @@ void si_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
             (src &&
              ctx->ws->cs_is_buffer_referenced(ctx->gfx.cs, src->buf,
                                               RADEON_USAGE_WRITE))))
-               ctx->gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
+               si_flush_gfx_cs(ctx, PIPE_FLUSH_ASYNC, NULL);
 
        /* Flush if there's not enough space, or if the memory usage per IB
         * is too large.
@@ -242,7 +204,7 @@ void si_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
        if (!ctx->ws->cs_check_space(ctx->dma.cs, num_dw) ||
            ctx->dma.cs->used_vram + ctx->dma.cs->used_gart > 64 * 1024 * 1024 ||
            !radeon_cs_memory_below_limit(ctx->screen, ctx->dma.cs, vram, gtt)) {
-               ctx->dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
+               si_flush_dma_cs(ctx, PIPE_FLUSH_ASYNC, NULL);
                assert((num_dw + ctx->dma.cs->current.cdw) <= ctx->dma.cs->current.max_dw);
        }
 
@@ -257,51 +219,27 @@ void si_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
                                              RADEON_USAGE_WRITE)))
                r600_dma_emit_wait_idle(ctx);
 
-       /* If GPUVM is not supported, the CS checker needs 2 entries
-        * in the buffer list per packet, which has to be done manually.
-        */
-       if (ctx->screen->info.has_virtual_memory) {
-               if (dst)
-                       radeon_add_to_buffer_list(ctx, &ctx->dma, dst,
-                                                 RADEON_USAGE_WRITE,
-                                                 RADEON_PRIO_SDMA_BUFFER);
-               if (src)
-                       radeon_add_to_buffer_list(ctx, &ctx->dma, src,
-                                                 RADEON_USAGE_READ,
-                                                 RADEON_PRIO_SDMA_BUFFER);
+       if (dst) {
+               radeon_add_to_buffer_list(ctx, &ctx->dma, dst,
+                                         RADEON_USAGE_WRITE,
+                                         RADEON_PRIO_SDMA_BUFFER);
+       }
+       if (src) {
+               radeon_add_to_buffer_list(ctx, &ctx->dma, src,
+                                         RADEON_USAGE_READ,
+                                         RADEON_PRIO_SDMA_BUFFER);
        }
 
        /* this function is called before all DMA calls, so increment this. */
        ctx->num_dma_calls++;
 }
 
-static void r600_memory_barrier(struct pipe_context *ctx, unsigned flags)
-{
-}
-
-void si_preflush_suspend_features(struct r600_common_context *ctx)
-{
-       /* suspend queries */
-       if (!LIST_IS_EMPTY(&ctx->active_queries))
-               si_suspend_queries(ctx);
-}
-
-void si_postflush_resume_features(struct r600_common_context *ctx)
-{
-       /* resume queries */
-       if (!LIST_IS_EMPTY(&ctx->active_queries))
-               si_resume_queries(ctx);
-}
-
-static void r600_flush_dma_ring(void *ctx, unsigned flags,
-                               struct pipe_fence_handle **fence)
+void si_flush_dma_cs(void *ctx, unsigned flags, struct pipe_fence_handle **fence)
 {
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
        struct radeon_winsys_cs *cs = rctx->dma.cs;
        struct radeon_saved_cs saved;
-       bool check_vm =
-               (rctx->screen->debug_flags & DBG(CHECK_VM)) &&
-               rctx->check_vm_faults;
+       bool check_vm = (rctx->screen->debug_flags & DBG(CHECK_VM));
 
        if (!radeon_emitted(cs, 0)) {
                if (fence)
@@ -322,7 +260,7 @@ static void r600_flush_dma_ring(void *ctx, unsigned flags,
                 */
                rctx->ws->fence_wait(rctx->ws, rctx->last_sdma_fence, 800*1000*1000);
 
-               rctx->check_vm_faults(rctx, &saved, RING_DMA);
+               si_check_vm_faults(rctx, &saved, RING_DMA);
                si_clear_saved_cs(&saved);
        }
 }
@@ -439,12 +377,12 @@ static bool r600_resource_commit(struct pipe_context *pctx,
        if (radeon_emitted(ctx->gfx.cs, ctx->initial_gfx_cs_size) &&
            ctx->ws->cs_is_buffer_referenced(ctx->gfx.cs,
                                             res->buf, RADEON_USAGE_READWRITE)) {
-               ctx->gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
+               si_flush_gfx_cs(ctx, PIPE_FLUSH_ASYNC, NULL);
        }
        if (radeon_emitted(ctx->dma.cs, 0) &&
            ctx->ws->cs_is_buffer_referenced(ctx->dma.cs,
                                             res->buf, RADEON_USAGE_READWRITE)) {
-               ctx->dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
+               si_flush_dma_cs(ctx, PIPE_FLUSH_ASYNC, NULL);
        }
 
        ctx->ws->cs_sync_flush(ctx->dma.cs);
@@ -456,27 +394,20 @@ static bool r600_resource_commit(struct pipe_context *pctx,
 }
 
 bool si_common_context_init(struct r600_common_context *rctx,
-                           struct r600_common_screen *rscreen,
+                           struct si_screen *sscreen,
                            unsigned context_flags)
 {
-       slab_create_child(&rctx->pool_transfers, &rscreen->pool_transfers);
-       slab_create_child(&rctx->pool_transfers_unsync, &rscreen->pool_transfers);
+       slab_create_child(&rctx->pool_transfers, &sscreen->pool_transfers);
+       slab_create_child(&rctx->pool_transfers_unsync, &sscreen->pool_transfers);
 
-       rctx->screen = rscreen;
-       rctx->ws = rscreen->ws;
-       rctx->family = rscreen->family;
-       rctx->chip_class = rscreen->chip_class;
+       rctx->screen = sscreen;
+       rctx->ws = sscreen->ws;
+       rctx->family = sscreen->info.family;
+       rctx->chip_class = sscreen->info.chip_class;
 
-       rctx->b.invalidate_resource = si_invalidate_resource;
        rctx->b.resource_commit = r600_resource_commit;
-       rctx->b.transfer_map = u_transfer_map_vtbl;
-       rctx->b.transfer_flush_region = u_transfer_flush_region_vtbl;
-       rctx->b.transfer_unmap = u_transfer_unmap_vtbl;
-       rctx->b.texture_subdata = u_default_texture_subdata;
-       rctx->b.memory_barrier = r600_memory_barrier;
-       rctx->b.buffer_subdata = si_buffer_subdata;
-
-       if (rscreen->info.drm_major == 2 && rscreen->info.drm_minor >= 43) {
+
+       if (sscreen->info.drm_major == 2 && sscreen->info.drm_minor >= 43) {
                rctx->b.get_device_reset_status = r600_get_reset_status;
                rctx->gpu_reset_counter =
                        rctx->ws->query_value(rctx->ws,
@@ -492,37 +423,46 @@ bool si_common_context_init(struct r600_common_context *rctx,
            rctx->chip_class == VI ||
            rctx->chip_class == GFX9) {
                rctx->eop_bug_scratch = (struct r600_resource*)
-                       pipe_buffer_create(&rscreen->b, 0, PIPE_USAGE_DEFAULT,
-                                          16 * rscreen->info.num_render_backends);
+                       pipe_buffer_create(&sscreen->b, 0, PIPE_USAGE_DEFAULT,
+                                          16 * sscreen->info.num_render_backends);
                if (!rctx->eop_bug_scratch)
                        return false;
        }
 
        rctx->allocator_zeroed_memory =
-               u_suballocator_create(&rctx->b, rscreen->info.gart_page_size,
+               u_suballocator_create(&rctx->b, sscreen->info.gart_page_size,
                                      0, PIPE_USAGE_DEFAULT, 0, true);
        if (!rctx->allocator_zeroed_memory)
                return false;
 
        rctx->b.stream_uploader = u_upload_create(&rctx->b, 1024 * 1024,
-                                                 0, PIPE_USAGE_STREAM);
+                                                 0, PIPE_USAGE_STREAM,
+                                                 R600_RESOURCE_FLAG_READ_ONLY);
        if (!rctx->b.stream_uploader)
                return false;
 
        rctx->b.const_uploader = u_upload_create(&rctx->b, 128 * 1024,
-                                                0, PIPE_USAGE_DEFAULT);
+                                                0, PIPE_USAGE_DEFAULT,
+                                                R600_RESOURCE_FLAG_32BIT |
+                                                (sscreen->cpdma_prefetch_writes_memory ?
+                                                       0 : R600_RESOURCE_FLAG_READ_ONLY));
        if (!rctx->b.const_uploader)
                return false;
 
+       rctx->cached_gtt_allocator = u_upload_create(&rctx->b, 16 * 1024,
+                                                    0, PIPE_USAGE_STAGING, 0);
+       if (!rctx->cached_gtt_allocator)
+               return false;
+
        rctx->ctx = rctx->ws->ctx_create(rctx->ws);
        if (!rctx->ctx)
                return false;
 
-       if (rscreen->info.num_sdma_rings && !(rscreen->debug_flags & DBG(NO_ASYNC_DMA))) {
+       if (sscreen->info.num_sdma_rings && !(sscreen->debug_flags & DBG(NO_ASYNC_DMA))) {
                rctx->dma.cs = rctx->ws->cs_create(rctx->ctx, RING_DMA,
-                                                  r600_flush_dma_ring,
+                                                  si_flush_dma_cs,
                                                   rctx);
-               rctx->dma.flush = r600_flush_dma_ring;
+               rctx->dma.flush = si_flush_dma_cs;
        }
 
        return true;
@@ -558,6 +498,8 @@ void si_common_context_cleanup(struct r600_common_context *rctx)
                u_upload_destroy(rctx->b.stream_uploader);
        if (rctx->b.const_uploader)
                u_upload_destroy(rctx->b.const_uploader);
+       if (rctx->cached_gtt_allocator)
+               u_upload_destroy(rctx->cached_gtt_allocator);
 
        slab_destroy_child(&rctx->pool_transfers);
        slab_destroy_child(&rctx->pool_transfers_unsync);
@@ -570,606 +512,14 @@ void si_common_context_cleanup(struct r600_common_context *rctx)
        r600_resource_reference(&rctx->eop_bug_scratch, NULL);
 }
 
-/*
- * pipe_screen
- */
-
-static const struct debug_named_value common_debug_options[] = {
-       /* logging */
-       { "tex", DBG(TEX), "Print texture info" },
-       { "nir", DBG(NIR), "Enable experimental NIR shaders" },
-       { "compute", DBG(COMPUTE), "Print compute info" },
-       { "vm", DBG(VM), "Print virtual addresses when creating resources" },
-       { "info", DBG(INFO), "Print driver information" },
-
-       /* shaders */
-       { "vs", DBG(VS), "Print vertex shaders" },
-       { "gs", DBG(GS), "Print geometry shaders" },
-       { "ps", DBG(PS), "Print pixel shaders" },
-       { "cs", DBG(CS), "Print compute shaders" },
-       { "tcs", DBG(TCS), "Print tessellation control shaders" },
-       { "tes", DBG(TES), "Print tessellation evaluation shaders" },
-       { "noir", DBG(NO_IR), "Don't print the LLVM IR"},
-       { "notgsi", DBG(NO_TGSI), "Don't print the TGSI"},
-       { "noasm", DBG(NO_ASM), "Don't print disassembled shaders"},
-       { "preoptir", DBG(PREOPT_IR), "Print the LLVM IR before initial optimizations" },
-       { "checkir", DBG(CHECK_IR), "Enable additional sanity checks on shader IR" },
-       { "nooptvariant", DBG(NO_OPT_VARIANT), "Disable compiling optimized shader variants." },
-
-       { "testdma", DBG(TEST_DMA), "Invoke SDMA tests and exit." },
-       { "testvmfaultcp", DBG(TEST_VMFAULT_CP), "Invoke a CP VM fault test and exit." },
-       { "testvmfaultsdma", DBG(TEST_VMFAULT_SDMA), "Invoke a SDMA VM fault test and exit." },
-       { "testvmfaultshader", DBG(TEST_VMFAULT_SHADER), "Invoke a shader VM fault test and exit." },
-
-       /* features */
-       { "nodma", DBG(NO_ASYNC_DMA), "Disable asynchronous DMA" },
-       { "nohyperz", DBG(NO_HYPERZ), "Disable Hyper-Z" },
-       { "no2d", DBG(NO_2D_TILING), "Disable 2D tiling" },
-       { "notiling", DBG(NO_TILING), "Disable tiling" },
-       { "switch_on_eop", DBG(SWITCH_ON_EOP), "Program WD/IA to switch on end-of-packet." },
-       { "forcedma", DBG(FORCE_DMA), "Use asynchronous DMA for all operations when possible." },
-       { "precompile", DBG(PRECOMPILE), "Compile one shader variant at shader creation." },
-       { "nowc", DBG(NO_WC), "Disable GTT write combining" },
-       { "check_vm", DBG(CHECK_VM), "Check VM faults and dump debug info." },
-       { "nodcc", DBG(NO_DCC), "Disable DCC." },
-       { "nodccclear", DBG(NO_DCC_CLEAR), "Disable DCC fast clear." },
-       { "norbplus", DBG(NO_RB_PLUS), "Disable RB+." },
-       { "sisched", DBG(SI_SCHED), "Enable LLVM SI Machine Instruction Scheduler." },
-       { "mono", DBG(MONOLITHIC_SHADERS), "Use old-style monolithic shaders compiled on demand" },
-       { "unsafemath", DBG(UNSAFE_MATH), "Enable unsafe math shader optimizations" },
-       { "nodccfb", DBG(NO_DCC_FB), "Disable separate DCC on the main framebuffer" },
-       { "nodccmsaa", DBG(NO_DCC_MSAA), "Disable DCC for MSAA" },
-       { "dccmsaa", DBG(DCC_MSAA), "Enable DCC for MSAA" },
-       { "nodpbb", DBG(NO_DPBB), "Disable DPBB." },
-       { "nodfsm", DBG(NO_DFSM), "Disable DFSM." },
-       { "dpbb", DBG(DPBB), "Enable DPBB." },
-       { "dfsm", DBG(DFSM), "Enable DFSM." },
-       { "nooutoforder", DBG(NO_OUT_OF_ORDER), "Disable out-of-order rasterization" },
-       { "reserve_vmid", DBG(RESERVE_VMID), "Force VMID reservation per context." },
-
-       DEBUG_NAMED_VALUE_END /* must be last */
-};
-
-static const char* r600_get_vendor(struct pipe_screen* pscreen)
-{
-       return "X.Org";
-}
-
-static const char* r600_get_device_vendor(struct pipe_screen* pscreen)
-{
-       return "AMD";
-}
-
-static const char *r600_get_marketing_name(struct radeon_winsys *ws)
-{
-       if (!ws->get_chip_name)
-               return NULL;
-       return ws->get_chip_name(ws);
-}
-
-static const char *r600_get_family_name(const struct r600_common_screen *rscreen)
-{
-       switch (rscreen->info.family) {
-       case CHIP_TAHITI: return "AMD TAHITI";
-       case CHIP_PITCAIRN: return "AMD PITCAIRN";
-       case CHIP_VERDE: return "AMD CAPE VERDE";
-       case CHIP_OLAND: return "AMD OLAND";
-       case CHIP_HAINAN: return "AMD HAINAN";
-       case CHIP_BONAIRE: return "AMD BONAIRE";
-       case CHIP_KAVERI: return "AMD KAVERI";
-       case CHIP_KABINI: return "AMD KABINI";
-       case CHIP_HAWAII: return "AMD HAWAII";
-       case CHIP_MULLINS: return "AMD MULLINS";
-       case CHIP_TONGA: return "AMD TONGA";
-       case CHIP_ICELAND: return "AMD ICELAND";
-       case CHIP_CARRIZO: return "AMD CARRIZO";
-       case CHIP_FIJI: return "AMD FIJI";
-       case CHIP_POLARIS10: return "AMD POLARIS10";
-       case CHIP_POLARIS11: return "AMD POLARIS11";
-       case CHIP_POLARIS12: return "AMD POLARIS12";
-       case CHIP_STONEY: return "AMD STONEY";
-       case CHIP_VEGA10: return "AMD VEGA10";
-       case CHIP_RAVEN: return "AMD RAVEN";
-       default: return "AMD unknown";
-       }
-}
-
-static void r600_disk_cache_create(struct r600_common_screen *rscreen)
-{
-       /* Don't use the cache if shader dumping is enabled. */
-       if (rscreen->debug_flags & DBG_ALL_SHADERS)
-               return;
-
-       /* TODO: remove this once gallium supports a nir cache */
-       if (rscreen->debug_flags & DBG(NIR))
-               return;
-
-       uint32_t mesa_timestamp;
-       if (disk_cache_get_function_timestamp(r600_disk_cache_create,
-                                             &mesa_timestamp)) {
-               char *timestamp_str;
-               int res = -1;
-               uint32_t llvm_timestamp;
-
-               if (disk_cache_get_function_timestamp(LLVMInitializeAMDGPUTargetInfo,
-                                                     &llvm_timestamp)) {
-                       res = asprintf(&timestamp_str, "%u_%u",
-                                      mesa_timestamp, llvm_timestamp);
-               }
-
-               if (res != -1) {
-                       /* These flags affect shader compilation. */
-                       uint64_t shader_debug_flags =
-                               rscreen->debug_flags &
-                               (DBG(FS_CORRECT_DERIVS_AFTER_KILL) |
-                                DBG(SI_SCHED) |
-                                DBG(UNSAFE_MATH));
-
-                       rscreen->disk_shader_cache =
-                               disk_cache_create(r600_get_family_name(rscreen),
-                                                 timestamp_str,
-                                                 shader_debug_flags);
-                       free(timestamp_str);
-               }
-       }
-}
-
-static struct disk_cache *r600_get_disk_shader_cache(struct pipe_screen *pscreen)
-{
-       struct r600_common_screen *rscreen = (struct r600_common_screen*)pscreen;
-       return rscreen->disk_shader_cache;
-}
-
-static const char* r600_get_name(struct pipe_screen* pscreen)
-{
-       struct r600_common_screen *rscreen = (struct r600_common_screen*)pscreen;
-
-       return rscreen->renderer_string;
-}
-
-static float r600_get_paramf(struct pipe_screen* pscreen,
-                            enum pipe_capf param)
-{
-       switch (param) {
-       case PIPE_CAPF_MAX_LINE_WIDTH:
-       case PIPE_CAPF_MAX_LINE_WIDTH_AA:
-       case PIPE_CAPF_MAX_POINT_WIDTH:
-       case PIPE_CAPF_MAX_POINT_WIDTH_AA:
-               return 8192.0f;
-       case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
-               return 16.0f;
-       case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
-               return 16.0f;
-       case PIPE_CAPF_GUARD_BAND_LEFT:
-       case PIPE_CAPF_GUARD_BAND_TOP:
-       case PIPE_CAPF_GUARD_BAND_RIGHT:
-       case PIPE_CAPF_GUARD_BAND_BOTTOM:
-               return 0.0f;
-       }
-       return 0.0f;
-}
-
-static int r600_get_video_param(struct pipe_screen *screen,
-                               enum pipe_video_profile profile,
-                               enum pipe_video_entrypoint entrypoint,
-                               enum pipe_video_cap param)
-{
-       switch (param) {
-       case PIPE_VIDEO_CAP_SUPPORTED:
-               return vl_profile_supported(screen, profile, entrypoint);
-       case PIPE_VIDEO_CAP_NPOT_TEXTURES:
-               return 1;
-       case PIPE_VIDEO_CAP_MAX_WIDTH:
-       case PIPE_VIDEO_CAP_MAX_HEIGHT:
-               return vl_video_buffer_max_size(screen);
-       case PIPE_VIDEO_CAP_PREFERED_FORMAT:
-               return PIPE_FORMAT_NV12;
-       case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
-               return false;
-       case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
-               return false;
-       case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
-               return true;
-       case PIPE_VIDEO_CAP_MAX_LEVEL:
-               return vl_level_supported(screen, profile);
-       default:
-               return 0;
-       }
-}
-
-static unsigned get_max_threads_per_block(struct r600_common_screen *screen,
-                                         enum pipe_shader_ir ir_type)
-{
-       if (ir_type != PIPE_SHADER_IR_TGSI)
-               return 256;
-
-       /* Only 16 waves per thread-group on gfx9. */
-       if (screen->chip_class >= GFX9)
-               return 1024;
-
-       /* Up to 40 waves per thread-group on GCN < gfx9. Expose a nice
-        * round number.
-        */
-       return 2048;
-}
-
-static int r600_get_compute_param(struct pipe_screen *screen,
-        enum pipe_shader_ir ir_type,
-        enum pipe_compute_cap param,
-        void *ret)
-{
-       struct r600_common_screen *rscreen = (struct r600_common_screen *)screen;
-
-       //TODO: select these params by asic
-       switch (param) {
-       case PIPE_COMPUTE_CAP_IR_TARGET: {
-               const char *gpu;
-               const char *triple;
-
-               if (HAVE_LLVM < 0x0400)
-                       triple = "amdgcn--";
-               else
-                       triple = "amdgcn-mesa-mesa3d";
-
-               gpu = ac_get_llvm_processor_name(rscreen->family);
-               if (ret) {
-                       sprintf(ret, "%s-%s", gpu, triple);
-               }
-               /* +2 for dash and terminating NIL byte */
-               return (strlen(triple) + strlen(gpu) + 2) * sizeof(char);
-       }
-       case PIPE_COMPUTE_CAP_GRID_DIMENSION:
-               if (ret) {
-                       uint64_t *grid_dimension = ret;
-                       grid_dimension[0] = 3;
-               }
-               return 1 * sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_GRID_SIZE:
-               if (ret) {
-                       uint64_t *grid_size = ret;
-                       grid_size[0] = 65535;
-                       grid_size[1] = 65535;
-                       grid_size[2] = 65535;
-               }
-               return 3 * sizeof(uint64_t) ;
-
-       case PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE:
-               if (ret) {
-                       uint64_t *block_size = ret;
-                       unsigned threads_per_block = get_max_threads_per_block(rscreen, ir_type);
-                       block_size[0] = threads_per_block;
-                       block_size[1] = threads_per_block;
-                       block_size[2] = threads_per_block;
-               }
-               return 3 * sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK:
-               if (ret) {
-                       uint64_t *max_threads_per_block = ret;
-                       *max_threads_per_block = get_max_threads_per_block(rscreen, ir_type);
-               }
-               return sizeof(uint64_t);
-       case PIPE_COMPUTE_CAP_ADDRESS_BITS:
-               if (ret) {
-                       uint32_t *address_bits = ret;
-                       address_bits[0] = 64;
-               }
-               return 1 * sizeof(uint32_t);
-
-       case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE:
-               if (ret) {
-                       uint64_t *max_global_size = ret;
-                       uint64_t max_mem_alloc_size;
-
-                       r600_get_compute_param(screen, ir_type,
-                               PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE,
-                               &max_mem_alloc_size);
-
-                       /* In OpenCL, the MAX_MEM_ALLOC_SIZE must be at least
-                        * 1/4 of the MAX_GLOBAL_SIZE.  Since the
-                        * MAX_MEM_ALLOC_SIZE is fixed for older kernels,
-                        * make sure we never report more than
-                        * 4 * MAX_MEM_ALLOC_SIZE.
-                        */
-                       *max_global_size = MIN2(4 * max_mem_alloc_size,
-                                               MAX2(rscreen->info.gart_size,
-                                                    rscreen->info.vram_size));
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE:
-               if (ret) {
-                       uint64_t *max_local_size = ret;
-                       /* Value reported by the closed source driver. */
-                       *max_local_size = 32768;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_INPUT_SIZE:
-               if (ret) {
-                       uint64_t *max_input_size = ret;
-                       /* Value reported by the closed source driver. */
-                       *max_input_size = 1024;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE:
-               if (ret) {
-                       uint64_t *max_mem_alloc_size = ret;
-
-                       *max_mem_alloc_size = rscreen->info.max_alloc_size;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_CLOCK_FREQUENCY:
-               if (ret) {
-                       uint32_t *max_clock_frequency = ret;
-                       *max_clock_frequency = rscreen->info.max_shader_clock;
-               }
-               return sizeof(uint32_t);
-
-       case PIPE_COMPUTE_CAP_MAX_COMPUTE_UNITS:
-               if (ret) {
-                       uint32_t *max_compute_units = ret;
-                       *max_compute_units = rscreen->info.num_good_compute_units;
-               }
-               return sizeof(uint32_t);
-
-       case PIPE_COMPUTE_CAP_IMAGES_SUPPORTED:
-               if (ret) {
-                       uint32_t *images_supported = ret;
-                       *images_supported = 0;
-               }
-               return sizeof(uint32_t);
-       case PIPE_COMPUTE_CAP_MAX_PRIVATE_SIZE:
-               break; /* unused */
-       case PIPE_COMPUTE_CAP_SUBGROUP_SIZE:
-               if (ret) {
-                       uint32_t *subgroup_size = ret;
-                       *subgroup_size = 64;
-               }
-               return sizeof(uint32_t);
-       case PIPE_COMPUTE_CAP_MAX_VARIABLE_THREADS_PER_BLOCK:
-               if (ret) {
-                       uint64_t *max_variable_threads_per_block = ret;
-                       if (ir_type == PIPE_SHADER_IR_TGSI)
-                               *max_variable_threads_per_block = SI_MAX_VARIABLE_THREADS_PER_BLOCK;
-                       else
-                               *max_variable_threads_per_block = 0;
-               }
-               return sizeof(uint64_t);
-       }
-
-        fprintf(stderr, "unknown PIPE_COMPUTE_CAP %d\n", param);
-        return 0;
-}
-
-static uint64_t r600_get_timestamp(struct pipe_screen *screen)
-{
-       struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
-
-       return 1000000 * rscreen->ws->query_value(rscreen->ws, RADEON_TIMESTAMP) /
-                       rscreen->info.clock_crystal_freq;
-}
-
-static void r600_query_memory_info(struct pipe_screen *screen,
-                                  struct pipe_memory_info *info)
-{
-       struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
-       struct radeon_winsys *ws = rscreen->ws;
-       unsigned vram_usage, gtt_usage;
-
-       info->total_device_memory = rscreen->info.vram_size / 1024;
-       info->total_staging_memory = rscreen->info.gart_size / 1024;
-
-       /* The real TTM memory usage is somewhat random, because:
-        *
-        * 1) TTM delays freeing memory, because it can only free it after
-        *    fences expire.
-        *
-        * 2) The memory usage can be really low if big VRAM evictions are
-        *    taking place, but the real usage is well above the size of VRAM.
-        *
-        * Instead, return statistics of this process.
-        */
-       vram_usage = ws->query_value(ws, RADEON_REQUESTED_VRAM_MEMORY) / 1024;
-       gtt_usage =  ws->query_value(ws, RADEON_REQUESTED_GTT_MEMORY) / 1024;
-
-       info->avail_device_memory =
-               vram_usage <= info->total_device_memory ?
-                               info->total_device_memory - vram_usage : 0;
-       info->avail_staging_memory =
-               gtt_usage <= info->total_staging_memory ?
-                               info->total_staging_memory - gtt_usage : 0;
-
-       info->device_memory_evicted =
-               ws->query_value(ws, RADEON_NUM_BYTES_MOVED) / 1024;
-
-       if (rscreen->info.drm_major == 3 && rscreen->info.drm_minor >= 4)
-               info->nr_device_memory_evictions =
-                       ws->query_value(ws, RADEON_NUM_EVICTIONS);
-       else
-               /* Just return the number of evicted 64KB pages. */
-               info->nr_device_memory_evictions = info->device_memory_evicted / 64;
-}
-
-struct pipe_resource *si_resource_create_common(struct pipe_screen *screen,
-                                               const struct pipe_resource *templ)
-{
-       if (templ->target == PIPE_BUFFER) {
-               return si_buffer_create(screen, templ, 256);
-       } else {
-               return si_texture_create(screen, templ);
-       }
-}
-
-bool si_common_screen_init(struct r600_common_screen *rscreen,
-                          struct radeon_winsys *ws)
-{
-       char family_name[32] = {}, llvm_string[32] = {}, kernel_version[128] = {};
-       struct utsname uname_data;
-       const char *chip_name;
-
-       ws->query_info(ws, &rscreen->info);
-       rscreen->ws = ws;
-
-       if ((chip_name = r600_get_marketing_name(ws)))
-               snprintf(family_name, sizeof(family_name), "%s / ",
-                        r600_get_family_name(rscreen) + 4);
-       else
-               chip_name = r600_get_family_name(rscreen);
-
-       if (uname(&uname_data) == 0)
-               snprintf(kernel_version, sizeof(kernel_version),
-                        " / %s", uname_data.release);
-
-       if (HAVE_LLVM > 0) {
-               snprintf(llvm_string, sizeof(llvm_string),
-                        ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
-                        HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
-       }
-
-       snprintf(rscreen->renderer_string, sizeof(rscreen->renderer_string),
-                "%s (%sDRM %i.%i.%i%s%s)",
-                chip_name, family_name, rscreen->info.drm_major,
-                rscreen->info.drm_minor, rscreen->info.drm_patchlevel,
-                kernel_version, llvm_string);
-
-       rscreen->b.get_name = r600_get_name;
-       rscreen->b.get_vendor = r600_get_vendor;
-       rscreen->b.get_device_vendor = r600_get_device_vendor;
-       rscreen->b.get_disk_shader_cache = r600_get_disk_shader_cache;
-       rscreen->b.get_compute_param = r600_get_compute_param;
-       rscreen->b.get_paramf = r600_get_paramf;
-       rscreen->b.get_timestamp = r600_get_timestamp;
-       rscreen->b.resource_destroy = u_resource_destroy_vtbl;
-       rscreen->b.resource_from_user_memory = si_buffer_from_user_memory;
-       rscreen->b.query_memory_info = r600_query_memory_info;
-
-       if (rscreen->info.has_hw_decode) {
-               rscreen->b.get_video_param = si_vid_get_video_param;
-               rscreen->b.is_video_format_supported = si_vid_is_format_supported;
-       } else {
-               rscreen->b.get_video_param = r600_get_video_param;
-               rscreen->b.is_video_format_supported = vl_video_buffer_is_format_supported;
-       }
-
-       si_init_screen_texture_functions(rscreen);
-       si_init_screen_query_functions(rscreen);
-
-       rscreen->family = rscreen->info.family;
-       rscreen->chip_class = rscreen->info.chip_class;
-       rscreen->debug_flags |= debug_get_flags_option("R600_DEBUG", common_debug_options, 0);
-       rscreen->has_rbplus = false;
-       rscreen->rbplus_allowed = false;
-
-       r600_disk_cache_create(rscreen);
-
-       slab_create_parent(&rscreen->pool_transfers, sizeof(struct r600_transfer), 64);
-
-       rscreen->force_aniso = MIN2(16, debug_get_num_option("R600_TEX_ANISO", -1));
-       if (rscreen->force_aniso >= 0) {
-               printf("radeon: Forcing anisotropy filter to %ix\n",
-                      /* round down to a power of two */
-                      1 << util_logbase2(rscreen->force_aniso));
-       }
-
-       (void) mtx_init(&rscreen->aux_context_lock, mtx_plain);
-       (void) mtx_init(&rscreen->gpu_load_mutex, mtx_plain);
-
-       if (rscreen->debug_flags & DBG(INFO)) {
-               printf("pci (domain:bus:dev.func): %04x:%02x:%02x.%x\n",
-                      rscreen->info.pci_domain, rscreen->info.pci_bus,
-                      rscreen->info.pci_dev, rscreen->info.pci_func);
-               printf("pci_id = 0x%x\n", rscreen->info.pci_id);
-               printf("family = %i (%s)\n", rscreen->info.family,
-                      r600_get_family_name(rscreen));
-               printf("chip_class = %i\n", rscreen->info.chip_class);
-               printf("pte_fragment_size = %u\n", rscreen->info.pte_fragment_size);
-               printf("gart_page_size = %u\n", rscreen->info.gart_page_size);
-               printf("gart_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.gart_size, 1024*1024));
-               printf("vram_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.vram_size, 1024*1024));
-               printf("vram_vis_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.vram_vis_size, 1024*1024));
-               printf("max_alloc_size = %i MB\n",
-                      (int)DIV_ROUND_UP(rscreen->info.max_alloc_size, 1024*1024));
-               printf("min_alloc_size = %u\n", rscreen->info.min_alloc_size);
-               printf("has_dedicated_vram = %u\n", rscreen->info.has_dedicated_vram);
-               printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory);
-               printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2);
-               printf("has_hw_decode = %u\n", rscreen->info.has_hw_decode);
-               printf("num_sdma_rings = %i\n", rscreen->info.num_sdma_rings);
-               printf("num_compute_rings = %u\n", rscreen->info.num_compute_rings);
-               printf("uvd_fw_version = %u\n", rscreen->info.uvd_fw_version);
-               printf("vce_fw_version = %u\n", rscreen->info.vce_fw_version);
-               printf("me_fw_version = %i\n", rscreen->info.me_fw_version);
-               printf("me_fw_feature = %i\n", rscreen->info.me_fw_feature);
-               printf("pfp_fw_version = %i\n", rscreen->info.pfp_fw_version);
-               printf("pfp_fw_feature = %i\n", rscreen->info.pfp_fw_feature);
-               printf("ce_fw_version = %i\n", rscreen->info.ce_fw_version);
-               printf("ce_fw_feature = %i\n", rscreen->info.ce_fw_feature);
-               printf("vce_harvest_config = %i\n", rscreen->info.vce_harvest_config);
-               printf("clock_crystal_freq = %i\n", rscreen->info.clock_crystal_freq);
-               printf("tcc_cache_line_size = %u\n", rscreen->info.tcc_cache_line_size);
-               printf("drm = %i.%i.%i\n", rscreen->info.drm_major,
-                      rscreen->info.drm_minor, rscreen->info.drm_patchlevel);
-               printf("has_userptr = %i\n", rscreen->info.has_userptr);
-               printf("has_syncobj = %u\n", rscreen->info.has_syncobj);
-               printf("has_sync_file = %u\n", rscreen->info.has_sync_file);
-
-               printf("r600_max_quad_pipes = %i\n", rscreen->info.r600_max_quad_pipes);
-               printf("max_shader_clock = %i\n", rscreen->info.max_shader_clock);
-               printf("num_good_compute_units = %i\n", rscreen->info.num_good_compute_units);
-               printf("max_se = %i\n", rscreen->info.max_se);
-               printf("max_sh_per_se = %i\n", rscreen->info.max_sh_per_se);
-
-               printf("r600_gb_backend_map = %i\n", rscreen->info.r600_gb_backend_map);
-               printf("r600_gb_backend_map_valid = %i\n", rscreen->info.r600_gb_backend_map_valid);
-               printf("r600_num_banks = %i\n", rscreen->info.r600_num_banks);
-               printf("num_render_backends = %i\n", rscreen->info.num_render_backends);
-               printf("num_tile_pipes = %i\n", rscreen->info.num_tile_pipes);
-               printf("pipe_interleave_bytes = %i\n", rscreen->info.pipe_interleave_bytes);
-               printf("enabled_rb_mask = 0x%x\n", rscreen->info.enabled_rb_mask);
-               printf("max_alignment = %u\n", (unsigned)rscreen->info.max_alignment);
-       }
-       return true;
-}
-
-void si_destroy_common_screen(struct r600_common_screen *rscreen)
-{
-       si_perfcounters_destroy(rscreen);
-       si_gpu_load_kill_thread(rscreen);
-
-       mtx_destroy(&rscreen->gpu_load_mutex);
-       mtx_destroy(&rscreen->aux_context_lock);
-       rscreen->aux_context->destroy(rscreen->aux_context);
-
-       slab_destroy_parent(&rscreen->pool_transfers);
-
-       disk_cache_destroy(rscreen->disk_shader_cache);
-       rscreen->ws->destroy(rscreen->ws);
-       FREE(rscreen);
-}
-
-bool si_can_dump_shader(struct r600_common_screen *rscreen,
-                       unsigned processor)
-{
-       return rscreen->debug_flags & (1 << processor);
-}
-
-bool si_extra_shader_checks(struct r600_common_screen *rscreen, unsigned processor)
-{
-       return (rscreen->debug_flags & DBG(CHECK_IR)) ||
-              si_can_dump_shader(rscreen, processor);
-}
 
-void si_screen_clear_buffer(struct r600_common_screen *rscreen, struct pipe_resource *dst,
+void si_screen_clear_buffer(struct si_screen *sscreen, struct pipe_resource *dst,
                            uint64_t offset, uint64_t size, unsigned value)
 {
-       struct r600_common_context *rctx = (struct r600_common_context*)rscreen->aux_context;
+       struct r600_common_context *rctx = (struct r600_common_context*)sscreen->aux_context;
 
-       mtx_lock(&rscreen->aux_context_lock);
+       mtx_lock(&sscreen->aux_context_lock);
        rctx->dma_clear_buffer(&rctx->b, dst, offset, size, value);
-       rscreen->aux_context->flush(rscreen->aux_context, NULL, 0);
-       mtx_unlock(&rscreen->aux_context_lock);
+       sscreen->aux_context->flush(sscreen->aux_context, NULL, 0);
+       mtx_unlock(&sscreen->aux_context_lock);
 }