[Intel-gfx] [PATCH] drm/i915/guc: Disable rpm wakeref asserts in GuC irq handler

Chris Wilson chris at chris-wilson.co.uk
Sat Jul 14 17:37:59 UTC 2018


Quoting Chris Wilson (2018-07-14 18:36:03)
> From: Michał Winiarski <michal.winiarski at intel.com>
> 
> We're seeing "RPM wakelock ref not held during HW access" warning
> otherwise. Since IRQs are synced for runtime suspend we can just disable
> the wakeref asserts.
> 
> Reported-by: Marta Löfstedt <marta.lofstedt at intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105710
> Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_guc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
> index e12bd259df17..560c7406ae40 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -466,11 +466,13 @@ void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc)
>          * could happen that GuC sets the bit for 2nd interrupt but Host
>          * clears out the bit on handling the 1st interrupt.
>          */

GEM_BUG_ON(!in_interrupt()); /* may be overkill */

> +       disable_rpm_wakeref_asserts(dev_priv);
>         spin_lock(&guc->irq_lock);
>         val = I915_READ(SOFT_SCRATCH(15));
>         msg = val & guc->msg_enabled_mask;
>         I915_WRITE(SOFT_SCRATCH(15), val & ~msg);
>         spin_unlock(&guc->irq_lock);
> +       enable_rpm_wakeref_asserts(dev_priv);
>  
>         intel_guc_to_host_process_recv_msg(guc, msg);

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris


More information about the Intel-gfx mailing list