summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2018-03-07 14:10:15 +0000
committerLionel Landwerlin <[email protected]>2018-03-08 23:05:29 +0000
commitd10a39ebe085dc28ab7352f76b57d628928e1e40 (patch)
treecdb171e82e83bebadd229c410c5b1adce84d8249 /src
parentfb921a2870ae51cdad129438dfb1b20f1538b2fa (diff)
i965: perf: consolidate unmapping oa perf bo outside accumulation
Do this in one place outside the only caller of the accumulation function. Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_performance_query.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index 71ea26753e0..13eff31ee61 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
@@ -1014,8 +1014,6 @@ end:
DBG("Marking %d accumulated - results gathered\n", o->Id);
- brw_bo_unmap(obj->oa.bo);
- obj->oa.map = NULL;
obj->oa.results_accumulated = true;
drop_from_unaccumulated_query_list(brw, obj);
dec_n_oa_users(brw);
@@ -1024,8 +1022,6 @@ end:
error:
- brw_bo_unmap(obj->oa.bo);
- obj->oa.map = NULL;
discard_all_queries(brw);
}
@@ -1470,6 +1466,9 @@ get_oa_counter_data(struct brw_context *brw,
if (!obj->oa.results_accumulated) {
accumulate_oa_reports(brw, obj);
assert(obj->oa.results_accumulated);
+
+ brw_bo_unmap(obj->oa.bo);
+ obj->oa.map = NULL;
}
for (int i = 0; i < n_counters; i++) {