On Fri, Jul 12, 2013 at 04:35:18PM -0300, Paulo Zanoni wrote:
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 0ad409a..ff3fb6d 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2169,21 +2169,33 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev)
> static int ironlake_irq_postinstall(struct drm_device *dev)
> {
> unsigned long irqflags;
> -
> drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
> - /* enable kind of interrupts always enabled */
> - u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT |
> - DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE |
> - DE_AUX_CHANNEL_A | DE_PIPEB_FIFO_UNDERRUN |
> - DE_PIPEA_FIFO_UNDERRUN | DE_POISON;
> + u32 display_mask, extra_mask;
> +
> + if (INTEL_INFO(dev)->gen >= 7) {
> + display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE_IVB |
If you add a leading bracket here, you make at least one vim user much
happier.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
