Mesa (master): iris: fully populate perf_config before using it to initialize perf_context

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 111d89eb7c62c0dc8df20a98bf6719adf90f3e44
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=111d89eb7c62c0dc8df20a98bf6719adf90f3e44

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Fri Apr 16 19:07:07 2021 +0200

iris: fully populate perf_config before using it to initialize perf_context

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9922>

---

 src/gallium/drivers/iris/iris_performance_query.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_performance_query.c b/src/gallium/drivers/iris/iris_performance_query.c
index 5008c47f304..39633c0cfa2 100644
--- a/src/gallium/drivers/iris/iris_performance_query.c
+++ b/src/gallium/drivers/iris/iris_performance_query.c
@@ -65,6 +65,8 @@ iris_init_perf_query_info(struct pipe_context *pipe)
 
    iris_perf_init_vtbl(perf_cfg);
 
+   intel_perf_init_metrics(perf_cfg, &screen->devinfo, screen->fd, true /* pipeline_statistics */);
+
    intel_perf_init_context(ice->perf_ctx,
                          perf_cfg,
                          ice,
@@ -74,8 +76,6 @@ iris_init_perf_query_info(struct pipe_context *pipe)
                          ice->batches[IRIS_BATCH_RENDER].hw_ctx_id,
                          screen->fd);
 
-   intel_perf_init_metrics(perf_cfg, &screen->devinfo, screen->fd, true /* pipeline_statistics */);
-
    return perf_cfg->n_queries;
 }