fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/perf: move free_sample_bufs into perf

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Mark Janes 2019-06-03 16:16:40 -07:00
parent 2f712d21b9
commit 4b2c885207
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/intel/perf/gen_perf.c
View file

@ -867,3 +867,13 @@ gen_perf_reap_old_sample_buffers(struct gen_perf_context *perf_ctx)
return;
}
}
void
gen_perf_free_sample_bufs(struct gen_perf_context *perf_ctx)
{
foreach_list_typed_safe(struct oa_sample_buf, buf, link,
&perf_ctx->free_sample_buffers)
ralloc_free(buf);
exec_list_make_empty(&perf_ctx->free_sample_buffers);
}

1
src/intel/perf/gen_perf.h
View file

@ -506,6 +506,7 @@ uint64_t gen_perf_query_get_metric_id(struct gen_perf_config *perf,
const struct gen_perf_query_info *query);
struct oa_sample_buf * gen_perf_get_free_sample_buf(struct gen_perf_context *perf);
void gen_perf_reap_old_sample_buffers(struct gen_perf_context *perf_ctx);
void gen_perf_free_sample_bufs(struct gen_perf_context *perf_ctx);
#endif /* GEN_PERF_H */

16
src/mesa/drivers/dri/i965/brw_performance_query.c
View file

@ -144,20 +144,6 @@ dump_perf_queries(struct brw_context *brw)
_mesa_HashWalk(ctx->PerfQuery.Objects, dump_perf_query_callback, brw);
}
/******************************************************************************/
static void
free_sample_bufs(struct brw_context *brw)
{
foreach_list_typed_safe(struct oa_sample_buf, buf, link,
&brw->perf_ctx.free_sample_buffers)
ralloc_free(buf);
exec_list_make_empty(&brw->perf_ctx.free_sample_buffers);
}
/******************************************************************************/
/**
* Driver hook for glGetPerfQueryInfoINTEL().
*/
@ -1393,7 +1379,7 @@ brw_delete_perf_query(struct gl_context *ctx,
* buffers and close any current i915-perf stream.
*/
if (--brw->perf_ctx.n_query_instances == 0) {
free_sample_bufs(brw);
gen_perf_free_sample_bufs(&brw->perf_ctx);
close_perf(brw, obj->query);
}