@@ -372,14 +372,43 @@ open_master_sysfs_dir(int drm_fd)
{
char path[128];
struct stat st;
+ int sysfs;
if (fstat(drm_fd, &st) || !S_ISCHR(st.st_mode))
return -1;
- snprintf(path, sizeof(path), "/sys/dev/char/%d:0",
- major(st.st_rdev));
+ snprintf(path, sizeof(path), "/sys/dev/char/%d:%d", major(st.st_rdev), minor(st.st_rdev));
+ sysfs = open(path, O_DIRECTORY);
+ if (sysfs < 0)
+ return sysfs;
- return open(path, O_DIRECTORY);
+ if (minor(st.st_rdev) >= 128) {
+ /* If we were given a renderD* drm_fd, find it's associated cardX node. */
+ char device[100], cmp[100];
+ int device_len, cmp_len, i;
+
+ device_len = readlinkat(sysfs, "device", device, sizeof(device));
+ close(sysfs);
+ if (device_len < 0)
+ return device_len;
+
+ for (i = 0; i < 64; i++) {
+
+ snprintf(path, sizeof(path), "/sys/dev/char/%d:%d", major(st.st_rdev), i);
+ sysfs = open(path, O_DIRECTORY);
+ if (sysfs < 0)
+ continue;
+
+ cmp_len = readlinkat(sysfs, "device", cmp, sizeof(cmp));
+ if (cmp_len == device_len && !memcmp(cmp, device, cmp_len))
+ break;
+
+ close(sysfs);
+ sysfs = -1;
+ }
+ }
+
+ return sysfs;
}
struct intel_perf *
IGT i915/perf library functions now always operate on sysfs perf attributes of card0 device node, no matter which DRM device fd a user passes. The intention was to always switch to primary device node if a user passes a render device node fd, but that breaks handling of non-card0 devices. If a user passed a render device node fd, find a primary device node of the same device and use it instead of forcibly using the primary device with minor number 0 when opening the device sysfs area. v2: Don't assume primary minor matches render minor with masked type. v3: Reset sysfs dir fd if no match, consequently spell out error paths, add a comment on convertion of renderD* to cardX (Lionel). v4: Limit primary lookup to minors <64 (Chris) Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> # v3 Cc: Chris Wilson <chris@chris-wilson.co.uk> --- lib/i915/perf.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)