drm/i915: move pc8.irqs_disabled to pm.irqs_disabled

When other platforms add runtime PM support they will also need to
disable interrupts, so move the variable to the runtime PM struct.

Also notice that the longer-term goal is to completely kill the
regsave struct, and I even have patches for that.

v2: - Rebase.
v3: - Rebase.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 29 insertions, 29 deletions

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index c8e262fc750a..1c00751eca69 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -86,9 +86,9 @@ ironlake_enable_display_irq(drm_i915_private_t *dev_priv, u32 mask)
 {
         assert_spin_locked(&dev_priv->irq_lock);
 
-        if (dev_priv->pc8.irqs_disabled) {
+        if (dev_priv->pm.irqs_disabled) {
                 WARN(1, "IRQs disabled\n");
-                dev_priv->pc8.regsave.deimr &= ~mask;
+                dev_priv->pm.regsave.deimr &= ~mask;
                 return;
         }
 
@@ -104,9 +104,9 @@ ironlake_disable_display_irq(drm_i915_private_t *dev_priv, u32 mask)
 {
         assert_spin_locked(&dev_priv->irq_lock);
 
-        if (dev_priv->pc8.irqs_disabled) {
+        if (dev_priv->pm.irqs_disabled) {
                 WARN(1, "IRQs disabled\n");
-                dev_priv->pc8.regsave.deimr |= mask;
+                dev_priv->pm.regsave.deimr |= mask;
                 return;
         }
 
@@ -129,10 +129,10 @@ static void ilk_update_gt_irq(struct drm_i915_private *dev_priv,
 {
         assert_spin_locked(&dev_priv->irq_lock);
 
-        if (dev_priv->pc8.irqs_disabled) {
+        if (dev_priv->pm.irqs_disabled) {
                 WARN(1, "IRQs disabled\n");
-                dev_priv->pc8.regsave.gtimr &= ~interrupt_mask;
-                dev_priv->pc8.regsave.gtimr |= (~enabled_irq_mask &
+                dev_priv->pm.regsave.gtimr &= ~interrupt_mask;
+                dev_priv->pm.regsave.gtimr |= (~enabled_irq_mask &
                                                 interrupt_mask);
                 return;
         }
@@ -167,10 +167,10 @@ static void snb_update_pm_irq(struct drm_i915_private *dev_priv,
 
         assert_spin_locked(&dev_priv->irq_lock);
 
-        if (dev_priv->pc8.irqs_disabled) {
+        if (dev_priv->pm.irqs_disabled) {
                 WARN(1, "IRQs disabled\n");
-                dev_priv->pc8.regsave.gen6_pmimr &= ~interrupt_mask;
-                dev_priv->pc8.regsave.gen6_pmimr |= (~enabled_irq_mask &
+                dev_priv->pm.regsave.gen6_pmimr &= ~interrupt_mask;
+                dev_priv->pm.regsave.gen6_pmimr |= (~enabled_irq_mask &
                                                      interrupt_mask);
                 return;
         }
@@ -313,11 +313,11 @@ static void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
 
         assert_spin_locked(&dev_priv->irq_lock);
 
-        if (dev_priv->pc8.irqs_disabled &&
+        if (dev_priv->pm.irqs_disabled &&
             (interrupt_mask & SDE_HOTPLUG_MASK_CPT)) {
                 WARN(1, "IRQs disabled\n");
-                dev_priv->pc8.regsave.sdeimr &= ~interrupt_mask;
-                dev_priv->pc8.regsave.sdeimr |= (~enabled_irq_mask &
+                dev_priv->pm.regsave.sdeimr &= ~interrupt_mask;
+                dev_priv->pm.regsave.sdeimr |= (~enabled_irq_mask &
                                                  interrupt_mask);
                 return;
         }
@@ -4118,32 +4118,32 @@ void intel_hpd_init(struct drm_device *dev)
         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
-/* Disable interrupts so we can allow Package C8+. */
-void hsw_pc8_disable_interrupts(struct drm_device *dev)
+/* Disable interrupts so we can allow runtime PM. */
+void hsw_runtime_pm_disable_interrupts(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         unsigned long irqflags;
 
         spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
 
-        dev_priv->pc8.regsave.deimr = I915_READ(DEIMR);
-        dev_priv->pc8.regsave.sdeimr = I915_READ(SDEIMR);
-        dev_priv->pc8.regsave.gtimr = I915_READ(GTIMR);
-        dev_priv->pc8.regsave.gtier = I915_READ(GTIER);
-        dev_priv->pc8.regsave.gen6_pmimr = I915_READ(GEN6_PMIMR);
+        dev_priv->pm.regsave.deimr = I915_READ(DEIMR);
+        dev_priv->pm.regsave.sdeimr = I915_READ(SDEIMR);
+        dev_priv->pm.regsave.gtimr = I915_READ(GTIMR);
+        dev_priv->pm.regsave.gtier = I915_READ(GTIER);
+        dev_priv->pm.regsave.gen6_pmimr = I915_READ(GEN6_PMIMR);
 
         ironlake_disable_display_irq(dev_priv, 0xffffffff);
         ibx_disable_display_interrupt(dev_priv, 0xffffffff);
         ilk_disable_gt_irq(dev_priv, 0xffffffff);
         snb_disable_pm_irq(dev_priv, 0xffffffff);
 
-        dev_priv->pc8.irqs_disabled = true;
+        dev_priv->pm.irqs_disabled = true;
 
         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
-/* Restore interrupts so we can recover from Package C8+. */
-void hsw_pc8_restore_interrupts(struct drm_device *dev)
+/* Restore interrupts so we can recover from runtime PM. */
+void hsw_runtime_pm_restore_interrupts(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         unsigned long irqflags;
@@ -4163,13 +4163,13 @@ void hsw_pc8_restore_interrupts(struct drm_device *dev)
         val = I915_READ(GEN6_PMIMR);
         WARN(val != 0xffffffff, "GEN6_PMIMR is 0x%08x\n", val);
 
-        dev_priv->pc8.irqs_disabled = false;
+        dev_priv->pm.irqs_disabled = false;
 
-        ironlake_enable_display_irq(dev_priv, ~dev_priv->pc8.regsave.deimr);
-        ibx_enable_display_interrupt(dev_priv, ~dev_priv->pc8.regsave.sdeimr);
-        ilk_enable_gt_irq(dev_priv, ~dev_priv->pc8.regsave.gtimr);
-        snb_enable_pm_irq(dev_priv, ~dev_priv->pc8.regsave.gen6_pmimr);
-        I915_WRITE(GTIER, dev_priv->pc8.regsave.gtier);
+        ironlake_enable_display_irq(dev_priv, ~dev_priv->pm.regsave.deimr);
+        ibx_enable_display_interrupt(dev_priv, ~dev_priv->pm.regsave.sdeimr);
+        ilk_enable_gt_irq(dev_priv, ~dev_priv->pm.regsave.gtimr);
+        snb_enable_pm_irq(dev_priv, ~dev_priv->pm.regsave.gen6_pmimr);
+        I915_WRITE(GTIER, dev_priv->pm.regsave.gtier);
 
         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }