error decode: Search for first i915_error_state

Handy for multi-GPU systems where the IGFX may not be first.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-01-25 16:34:08 +00:00
parent 3c5c8ba71c
commit 68a95f0e38

View File

@ -344,10 +344,10 @@ main (int argc, char *argv[])
if (argc == 1) { if (argc == 1) {
if (isatty(0)) { if (isatty(0)) {
path = "/debug/dri/0"; path = "/debug/dri";
err = stat (path, &st); err = stat (path, &st);
if (err != 0) { if (err != 0) {
path = "/sys/kernel/debug/dri/0"; path = "/sys/kernel/debug/dri";
err = stat (path, &st); err = stat (path, &st);
if (err != 0) { if (err != 0) {
errx(1, errx(1,
@ -370,20 +370,36 @@ main (int argc, char *argv[])
} }
} }
if (S_ISDIR (st.st_mode)) if (S_ISDIR (st.st_mode)) {
asprintf (&filename, "%s/i915_error_state", path); asprintf (&filename, "%s/i915_error_state", path);
else
filename = (char *) path;
file = fopen(filename, "r"); file = fopen(filename, "r");
if (file) { if (!file) {
read_data_file (file); int minor;
fclose (file); for (minor = 0; minor < 64; minor++) {
free(filename);
asprintf(&filename, "%s/%d/i915_error_state", path, minor);
file = fopen(filename, "r");
if (file)
break;
}
}
if (!file) {
fprintf (stderr, "Failed to find i915_error_state beneath %s\n",
path);
exit (1);
}
} else { } else {
filename = (char *) path;
file = fopen(filename, "r");
if (!file) {
fprintf (stderr, "Failed to open %s: %s\n", fprintf (stderr, "Failed to open %s: %s\n",
filename, strerror (errno)); filename, strerror (errno));
exit (1); exit (1);
} }
}
read_data_file (file);
fclose (file);
if (filename != path) if (filename != path)
free (filename); free (filename);