diff options
author | Dave Airlie <airlied@redhat.com> | 2011-03-08 07:18:35 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-03-08 07:18:35 +1000 |
commit | 862060414b7f3e6b1c20cc3cf1f2014328069f0b (patch) | |
tree | aef09e10ff5087563d94dc8bdeeb67a2ad7b2f26 /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | 6f70a4c3d19e8e8e1047a4dbf0ca910fed39f619 (diff) | |
parent | 467cffba85791cdfce38c124d75bd578f4bb8625 (diff) | |
download | op-kernel-dev-862060414b7f3e6b1c20cc3cf1f2014328069f0b.zip op-kernel-dev-862060414b7f3e6b1c20cc3cf1f2014328069f0b.tar.gz |
Merge remote branch 'ickle/drm-intel-fixes' into drm-fixes
* ickle/drm-intel-fixes:
drm/i915: Rebind the buffer if its alignment constraints changes with tiling
drm/i915: Disable GPU semaphores by default
drm/i915: Do not overflow the MMADDR write FIFO
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 3601466..4ff9b6c 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -865,7 +865,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) int max_freq; /* RPSTAT1 is in the GT power well */ - __gen6_force_wake_get(dev_priv); + __gen6_gt_force_wake_get(dev_priv); seq_printf(m, "GT_PERF_STATUS: 0x%08x\n", gt_perf_status); seq_printf(m, "RPSTAT1: 0x%08x\n", I915_READ(GEN6_RPSTAT1)); @@ -888,7 +888,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) seq_printf(m, "Max non-overclocked (RP0) frequency: %dMHz\n", max_freq * 100); - __gen6_force_wake_put(dev_priv); + __gen6_gt_force_wake_put(dev_priv); } else { seq_printf(m, "no P-state info available\n"); } |