]>
Commit | Line | Data |
---|---|---|
6918624e | 1 | This patch by Adam J. Richter. |
2 | ||
3 | --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c Tue May 29 15:51:52 2001 | |
4 | +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c Tue Jul 17 03:50:27 2001 | |
5 | @@ -1635,6 +1635,7 @@ | |
6 | VGAOUT8(vgaCRReg, cr66 | 0x80); | |
7 | VGAOUT8(vgaCRIndex, 0x3a); | |
8 | cr3a = VGAIN8(vgaCRReg); | |
9 | + save->CR3A = cr3a; | |
10 | VGAOUT8(vgaCRReg, cr3a | 0x80); | |
11 | ||
12 | /* VGA_SR_MODE saves mode info only, no fonts, no colormap */ | |
13 | @@ -1664,7 +1665,6 @@ | |
14 | VGAOUT8(vgaCRIndex, 0x36); | |
15 | save->CR36 = VGAIN8(vgaCRReg); | |
16 | VGAOUT8(vgaCRIndex, 0x3a); | |
17 | - save->CR3A = VGAIN8(vgaCRReg); | |
18 | if (!S3_TRIO_3D_SERIES(ps3v->Chipset)) { | |
19 | VGAOUT8(vgaCRIndex, 0x40); | |
20 | save->CR40 = VGAIN8(vgaCRReg); | |
21 | @@ -2093,8 +2093,7 @@ | |
22 | cr66 = VGAIN8(vgaCRReg); | |
23 | VGAOUT8(vgaCRReg, cr66 | 0x80); | |
24 | VGAOUT8(vgaCRIndex, 0x3a); | |
25 | - cr3a = VGAIN8(vgaCRReg); | |
26 | - VGAOUT8(vgaCRReg, cr3a | 0x80); | |
27 | + VGAOUT8(vgaCRReg, restore->CR3A | 0x80); | |
28 | ||
29 | /* And finally, we init the STREAMS processor if we have CR67 indicate 24bpp | |
30 | * We also restore FIFO and TIMEOUT memory controller registers. (later...) | |
31 | @@ -2157,7 +2156,7 @@ | |
32 | VGAOUT8(vgaCRIndex, 0x66); | |
33 | VGAOUT8(vgaCRReg, cr66); | |
34 | VGAOUT8(vgaCRIndex, 0x3a); | |
35 | - VGAOUT8(vgaCRReg, cr3a); | |
36 | + VGAOUT8(vgaCRReg, restore->CR3A); | |
37 | ||
38 | if (xf86GetVerbosity() > 1) { | |
39 | xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV, |