diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-04-13 21:19:56 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-04-14 14:45:45 +0300 |
| commit | 528948745f6f52f36839b76beeab0632a9f16471 (patch) | |
| tree | c34668eff76741227ec42ff74aa95f7a7668eda7 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 2ecb8ca4a0190eb27c16e4484a0719cd692bc633 (diff) | |
| download | op-kernel-dev-528948745f6f52f36839b76beeab0632a9f16471.zip op-kernel-dev-528948745f6f52f36839b76beeab0632a9f16471.tar.gz | |
drm/i915: Move gt/pm irq handling out from irq disabled section on VLV
No need to actually handle the GT/PM interrupt while we have interrupt
sources disabled. Move the actual processing to happen after we've
restored VLV_IER and master interrupt enable.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460571598-24452-11-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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 5c093a3..d82c124 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1819,11 +1819,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) if (pm_iir) I915_WRITE(GEN6_PMIIR, pm_iir); - if (gt_iir) - snb_gt_irq_handler(dev, dev_priv, gt_iir); - if (pm_iir) - gen6_rps_irq_handler(dev_priv, pm_iir); - if (iir & I915_DISPLAY_PORT_INTERRUPT) hotplug_status = i9xx_hpd_irq_ack(dev_priv); @@ -1842,6 +1837,11 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE); POSTING_READ(VLV_MASTER_IER); + if (gt_iir) + snb_gt_irq_handler(dev, dev_priv, gt_iir); + if (pm_iir) + gen6_rps_irq_handler(dev_priv, pm_iir); + if (hotplug_status) i9xx_hpd_irq_handler(dev, hotplug_status); |
