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

Commit f898780b authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: cleanup redundant checks from intel_enable_asle 



Realize that intel_enable_asle() is never called on PCH-split platforms
or on VLV. Rip out the GSE irq enable for PCH-split platforms, which
also happens to be incorrect for IVB+.

This should not cause any functional changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2cc7aa29

drivers/gpu/drm/i915/i915_irq.c

+3 −13
Original line number Diff line number Diff line
@@ -356,21 +356,11 @@ void intel_enable_asle(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = dev->dev_private;

	unsigned long irqflags;



	/* FIXME: opregion/asle for VLV */

	if (IS_VALLEYVIEW(dev))

		return;



	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);



	if (HAS_PCH_SPLIT(dev))

		ironlake_enable_display_irq(dev_priv, DE_GSE);

	else {

		i915_enable_pipestat(dev_priv, 1,

				     PIPE_LEGACY_BLC_EVENT_ENABLE);

	i915_enable_pipestat(dev_priv, 1, PIPE_LEGACY_BLC_EVENT_ENABLE);

	if (INTEL_INFO(dev)->gen >= 4)

			i915_enable_pipestat(dev_priv, 0,

					     PIPE_LEGACY_BLC_EVENT_ENABLE);

	}

		i915_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE);



	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

}