radeonsi: move PKT3_WRITE_DATA generation into a helper function

[mesa.git] / src / gallium / drivers / radeonsi / si_pipe.c

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 39bb192b1de336435a0efecf7655d68adaa4b6dd..4edb25494ea90f663d3a3fe6da8f28714fb332bf 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -501,7 +501,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        si_init_state_functions(sctx);
        si_init_shader_functions(sctx);
        si_init_viewport_functions(sctx);
-       si_init_ia_multi_vgt_param_table(sctx);
 
        if (sctx->chip_class >= CIK)
                cik_init_sdma_functions(sctx);
@@ -511,20 +510,13 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (sscreen->debug_flags & DBG(FORCE_DMA))
                sctx->b.resource_copy_region = sctx->dma_copy;
 
-       bool dst_stream_policy = SI_COMPUTE_DST_CACHE_POLICY != L2_LRU;
-       sctx->cs_clear_buffer = si_create_dma_compute_shader(&sctx->b,
-                                            SI_COMPUTE_CLEAR_DW_PER_THREAD,
-                                            dst_stream_policy, false);
-       sctx->cs_copy_buffer = si_create_dma_compute_shader(&sctx->b,
-                                            SI_COMPUTE_COPY_DW_PER_THREAD,
-                                            dst_stream_policy, true);
-
        sctx->blitter = util_blitter_create(&sctx->b);
        if (sctx->blitter == NULL)
                goto fail;
-       sctx->blitter->draw_rectangle = si_draw_rectangle;
        sctx->blitter->skip_viewport_restore = true;
 
+       si_init_draw_functions(sctx);
+
        sctx->sample_mask = 0xffff;
 
        if (sctx->chip_class >= GFX9) {
@@ -534,16 +526,8 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
                        goto fail;
 
                /* Initialize the memory. */
-               struct radeon_cmdbuf *cs = sctx->gfx_cs;
-               radeon_emit(cs, PKT3(PKT3_WRITE_DATA, 3, 0));
-               radeon_emit(cs, S_370_DST_SEL(V_370_MEMORY_SYNC) |
-                           S_370_WR_CONFIRM(1) |
-                           S_370_ENGINE_SEL(V_370_ME));
-               radeon_emit(cs, sctx->wait_mem_scratch->gpu_address);
-               radeon_emit(cs, sctx->wait_mem_scratch->gpu_address >> 32);
-               radeon_emit(cs, sctx->wait_mem_number);
-               radeon_add_to_buffer_list(sctx, cs, sctx->wait_mem_scratch,
-                                         RADEON_USAGE_WRITE, RADEON_PRIO_FENCE);
+               si_cp_write_data(sctx, sctx->wait_mem_scratch, 0, 4,
+                                V_370_MEM, V_370_ME, &sctx->wait_mem_number);
        }
 
        /* CIK cannot unbind a constant buffer (S_BUFFER_LOAD doesn't skip loads
@@ -705,7 +689,7 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
        mtx_destroy(&sscreen->shader_parts_mutex);
        si_destroy_shader_cache(sscreen);
 
-       si_perfcounters_destroy(sscreen);
+       si_destroy_perfcounters(sscreen);
        si_gpu_load_kill_thread(sscreen);
 
        mtx_destroy(&sscreen->gpu_load_mutex);
@@ -725,39 +709,6 @@ static void si_init_gs_info(struct si_screen *sscreen)
                                                        sscreen->info.family);
 }
 
-static void si_handle_env_var_force_family(struct si_screen *sscreen)
-{
-       const char *family = debug_get_option("SI_FORCE_FAMILY", NULL);
-       unsigned i;
-
-       if (!family)
-               return;
-
-       for (i = CHIP_TAHITI; i < CHIP_LAST; i++) {
-               if (!strcmp(family, ac_get_llvm_processor_name(i))) {
-                       /* Override family and chip_class. */
-                       sscreen->info.family = i;
-                       sscreen->info.name = "GCN-NOOP";
-
-                       if (i >= CHIP_VEGA10)
-                               sscreen->info.chip_class = GFX9;
-                       else if (i >= CHIP_TONGA)
-                               sscreen->info.chip_class = VI;
-                       else if (i >= CHIP_BONAIRE)
-                               sscreen->info.chip_class = CIK;
-                       else
-                               sscreen->info.chip_class = SI;
-
-                       /* Don't submit any IBs. */
-                       setenv("RADEON_NOOP", "1", 1);
-                       return;
-               }
-       }
-
-       fprintf(stderr, "radeonsi: Unknown family: %s\n", family);
-       exit(1);
-}
-
 static void si_test_vmfault(struct si_screen *sscreen)
 {
        struct pipe_context *ctx = sscreen->aux_context;
@@ -878,7 +829,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
 
        sscreen->ws = ws;
        ws->query_info(ws, &sscreen->info);
-       si_handle_env_var_force_family(sscreen);
 
        if (sscreen->info.chip_class >= GFX9) {
                sscreen->se_tile_repeat = 32 * sscreen->info.max_se;