nouveau: nv20 bios does not initialise PTIMER

The wait functions depend on PTIMER, so write the old (incorrect, but working) values for uninitialised hw
main
Stuart Bennett 2008-03-25 18:30:05 +00:00
parent b0817a42e7
commit a81d07f64d
1 changed files with 8 additions and 6 deletions

View File

@ -11,15 +11,17 @@ nv04_timer_init(struct drm_device *dev)
NV_WRITE(NV04_PTIMER_INTR_EN_0, 0x00000000); NV_WRITE(NV04_PTIMER_INTR_EN_0, 0x00000000);
NV_WRITE(NV04_PTIMER_INTR_0, 0xFFFFFFFF); NV_WRITE(NV04_PTIMER_INTR_0, 0xFFFFFFFF);
/* Just use the pre-existing values for now; these regs are not written /* Just use the pre-existing values when possible for now; these regs
* in nv (driver writer missed a /4 on the address), and writing 8 and 3 * are not written in nv (driver writer missed a /4 on the address), and
* to the correct regs breaks the timings on the LVDS hardware * writing 8 and 3 to the correct regs breaks the timings on the LVDS
* sequencing microcode. * hardware sequencing microcode.
* A correct solution (involving calculations with the GPU PLL) can * A correct solution (involving calculations with the GPU PLL) can
* be done when kernel modesetting lands * be done when kernel modesetting lands
NV_WRITE(NV04_PTIMER_NUMERATOR, 0x00000008);
NV_WRITE(NV04_PTIMER_DENOMINATOR, 0x00000003);
*/ */
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; return 0;
} }