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: 27ee83eaf7 ("i965: perf: add support for userspace configurations")
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 1603ce1921)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>

Conflicts:
	src/mesa/drivers/dri/i965/brw_performance_query.c
This commit is contained in:
Lionel Landwerlin 2018-03-22 16:02:11 +00:00 committed by Juan A. Suarez Romero
parent 31f323165c
commit 4cfb3553eb

View file

@ -1896,7 +1896,7 @@ init_oa_configs(struct brw_context *brw, const char *sysfs_dev_dir)
continue;
}
register_oa_config(brw, query, config_id);
register_oa_config(brw, query, ret);
}
}