Mesa (master): i965/perf: fix config registration when uploading to kernel

[Lionel Landwerlin]

Module: Mesa
Branch: master
Commit: 1603ce1921a511f128025a49d055283440376231
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1603ce1921a511f128025a49d055283440376231

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Mar 22 16:02:11 2018 +0000

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 <lionel.g.landwerlin at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_performance_query.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index 0d0fb94537..12f797c129 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);
    }
 }