Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb3600db authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Use correct fw_domains during reset 



In the next patch we will begin to sanity check that we do not attempt
to obtain the forcewake on an unsupport domain. However, that is exactly
what we do during reset of the fw_domains - rectify it before it explodes.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170323101944.21627-3-chris@chris-wilson.co.uk
parent bd527504

drivers/gpu/drm/i915/intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static void intel_uncore_forcewake_reset(struct drm_i915_private *dev_priv, 
	if (fw)

		dev_priv->uncore.funcs.force_wake_put(dev_priv, fw);



	fw_domains_reset(dev_priv, FORCEWAKE_ALL);

	fw_domains_reset(dev_priv, dev_priv->uncore.fw_domains);



	if (restore) { /* If reset with a user forcewake, try to restore */

		if (fw)