UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: enable ring freq scaling, RC6 and graphics turbo on Ivy Bridge v3 

They use the same register interfaces, so we can simply enable the
existing code on IVB.

v2:
  - resolve conflict with ring freq scaling, we can enable it too
v3:
  - resolve conflict again, this time on drm-intel-next

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Jesse Barnes 2011-06-29 13:34:36 -07:00 committed by Keith Packard
parent 8eb2c0ee67
commit 1c70c0cebd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -865,7 +865,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
MEMSTAT_VID_SHIFT); MEMSTAT_VID_SHIFT);
seq_printf(m, "Current P-state: %d\n", seq_printf(m, "Current P-state: %d\n",
(rgvstat & MEMSTAT_PSTATE_MASK) >> MEMSTAT_PSTATE_SHIFT); (rgvstat & MEMSTAT_PSTATE_MASK) >> MEMSTAT_PSTATE_SHIFT);
} else if (IS_GEN6(dev)) { } else if (IS_GEN6(dev) || IS_GEN7(dev)) {
u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS); u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);
u32 rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS); u32 rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS);
u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP); u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
@ -1131,7 +1131,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)
int ret; int ret;
int gpu_freq, ia_freq; int gpu_freq, ia_freq;
if (!IS_GEN6(dev)) { if (!(IS_GEN6(dev) || IS_GEN7(dev))) {
seq_printf(m, "unsupported on this chipset\n"); seq_printf(m, "unsupported on this chipset\n");
return 0; return 0;
} }

4
drivers/gpu/drm/i915/intel_display.c
View File

@ -7970,7 +7970,7 @@ void intel_modeset_init(struct drm_device *dev)
intel_init_emon(dev); intel_init_emon(dev);
} }
if (IS_GEN6(dev)) { if (IS_GEN6(dev) || IS_GEN7(dev)) {
gen6_enable_rps(dev_priv); gen6_enable_rps(dev_priv);
gen6_update_ring_freq(dev_priv); gen6_update_ring_freq(dev_priv);
} }
@ -8014,7 +8014,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)) if (IS_GEN6(dev) || IS_GEN7(dev))
gen6_disable_rps(dev); gen6_disable_rps(dev);
if (IS_IRONLAKE_M(dev)) if (IS_IRONLAKE_M(dev))