Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Jani Nikula]

On Fri, 14 Oct 2016, Petri Latvala  wrote:
> On Fri, Oct 14, 2016 at 02:50:49PM +0300, Jani Nikula wrote:
>> On Fri, 14 Oct 2016, Petri Latvala  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 
>> >> ---
>> >>  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
>> >
>> > Would parsing the output of  `mount -t debugfs`  be an option?
>> 
>> I contemplated that, but decided that should be a separate change later
>> on. I can send a patch on top if you like.
>
>
> Yes, separate patch, but no hurry on that one. Another patch for
> making the same change in tools/intel_gpu_abrt would also be nice.
>
>
> The series is
>
> Reviewed-by: Petri Latvala 

Thanks, pushed.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Petri Latvala]

On Fri, Oct 14, 2016 at 02:50:49PM +0300, Jani Nikula wrote:
> On Fri, 14 Oct 2016, Petri Latvala  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 
> >> ---
> >>  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
> >
> > Would parsing the output of  `mount -t debugfs`  be an option?
> 
> I contemplated that, but decided that should be a separate change later
> on. I can send a patch on top if you like.


Yes, separate patch, but no hurry on that one. Another patch for
making the same change in tools/intel_gpu_abrt would also be nice.


The series is

Reviewed-by: Petri Latvala 








> 
> BR,
> Jani.
> 
> >
> >
> > --
> > Petri Latvala
> >
> >
> >
> >>  
> >> -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
> >>break
> >>fi
> >>  done
> >> -- 
> >> 2.1.4
> >> 
> >> ___
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Jani Nikula]

On Fri, 14 Oct 2016, Jani Nikula  wrote:
> On Fri, 14 Oct 2016, Petri Latvala  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 
>>> ---
>>>  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
>>
>> Would parsing the output of  `mount -t debugfs`  be an option?
>
> I contemplated that, but decided that should be a separate change later
> on. I can send a patch on top if you like.

Something like this (untested):

diff --git a/tests/drm_lib.sh b/tests/drm_lib.sh
index af104ad791b7..6db604e22abf 100755
--- a/tests/drm_lib.sh
+++ b/tests/drm_lib.sh
@@ -58,11 +58,15 @@ do_or_die() {
$@ > /dev/null 2>&1 || (echo "FAIL: $@ ($?)" && exit $IGT_EXIT_FAILURE)
 }
 
-if [ -d /sys/kernel/debug ]; then
-   debugfs_path=/sys/kernel/debug
-elif [ -d /debug ]; then
-   debugfs_path=/debug
-else
+debugfs_path=
+for path in $(mount -t debugfs | cut -d " " -f 3) /sys/kernel/debug /debug; do
+   if [ -d "$path" -a -d "$path/dri" ]; then
+   debugfs_path=$path
+   break
+   fi
+done
+
+if [ -z "$debugfs_path" ]; then
skip "debugfs not found"
 fi
 
@@ -71,10 +75,6 @@ if [ ! -e "$dynamic_debug" ]; then
echo "WARNING: dynamic debug control not available"
 fi
 
-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/dri/$minor/i915_error_state ] ; then



-- 
Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Jani Nikula]

On Fri, 14 Oct 2016, Petri Latvala  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 
>> ---
>>  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
>
> Would parsing the output of  `mount -t debugfs`  be an option?

I contemplated that, but decided that should be a separate change later
on. I can send a patch on top if you like.

BR,
Jani.

>
>
> --
> Petri Latvala
>
>
>
>>  
>> -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
>>  break
>>  fi
>>  done
>> -- 
>> 2.1.4
>> 
>> ___
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Petri Latvala]

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 
> ---
>  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

Would parsing the output of  `mount -t debugfs`  be an option?


--
Petri Latvala



>  
> -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
>   break
>   fi
>  done
> -- 
> 2.1.4
> 
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Jani Nikula]

On Thu, 13 Oct 2016, Chris Wilson  wrote:
> On Thu, Oct 13, 2016 at 04:55:49PM +0300, Jani Nikula wrote:
>> 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*.
>
> Appears to be Daniel's regression:
>
> commit 95c081c17f284de50eaca60d4d55643a64d39019
> Author: Daniel Vetter 
> Date:   Tue Jun 21 10:54:12 2016 +0200
>
> drm: Move master pointer from drm_minor to drm_device

Ah, I guess I was just running an old kernel on the machine where it
still worked.

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Chris Wilson]

On Thu, Oct 13, 2016 at 04:55:49PM +0300, Jani Nikula wrote:
> 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*.

Appears to be Daniel's regression:

commit 95c081c17f284de50eaca60d4d55643a64d39019
Author: Daniel Vetter 
Date:   Tue Jun 21 10:54:12 2016 +0200

drm: Move master pointer from drm_minor to drm_device


Too bad my name's on it as well. :|
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Chris Wilson]

On Thu, Oct 13, 2016 at 04:55:49PM +0300, Jani Nikula wrote:
> On Thu, 13 Oct 2016, Chris Wilson  wrote:
> >> +  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*.

Is the first i915.ko builtin?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Jani Nikula]

On Thu, 13 Oct 2016, Chris Wilson  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 
>> ---
>>  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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Chris Wilson]

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 
> ---
>  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

if [ grep -s i915 $debugfs_path/dri/$minor/name ]; then

?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Jani Nikula]

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 
---
 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
break
fi
 done
-- 
2.1.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx