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

Commit f98cd096 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use IS_BROADWELL() instead of IS_GEN8() in forcewake code 



IS_GEN8() is a bad check in the forcewake code due to bdw vs. chv
differences. Use IS_BROADWELL() instead.

The only actual bug here is that we currently call
__gen7_gt_force_wake_mt_reset() on chv. On the other places we
have checked for chv before using IS_GEN8(), but change them
to use IS_BROADWELL() anyway to reduce the chance of accidents in the
future.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDeepak S <deepak.s@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c317adcd

drivers/gpu/drm/i915/intel_uncore.c

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv, 
{

	u32 forcewake_ack;



	if (IS_HASWELL(dev_priv->dev) || IS_GEN8(dev_priv->dev))

	if (IS_HASWELL(dev_priv->dev) || IS_BROADWELL(dev_priv->dev))

		forcewake_ack = FORCEWAKE_ACK_HSW;

	else

		forcewake_ack = FORCEWAKE_MT_ACK;
@@ -334,7 +334,7 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore) 
	else if (IS_GEN6(dev) || IS_GEN7(dev))

		__gen6_gt_force_wake_reset(dev_priv);



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

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

		__gen7_gt_force_wake_mt_reset(dev_priv);



	if (restore) { /* If reset with a user forcewake, try to restore */
@@ -838,7 +838,7 @@ void intel_uncore_init(struct drm_device *dev) 
	if (IS_VALLEYVIEW(dev)) {

		dev_priv->uncore.funcs.force_wake_get = __vlv_force_wake_get;

		dev_priv->uncore.funcs.force_wake_put = __vlv_force_wake_put;

	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {

	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {

		dev_priv->uncore.funcs.force_wake_get = __gen7_gt_force_wake_mt_get;

		dev_priv->uncore.funcs.force_wake_put = __gen7_gt_force_wake_mt_put;

	} else if (IS_IVYBRIDGE(dev)) {