diff options
| author | Imre Deak <imre.deak@intel.com> | 2014-06-06 13:04:37 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2014-06-11 10:06:43 +0200 |
| commit | 329ff963fd4c1356af66b878b11460388cb5f5dd (patch) | |
| tree | ed6d7cb480334e16566a2905300c9f7dc788d1a2 /drivers | |
| parent | drm/i915: Reorder semaphore deadlock check (diff) | |
| download | linux-329ff963fd4c1356af66b878b11460388cb5f5dd.tar.xz linux-329ff963fd4c1356af66b878b11460388cb5f5dd.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 79cba593df0d..4f6fef7ac069 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -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 |