[PATCH 11/12] drm/i915/guc: Restore GuC interrupts across suspend/reset if enabled
Sagar Arun Kamble
sagar.a.kamble at intel.com
Tue Oct 31 17:53:11 UTC 2017
In order to override the disable/enable control of GuC interrupts during
suspend/reset cycle we are creating two new functions suspend/restore
guc_interrupts which check if interrupts were enabled and disable them
on suspend and enable them on resume. They are used to restore interrupts
across reset as well.
v2: Updated suspend/restore with the new low level get/put functions.
(Tvrtko)
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 2 ++
drivers/gpu/drm/i915/intel_guc.c | 32 ++++++++++++++++++++++++++++----
drivers/gpu/drm/i915/intel_guc.h | 2 ++
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a369b35..565b98b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3671,8 +3671,10 @@ void intel_finish_reset(struct drm_i915_private *dev_priv)
* The display has been reset as well,
* so need a full re-initialization.
*/
+ intel_suspend_guc_interrupts(&dev_priv->guc);
intel_runtime_pm_disable_interrupts(dev_priv);
intel_runtime_pm_enable_interrupts(dev_priv);
+ intel_restore_guc_interrupts(&dev_priv->guc);
intel_pps_unlock_regs_wa(dev_priv);
intel_modeset_init_hw(dev);
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 535f3f5..a551c1d 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -273,8 +273,7 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)
if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
return 0;
- if (guc->log.level >= 0)
- intel_put_guc_interrupts(guc, GUC_INTR_CLIENT_LOG);
+ intel_suspend_guc_interrupts(guc);
data[0] = INTEL_GUC_ACTION_ENTER_S_STATE;
/* any value greater than GUC_POWER_D0 */
@@ -296,8 +295,7 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)
if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
return 0;
- if (guc->log.level >= 0)
- intel_get_guc_interrupts(guc, GUC_INTR_CLIENT_LOG);
+ intel_restore_guc_interrupts(guc);
data[0] = INTEL_GUC_ACTION_EXIT_S_STATE;
data[1] = GUC_POWER_D0;
@@ -392,6 +390,16 @@ void intel_get_guc_interrupts(struct intel_guc *guc, enum guc_intr_client id)
spin_unlock_irq(&dev_priv->irq_lock);
}
+void intel_restore_guc_interrupts(struct intel_guc *guc)
+{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
+ spin_lock_irq(&dev_priv->irq_lock);
+ if (guc->interrupt_clients)
+ __intel_get_guc_interrupts(guc);
+ spin_unlock_irq(&dev_priv->irq_lock);
+}
+
static void __intel_put_guc_interrupts(struct intel_guc *guc)
{
struct drm_i915_private *dev_priv = guc_to_i915(guc);
@@ -420,6 +428,22 @@ void intel_put_guc_interrupts(struct intel_guc *guc, enum guc_intr_client id)
intel_reset_guc_interrupts(guc);
}
+void intel_suspend_guc_interrupts(struct intel_guc *guc)
+{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
+ spin_lock_irq(&dev_priv->irq_lock);
+ if (!guc->interrupt_clients) {
+ spin_unlock_irq(&dev_priv->irq_lock);
+ return;
+ }
+ __intel_put_guc_interrupts(guc);
+ spin_unlock_irq(&dev_priv->irq_lock);
+ synchronize_irq(dev_priv->drm.irq);
+
+ intel_reset_guc_interrupts(guc);
+}
+
void intel_guc_irq_handler(struct intel_guc *guc, u32 gt_iir)
{
struct drm_i915_private *dev_priv = guc_to_i915(guc);
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 92ea596..9a4642d 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -136,5 +136,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
void intel_get_guc_interrupts(struct intel_guc *guc, enum guc_intr_client id);
void intel_put_guc_interrupts(struct intel_guc *guc, enum guc_intr_client id);
void intel_guc_irq_handler(struct intel_guc *guc, u32 pm_iir);
+void intel_suspend_guc_interrupts(struct intel_guc *guc);
+void intel_restore_guc_interrupts(struct intel_guc *guc);
#endif
--
1.9.1
More information about the Intel-gfx-trybot
mailing list