summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorPaulo Zanoni2014-04-01 19:55:13 +0200
committerDaniel Vetter2014-04-01 22:53:46 +0200
commitc8431fda9f9f3c3b7490cb44bd5720b494a2421e (patch)
treea5017b84cfce485c99f02def998400ee460436d5 /drivers/gpu/drm/i915
parentdrm/i915: fix WARNs when reading DDI state while suspended (diff)
downloadkernel-qcow2-linux-c8431fda9f9f3c3b7490cb44bd5720b494a2421e.tar.gz
kernel-qcow2-linux-c8431fda9f9f3c3b7490cb44bd5720b494a2421e.tar.xz
kernel-qcow2-linux-c8431fda9f9f3c3b7490cb44bd5720b494a2421e.zip
drm/i915: don't get/put runtime PM at the debugfs forcewake file
Because gen6_gt_force_wake_{get,put} should already be responsible for getting/putting runtime PM. If we keep these calls, debugfs will not be testing the get/put calls of the forcewake functions. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 2bf7c42268e1..b27b7a5244b1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3699,7 +3699,6 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
if (INTEL_INFO(dev)->gen < 6)
return 0;
- intel_runtime_pm_get(dev_priv);
gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
return 0;
@@ -3714,7 +3713,6 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)
return 0;
gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
- intel_runtime_pm_put(dev_priv);
return 0;
}