提交 ee7fa12c 编写于 作者: V Ville Syrjälä 提交者: Daniel Vetter

drm/i915: Fix VLV forcewake after reset

Use the render/media specific forcewake counts to properly restore the
forcewake status after a GPU reset on VLV.
Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: NDeepak S <deepak.s@intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 f900db47
......@@ -982,10 +982,22 @@ static int gen6_do_reset(struct drm_device *dev)
intel_uncore_forcewake_reset(dev);
/* If reset with a user forcewake, try to restore, otherwise turn it off */
if (dev_priv->uncore.forcewake_count)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
if (IS_VALLEYVIEW(dev)) {
if (dev_priv->uncore.fw_rendercount)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_RENDER);
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_RENDER);
if (dev_priv->uncore.fw_mediacount)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_MEDIA);
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_MEDIA);
} else {
if (dev_priv->uncore.forcewake_count)
dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
else
dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
}
/* Restore fifo count */
dev_priv->uncore.fifo_count = __raw_i915_read32(dev_priv, GTFIFOCTL) & GT_FIFO_FREE_ENTRIES_MASK;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册