From e8436677339d65449bdabefd3ed8bb5a65f13d46 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 6 Feb 2018 23:28:24 +0000 Subject: [PATCH] i965: perf: cleanup detection of kernel support for loadable configs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The initial revision of the patch adding loadable configs was testing the feature's availability by adding a new config successfully and then removing it. A second version tested the availability just by exercising the removal. But some unused code remained. Signed-off-by: Lionel Landwerlin Reviewed-by: Tapani Pälli --- .../drivers/dri/i965/brw_performance_query.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index f4ff858bd5d..c0bb4442bec 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -1832,21 +1832,8 @@ kernel_has_dynamic_config_support(struct brw_context *brw, /* Look for the test config, which we know we can't replace. */ if (read_file_uint64(config_path, &config_id) && config_id == 1) { - uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 }; - struct drm_i915_perf_oa_config config; - - memset(&config, 0, sizeof(config)); - - memcpy(config.uuid, query->guid, sizeof(config.uuid)); - - config.n_mux_regs = 1; - config.mux_regs_ptr = (uintptr_t) mux_regs; - - if (drmIoctl(screen->fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &config_id) < 0 && - errno == ENOENT) - return true; - - break; + return drmIoctl(screen->fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, + &config_id) < 0 && errno == ENOENT; } } -- 2.30.2