On Thu, 13 Oct 2016, Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> wrote:
> On Thu, Oct 13, 2016 at 03:59:55PM +0300, Jani Nikula wrote:
>> While at it, make debugfs_path point at the debugfs root, not
>> dri. This'll be handy in future work.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> tests/drm_lib.sh | 16 ++++++++++------
>> 1 file changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/tests/drm_lib.sh b/tests/drm_lib.sh
>> index 113da4c7d645..87e3ad0ab547 100755
>> --- a/tests/drm_lib.sh
>> +++ b/tests/drm_lib.sh
>> @@ -41,18 +41,22 @@ do_or_die() {
>> $@ > /dev/null 2>&1 || (echo "FAIL: $@ ($?)" && exit $IGT_EXIT_FAILURE)
>> }
>>
>> -if [ -d /debug/dri ] ; then
>> - debugfs_path=/debug/dri
>> +if [ -d /sys/kernel/debug ]; then
>> + debugfs_path=/sys/kernel/debug
>> +elif [ -d /debug ]; then
>> + debugfs_path=/debug
>> +else
>> + skip "debugfs not found"
>> fi
>>
>> -if [ -d /sys/kernel/debug/dri ] ; then
>> - debugfs_path=/sys/kernel/debug/dri
>> +if [ ! -d $debugfs_path/dri ]; then
>> + skip "dri debugfs not found"
>> fi
>>
>> i915_dfs_path=x
>> for minor in `seq 0 16`; do
>> - if [ -f $debugfs_path/$minor/i915_error_state ] ; then
>> - i915_dfs_path=$debugfs_path/$minor
>> + if [ -f $debugfs_path/dri/$minor/i915_error_state ] ; then
>> + i915_dfs_path=$debugfs_path/dri/$minor
>
> Thinking of how to wean ourselves off i915_error_state; how about
That's of course independent of this series.
> if [ grep -s i915 $debugfs_path/dri/$minor/name ]; then
For whatever reason, I got a machine here where that file is empty (not
talking about the size, but cating the file actually produces
nothing). And I've got another machine where that is not the
case. *scratches head*.
BR,
Jani.
>
> ?
> -Chris
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
