| Message ID | 20190707165259.2025-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915: Fix assert_forcewake_active consideration of timer | expand |
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 5f0367fd3200..e13539fedd59 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -764,7 +764,7 @@ void assert_forcewakes_active(struct intel_uncore *uncore, unsigned int actual = READ_ONCE(domain->wake_count); unsigned int expect = 1; - if (hrtimer_active(&domain->timer) && READ_ONCE(domain->active)) + if (hrtimer_active(&domain->timer)) expect++; /* pending automatic release */ if (WARN(actual < expect,
The timer will keep running until there are no active users of the fw_domain; until it completes, the wake_count will be raised. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- Last go, honest. -Chris --- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)