Commit 6ddbb12e authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Fix wakeref cookie handling in debugfs/i915_forcewake_user

To avoid a false positive of a leaked wakeref, we can store the cookie
in file->private_data and use it in intel_runtime_pm_put.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190117144831.13156-1-tvrtko.ursulin@linux.intel.com
parent 1b4bd5c4
...@@ -4413,7 +4413,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) ...@@ -4413,7 +4413,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
if (INTEL_GEN(i915) < 6) if (INTEL_GEN(i915) < 6)
return 0; return 0;
intel_runtime_pm_get(i915); file->private_data = (void *)(uintptr_t)intel_runtime_pm_get(i915);
intel_uncore_forcewake_user_get(i915); intel_uncore_forcewake_user_get(i915);
return 0; return 0;
...@@ -4427,7 +4427,8 @@ static int i915_forcewake_release(struct inode *inode, struct file *file) ...@@ -4427,7 +4427,8 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)
return 0; return 0;
intel_uncore_forcewake_user_put(i915); intel_uncore_forcewake_user_put(i915);
intel_runtime_pm_put_unchecked(i915); intel_runtime_pm_put(i915,
(intel_wakeref_t)(uintptr_t)file->private_data);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment