Commit b6834bd6 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter

drm/i915: disable turbo on ValleyView for now

We'll probably need new init functions and will need to test it.

v2: fix impossible GEN6 && GEN7 condition, move to Daniel's new init function
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bfa3384a
...@@ -9541,7 +9541,7 @@ void intel_modeset_init_hw(struct drm_device *dev) ...@@ -9541,7 +9541,7 @@ void intel_modeset_init_hw(struct drm_device *dev)
intel_init_emon(dev); intel_init_emon(dev);
} }
if (IS_GEN6(dev) || IS_GEN7(dev)) { if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
gen6_enable_rps(dev_priv); gen6_enable_rps(dev_priv);
gen6_update_ring_freq(dev_priv); gen6_update_ring_freq(dev_priv);
} }
...@@ -9632,7 +9632,7 @@ void intel_modeset_cleanup(struct drm_device *dev) ...@@ -9632,7 +9632,7 @@ void intel_modeset_cleanup(struct drm_device *dev)
if (IS_IRONLAKE_M(dev)) if (IS_IRONLAKE_M(dev))
ironlake_disable_drps(dev); ironlake_disable_drps(dev);
if (IS_GEN6(dev) || IS_GEN7(dev)) if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev))
gen6_disable_rps(dev); gen6_disable_rps(dev);
if (IS_IRONLAKE_M(dev)) if (IS_IRONLAKE_M(dev))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment