leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Pull assert_forcewake_active() underneath the lock

Browse Source 
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
This commit is contained in:
Chris Wilson 2019-07-07 16:11:35 +01:00
parent 50b38bc4d3
commit 15e7facb7b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/intel_uncore.c
View File

@ -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 */