diff options
| author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-05-28 08:16:29 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-05-28 08:16:29 +0000 |
| commit | 480d8a19b1faca90f8c4eb2df2d085c00927697e (patch) | |
| tree | 2f0510238988d3ea4ad5f05c1945788787b86c6c /sys | |
| parent | fbbb449cc0bd35ebb89b87d5b46ed2874246876e (diff) | |
| parent | 40319a2b963a3b1988910b3a62a0606bf16b6bd0 (diff) | |
merge
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/src/cmd/aux/vga/nvidia.c | 3 | ||||
| -rw-r--r-- | sys/src/cmd/aux/vga/pci.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/src/cmd/aux/vga/nvidia.c b/sys/src/cmd/aux/vga/nvidia.c index 5915f2d43..12bb2ca57 100644 --- a/sys/src/cmd/aux/vga/nvidia.c +++ b/sys/src/cmd/aux/vga/nvidia.c @@ -222,6 +222,9 @@ snarf(Vga* vga, Ctlr* ctlr) * Unlock */ vgaxo(Crtx, 0x1F, 0x57); + outportb(Crtx, 0x11); + outportb(Crtx+1, inportb(Crtx+1) & ~0x80); + trace("nvidia: Unlocked\n"); if (nv->pextdev[0] & 0x40) nv->crystalfreq = RefFreq; diff --git a/sys/src/cmd/aux/vga/pci.c b/sys/src/cmd/aux/vga/pci.c index 230739217..8bd730e63 100644 --- a/sys/src/cmd/aux/vga/pci.c +++ b/sys/src/cmd/aux/vga/pci.c @@ -55,7 +55,7 @@ pcicfginit(void) buf[j] = 0; close(fd); - p->ccru = strtol(buf + 3, nil, 16); + p->ccru = strtol(buf + 0, nil, 16) << 8; p->vid = strtol(buf + 9, &s, 16); p->did = strtol(s + 1, &s, 16); p->intl = strtol(s + 1, &s, 10); |