diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index c04fbbf0acf7..e1bfc85d1789 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -1793,8 +1793,11 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) | |||
1793 | intel_finish_page_flip_plane(dev, pipe); | 1793 | intel_finish_page_flip_plane(dev, pipe); |
1794 | } | 1794 | } |
1795 | 1795 | ||
1796 | if (pipe_iir & GEN8_DE_PIPE_IRQ_ERRORS) | 1796 | if (pipe_iir & GEN8_DE_PIPE_IRQ_FAULT_ERRORS) { |
1797 | DRM_ERROR("Errors on pipe %c\n", 'A' + pipe); | 1797 | DRM_ERROR("Fault errors on pipe %c\n: 0x%08x", |
1798 | pipe_name(pipe), | ||
1799 | pipe_iir & GEN8_DE_PIPE_IRQ_FAULT_ERRORS); | ||
1800 | } | ||
1798 | 1801 | ||
1799 | if (pipe_iir) { | 1802 | if (pipe_iir) { |
1800 | ret = IRQ_HANDLED; | 1803 | ret = IRQ_HANDLED; |
@@ -2863,9 +2866,8 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) | |||
2863 | { | 2866 | { |
2864 | struct drm_device *dev = dev_priv->dev; | 2867 | struct drm_device *dev = dev_priv->dev; |
2865 | uint32_t de_pipe_enables = GEN8_PIPE_FLIP_DONE | | 2868 | uint32_t de_pipe_enables = GEN8_PIPE_FLIP_DONE | |
2866 | GEN8_PIPE_SCAN_LINE_EVENT | | ||
2867 | GEN8_PIPE_VBLANK | | 2869 | GEN8_PIPE_VBLANK | |
2868 | GEN8_DE_PIPE_IRQ_ERRORS; | 2870 | GEN8_DE_PIPE_IRQ_FAULT_ERRORS; |
2869 | int pipe; | 2871 | int pipe; |
2870 | dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_enables; | 2872 | dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_enables; |
2871 | dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_enables; | 2873 | dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_enables; |