From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 27 Nov 2013 19:47:58 +0000 (+0100)
Subject: drm/i915: drop the right force-wake engine in the vlv mmio funcs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=084054fc05c7798ff7cf61e25c246f222f41db5b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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) { \
 		val = __raw_i915_read##x(dev_priv, reg); \
 		if (--(*fwcount) == 0) \
 			(dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
-							FORCEWAKE_ALL); \
+							fwengine); \
 	} else { \
 		val = __raw_i915_read##x(dev_priv, reg); \
 	} \