From: Tvrtko Ursulin Date: Thu, 17 Jan 2019 14:48:31 +0000 (+0000) Subject: drm/i915: Fix wakeref cookie handling in debugfs/i915_forcewake_user X-Git-Tag: v5.1-rc1~117^2~19^2~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ddbb12e3f54e491abd1660d34da255e462b0aa2;p=thirdparty%2Flinux.git 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: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190117144831.13156-1-tvrtko.ursulin@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index cdf7730a79df1..0f100fd5ff2cf 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4413,7 +4413,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) if (INTEL_GEN(i915) < 6) return 0; - intel_runtime_pm_get(i915); + file->private_data = (void *)(uintptr_t)intel_runtime_pm_get(i915); intel_uncore_forcewake_user_get(i915); return 0; @@ -4427,7 +4427,8 @@ static int i915_forcewake_release(struct inode *inode, struct file *file) return 0; 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; }