diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:51 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:51 +0000 |
commit | 06bbfeac0401f34ce08fb5eaafe4d8db83b8f7a5 (patch) | |
tree | 6552faaaf1026cc89bda9d6235a357e2868f7d22 /src/nv_hw.c | |
parent | b56dd6bacff59e17249b5a1427f99edf93657f30 (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)YGWIN-6_8_1-MERGECYGWIN-RELEASE-1-MERGE
Diffstat (limited to 'src/nv_hw.c')
-rw-r--r-- | src/nv_hw.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/nv_hw.c b/src/nv_hw.c index b5bb015..67e3b5b 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -1132,9 +1132,9 @@ void NVLoadStateExt ( } VGA_WR08(pNv->PCIO, 0x03D4, 0x53); - VGA_WR08(pNv->PCIO, 0x03D5, 0); + VGA_WR08(pNv->PCIO, 0x03D5, state->timingH); VGA_WR08(pNv->PCIO, 0x03D4, 0x54); - VGA_WR08(pNv->PCIO, 0x03D5, 0); + VGA_WR08(pNv->PCIO, 0x03D5, state->timingV); VGA_WR08(pNv->PCIO, 0x03D4, 0x21); VGA_WR08(pNv->PCIO, 0x03D5, 0xfa); } @@ -1243,6 +1243,13 @@ void NVUnloadStateExt if((pNv->Chipset & 0x0ff0) >= 0x0170) { state->dither = pNv->PRAMDAC[0x083C/4]; } + + if(pNv->FlatPanel) { + VGA_WR08(pNv->PCIO, 0x03D4, 0x53); + state->timingH = VGA_RD08(pNv->PCIO, 0x03D5); + VGA_WR08(pNv->PCIO, 0x03D4, 0x54); + state->timingV = VGA_RD08(pNv->PCIO, 0x03D5); + } } } |