aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_debugfs.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-11-06 09:36:36 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 17:51:45 -0500
commit44cbd33899302fc5294fc5fedfd0276348d796e4 (patch)
tree1af58fbe7c7589940ffe193b21d6fd04f49e99e7 /drivers/gpu/drm/i915/i915_debugfs.c
parent26b1ff35c8c4888fb544f290e0fc64143f7dbe45 (diff)
drm/i915: Missed lock change with rps lock
Fixes a WARN_ON in igt/tests/debugfs_reader CC: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 09cd7d76f6ae..4568e7d8a060 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1096,8 +1096,10 @@ static int gen6_drpc_info(struct seq_file *m)
1096 1096
1097 rpmodectl1 = I915_READ(GEN6_RP_CONTROL); 1097 rpmodectl1 = I915_READ(GEN6_RP_CONTROL);
1098 rcctl1 = I915_READ(GEN6_RC_CONTROL); 1098 rcctl1 = I915_READ(GEN6_RC_CONTROL);
1099 sandybridge_pcode_read(dev_priv, GEN6_PCODE_READ_RC6VIDS, &rc6vids);
1100 mutex_unlock(&dev->struct_mutex); 1099 mutex_unlock(&dev->struct_mutex);
1100 mutex_lock(&dev_priv->rps.hw_lock);
1101 sandybridge_pcode_read(dev_priv, GEN6_PCODE_READ_RC6VIDS, &rc6vids);
1102 mutex_unlock(&dev_priv->rps.hw_lock);
1101 1103
1102 seq_printf(m, "Video Turbo Mode: %s\n", 1104 seq_printf(m, "Video Turbo Mode: %s\n",
1103 yesno(rpmodectl1 & GEN6_RP_MEDIA_TURBO)); 1105 yesno(rpmodectl1 & GEN6_RP_MEDIA_TURBO));