From: Paulo Zanoni Date: Tue, 1 Apr 2014 17:55:13 +0000 (-0300) Subject: drm/i915: don't get/put runtime PM at the debugfs forcewake file X-Git-Tag: v3.15-rc1~51^2~1^2~5 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c8431fda9f9f3c3b7490cb44bd5720b494a2421e;p=uclinux-h8%2Flinux.git 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 Signed-off-by: Daniel Vetter --- 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; }