diff options
| author | Zhao Yakui <[email protected]> | 2014-04-17 10:37:38 +0800 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2014-05-05 09:08:47 +0200 |
| commit | 85f9b5f9c48abdbcbeacdd5a6daf76c63eba8c83 (patch) | |
| tree | 8dcf5407c2fcf1dd89fb054780647c8ecdc5e7ef | |
| parent | 845f74a701541662bf7d4880a0f4d492b28f2d18 (diff) | |
drm/i915:Handle the irq interrupt for the second BSD ring
Reviewed-by: Imre Deak <[email protected]>
Signed-off-by: Zhao Yakui <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index afa55199b829..2b3d852acb04 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1347,13 +1347,16 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev, DRM_ERROR("The master control interrupt lied (GT0)!\n"); } - if (master_ctl & GEN8_GT_VCS1_IRQ) { + if (master_ctl & (GEN8_GT_VCS1_IRQ | GEN8_GT_VCS2_IRQ)) { tmp = I915_READ(GEN8_GT_IIR(1)); if (tmp) { ret = IRQ_HANDLED; vcs = tmp >> GEN8_VCS1_IRQ_SHIFT; if (vcs & GT_RENDER_USER_INTERRUPT) notify_ring(dev, &dev_priv->ring[VCS]); + vcs = tmp >> GEN8_VCS2_IRQ_SHIFT; + if (vcs & GT_RENDER_USER_INTERRUPT) + notify_ring(dev, &dev_priv->ring[VCS2]); I915_WRITE(GEN8_GT_IIR(1), tmp); } else DRM_ERROR("The master control interrupt lied (GT1)!\n"); |