diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2012-11-06 14:36:36 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-11 23:51:45 +0100 |
| commit | 44cbd33899302fc5294fc5fedfd0276348d796e4 (patch) | |
| tree | 1af58fbe7c7589940ffe193b21d6fd04f49e99e7 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | 26b1ff35c8c4888fb544f290e0fc64143f7dbe45 (diff) | |
| download | olio-linux-3.10-44cbd33899302fc5294fc5fedfd0276348d796e4.tar.xz olio-linux-3.10-44cbd33899302fc5294fc5fedfd0276348d796e4.zip | |
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.c | 4 |
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 09cd7d76f6a..4568e7d8a06 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) 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)); |