]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: don't schedule force_wake_timer at gen6_read
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Tue, 1 Apr 2014 17:55:07 +0000 (14:55 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 1 Apr 2014 20:36:17 +0000 (22:36 +0200)
commit586af236e5ea7ab3e1a972ecf99035d6b27a3420
tree01508e9667b38101f0eec2cdd87d37122b440812
parent404dd77bfb830a7c9d768d02528424aef203bb13
drm/i915: don't schedule force_wake_timer at gen6_read

So far force_wake_timer was only used by gen6_gt_force_wake_put. Since
we always had balanced gen6_gt_force_wake_get/put calls, we could
guarantee balanced calls to intel_runtime_pm_get/put.

Commit 59a358370950f64e0dbec237fd3528a7e2d33a9e, "drm/i915: Convert
the forcewake worker into a timer func" started scheduling the
force_wake_timer at gen6_read, which resulted in an unbalanced
runtime_pm refcount.

So this commit just reverts to the old behavior until we can find a
proper way to used delayed force_wake from the register read/write
macros without leaving the runtime_pm refcounts unbalanced and without
runtime suspending the driver while forcewake is active.

Testcase: igt/pm_pc8/rte
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76544
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_uncore.c