mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
drm/i915: Unmask and enable master error interrupt on gen2/3
For whatever reason we only unmask and enable the master error interrut on gen4. With the EIR handling fixed let's do that on gen2/3 as well. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180611200258.27121-4-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com>
This commit is contained in:
parent
78c357dd3f
commit
16659bc53a
1 changed files with 6 additions and 2 deletions
|
@ -4387,11 +4387,13 @@ static int i8xx_irq_postinstall(struct drm_device *dev)
|
|||
/* Unmask the interrupts that we always want on. */
|
||||
dev_priv->irq_mask =
|
||||
~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||||
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);
|
||||
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||||
I915_MASTER_ERROR_INTERRUPT);
|
||||
|
||||
enable_mask =
|
||||
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||||
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||||
I915_MASTER_ERROR_INTERRUPT |
|
||||
I915_USER_INTERRUPT;
|
||||
|
||||
GEN2_IRQ_INIT(, dev_priv->irq_mask, enable_mask);
|
||||
|
@ -4555,12 +4557,14 @@ static int i915_irq_postinstall(struct drm_device *dev)
|
|||
dev_priv->irq_mask =
|
||||
~(I915_ASLE_INTERRUPT |
|
||||
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||||
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);
|
||||
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||||
I915_MASTER_ERROR_INTERRUPT);
|
||||
|
||||
enable_mask =
|
||||
I915_ASLE_INTERRUPT |
|
||||
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||||
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||||
I915_MASTER_ERROR_INTERRUPT |
|
||||
I915_USER_INTERRUPT;
|
||||
|
||||
if (I915_HAS_HOTPLUG(dev_priv)) {
|
||||
|
|
Loading…
Reference in a new issue