From: Lionel Landwerlin Date: Thu, 22 Mar 2018 16:02:11 +0000 (+0000) Subject: i965/perf: fix config registration when uploading to kernel X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1603ce1921a511f128025a49d055283440376231;p=mesa.git i965/perf: fix config registration when uploading to kernel When registring configurations to the kernel for the first time, we run into an issue where the id number is not properly set (we're using the wrong variable). As a result when trying to use that id later on, we get an error. This issue manifest itself the first time you use frameretrace after reboot, subsequent runs are fine. Fixes: 27ee83eaf7e9 ("i965: perf: add support for userspace configurations") Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index 0d0fb94537f..12f797c1297 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -1905,7 +1905,7 @@ init_oa_configs(struct brw_context *brw) continue; } - register_oa_config(brw, query, config_id); + register_oa_config(brw, query, ret); DBG("metric set: %s (added)\n", query->guid); } }