From 330067407e6701af0b7b74b2628035363222a47d Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 22 Jul 2011 09:21:36 -0700 Subject: [PATCH] --- yaml --- r: 262621 b: refs/heads/master c: 70fda70a724c737b0df4195763f9124d181fe64d h: refs/heads/master i: 262619: c88f17ae3ecb16f7ceb5967a11d77437c596ec0c v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/intel_ips.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0e77a4effe20..d6c4cb70ff3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78a7539b881eb557494a7c810625c0307b27296c +refs/heads/master: 70fda70a724c737b0df4195763f9124d181fe64d diff --git a/trunk/drivers/platform/x86/intel_ips.c b/trunk/drivers/platform/x86/intel_ips.c index 5ffe7c398148..809a3ae943c6 100644 --- a/trunk/drivers/platform/x86/intel_ips.c +++ b/trunk/drivers/platform/x86/intel_ips.c @@ -403,7 +403,7 @@ static void ips_cpu_raise(struct ips_driver *ips) thm_writew(THM_MPCPC, (new_tdp_limit * 10) / 8); - turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDC_OVR_EN; + turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDP_OVR_EN; wrmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_override); turbo_override &= ~TURBO_TDP_MASK; @@ -438,7 +438,7 @@ static void ips_cpu_lower(struct ips_driver *ips) thm_writew(THM_MPCPC, (new_limit * 10) / 8); - turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDC_OVR_EN; + turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDP_OVR_EN; wrmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_override); turbo_override &= ~TURBO_TDP_MASK;