Commit 329ff963 authored Jun 06, 2014 by Imre Deak Committed by Jani Nikula Jun 11, 2014

drm/i915: fix possible refcount leak when resetting forcewake



If the timer putting the last forcewake refcount was pending and we
canceled it, we'll leak the corresponding forcewake and RPM references.

v2:
- do the ptr casting at the caller instead of adding a separate helper
  for this (Chris)

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent 4be17381

drivers/gpu/drm/i915/intel_uncore.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,8 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
		struct drm_i915_private *dev_priv = dev->dev_private;
		unsigned long irqflags;

		del_timer_sync(&dev_priv->uncore.force_wake_timer);
		if (del_timer_sync(&dev_priv->uncore.force_wake_timer))
		gen6_force_wake_timer((unsigned long)dev_priv);

		/* Hold uncore.lock across reset to prevent any register access
		* with forcewake not set correctly