diff mbox

drm/i915: initialize dpio_lock spin lock

Message ID 1346417455-23856-1-git-send-email-jani.nikula@intel.com (mailing list archive)
State Accepted
Headers show

Commit Message

Jani Nikula Aug. 31, 2012, 12:50 p.m. UTC 
From: Alexander Shishkin <alexander.shishkin@linux.intel.com>

This thing is killing lockdep.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
[Jani: move the init next to the other spin lock inits]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Ben Widawsky Sept. 8, 2012, 6:20 a.m. UTC | #1 
On Fri, 31 Aug 2012 15:50:55 +0300
Jani Nikula <jani.nikula@intel.com> wrote:

> From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> 
> This thing is killing lockdep.
> 
> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> [Jani: move the init next to the other spin lock inits]
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Daniel Vetter Sept. 8, 2012, 5:04 p.m. UTC | #2 
On Fri, Sep 07, 2012 at 11:20:44PM -0700, Ben Widawsky wrote:
> On Fri, 31 Aug 2012 15:50:55 +0300
> Jani Nikula <jani.nikula@intel.com> wrote:
> 
> > From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> > 
> > This thing is killing lockdep.
> > 
> > Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> > [Jani: move the init next to the other spin lock inits]
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> Acked-by: Ben Widawsky <ben@bwidawsk.net>
Oops, I've missed this patch here. Now applied to -fixes, thanks.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2c09900..8bd7c9a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1607,6 +1607,7 @@  int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	spin_lock_init(&dev_priv->irq_lock);
 	spin_lock_init(&dev_priv->error_lock);
 	spin_lock_init(&dev_priv->rps.lock);
+	spin_lock_init(&dev_priv->dpio_lock);
 
 	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
 		dev_priv->num_pipe = 3;