radeonsi: remove open-coded PS_PARTIAL_FLUSH event
[mesa.git] / src / gallium / drivers / radeonsi / si_pipe.c
index d76f38350847b4affce18692b93a890eba71dc4e..2ef41ae73d5de213364369ba20ebc329c038302b 100644 (file)
@@ -44,9 +44,7 @@
 #include "pipebuffer/pb_buffer.h"
 #include "si_pipe.h"
 #include "radeon/radeon_uvd.h"
-#include "si.h"
 #include "sid.h"
-#include "si_resource.h"
 #include "si_pipe.h"
 #include "si_state.h"
 #include "../radeon/r600_cs.h"
@@ -67,10 +65,10 @@ void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
        }
 
        /* Disable render condition. */
-       if (sctx->current_render_cond) {
-               render_cond = sctx->current_render_cond;
-               render_cond_cond = sctx->current_render_cond_cond;
-               render_cond_mode = sctx->current_render_cond_mode;
+       if (sctx->b.current_render_cond) {
+               render_cond = sctx->b.current_render_cond;
+               render_cond_cond = sctx->b.current_render_cond_cond;
+               render_cond_mode = sctx->b.current_render_cond_mode;
                ctx->render_condition(ctx, NULL, FALSE, 0);
        }
 
@@ -132,20 +130,16 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
        if (sctx == NULL)
                return NULL;
 
-       if (!r600_common_context_init(&sctx->b, &sscreen->b))
-               goto fail;
-
-       sctx->b.b.screen = screen;
+       sctx->b.b.screen = screen; /* this must be set first */
        sctx->b.b.priv = priv;
        sctx->b.b.destroy = si_destroy_context;
        sctx->b.b.flush = si_flush_from_st;
+       sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
 
-       /* Easy accessing of screen/winsys. */
-       sctx->screen = sscreen;
+       if (!r600_common_context_init(&sctx->b, &sscreen->b))
+               goto fail;
 
        si_init_blit_functions(sctx);
-       si_init_query_functions(sctx);
-       si_init_context_resource_functions(sctx);
        si_init_compute_functions(sctx);
 
        if (sscreen->b.info.has_uvd) {
@@ -171,8 +165,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
        case SI:
        case CIK:
                si_init_state_functions(sctx);
-               LIST_INITHEAD(&sctx->active_nontimer_query_list);
-               sctx->max_db = 8;
                si_init_config(sctx);
                break;
        default:
@@ -194,7 +186,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
 
        /* these must be last */
        si_begin_new_cs(sctx);
-       si_get_backend_mask(sctx);
+       r600_query_init_backend_mask(&sctx->b); /* this emits commands and must be last */
 
        /* CIK cannot unbind a constant buffer (S_BUFFER_LOAD is buggy
         * with a NULL buffer). We need to use a dummy buffer instead. */
@@ -224,53 +216,6 @@ fail:
 /*
  * pipe_screen
  */
-static const char* si_get_vendor(struct pipe_screen* pscreen)
-{
-       return "X.Org";
-}
-
-const char *si_get_llvm_processor_name(enum radeon_family family)
-{
-       switch (family) {
-               case CHIP_TAHITI: return "tahiti";
-               case CHIP_PITCAIRN: return "pitcairn";
-               case CHIP_VERDE: return "verde";
-               case CHIP_OLAND: return "oland";
-#if HAVE_LLVM <= 0x0303
-               default: return "SI";
-#else
-               case CHIP_HAINAN: return "hainan";
-               case CHIP_BONAIRE: return "bonaire";
-               case CHIP_KABINI: return "kabini";
-               case CHIP_KAVERI: return "kaveri";
-               case CHIP_HAWAII: return "hawaii";
-               default: return "";
-#endif
-       }
-}
-
-static const char *si_get_family_name(enum radeon_family family)
-{
-       switch(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";
-       default: return "AMD unknown";
-       }
-}
-
-static const char* si_get_name(struct pipe_screen* pscreen)
-{
-       struct si_screen *sscreen = (struct si_screen *)pscreen;
-
-       return si_get_family_name(sscreen->b.family);
-}
 
 static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 {
@@ -315,6 +260,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_COMPUTE:
        case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
         case PIPE_CAP_TGSI_VS_LAYER:
+       case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
                return 1;
 
        case PIPE_CAP_TEXTURE_MULTISAMPLE:
@@ -347,7 +293,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_VERTEX_COLOR_CLAMPED:
        case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION:
        case PIPE_CAP_USER_VERTEX_BUFFERS:
-       case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
        case PIPE_CAP_CUBE_MAP_ARRAY:
                return 0;
 
@@ -396,28 +341,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        return 0;
 }
 
-static float si_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 16384.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 si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
 {
        switch(shader)
@@ -483,107 +406,6 @@ static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enu
        return 0;
 }
 
-static int si_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_MAX_LEVEL:
-               return vl_level_supported(screen, profile);
-       default:
-               return 0;
-       }
-}
-
-static int si_get_compute_param(struct pipe_screen *screen,
-        enum pipe_compute_cap param,
-        void *ret)
-{
-       struct si_screen *sscreen = (struct si_screen *)screen;
-       //TODO: select these params by asic
-       switch (param) {
-       case PIPE_COMPUTE_CAP_IR_TARGET: {
-               const char *gpu = si_get_llvm_processor_name(sscreen->b.family);
-               if (ret) {
-                       sprintf(ret, "%s-r600--", gpu);
-               }
-               return (8 + strlen(gpu)) * 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] = 1;
-               }
-               return 3 * sizeof(uint64_t) ;
-
-       case PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE:
-               if (ret) {
-                       uint64_t * block_size = ret;
-                       block_size[0] = 256;
-                       block_size[1] = 256;
-                       block_size[2] = 256;
-               }
-               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 = 256;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE:
-               if (ret) {
-                       uint64_t *max_global_size = ret;
-                       /* XXX: Not sure what to put here. */
-                       *max_global_size = 2000000000;
-               }
-               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_global_size;
-                       uint64_t *max_mem_alloc_size = ret;
-                       si_get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE, &max_global_size);
-                       *max_mem_alloc_size = max_global_size / 4;
-               }
-               return sizeof(uint64_t);
-       default:
-               fprintf(stderr, "unknown PIPE_COMPUTE_CAP %d\n", param);
-               return 0;
-       }
-}
-
 static void si_destroy_screen(struct pipe_screen* pscreen)
 {
        struct si_screen *sscreen = (struct si_screen *)pscreen;
@@ -594,25 +416,7 @@ static void si_destroy_screen(struct pipe_screen* pscreen)
        if (!radeon_winsys_unref(sscreen->b.ws))
                return;
 
-       r600_common_screen_cleanup(&sscreen->b);
-
-#if SI_TRACE_CS
-       if (sscreen->trace_bo) {
-               sscreen->ws->buffer_unmap(sscreen->trace_bo->cs_buf);
-               pipe_resource_reference((struct pipe_resource**)&sscreen->trace_bo, NULL);
-       }
-#endif
-
-       sscreen->b.ws->destroy(sscreen->b.ws);
-       FREE(sscreen);
-}
-
-static uint64_t si_get_timestamp(struct pipe_screen *screen)
-{
-       struct si_screen *sscreen = (struct si_screen*)screen;
-
-       return 1000000 * sscreen->b.ws->query_value(sscreen->b.ws, RADEON_TIMESTAMP) /
-               sscreen->b.info.r600_clock_crystal_freq;
+       r600_destroy_common_screen(&sscreen->b);
 }
 
 struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
