[v4,1/6] drm/i915/guc: Grab RPM wakelock while disabling GuC interrupts

Commit Message

[e-mail] Jan. 24, 2018, 3:46 p.m. UTC

Disabling GuC interrupts involves access to GuC IRQ control registers
hence ensure device is RPM awake.

v1-v2: old changelog
1: Add comment about need to synchronize flush work and log runtime
   destroy
2: Moved patch earlier in the series and removed comment about future
work. (Tvrtko)

v3: Added assert_rpm_wakelock_held() to gen9_*_guc_interrupts. (Chris)

Signed-off-by: Sagar Arun Kamble <[e-mail]>
Cc: Michal Wajdeczko <[e-mail]>
Cc: Daniele Ceraolo Spurio <[e-mail]>
Cc: Tvrtko Ursulin <[e-mail]>
Cc: Chris Wilson <[e-mail]>
Cc: Joonas Lahtinen <[e-mail]>
Reviewed-by: Chris Wilson <[e-mail]>
---
 drivers/gpu/drm/i915/i915_irq.c      | 6 ++++++
 drivers/gpu/drm/i915/intel_guc_log.c | 3 +++
 2 files changed, 9 insertions(+)

Comments

Chris Wilson Jan. 24, 2018, 7:46 p.m. UTC | #1

Quoting Patchwork (2018-01-24 19:39:56)
> == Series Details ==
> 
> Series: series starting with [v4,1/6] drm/i915/guc: Grab RPM wakelock while disabling GuC interrupts
> URL   : https://patchwork.freedesktop.org/series/37044/
> State : failure
> 
> == Summary ==
> 
> Test kms_cursor_crc:
>         Subgroup cursor-256x256-suspend:
>                 skip       -> PASS       (shard-hsw) fdo#103375 +1
> Test kms_frontbuffer_tracking:
>         Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
>                 pass       -> FAIL       (shard-snb) fdo#101623 +1
> Test kms_flip:
>         Subgroup 2x-plain-flip-ts-check-interruptible:
>                 fail       -> PASS       (shard-hsw)
> Test drv_selftest:
>         Subgroup live_hangcheck:
>                 pass       -> INCOMPLETE (shard-apl)
> Test kms_draw_crc:
>         Subgroup draw-method-xrgb8888-mmap-wc-untiled:
>                 pass       -> SKIP       (shard-snb)
> Test kms_vblank:
>         Subgroup crtc-id:
>                 pass       -> SKIP       (shard-snb)
> Test perf:
>         Subgroup oa-exponents:
>                 fail       -> PASS       (shard-apl) fdo#102254

And pushed (except for the last patch ofc). Thanks for the patches and
review,
-Chris

Patch

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 3517c65..85c46a2 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -452,6 +452,8 @@  void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)
 
 void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv)
 {
+	assert_rpm_wakelock_held(dev_priv);
+
 	spin_lock_irq(&dev_priv->irq_lock);
 	gen6_reset_pm_iir(dev_priv, dev_priv->pm_guc_events);
 	spin_unlock_irq(&dev_priv->irq_lock);
@@ -459,6 +461,8 @@  void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv)
 
 void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv)
 {
+	assert_rpm_wakelock_held(dev_priv);
+
 	spin_lock_irq(&dev_priv->irq_lock);
 	if (!dev_priv->guc.interrupts_enabled) {
 		WARN_ON_ONCE(I915_READ(gen6_pm_iir(dev_priv)) &
@@ -471,6 +475,8 @@  void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv)
 
 void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv)
 {
+	assert_rpm_wakelock_held(dev_priv);
+
 	spin_lock_irq(&dev_priv->irq_lock);
 	dev_priv->guc.interrupts_enabled = false;
 
diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index 2ffc966..8f2da30 100644
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -639,7 +639,10 @@  void i915_guc_log_unregister(struct drm_i915_private *dev_priv)
 
 	mutex_lock(&dev_priv->drm.struct_mutex);
 	/* GuC logging is currently the only user of Guc2Host interrupts */
+	intel_runtime_pm_get(dev_priv);
 	gen9_disable_guc_interrupts(dev_priv);
+	intel_runtime_pm_put(dev_priv);
+
 	guc_log_runtime_destroy(&dev_priv->guc);
 	mutex_unlock(&dev_priv->drm.struct_mutex);
 }