|
|
@@ -1326,13 +1326,12 @@ void i915_error_state_get(struct drm_device *dev,
|
|
|
struct i915_error_state_file_priv *error_priv)
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
- unsigned long flags;
|
|
|
|
|
|
- spin_lock_irqsave(&dev_priv->gpu_error.lock, flags);
|
|
|
+ spin_lock_irq(&dev_priv->gpu_error.lock);
|
|
|
error_priv->error = dev_priv->gpu_error.first_error;
|
|
|
if (error_priv->error)
|
|
|
kref_get(&error_priv->error->ref);
|
|
|
- spin_unlock_irqrestore(&dev_priv->gpu_error.lock, flags);
|
|
|
+ spin_unlock_irq(&dev_priv->gpu_error.lock);
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -1346,12 +1345,11 @@ void i915_destroy_error_state(struct drm_device *dev)
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct drm_i915_error_state *error;
|
|
|
- unsigned long flags;
|
|
|
|
|
|
- spin_lock_irqsave(&dev_priv->gpu_error.lock, flags);
|
|
|
+ spin_lock_irq(&dev_priv->gpu_error.lock);
|
|
|
error = dev_priv->gpu_error.first_error;
|
|
|
dev_priv->gpu_error.first_error = NULL;
|
|
|
- spin_unlock_irqrestore(&dev_priv->gpu_error.lock, flags);
|
|
|
+ spin_unlock_irq(&dev_priv->gpu_error.lock);
|
|
|
|
|
|
if (error)
|
|
|
kref_put(&error->ref, i915_error_state_free);
|