[PATCH i-g-t] intel_reg: ensure "intel_reg help" always works

[PATCH i-g-t] intel_reg: ensure "intel_reg help" always works

[Thomas Wood]

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 tools/intel_reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/intel_reg.c b/tools/intel_reg.c
index 95760db..2b3c686 100644
--- a/tools/intel_reg.c
+++ b/tools/intel_reg.c
@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	if (help)
+	if (help || (argc > 0 && strcmp(argv[0], "help") == 0))
 		return intel_reg_help(&config, argc, argv);
 
 	if (argc == 0) {
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] intel_reg: ensure "intel_reg help" always works

[Jani Nikula]

On Mon, 07 Sep 2015, Thomas Wood <thomas.wood@intel.com> wrote:
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>

I'm lagging behind with my mails, and I see you already pushed
this... but care to explain the scenario where 'intel_reg help' does not
work? Should be part of the commit message...

BR,
Jani.

> ---
>  tools/intel_reg.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/intel_reg.c b/tools/intel_reg.c
> index 95760db..2b3c686 100644
> --- a/tools/intel_reg.c
> +++ b/tools/intel_reg.c
> @@ -865,7 +865,7 @@ int main(int argc, char *argv[])
>  	argc -= optind;
>  	argv += optind;
>  
> -	if (help)
> +	if (help || (argc > 0 && strcmp(argv[0], "help") == 0))
>  		return intel_reg_help(&config, argc, argv);
>  
>  	if (argc == 0) {
> -- 
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH i-g-t] intel_reg: ensure "intel_reg help" always works

[Thomas Wood]

On 9 September 2015 at 13:20, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Mon, 07 Sep 2015, Thomas Wood <thomas.wood@intel.com> wrote:
>> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
>
> I'm lagging behind with my mails, and I see you already pushed
> this... but care to explain the scenario where 'intel_reg help' does not
> work? Should be part of the commit message...

The "help" variable is only set by the --help option, so if the user
specified "help" as a command, some initialisation takes place that
would cause an assert on (for example) platforms without an Intel GPU.
There are a few other commands that could work on systems without an
Intel GPU such as decoding register values, but this will need a bit
more work to implement.



>
> BR,
> Jani.
>
>> ---
>>  tools/intel_reg.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/intel_reg.c b/tools/intel_reg.c
>> index 95760db..2b3c686 100644
>> --- a/tools/intel_reg.c
>> +++ b/tools/intel_reg.c
>> @@ -865,7 +865,7 @@ int main(int argc, char *argv[])
>>       argc -= optind;
>>       argv += optind;
>>
>> -     if (help)
>> +     if (help || (argc > 0 && strcmp(argv[0], "help") == 0))
>>               return intel_reg_help(&config, argc, argv);
>>
>>       if (argc == 0) {
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx