diff options
| author | Ville Syrjälä | 2016-04-13 20:19:48 +0200 |
|---|---|---|
| committer | Ville Syrjälä | 2016-04-14 13:45:11 +0200 |
| commit | 34c7b8a7b8b5a2075b37654aa2d1a46b1cee9ef2 (patch) | |
| tree | 3b20c80bbe7a291b4d93bdaf78e3956870f913dd /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915: Use GEN8_MASTER_IRQ_CONTROL consistently (diff) | |
| download | kernel-qcow2-linux-34c7b8a7b8b5a2075b37654aa2d1a46b1cee9ef2.tar.gz kernel-qcow2-linux-34c7b8a7b8b5a2075b37654aa2d1a46b1cee9ef2.tar.xz kernel-qcow2-linux-34c7b8a7b8b5a2075b37654aa2d1a46b1cee9ef2.zip | |
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460571598-24452-3-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index f0790fcc6b80..b4152f1d9ed8 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3338,6 +3338,9 @@ static void valleyview_irq_preinstall(struct drm_device *dev) { 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); spin_lock_irq(&dev_priv->irq_lock); @@ -3707,6 +3710,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev) spin_unlock_irq(&dev_priv->irq_lock); I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE); + POSTING_READ(VLV_MASTER_IER); return 0; } @@ -3837,6 +3841,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev) return; I915_WRITE(VLV_MASTER_IER, 0); + POSTING_READ(VLV_MASTER_IER); gen5_gt_irq_reset(dev); |