summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2017-08-29 10:41:27 +0100
committerLionel Landwerlin <[email protected]>2017-11-28 13:34:04 +0000
commit349712018bb05d7709bb90af194c544cb9e3474d (patch)
tree964a63bcc3428e128a882ece2de5af0a4cb09a86 /src/mesa
parent27ee83eaf7e9976d3df77417eb20e2e1ff3750ff (diff)
i965: add a debug option to disable oa config loading
This provides a good way to verify we haven't broken using the perf driver on older kernels (which don't have the oa config loading mechanism). Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_performance_query.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index cdae18c6275..9a5117c46c6 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
@@ -2144,7 +2144,8 @@ brw_init_perf_query_info(struct gl_context *ctx)
*/
oa_register(brw);
- if (kernel_has_dynamic_config_support(brw, sysfs_dev_dir))
+ if (likely((INTEL_DEBUG & DEBUG_NO_OACONFIG) == 0) &&
+ kernel_has_dynamic_config_support(brw, sysfs_dev_dir))
init_oa_configs(brw, sysfs_dev_dir);
else
enumerate_sysfs_metrics(brw, sysfs_dev_dir);