Commit 34c7b8a7 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Set up VLV_MASTER_IER consistently

We're lacking VLV_MASTER_IER setup from valleyview_irq_preinstall(), so
add it there. Also cargo cult in some POSTING_READ()s to match the other
platforms.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460571598-24452-3-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent e5328c43
...@@ -3338,6 +3338,9 @@ static void valleyview_irq_preinstall(struct drm_device *dev) ...@@ -3338,6 +3338,9 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
I915_WRITE(VLV_MASTER_IER, 0);
POSTING_READ(VLV_MASTER_IER);
gen5_gt_irq_reset(dev); gen5_gt_irq_reset(dev);
spin_lock_irq(&dev_priv->irq_lock); spin_lock_irq(&dev_priv->irq_lock);
...@@ -3707,6 +3710,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev) ...@@ -3707,6 +3710,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev)
spin_unlock_irq(&dev_priv->irq_lock); spin_unlock_irq(&dev_priv->irq_lock);
I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE); I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE);
POSTING_READ(VLV_MASTER_IER);
return 0; return 0;
} }
...@@ -3837,6 +3841,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev) ...@@ -3837,6 +3841,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
return; return;
I915_WRITE(VLV_MASTER_IER, 0); I915_WRITE(VLV_MASTER_IER, 0);
POSTING_READ(VLV_MASTER_IER);
gen5_gt_irq_reset(dev); gen5_gt_irq_reset(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment