From: Ville Syrjälä Date: Fri, 23 May 2014 15:30:18 +0000 (+0530) Subject: drm/i915/chv: CHV doesn't need WaRsForcewakeWaitTC0 X-Git-Tag: next-20140530~66^2~27 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=409c99131722bfec54eac300d37a31fd471920a6;p=karo-tx-linux.git drm/i915/chv: CHV doesn't need WaRsForcewakeWaitTC0 Skip __gen6_gt_wait_for_thread_c0() on CHV. Reviewed-by: Mika Kuoppala Signed-off-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 81839a6a6bbe..819c39b61ece 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -229,8 +229,8 @@ static void __vlv_force_wake_get(struct drm_i915_private *dev_priv, } /* WaRsForcewakeWaitTC0:vlv */ - __gen6_gt_wait_for_thread_c0(dev_priv); - + if (!IS_CHERRYVIEW(dev_priv->dev)) + __gen6_gt_wait_for_thread_c0(dev_priv); } static void __vlv_force_wake_put(struct drm_i915_private *dev_priv,