All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] drm/i915: Check caller held wakerefs in assert_forcewakes_active
@ 2019-07-03 15:52 Chris Wilson
  2019-07-03 15:52 ` [PATCH 2/4] drm/i915/gt: Use caller provided forcewake for intel_mocs_init_engine Chris Wilson
                   ` (11 more replies)
  0 siblings, 12 replies; 14+ messages in thread
From: Chris Wilson @ 2019-07-03 15:52 UTC (permalink / raw)
  To: intel-gfx

The intent of the assert is to document that the caller took the
appropriate wakerefs for the function. However, as Tvrtko pointed out,
we simply check whether the fw_domains are active and may be confused by
the auto wakeref which may be dropped between the check and use. Let's
be more careful in the assert and check that each fw_domain has an
explicit caller wakeref above and beyond the automatic wakeref.

Reported-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 68d54e126d79..bc25a6e51463 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -738,6 +738,12 @@ void assert_forcewakes_inactive(struct intel_uncore *uncore)
 void assert_forcewakes_active(struct intel_uncore *uncore,
 			      enum forcewake_domains fw_domains)
 {
+	struct intel_uncore_forcewake_domain *domain;
+	unsigned int tmp;
+
+	if (!IS_ENABLED(CONFIG_DRM_i915_RUNTIME_PM))
+		return;
+
 	if (!uncore->funcs.force_wake_get)
 		return;
 
@@ -747,6 +753,24 @@ void assert_forcewakes_active(struct intel_uncore *uncore,
 	WARN(fw_domains & ~uncore->fw_domains_active,
 	     "Expected %08x fw_domains to be active, but %08x are off\n",
 	     fw_domains, fw_domains & ~uncore->fw_domains_active);
+
+	/*
+	 * Check that the caller has an explicit wakeref and we don't mistake
+	 * it for the auto wakeref.
+	 */
+	local_irq_disable();
+	for_each_fw_domain_masked(domain, fw_domains, uncore, tmp) {
+		unsigned int expect = 1;
+
+		if (hrtimer_active(&domain->timer))
+			expect++;
+
+		if (WARN(domain->wake_count < expect,
+			 "Expected domain %d to be held awake by caller\n",
+			 domain->id))
+			break;
+	}
+	local_irq_enable();
 }
 
 /* We give fast paths for the really cool registers */
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2019-07-05 15:06 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-03 15:52 [PATCH 1/4] drm/i915: Check caller held wakerefs in assert_forcewakes_active Chris Wilson
2019-07-03 15:52 ` [PATCH 2/4] drm/i915/gt: Use caller provided forcewake for intel_mocs_init_engine Chris Wilson
2019-07-03 15:52 ` [PATCH 3/4] drm/i915/gt: Assume we hold forcewake for execlists resume Chris Wilson
2019-07-03 15:52 ` [PATCH 4/4] drm/i915/gt: Ignore forcewake acquisition for posting_reads Chris Wilson
2019-07-03 18:46 ` ✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915: Check caller held wakerefs in assert_forcewakes_active Patchwork
2019-07-04  8:17 ` [PATCH v2] " Chris Wilson
2019-07-04  8:38   ` Tvrtko Ursulin
2019-07-04  9:26 ` ✗ Fi.CI.BAT: failure for series starting with [v2] drm/i915: Check caller held wakerefs in assert_forcewakes_active (rev2) Patchwork
2019-07-04  9:37 ` [PATCH v3] drm/i915: Check caller held wakerefs in assert_forcewakes_active Chris Wilson
2019-07-04 10:14 ` ✗ Fi.CI.BAT: failure for series starting with [v3] drm/i915: Check caller held wakerefs in assert_forcewakes_active (rev3) Patchwork
2019-07-04 10:20 ` [PATCH v4] drm/i915: Check caller held wakerefs in assert_forcewakes_active Chris Wilson
2019-07-04 12:12 ` ✓ Fi.CI.BAT: success for series starting with [v4] drm/i915: Check caller held wakerefs in assert_forcewakes_active (rev4) Patchwork
2019-07-04 22:46 ` ✗ Fi.CI.IGT: failure for series starting with [1/4] drm/i915: Check caller held wakerefs in assert_forcewakes_active Patchwork
2019-07-05 15:06 ` ✗ Fi.CI.IGT: failure for series starting with [v4] drm/i915: Check caller held wakerefs in assert_forcewakes_active (rev4) Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.