system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-27 21:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Fix VLV forcewake after reset

Browse source 
Use the render/media specific forcewake counts to properly restore the
forcewake status after a GPU reset on VLV.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Deepak S <deepak.s@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2014-02-24 17:02:08 +02:00 committed by Daniel Vetter
parent f900db4758
commit ee7fa12ce4
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpu/drm/i915/intel_uncore.c
View file

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