diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-27 20:47:58 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-28 08:31:47 +0100 |
| commit | 084054fc05c7798ff7cf61e25c246f222f41db5b (patch) | |
| tree | 17f31057aaa85b60dd96a601be129103c91dbc06 | |
| parent | drm/i915: Fix GT wake FIFO free entries for VLV (diff) | |
| download | linux-084054fc05c7798ff7cf61e25c246f222f41db5b.tar.xz linux-084054fc05c7798ff7cf61e25c246f222f41db5b.zip | |
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.c | 2 |
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) { \ 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); \ } \ |