From 9d0a5c817ce21adabeda5153035b30609e2862b2 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 3 Dec 2019 16:12:03 +0200 Subject: [PATCH] intel/perf: set read buffer len to 0 to identify empty buffer We always add an empty buffer in the list when creating the query. Let's set the len appropriately so that we can recognize it when we read OA reports up to the end of a query. We were using an 0 timestamp value associated with the empty buffer and incorrectly assuming this was a valid value. In turn that led to not reading enough reports and resulted in deltas added to our counter values which should have been discarded because those would be flagged for a different context. Signed-off-by: Lionel Landwerlin Cc: Reviewed-by: Mark Janes Reviewed-by: Kenneth Graunke --- src/intel/perf/gen_perf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c index 7e3847d073d..05103acfb21 100644 --- a/src/intel/perf/gen_perf.c +++ b/src/intel/perf/gen_perf.c @@ -1465,8 +1465,8 @@ get_free_sample_buf(struct gen_perf_context *perf_ctx) exec_node_init(&buf->link); buf->refcount = 0; - buf->len = 0; } + buf->len = 0; return buf; } @@ -1983,7 +1983,8 @@ read_oa_samples_until(struct gen_perf_context *perf_ctx, exec_list_get_tail(&perf_ctx->sample_buffers); struct oa_sample_buf *tail_buf = exec_node_data(struct oa_sample_buf, tail_node, link); - uint32_t last_timestamp = tail_buf->last_timestamp; + uint32_t last_timestamp = + tail_buf->len == 0 ? start_timestamp : tail_buf->last_timestamp; while (1) { struct oa_sample_buf *buf = get_free_sample_buf(perf_ctx); -- 2.30.2