projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46520e2
)
drm/i915: drop the right force-wake engine in the vlv mmio funcs
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 27 Nov 2013 19:47:58 +0000
(20:47 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Thu, 28 Nov 2013 07:31:47 +0000
(08:31 +0100)
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>
drivers/gpu/drm/i915/intel_uncore.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_uncore.c
b/drivers/gpu/drm/i915/intel_uncore.c
index 97ae8bda7a1e1f2c7da7e18698348e3037657c1f..a7c6de7d6240ceb5335ef67bcff9c5b1aa685986 100644
(file)
--- 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); \
} \