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 <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Lionel Landwerlin 2018-03-07 14:10:15 +00:00
parent fb921a2870
commit d10a39ebe0

View file

@ -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++) {