Skip to content

Commit

Permalink
drm/i915: Use correct fw_domains during reset
Browse files Browse the repository at this point in the history
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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170323101944.21627-3-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Mar 23, 2017
1 parent bd52750 commit cb3600d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_uncore.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cb3600d

Please sign in to comment.