From 3bfc0f7d1cfc2ecfc952878cb996bb9f84f2283b Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 11 Apr 2012 09:23:33 -0700 Subject: [PATCH] --- yaml --- r: 307135 b: refs/heads/master c: b6834bd63ec407444098be233122a25bf4f17c75 h: refs/heads/master i: 307133: 88a26a3116c8b8b1bfed51eaf1c2df1660972663 307131: 72c5f77f39a82f49f0ae56a707c821a7daf5f8c9 307127: 1efdeace38f4c0474d7b40d415aecb35f93567a0 307119: f8b47adaf78b01c1d62098efc3b9798466aeb52d 307103: 8a9e7e1715b42ba77cb2a08be142c967a71ef93b 307071: a37fffbcb59d9efffee4fd0c900aba1dc25bd080 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e37c4aa4d9e..d4ca5216d752 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfa3384a9a84aaaa59443bbd776c142e7dba4b0f +refs/heads/master: b6834bd63ec407444098be233122a25bf4f17c75 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index aee389c442a4..58f4b02151f2 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -9541,7 +9541,7 @@ void intel_modeset_init_hw(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)) { gen6_enable_rps(dev_priv); gen6_update_ring_freq(dev_priv); } @@ -9632,7 +9632,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))