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

Commit 58ead0d7 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: vlv: s/spin_lock_irqsave/spin_lock/ in irq handler 



Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c1874ed7

drivers/gpu/drm/i915/i915_irq.c

+2 −3
Original line number Diff line number Diff line
@@ -1481,10 +1481,9 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 pipe_stats[I915_MAX_PIPES];

	unsigned long irqflags;

	int pipe;



	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);

	spin_lock(&dev_priv->irq_lock);

	for_each_pipe(pipe) {

		int reg = PIPESTAT(pipe);

		pipe_stats[pipe] = I915_READ(reg);
@@ -1495,7 +1494,7 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) 
		if (pipe_stats[pipe] & 0x8000ffff)

			I915_WRITE(reg, pipe_stats[pipe]);

	}

	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

	spin_unlock(&dev_priv->irq_lock);



	for_each_pipe(pipe) {

		if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS)