From dbbf2e9b24d1488402269a803a230f341791d39a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Aug 2013 23:41:54 +0100 Subject: intel_error_decode: First try /sys/drm/card0/error for the error-state As the sysfs is almost always mounted and readable, we have a higher success rate checking for our error state there than in debugfs. Signed-off-by: Chris Wilson --- tools/intel_error_decode.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'tools/intel_error_decode.c') diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c index b3d7efbd..39177379 100644 --- a/tools/intel_error_decode.c +++ b/tools/intel_error_decode.c @@ -504,17 +504,21 @@ main(int argc, char *argv[]) if (argc == 1) { if (isatty(0)) { - path = "/debug/dri"; + path = "/sys/class/drm/card0/error"; error = stat(path, &st); + if (error != 0) { + path = "/debug/dri"; + error = stat(path, &st); + } if (error != 0) { path = "/sys/kernel/debug/dri"; error = stat(path, &st); - if (error != 0) { - errx(1, - "Couldn't find i915 debugfs directory.\n\n" - "Is debugfs mounted? You might try mounting it with a command such as:\n\n" - "\tsudo mount -t debugfs debugfs /sys/kernel/debug\n"); - } + } + if (error != 0) { + errx(1, + "Couldn't find i915 debugfs directory.\n\n" + "Is debugfs mounted? You might try mounting it with a command such as:\n\n" + "\tsudo mount -t debugfs debugfs /sys/kernel/debug\n"); } } else { read_data_file(stdin); -- cgit v1.2.3