Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211447
b: refs/heads/master
c: 070c0ee
h: refs/heads/master
i:
  211445: 2306ec7
  211443: ef9e192
  211439: 80c80e8
v: v3
  • Loading branch information
Andy Whitcroft authored and Matthew Garrett committed Oct 5, 2010
1 parent 72fb536 commit bee6be0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a8c096adbd2b55942ff13c8bbc573a7551768003
refs/heads/master: 070c0ee1ef9f5550cac9247190f0289349f28c01
6 changes: 4 additions & 2 deletions trunk/drivers/platform/x86/intel_ips.c
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,8 @@ static void update_turbo_limits(struct ips_driver *ips)
u32 hts = thm_readl(THM_HTS);

ips->cpu_turbo_enabled = !(hts & HTS_PCTD_DIS);
ips->gpu_turbo_enabled = !(hts & HTS_GTD_DIS);
if (ips->gpu_busy)
ips->gpu_turbo_enabled = !(hts & HTS_GTD_DIS);
ips->core_power_limit = thm_readw(THM_MPCPC);
ips->mch_power_limit = thm_readw(THM_MMGPC);
ips->mcp_temp_limit = thm_readw(THM_PTL);
Expand Down Expand Up @@ -1185,7 +1186,8 @@ static irqreturn_t ips_irq_handler(int irq, void *arg)
STS_GPL_SHIFT;
/* ignore EC CPU vs GPU pref */
ips->cpu_turbo_enabled = !(sts & STS_PCTD_DIS);
ips->gpu_turbo_enabled = !(sts & STS_GTD_DIS);
if (ips->gpu_busy)
ips->gpu_turbo_enabled = !(sts & STS_GTD_DIS);
ips->mcp_temp_limit = (sts & STS_PTL_MASK) >>
STS_PTL_SHIFT;
ips->mcp_power_limit = (tc1 & STS_PPL_MASK) >>
Expand Down

0 comments on commit bee6be0

Please sign in to comment.