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

Commit d518ce50 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: WARN if interrupts aren't on in en/disable_pipestat 



Now that vlv has runtime pm we kinda should check for that like on the
pch split platforms. Looks like this was simply lost in the vlv rpm
enabling.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 8c50f10d

drivers/gpu/drm/i915/i915_irq.c

+2 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ __i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, 
	u32 pipestat = I915_READ(reg) & PIPESTAT_INT_ENABLE_MASK;



	assert_spin_locked(&dev_priv->irq_lock);

	WARN_ON(!intel_irqs_enabled(dev_priv));



	if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||

		      status_mask & ~PIPESTAT_INT_STATUS_MASK,
@@ -615,6 +616,7 @@ __i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, 
	u32 pipestat = I915_READ(reg) & PIPESTAT_INT_ENABLE_MASK;



	assert_spin_locked(&dev_priv->irq_lock);

	WARN_ON(!intel_irqs_enabled(dev_priv));



	if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||

		      status_mask & ~PIPESTAT_INT_STATUS_MASK,