@@ -622,27 +426,12 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
                return NULL;
        }
 
-       ws->query_info(ws, &sscreen->b.info);
-
        /* Set functions first. */
        sscreen->b.b.context_create = si_create_context;
        sscreen->b.b.destroy = si_destroy_screen;
-       sscreen->b.b.get_name = si_get_name;
-       sscreen->b.b.get_vendor = si_get_vendor;
        sscreen->b.b.get_param = si_get_param;
        sscreen->b.b.get_shader_param = si_get_shader_param;
-       sscreen->b.b.get_paramf = si_get_paramf;
-       sscreen->b.b.get_compute_param = si_get_compute_param;
-       sscreen->b.b.get_timestamp = si_get_timestamp;
        sscreen->b.b.is_format_supported = si_is_format_supported;
-       if (sscreen->b.info.has_uvd) {
-               sscreen->b.b.get_video_param = ruvd_get_video_param;
-               sscreen->b.b.is_video_format_supported = ruvd_is_format_supported;
-       } else {
-               sscreen->b.b.get_video_param = si_get_video_param;
-               sscreen->b.b.is_video_format_supported = vl_video_buffer_is_format_supported;
-       }
-       si_init_screen_resource_functions(&sscreen->b.b);
 
        if (!r600_common_screen_init(&sscreen->b, ws)) {
                FREE(sscreen);
@@ -655,20 +444,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
        if (debug_get_bool_option("RADEON_DUMP_SHADERS", FALSE))
                sscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS;
 
-#if SI_TRACE_CS
-       sscreen->cs_count = 0;
-       if (sscreen->info.drm_minor >= 28) {
-               sscreen->trace_bo = (struct r600_resource*)pipe_buffer_create(&sscreen->screen,
-                                                                               PIPE_BIND_CUSTOM,
-                                                                               PIPE_USAGE_STAGING,
-                                                                               4096);
-               if (sscreen->trace_bo) {
-                       sscreen->trace_ptr = sscreen->ws->buffer_map(sscreen->trace_bo->cs_buf, NULL,
-                                                                       PIPE_TRANSFER_UNSYNCHRONIZED);
-               }
-       }
-#endif
-
        /* Create the auxiliary context. This must be done last. */
        sscreen->b.aux_context = sscreen->b.b.context_create(&sscreen->b.b, NULL);