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-Url: http://drtracing.org/?a=commitdiff_plain;h=3f4e349587cd840f01bd24ab6911bbcc790f2b0a;p=deliverable%2Flinux.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 a0e35866a70a..bc18444da786 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -231,8 +231,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,