Commit 5babf0fc authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter

drm/i915: No need to put forcewake after a reset

As we now have intel_uncore_forcewake_reset() no need
to do explicit put after reset.

v2: rebase
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 96a6f0f1
...@@ -952,6 +952,7 @@ static int gen6_do_reset(struct drm_device *dev) ...@@ -952,6 +952,7 @@ static int gen6_do_reset(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
int ret; int ret;
unsigned long irqflags; unsigned long irqflags;
u32 fw_engine = 0;
/* Hold uncore.lock across reset to prevent any register access /* Hold uncore.lock across reset to prevent any register access
* with forcewake not set correctly * with forcewake not set correctly
...@@ -971,25 +972,21 @@ static int gen6_do_reset(struct drm_device *dev) ...@@ -971,25 +972,21 @@ static int gen6_do_reset(struct drm_device *dev)
intel_uncore_forcewake_reset(dev); intel_uncore_forcewake_reset(dev);
/* If reset with a user forcewake, try to restore, otherwise turn it off */ /* If reset with a user forcewake, try to restore */
if (IS_VALLEYVIEW(dev)) { if (IS_VALLEYVIEW(dev)) {
if (dev_priv->uncore.fw_rendercount) if (dev_priv->uncore.fw_rendercount)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_RENDER); fw_engine |= FORCEWAKE_RENDER;
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_RENDER);
if (dev_priv->uncore.fw_mediacount) if (dev_priv->uncore.fw_mediacount)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_MEDIA); fw_engine |= FORCEWAKE_MEDIA;
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_MEDIA);
} else { } else {
if (dev_priv->uncore.forcewake_count) if (dev_priv->uncore.forcewake_count)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL); fw_engine = FORCEWAKE_ALL;
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
} }
/* Restore fifo count */ if (fw_engine)
dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_engine);
if (IS_GEN6(dev) || IS_GEN7(dev)) if (IS_GEN6(dev) || IS_GEN7(dev))
dev_priv->uncore.fifo_count = dev_priv->uncore.fifo_count =
__raw_i915_read32(dev_priv, GTFIFOCTL) & __raw_i915_read32(dev_priv, GTFIFOCTL) &
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment