[Intel-gfx] [PATCH 3/7] drm/i915: vlv: s/spin_lock_irqsave/spin_lock/ in irq handler

[Jesse Barnes]

On Tue,  4 Feb 2014 21:35:47 +0200
Imre Deak <imre.deak at intel.com> wrote:

> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index b5524ea..e0e5190 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1481,10 +1481,9 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir)
>  {
>  	drm_i915_private_t *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)

I guess we don't have to worry about new interrupts until we ack this
one, so:

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>