diff mbox series

[v2,07/22] drm/i915/guc: Update GuC sleep status values

Message ID 20190411084436.24384-8-michal.wajdeczko@intel.com (mailing list archive)
State New, archived
Headers show
Series GuC 32.0.3 | expand

Commit Message

Michal Wajdeczko April 11, 2019, 8:44 a.m. UTC
New GuC firmwares use updated sleep status definitions.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_fwif.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Daniele Ceraolo Spurio April 13, 2019, 12:06 a.m. UTC | #1
On 4/11/19 1:44 AM, Michal Wajdeczko wrote:
> New GuC firmwares use updated sleep status definitions.
> 

There is also no need to poll on resume anymore. We're not failing on it 
in CI because the wait timeout comes out as a debug message and the guc 
is obviously still fine and responsive since we waited for nothing.

I think I had sent you a patch for this already, let me see if I can 
find it again and send it in reply to this one (if I do find it, I'm 
going to re-compile test it only).

Daniele

> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_guc_fwif.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
> index 64b56da9775c..25d57c819e3f 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fwif.h
> +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
> @@ -648,9 +648,9 @@ enum intel_guc_report_status {
>   };
>   
>   enum intel_guc_sleep_state_status {
> -	INTEL_GUC_SLEEP_STATE_SUCCESS = 0x0,
> -	INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x1,
> -	INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x2
> +	INTEL_GUC_SLEEP_STATE_SUCCESS = 0x1,
> +	INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x2,
> +	INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x3
>   #define INTEL_GUC_SLEEP_STATE_INVALID_MASK 0x80000000
>   };
>   
>
Daniele Ceraolo Spurio April 13, 2019, 12:24 a.m. UTC | #2
On 4/12/19 5:06 PM, Daniele Ceraolo Spurio wrote:
> 
> 
> On 4/11/19 1:44 AM, Michal Wajdeczko wrote:
>> New GuC firmwares use updated sleep status definitions.
>>
> 
> There is also no need to poll on resume anymore. We're not failing on it 
> in CI because the wait timeout comes out as a debug message and the guc 
> is obviously still fine and responsive since we waited for nothing.
> 
> I think I had sent you a patch for this already, let me see if I can 
> find it again and send it in reply to this one (if I do find it, I'm 
> going to re-compile test it only).
> 
> Daniele
> 

One more thing: John S had mentioned that the guc suspend/resume 
protocol mainly handles submission-related data, so it should be 
possible to skip it when in huc-only mode. Not something that needs to 
be included here, but a possible follow up optimization.

John, can you confirm this?

Thanks,
Daniele

>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: John Spotswood <john.a.spotswood@intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_guc_fwif.h | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h 
>> b/drivers/gpu/drm/i915/intel_guc_fwif.h
>> index 64b56da9775c..25d57c819e3f 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_fwif.h
>> +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
>> @@ -648,9 +648,9 @@ enum intel_guc_report_status {
>>   };
>>   enum intel_guc_sleep_state_status {
>> -    INTEL_GUC_SLEEP_STATE_SUCCESS = 0x0,
>> -    INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x1,
>> -    INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x2
>> +    INTEL_GUC_SLEEP_STATE_SUCCESS = 0x1,
>> +    INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x2,
>> +    INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x3
>>   #define INTEL_GUC_SLEEP_STATE_INVALID_MASK 0x80000000
>>   };
>>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
John Spotswood April 15, 2019, 8:21 p.m. UTC | #3
On Fri, 2019-04-12 at 17:24 -0700, Ceraolo Spurio, Daniele wrote:
> 
> On 4/12/19 5:06 PM, Daniele Ceraolo Spurio wrote:
> > 
> > 
> > 
> > On 4/11/19 1:44 AM, Michal Wajdeczko wrote:
> > > 
> > > New GuC firmwares use updated sleep status definitions.
> > > 
> > There is also no need to poll on resume anymore. We're not failing
> > on it 
> > in CI because the wait timeout comes out as a debug message and the
> > guc 
> > is obviously still fine and responsive since we waited for nothing.
> > 
> > I think I had sent you a patch for this already, let me see if I
> > can 
> > find it again and send it in reply to this one (if I do find it,
> > I'm 
> > going to re-compile test it only).
> > 
> > Daniele
> > 
> One more thing: John S had mentioned that the guc suspend/resume 
> protocol mainly handles submission-related data, so it should be 
> possible to skip it when in huc-only mode. Not something that needs
> to 
> be included here, but a possible follow up optimization.
> 
> John, can you confirm this?
> 
> Thanks,
> Daniele
> 

If running with HuC authentication only, the GuC will have nothing to
do once authentication is completed, so GuC will go to sleep on its
own.  The driver can remove those suspend/resume calls if GuC
submission is disabled.

John


> > 
> > > 
> > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> > > Cc: John Spotswood <john.a.spotswood@intel.com>
> > > ---
> > >   drivers/gpu/drm/i915/intel_guc_fwif.h | 6 +++---
> > >   1 file changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h 
> > > b/drivers/gpu/drm/i915/intel_guc_fwif.h
> > > index 64b56da9775c..25d57c819e3f 100644
> > > --- a/drivers/gpu/drm/i915/intel_guc_fwif.h
> > > +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
> > > @@ -648,9 +648,9 @@ enum intel_guc_report_status {
> > >   };
> > >   enum intel_guc_sleep_state_status {
> > > -    INTEL_GUC_SLEEP_STATE_SUCCESS = 0x0,
> > > -    INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x1,
> > > -    INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x2
> > > +    INTEL_GUC_SLEEP_STATE_SUCCESS = 0x1,
> > > +    INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x2,
> > > +    INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x3
> > >   #define INTEL_GUC_SLEEP_STATE_INVALID_MASK 0x80000000
> > >   };
> > > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
index 64b56da9775c..25d57c819e3f 100644
--- a/drivers/gpu/drm/i915/intel_guc_fwif.h
+++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
@@ -648,9 +648,9 @@  enum intel_guc_report_status {
 };
 
 enum intel_guc_sleep_state_status {
-	INTEL_GUC_SLEEP_STATE_SUCCESS = 0x0,
-	INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x1,
-	INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x2
+	INTEL_GUC_SLEEP_STATE_SUCCESS = 0x1,
+	INTEL_GUC_SLEEP_STATE_PREEMPT_TO_IDLE_FAILED = 0x2,
+	INTEL_GUC_SLEEP_STATE_ENGINE_RESET_FAILED = 0x3
 #define INTEL_GUC_SLEEP_STATE_INVALID_MASK 0x80000000
 };