diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-05-23 21:00:18 +0530 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-11 16:57:27 +0200 |
| commit | 3f4e349587cd840f01bd24ab6911bbcc790f2b0a (patch) | |
| tree | fac730ad8650740ed6a013de51f124d94614c7b2 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | 2b6b3a09915f852ecca4317af6b55d2610e6b8d6 (diff) | |
| download | op-kernel-dev-3f4e349587cd840f01bd24ab6911bbcc790f2b0a.zip op-kernel-dev-3f4e349587cd840f01bd24ab6911bbcc790f2b0a.tar.gz | |
drm/i915/chv: CHV doesn't need WaRsForcewakeWaitTC0
Skip __gen6_gt_wait_for_thread_c0() on CHV.
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index a0e3586..bc18444 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, |
