Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8473050 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Fix forcewake active domain tracking 



In commit 003342a5 ("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.

v2: Bitmask checks are required since vfuncs are not
    always present.

v3: Move bitmask tracking to get/put vfunc for simplicity.
    (Chris Wilson)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 003342a5 ("drm/i915: Keep track of active forcewake domains in a bitmask")
Testcase: igt/drv_suspend/forcewake
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: "Paneri, Praveen" <praveen.paneri@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: v4.10+ <stable@vger.kernel.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170310093249.4484-1-tvrtko.ursulin@linux.intel.com
parent 1524e93e

drivers/gpu/drm/i915/intel_uncore.c

+6 −7
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ fw_domains_get(struct drm_i915_private *dev_priv, enum forcewake_domains fw_doma 


	for_each_fw_domain_masked(d, fw_domains, dev_priv)

		fw_domain_wait_ack(d);



	dev_priv->uncore.fw_domains_active |= fw_domains;

}



static void
@@ -130,6 +132,8 @@ fw_domains_put(struct drm_i915_private *dev_priv, enum forcewake_domains fw_doma 
		fw_domain_put(d);

		fw_domain_posting_read(d);

	}



	dev_priv->uncore.fw_domains_active &= ~fw_domains;

}



static void
@@ -247,10 +251,8 @@ intel_uncore_fw_release_timer(struct hrtimer *timer) 
	if (WARN_ON(domain->wake_count == 0))

		domain->wake_count++;



	if (--domain->wake_count == 0) {

	if (--domain->wake_count == 0)

		dev_priv->uncore.funcs.force_wake_put(dev_priv, domain->mask);

		dev_priv->uncore.fw_domains_active &= ~domain->mask;

	}



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
@@ -461,10 +463,8 @@ static void __intel_uncore_forcewake_get(struct drm_i915_private *dev_priv, 
			fw_domains &= ~domain->mask;

	}



	if (fw_domains) {

	if (fw_domains)

		dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_domains);

		dev_priv->uncore.fw_domains_active |= fw_domains;

	}

}



/**
@@ -931,7 +931,6 @@ static noinline void ___force_wake_auto(struct drm_i915_private *dev_priv, 
		fw_domain_arm_timer(domain);



	dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_domains);

	dev_priv->uncore.fw_domains_active |= fw_domains;

}



static inline void __force_wake_auto(struct drm_i915_private *dev_priv,