diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-28 12:10:44 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-28 12:10:44 +0200 |
| commit | 7f269bec7ed49385de394fdbd970f463ef2060f0 (patch) | |
| tree | 8c45f8c2e11cf101350272f81892cf4cf7678c3a /shared-core/nv04_timer.c | |
| parent | 55a9941977953d16b36bbf3e1dcad392ac70e1ef (diff) | |
| parent | 7f8e4060859651993921281445ec00940c577222 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_fops.c
linux-core/drm_lock.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/nv04_timer.c')
| -rw-r--r-- | shared-core/nv04_timer.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/shared-core/nv04_timer.c b/shared-core/nv04_timer.c index 88dff36d..616f197b 100644 --- a/shared-core/nv04_timer.c +++ b/shared-core/nv04_timer.c @@ -11,8 +11,17 @@ nv04_timer_init(struct drm_device *dev) NV_WRITE(NV04_PTIMER_INTR_EN_0, 0x00000000); NV_WRITE(NV04_PTIMER_INTR_0, 0xFFFFFFFF); - NV_WRITE(NV04_PTIMER_NUMERATOR, 0x00000008); - NV_WRITE(NV04_PTIMER_DENOMINATOR, 0x00000003); + /* Just use the pre-existing values when possible for now; these regs + * are not written in nv (driver writer missed a /4 on the address), and + * writing 8 and 3 to the correct regs breaks the timings on the LVDS + * hardware sequencing microcode. + * A correct solution (involving calculations with the GPU PLL) can + * be done when kernel modesetting lands + */ + if (!NV_READ(NV04_PTIMER_NUMERATOR) || !NV_READ(NV04_PTIMER_DENOMINATOR)) { + NV_WRITE(NV04_PTIMER_NUMERATOR, 0x00000008); + NV_WRITE(NV04_PTIMER_DENOMINATOR, 0x00000003); + } return 0; } |