aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-04-01 13:55:13 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-01 16:53:46 -0400
commitc8431fda9f9f3c3b7490cb44bd5720b494a2421e (patch)
treea5017b84cfce485c99f02def998400ee460436d5 /drivers/gpu/drm/i915
parent882244a3404088113f1add19d2d029f83e69efeb (diff)
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)
3699 if (INTEL_INFO(dev)->gen < 6) 3699 if (INTEL_INFO(dev)->gen < 6)
3700 return 0; 3700 return 0;
3701 3701
3702 intel_runtime_pm_get(dev_priv);
3703 gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL); 3702 gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
3704 3703
3705 return 0; 3704 return 0;
@@ -3714,7 +3713,6 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)
3714 return 0; 3713 return 0;
3715 3714
3716 gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL); 3715 gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
3717 intel_runtime_pm_put(dev_priv);
3718 3716
3719 return 0; 3717 return 0;
3720} 3718}