Skip to contentSkip to conversation

drm/i915: Missed lock change with rps lock

PATCH Applied Ben Widawsky 2 participants 2 messages Nov 6, 2012 – Nov 10, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Missed lock change with rps lock

Fixes a WARN_ON in igt/tests/debugfs_reader

---
 drivers/gpu/drm/i915/i915_debugfs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -1
index e842dea..09bc24c 100644
@@ -1108,8 +1108,10 @@ static int gen6_drpc_info(struct seq_file *m)
 
 	rpmodectl1 = I915_READ(GEN6_RP_CONTROL);
 	rcctl1 = I915_READ(GEN6_RC_CONTROL);
-	sandybridge_pcode_read(dev_priv, GEN6_PCODE_READ_RC6VIDS, &rc6vids);
 	mutex_unlock(&dev->struct_mutex);
+	mutex_lock(&dev_priv->rps.hw_lock);
+	sandybridge_pcode_read(dev_priv, GEN6_PCODE_READ_RC6VIDS, &rc6vids);
+	mutex_unlock(&dev_priv->rps.hw_lock);
 
 	seq_printf(m, "Video Turbo Mode: %s\n",
 		   yesno(rpmodectl1 & GEN6_RP_MEDIA_TURBO));
Signature · 1 line
1.8.0
#1 lore raw
Quoted 4 lines · Ben Widawsky

Fixes a WARN_ON in igt/tests/debugfs_reader

Queued for -next, thanks for the patch (I've accidentaly replied to the wrong patch, hence the two replies for the sparse fixup patch). -Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch