Date: Sun, 9 Oct 2005 18:57:57 +0800 (CST) From: Ying-Chieh Chen <yinjieh@csie.nctu.edu.tw> To: FreeBSD-gnats-submit@freebsd.org Cc: x11@freebsd.org Subject: [UPDATE] fix xorg-server and bump PORTREVISION Message-ID: <200510091057.j99AvvM5060160@alumni.csie.nctu.edu.tw>
index | next in thread | raw e-mail
>Submitter-Id: current-users >Originator: Ying-Chieh Chen >Organization: MANA lab, CCU CS >Confidential: no >Synopsis: [UPDATE] fix xorg-server and bump PORTREVISION >Severity: non-critical >Priority: low >Category: ports >Class: sw-bug >Release: FreeBSD 6.0-BETA4 amd64 >Environment: System: FreeBSD amd64.yinjieh.org 6.0-BETA4 FreeBSD 6.0-BETA4 #0: Sat Oct 1 07:23:35 UTC 2005 root@:/usr/obj/usr/src/sys/GENERIC amd64 >Description: XOrg hangs with GeForce 6200 and 6600. According to https://bugs.freedesktop.org/show_bug.cgi?id=3333 , there is a patch to fix this problem. Bump PORTREVISION. Please commit this patch, thanks! >How-To-Repeat: Use a GeForce 6200 or 6600 VGA and startx. >Fix: --- xorg-server.patch begins here --- diff -ruN /usr/ports/x11-servers/xorg-server/Makefile xorg-server/Makefile --- /usr/ports/x11-servers/xorg-server/Makefile Sun Sep 18 16:34:24 2005 +++ xorg-server/Makefile Sun Oct 9 18:48:20 2005 @@ -7,7 +7,7 @@ PORTNAME= xorg-server PORTVERSION= 6.8.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src diff -ruN /usr/ports/x11-servers/xorg-server/files/patch-nv_hw.c xorg-server/files/patch-nv_hw.c --- /usr/ports/x11-servers/xorg-server/files/patch-nv_hw.c Thu Jan 1 00:00:00 1970 +++ xorg-server/files/patch-nv_hw.c Sun Oct 9 18:33:28 2005 @@ -0,0 +1,22 @@ +--- programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c.orig Sat Oct 8 20:13:06 2005 ++++ programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c Sat Oct 8 20:14:53 2005 +@@ -915,7 +915,7 @@ + RIVA_HW_STATE *state + ) + { +- int i; ++ int i, j; + + pNv->PMC[0x0140/4] = 0x00000000; + pNv->PMC[0x0200/4] = 0xFFFF00FF; +@@ -1162,6 +1162,10 @@ + pNv->PGRAPH[0x008C/4] = 0x60de8051; + pNv->PGRAPH[0x0090/4] = 0x00008000; + pNv->PGRAPH[0x0610/4] = 0x00be3c5f; ++ ++ j = pNv->REGS[0x1540/4] & 0xff; ++ for(i = 0; !(j & 1); j >>= 1, i++); ++ pNv->PGRAPH[0x5000/4] = i; + + if((pNv->Chipset & 0xfff0) == 0x0040) { + pNv->PGRAPH[0x09b0/4] = 0x83280fff; --- xorg-server.patch ends here ---help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510091057.j99AvvM5060160>