aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-27 14:47:58 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-28 02:31:47 -0500
commit084054fc05c7798ff7cf61e25c246f222f41db5b (patch)
tree17f31057aaa85b60dd96a601be129103c91dbc06
parent46520e2baa861a02c14d3d590d5897092950c62a (diff)
drm/i915: drop the right force-wake engine in the vlv mmio funcs
This was fumbled in the conversion to per-engine forcewake. Cc: Deepak S <deepak.s@intel.com> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_uncore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 97ae8bda7a1e..a7c6de7d6240 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -496,7 +496,7 @@ vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
496 val = __raw_i915_read##x(dev_priv, reg); \ 496 val = __raw_i915_read##x(dev_priv, reg); \
497 if (--(*fwcount) == 0) \ 497 if (--(*fwcount) == 0) \
498 (dev_priv)->uncore.funcs.force_wake_put(dev_priv, \ 498 (dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
499 FORCEWAKE_ALL); \ 499 fwengine); \
500 } else { \ 500 } else { \
501 val = __raw_i915_read##x(dev_priv, reg); \ 501 val = __raw_i915_read##x(dev_priv, reg); \
502 } \ 502 } \