OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: perf: cleanup detection of kernel support for loadable configs

Browse Source 
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 <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Lionel Landwerlin
2018-02-06 23:28:24 +00:00
parent bd6c0cab60
commit e843667733
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesa/drivers/dri/i965/brw_performance_query.c
View File

@@ -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. */ /* Look for the test config, which we know we can't replace. */
if (read_file_uint64(config_path, &config_id) && config_id == 1) { if (read_file_uint64(config_path, &config_id) && config_id == 1) {
uint32_t mux_regs[] = { 0x9888 /* NOA_WRITE */, 0x0 }; return drmIoctl(screen->fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG,
struct drm_i915_perf_oa_config config; &config_id) < 0 && errno == ENOENT;
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;
} }
} }