Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16659bc5 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180611200258.27121-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent 78c357dd

drivers/gpu/drm/i915/i915_irq.c

+6 −2
Original line number Diff line number Diff line
@@ -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)) {