shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/cmd/aux/vga/nvidia.c

+++ b/sys/src/cmd/aux/vga/nvidia.c

@@ -222,6 +222,9 @@

 	 * 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;

--- a/sys/src/cmd/aux/vga/pci.c

+++ b/sys/src/cmd/aux/vga/pci.c

@@ -55,7 +55,7 @@

 		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);