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

Commit 521198a2 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: sanitize forcewake registers on reset 



In reset we try to restore the forcewake state to
pre reset state, using forcewake_count. The reset
doesn't seem to clear the forcewake bits so we
get warn on forcewake ack register not clearing.

Use same mechanism as intel_uncore_sanitize() does
when loading driver to reset the forcewake bits, right
after the chip has been reset.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a9c1f90c

drivers/gpu/drm/i915/intel_uncore.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -261,7 +261,7 @@ void intel_uncore_init(struct drm_device *dev) 
	}

	}

}

}





void intel_uncore_sanitize(struct drm_device *dev)

static void intel_uncore_forcewake_reset(struct drm_device *dev)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -272,6 +272,11 @@ void intel_uncore_sanitize(struct drm_device *dev) 
		if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))

		if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))

			__gen6_gt_force_wake_mt_reset(dev_priv);

			__gen6_gt_force_wake_mt_reset(dev_priv);

	}

	}

}



void intel_uncore_sanitize(struct drm_device *dev)

{

	intel_uncore_forcewake_reset(dev);





	/* BIOS often leaves RC6 enabled, but disable it for hw init */

	/* BIOS often leaves RC6 enabled, but disable it for hw init */

	intel_disable_gt_powersave(dev);

	intel_disable_gt_powersave(dev);
@@ -549,6 +554,8 @@ static int gen6_do_reset(struct drm_device *dev) 
	/* Spin waiting for the device to ack the reset request */

	/* Spin waiting for the device to ack the reset request */

	ret = wait_for((__raw_i915_read32(dev_priv, GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500);

	ret = wait_for((__raw_i915_read32(dev_priv, GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500);





	intel_uncore_forcewake_reset(dev);



	/* If reset with a user forcewake, try to restore, otherwise turn it off */

	/* If reset with a user forcewake, try to restore, otherwise turn it off */

	if (dev_priv->uncore.forcewake_count)

	if (dev_priv->uncore.forcewake_count)

		dev_priv->uncore.funcs.force_wake_get(dev_priv);

		dev_priv->uncore.funcs.force_wake_get(dev_priv);