From: Chris Wilson <chris@chris-wilson.co.uk> Date: Sun, 7 Jul 2019 15:11:35 +0000 (+0100) Subject: drm/i915: Pull assert_forcewake_active() underneath the lock X-Git-Tag: baikal/mips/sdk5.9~15288^2~19^2~187 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=70008d8ba2b409ff458627e7c1e0e0fff04747e1;p=kernel.git drm/i915: Pull assert_forcewake_active() underneath the lock Make no assumption that something in the background is not acquiring the fw_domain -- but we still do not track owner so assume that any active domain is intended by the caller. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190707151135.11700-1-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index bb9e0da30e94c..5f0367fd32007 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -747,6 +747,8 @@ void assert_forcewakes_active(struct intel_uncore *uncore, if (!uncore->funcs.force_wake_get) return; + spin_lock_irq(&uncore->lock); + assert_rpm_wakelock_held(uncore->rpm); fw_domains &= uncore->fw_domains; @@ -770,6 +772,8 @@ void assert_forcewakes_active(struct intel_uncore *uncore, domain->id, actual)) break; } + + spin_unlock_irq(&uncore->lock); } /* We give fast paths for the really cool registers */