iris: fix aux buf map failure in 32bits app on Android

[mesa.git] / src / gallium / drivers / iris / iris_monitor.c

diff --git a/src/gallium/drivers/iris/iris_monitor.c b/src/gallium/drivers/iris/iris_monitor.c
index cef3f844487106b98077f7205822c3e56eb4e25a..f2c0774b1c3f387887895d025f45cfef79c387f1 100644 (file)
--- a/src/gallium/drivers/iris/iris_monitor.c
+++ b/src/gallium/drivers/iris/iris_monitor.c
@@ -26,8 +26,7 @@
 
 #include "iris_screen.h"
 #include "iris_context.h"
-
-#include "perf/gen_perf.h"
+#include "iris_perf.h"
 
 struct iris_monitor_object {
    int num_active_counters;
@@ -94,78 +93,6 @@ iris_get_monitor_info(struct pipe_screen *pscreen, unsigned index,
    return 1;
 }
 
-typedef void (*bo_unreference_t)(void *);
-typedef void *(*bo_map_t)(void *, void *, unsigned flags);
-typedef void (*bo_unmap_t)(void *);
-typedef void (*emit_mi_report_t)(void *, void *, uint32_t, uint32_t);
-typedef void (*emit_mi_flush_t)(void *);
-typedef void (*capture_frequency_stat_register_t)(void *, void *,
-                                                  uint32_t );
-typedef void (*store_register_mem64_t)(void *ctx, void *bo,
-                                       uint32_t reg, uint32_t offset);
-typedef bool (*batch_references_t)(void *batch, void *bo);
-typedef void (*bo_wait_rendering_t)(void *bo);
-typedef int (*bo_busy_t)(void *bo);
-
-static void *
-iris_oa_bo_alloc(void *bufmgr, const char *name, uint64_t size)
-{
-   return iris_bo_alloc(bufmgr, name, size, IRIS_MEMZONE_OTHER);
-}
-
-static void
-iris_monitor_emit_mi_flush(struct iris_context *ice)
-{
-   const int flags = PIPE_CONTROL_RENDER_TARGET_FLUSH |
-                     PIPE_CONTROL_INSTRUCTION_INVALIDATE |
-                     PIPE_CONTROL_CONST_CACHE_INVALIDATE |
-                     PIPE_CONTROL_DATA_CACHE_FLUSH |
-                     PIPE_CONTROL_DEPTH_CACHE_FLUSH |
-                     PIPE_CONTROL_VF_CACHE_INVALIDATE |
-                     PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE |
-                     PIPE_CONTROL_CS_STALL;
-   iris_emit_pipe_control_flush(&ice->batches[IRIS_BATCH_RENDER],
-                                "OA metrics", flags);
-}
-
-static void
-iris_monitor_emit_mi_report_perf_count(void *c,
-                                       void *bo,
-                                       uint32_t offset_in_bytes,
-                                       uint32_t report_id)
-{
-   struct iris_context *ice = c;
-   struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
-   ice->vtbl.emit_mi_report_perf_count(batch, bo, offset_in_bytes, report_id);
-}
-
-static void
-iris_monitor_batchbuffer_flush(void *c, const char *file, int line)
-{
-   struct iris_context *ice = c;
-   _iris_batch_flush(&ice->batches[IRIS_BATCH_RENDER], __FILE__, __LINE__);
-}
-
-static void
-iris_monitor_capture_frequency_stat_register(void *ctx,
-                                             void *bo,
-                                             uint32_t bo_offset)
-{
-   struct iris_context *ice = ctx;
-   struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
-   ice->vtbl.store_register_mem32(batch, GEN9_RPSTAT0, bo, bo_offset, false);
-}
-
-static void
-iris_monitor_store_register_mem64(void *ctx, void *bo,
-                                  uint32_t reg, uint32_t offset)
-{
-   struct iris_context *ice = ctx;
-   struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
-   ice->vtbl.store_register_mem64(batch, reg, bo, offset, false);
-}
-
-
 static bool
 iris_monitor_init_metrics(struct iris_screen *screen)
 {
@@ -180,23 +107,7 @@ iris_monitor_init_metrics(struct iris_screen *screen)
 
    monitor_cfg->perf_cfg = perf_cfg;
 
-   perf_cfg->vtbl.bo_alloc = iris_oa_bo_alloc;
-   perf_cfg->vtbl.bo_unreference = (bo_unreference_t)iris_bo_unreference;
-   perf_cfg->vtbl.bo_map = (bo_map_t)iris_bo_map;
-   perf_cfg->vtbl.bo_unmap = (bo_unmap_t)iris_bo_unmap;
-   perf_cfg->vtbl.emit_mi_flush = (emit_mi_flush_t)iris_monitor_emit_mi_flush;
-
-   perf_cfg->vtbl.emit_mi_report_perf_count =
-      (emit_mi_report_t)iris_monitor_emit_mi_report_perf_count;
-   perf_cfg->vtbl.batchbuffer_flush = iris_monitor_batchbuffer_flush;
-   perf_cfg->vtbl.capture_frequency_stat_register =
-      (capture_frequency_stat_register_t) iris_monitor_capture_frequency_stat_register;
-   perf_cfg->vtbl.store_register_mem64 =
-      (store_register_mem64_t) iris_monitor_store_register_mem64;
-   perf_cfg->vtbl.batch_references = (batch_references_t)iris_batch_references;
-   perf_cfg->vtbl.bo_wait_rendering =
-      (bo_wait_rendering_t)iris_bo_wait_rendering;
-   perf_cfg->vtbl.bo_busy = (bo_busy_t)iris_bo_busy;
+   iris_perf_init_vtbl(perf_cfg);
 
    gen_perf_init_metrics(perf_cfg, &screen->devinfo, screen->fd);
    screen->monitor_cfg = monitor_cfg;