On Wed, Mar 28, 2012 at 01:39:41PM -0700, Jesse Barnes wrote: > We'll probably need new init functions and will need to test it. > > Signed-off-by: Jesse Barnes <[email protected]> > --- > drivers/gpu/drm/i915/i915_suspend.c | 2 +- > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_suspend.c > b/drivers/gpu/drm/i915/i915_suspend.c > index 2b5eb22..2a52060 100644 > --- a/drivers/gpu/drm/i915/i915_suspend.c > +++ b/drivers/gpu/drm/i915/i915_suspend.c > @@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev) > intel_init_emon(dev); > } > > - if (INTEL_INFO(dev)->gen >= 6) { > + if (INTEL_INFO(dev)->gen >= 6 && !IS_VALLEYVIEW(dev)) { > gen6_enable_rps(dev_priv); > gen6_update_ring_freq(dev_priv); > } > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index cfd4267..70cd86f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -9756,7 +9756,7 @@ void intel_modeset_init(struct drm_device *dev) > intel_init_emon(dev); > } > > - if (IS_GEN6(dev) || IS_GEN7(dev)) { > + if ((IS_GEN6(dev) && IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
IS_GEN6 && IS_GEN7 is unlikely to exist ... -Daniel > gen6_enable_rps(dev_priv); > gen6_update_ring_freq(dev_priv); > } > @@ -9799,7 +9799,7 @@ void intel_modeset_cleanup(struct drm_device *dev) > > if (IS_IRONLAKE_M(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); > > if (IS_IRONLAKE_M(dev)) > -- > 1.7.5.4 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
