On Fri, Mar 10, 2017 at 09:32:49AM +0000, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > > In commit 003342a50021 ("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: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > Fixes: 003342a50021 ("drm/i915: Keep track of active forcewake domains in a bitmask") > Testcase: igt/drv_suspend/forcewake > Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > Cc: "Paneri, Praveen" <praveen.paneri@xxxxxxxxx> > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: v4.10+ <stable@xxxxxxxxxxxxxxx> After being a chicken and waiting for CI, Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> -Chris -- Chris Wilson, Intel Open Source Technology Centre