freedreno: proper locking for iterating dependent batches

[mesa.git] / src / gallium / drivers / radeon / r600_query.h

diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h
index ca27be5c6ea5d7a5448e180b611805b755e16b88..db86dc14e5aa1c488bbfb4ab9800d5fcdbbb3a0d 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -19,10 +19,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * Authors:
- *  Nicolai Hähnle <nicolai.haehnle@amd.com>
- *
  */
 
 #ifndef R600_QUERY_H
@@ -35,13 +31,14 @@ struct pipe_query;
 struct pipe_resource;
 
 struct r600_common_context;
-struct r600_common_screen;
+struct si_screen;
 struct r600_query;
 struct r600_query_hw;
 struct r600_resource;
 
 enum {
        R600_QUERY_DRAW_CALLS = PIPE_QUERY_DRIVER_SPECIFIC,
+       R600_QUERY_DECOMPRESS_CALLS,
        R600_QUERY_MRT_DRAW_CALLS,
        R600_QUERY_PRIM_RESTART_CALLS,
        R600_QUERY_SPILL_DRAW_CALLS,
@@ -71,6 +68,7 @@ enum {
        R600_QUERY_NUM_GFX_IBS,
        R600_QUERY_NUM_SDMA_IBS,
        R600_QUERY_GFX_BO_LIST_SIZE,
+       R600_QUERY_GFX_IB_SIZE,
        R600_QUERY_NUM_BYTES_MOVED,
        R600_QUERY_NUM_EVICTIONS,
        R600_QUERY_NUM_VRAM_CPU_PAGE_FAULTS,
@@ -101,7 +99,6 @@ enum {
        R600_QUERY_GPU_SURF_SYNC_BUSY,
        R600_QUERY_GPU_CP_DMA_BUSY,
        R600_QUERY_GPU_SCRATCH_RAM_BUSY,
-       R600_QUERY_GPU_CE_BUSY,
        R600_QUERY_NUM_COMPILATIONS,
        R600_QUERY_NUM_SHADERS_CREATED,
        R600_QUERY_BACK_BUFFER_PS_DRAW_RATIO,
@@ -121,7 +118,7 @@ enum {
 };
 
 struct r600_query_ops {
-       void (*destroy)(struct r600_common_screen *, struct r600_query *);
+       void (*destroy)(struct si_screen *, struct r600_query *);
        bool (*begin)(struct r600_common_context *, struct r600_query *);
        bool (*end)(struct r600_common_context *, struct r600_query *);
        bool (*get_result)(struct r600_common_context *,
@@ -151,7 +148,7 @@ enum {
 };
 
 struct r600_query_hw_ops {
-       bool (*prepare_buffer)(struct r600_common_screen *,
+       bool (*prepare_buffer)(struct si_screen *,
                               struct r600_query_hw *,
                               struct r600_resource *);
        void (*emit_start)(struct r600_common_context *,
@@ -161,7 +158,7 @@ struct r600_query_hw_ops {
                          struct r600_query_hw *,
                          struct r600_resource *buffer, uint64_t va);
        void (*clear_result)(struct r600_query_hw *, union pipe_query_result *);
-       void (*add_result)(struct r600_common_screen *screen,
+       void (*add_result)(struct si_screen *screen,
                           struct r600_query_hw *, void *buffer,
                           union pipe_query_result *result);
 };
@@ -200,18 +197,18 @@ struct r600_query_hw {
        unsigned workaround_offset;
 };
 
-bool r600_query_hw_init(struct r600_common_screen *rscreen,
-                       struct r600_query_hw *query);
-void r600_query_hw_destroy(struct r600_common_screen *rscreen,
-                          struct r600_query *rquery);
-bool r600_query_hw_begin(struct r600_common_context *rctx,
+bool si_query_hw_init(struct si_screen *sscreen,
+                     struct r600_query_hw *query);
+void si_query_hw_destroy(struct si_screen *sscreen,
                         struct r600_query *rquery);
-bool r600_query_hw_end(struct r600_common_context *rctx,
+bool si_query_hw_begin(struct r600_common_context *rctx,
                       struct r600_query *rquery);
-bool r600_query_hw_get_result(struct r600_common_context *rctx,
-                             struct r600_query *rquery,
-                             bool wait,
-                             union pipe_query_result *result);
+bool si_query_hw_end(struct r600_common_context *rctx,
+                    struct r600_query *rquery);
+bool si_query_hw_get_result(struct r600_common_context *rctx,
+                           struct r600_query *rquery,
+                           bool wait,
+                           union pipe_query_result *result);
 
 /* Performance counters */
 enum {
@@ -291,32 +288,32 @@ struct r600_perfcounters {
                          unsigned count, unsigned *selectors,
                          struct r600_resource *buffer, uint64_t va);
 
-       void (*cleanup)(struct r600_common_screen *);
+       void (*cleanup)(struct si_screen *);
 
        bool separate_se;
        bool separate_instance;
 };
 
-struct pipe_query *r600_create_batch_query(struct pipe_context *ctx,
-                                          unsigned num_queries,
-                                          unsigned *query_types);
-
-int r600_get_perfcounter_info(struct r600_common_screen *,
-                             unsigned index,
-                             struct pipe_driver_query_info *info);
-int r600_get_perfcounter_group_info(struct r600_common_screen *,
-                                   unsigned index,
-                                   struct pipe_driver_query_group_info *info);
-
-bool r600_perfcounters_init(struct r600_perfcounters *, unsigned num_blocks);
-void r600_perfcounters_add_block(struct r600_common_screen *,
-                                struct r600_perfcounters *,
-                                const char *name, unsigned flags,
-                                unsigned counters, unsigned selectors,
-                                unsigned instances, void *data);
-void r600_perfcounters_do_destroy(struct r600_perfcounters *);
-void r600_query_hw_reset_buffers(struct r600_common_context *rctx,
-                                struct r600_query_hw *query);
+struct pipe_query *si_create_batch_query(struct pipe_context *ctx,
+                                        unsigned num_queries,
+                                        unsigned *query_types);
+
+int si_get_perfcounter_info(struct si_screen *,
+                           unsigned index,
+                           struct pipe_driver_query_info *info);
+int si_get_perfcounter_group_info(struct si_screen *,
+                                 unsigned index,
+                                 struct pipe_driver_query_group_info *info);
+
+bool si_perfcounters_init(struct r600_perfcounters *, unsigned num_blocks);
+void si_perfcounters_add_block(struct si_screen *,
+                              struct r600_perfcounters *,
+                              const char *name, unsigned flags,
+                              unsigned counters, unsigned selectors,
+                              unsigned instances, void *data);
+void si_perfcounters_do_destroy(struct r600_perfcounters *);
+void si_query_hw_reset_buffers(struct r600_common_context *rctx,
+                              struct r600_query_hw *query);
 
 struct r600_qbo_state {
        void *saved_compute;