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

i965: perf: use drmIoctl() instead of ioctl()

Browse Source 
ioctl() might be interrupted, use drmIoctl() instead as it'll retry
automatically.

Fixes: 27ee83eaf7 "i965: perf: add support for userspace configurations"
Cc: "18.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Mark Janes <mark.a.janes@intel.com>
This commit is contained in:
Lionel Landwerlin
2018-02-06 23:23:22 +00:00
parent 0f952b778f
commit bd6c0cab60
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1842,7 +1842,7 @@ kernel_has_dynamic_config_support(struct brw_context *brw,
config.n_mux_regs = 1; config.n_mux_regs = 1;
config.mux_regs_ptr = (uintptr_t) mux_regs; config.mux_regs_ptr = (uintptr_t) mux_regs;
if (ioctl(screen->fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &config_id) < 0 && if (drmIoctl(screen->fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &config_id) < 0 &&
errno == ENOENT) errno == ENOENT)
return true; return true;
@@ -1889,7 +1889,7 @@ init_oa_configs(struct brw_context *brw, const char *sysfs_dev_dir)
config.n_flex_regs = query->n_flex_regs; config.n_flex_regs = query->n_flex_regs;
config.flex_regs_ptr = (uintptr_t) query->flex_regs; config.flex_regs_ptr = (uintptr_t) query->flex_regs;
ret = ioctl(screen->fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, &config); ret = drmIoctl(screen->fd, DRM_IOCTL_I915_PERF_ADD_CONFIG, &config);
if (ret < 0) { if (ret < 0) {
DBG("Failed to load \"%s\" (%s) metrics set in kernel: %s\n", DBG("Failed to load \"%s\" (%s) metrics set in kernel: %s\n",
query->name, query->guid, strerror(errno)); query->name, query->guid, strerror(errno));