From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
In commit 003342a50021 ("drm/i915: Keep track of active
forcewake domains in a bitmask") I forgot to adjust the
newly introduce fw_domains_active state across reset.
This caused the assert_forcewakes_inactive to trigger
during suspend and resume if there were user held
forcewakes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
Fixes: 003342a50021 ("drm/i915: Keep track of active forcewake domains in a bitmask")
Testcase: igt/drv_suspend/forcewake
Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
Cc: "Paneri, Praveen" <praveen.paneri@xxxxxxxxx>
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
Cc: v4.10+ <stable@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_uncore.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 2a3f35c30501..efa040847d69 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -302,22 +302,21 @@ static void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv,
WARN_ON(active_domains);
fw = dev_priv->uncore.fw_domains_active;
- if (fw)
- dev_priv->uncore.funcs.force_wake_put(dev_priv, fw);
+ dev_priv->uncore.funcs.force_wake_put(dev_priv, fw);
+ dev_priv->uncore.fw_domains_active = 0;
fw_domains_reset(dev_priv, FORCEWAKE_ALL);
if (restore) { /* If reset with a user forcewake, try to restore */
- if (fw)
- dev_priv->uncore.funcs.force_wake_get(dev_priv, fw);
+ dev_priv->uncore.funcs.force_wake_get(dev_priv, fw);
+ dev_priv->uncore.fw_domains_active = fw;
if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv))
dev_priv->uncore.fifo_count =
fifo_free_entries(dev_priv);
- }
-
- if (!restore)
+ } else {
assert_forcewakes_inactive(dev_priv);
+ }
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
}
--
2.9.3