Tue Apr 12 18:32:38 UTC 2005

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12836

Modified Files:
	xorg-x11-6.8.1-battle-libc-wrapper.patch 
	xorg-x11-6.8.2-cursor-flicker.patch 
	xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch 
	xorg-x11-6.8.2-xnest-shape-fix.patch xorg-x11.spec 
Added Files:
	xorg-x11-6.8.3-alpha-srel32-fix-fdo1765-2174.patch 
	xorg-x11-6.8.3-canonicalize-builderaddr-1-fdo2884-2293.patch 
	xorg-x11-6.8.3-intrinsics-gcc4-fdo2893-2305.patch 
	xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch 
	xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch 
	xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch 
	xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch 
	xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch 
	xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch 
	xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch 
	xorg-x11-6.8.3-saver-c-fdo2194-1613.patch 
	xorg-x11-6.8.3-uname-fdo2123-1587.patch 
	xorg-x11-6.8.3-void-fdo2467-1828.patch 
	xorg-x11-6.8.3-xnest-fdo2599-1964.patch 
	xorg-x11-6.8.3-xorgcfg-typo-fdo2896-2311.patch 
	xorg-x11-6.8.3-xset-fdo2258-2166.patch 
Log Message:
Merge 6.8.3 patch candidates and a fix for radeon ddc probing.


xorg-x11-6.8.3-alpha-srel32-fix-fdo1765-2174.patch:
 elfloader.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- NEW FILE xorg-x11-6.8.3-alpha-srel32-fix-fdo1765-2174.patch ---
--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c.alpha-srel32-fix-fdo1765-2174	2004-12-08 01:25:07.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c	2005-04-11 23:01:47.000000000 -0400
@@ -1609,6 +1609,20 @@
 	    break;
 	}
 
+ 	case R_ALPHA_SREL32:
+ 	    {
+ 		dest32 = (unsigned int *)(secp + rel->r_offset);
+ 		symval += rel->r_addend;
+ 		symval -= (unsigned long) dest32;
+ 		if ((long)symval >= 0x80000000
+ 		    || (long)symval < -(long)0x80000000)
+ 		    FatalError("R_ALPHA_SREL32 overflow for %s: %lx\n",
+ 			       ElfGetSymbolName(elffile, ELF_R_SYM(rel->r_info)),
+ 			       symval);
+ 		*dest32 = symval;
+ 		break;
+ 	    }
+ 
 #endif /* alpha */
 #if defined(__mc68000__)
     case R_68K_32:

xorg-x11-6.8.3-canonicalize-builderaddr-1-fdo2884-2293.patch:
 xorg.tmpl |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-6.8.3-canonicalize-builderaddr-1-fdo2884-2293.patch ---
--- xc/config/cf/xorg.tmpl.canonicalize-builderaddr-1-fdo2884-2293	2004-04-23 14:41:59.000000000 -0400
+++ xc/config/cf/xorg.tmpl	2005-04-12 01:20:36.000000000 -0400
@@ -16,7 +16,7 @@
 #ifdef BuilderEMailAddr
 BUILDERADDR = BuilderEMailAddr
 #else 
-BUILDERADDR = "xorg at freedesktop.org"
+BUILDERADDR = "xorg at lists.freedesktop.org"
 #endif
 #ifdef VendorSupportAddress
  VENDORSUPPORT = VendorSupportAddress

xorg-x11-6.8.3-intrinsics-gcc4-fdo2893-2305.patch:
 fbmmx.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-6.8.3-intrinsics-gcc4-fdo2893-2305.patch ---
--- xc/programs/Xserver/fb/fbmmx.c.intrinsics-gcc4-fdo2893-2305	2005-04-11 22:54:26.000000000 -0400
+++ xc/programs/Xserver/fb/fbmmx.c	2005-04-11 23:09:22.000000000 -0400
@@ -35,10 +35,18 @@
 #include "mipict.h"
 #include "fbpict.h"
 
+#if __GNUC__ >= 4
+#include <mmintrin.h>
+typedef __m64 Vector1x64;
+typedef int Vector2x32 __attribute__ ((vector_size (8)));
+typedef short Vector4x16 __attribute__ ((vector_size (8)));
+typedef char Vector8x8  __attribute__ ((vector_size (8)));
+#else
 typedef int Vector1x64 __attribute__ ((mode(DI)));
 typedef int Vector2x32 __attribute__ ((mode(V2SI)));
 typedef int Vector4x16 __attribute__ ((mode(V4HI)));
 typedef int Vector8x8  __attribute__ ((mode(V8QI)));
+#endif
 
 typedef unsigned long long ullong;
 
@@ -98,9 +106,9 @@
 shift (Vector1x64 v, int s)
 {
     if (s > 0)
-	return __builtin_ia32_psllq (v, s);
+	return (Vector1x64) __builtin_ia32_psllq ((long long) v, s);
     else if (s < 0)
-	return __builtin_ia32_psrlq (v, -s);
+	return (Vector1x64) __builtin_ia32_psrlq ((long long) v, -s);
     else
 	return v;
 }

xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch:
 iso8859-2  |    4 ++--
 iso8859-3  |    4 ++--
 iso8859-9  |    4 ++--
 iso8859-9e |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch ---
Index: xc/nls/Compose/iso8859-2
===================================================================
RCS file: /cvs/xorg/xc/nls/Compose/iso8859-2,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 iso8859-2
--- xc/nls/Compose/iso8859-2	23 Apr 2004 18:44:33 -0000	1.2
+++ xc/nls/Compose/iso8859-2	19 Mar 2005 21:37:56 -0000
@@ -2,42 +2,42 @@
 XCOMM
 XCOMM ISO 8859-2 (Latin2) Compose Sequence
 XCOMM
 XCOMM $XFree86: xc/nls/Compose/iso8859-2,v 1.6 2001/05/18 23:35:29 dawes Exp $
 XCOMM
 XCOMM Sequence Definition
 XCOMM
 XCOMM <Multi_key> Means <Compose>
 XCOMM Special Character
 <Multi_key> <plus> <plus>		: "#"	numbersign
 <Multi_key> <apostrophe> <space>	: "'"	apostrophe
 <Multi_key> <space> <apostrophe>	: "'"	apostrophe
 <Multi_key> <A> <A>			: "@"	at
 <Multi_key> <parenleft> <parenleft>	: "["	bracketleft
 <Multi_key> <slash> <slash>		: "\\"	backslash
 <Multi_key> <slash> <less>		: "\\"	backslash
 <Multi_key> <less> <slash>		: "\\"	backslash
 <Multi_key> <parenright> <parenright>	: "]"	bracketright
 <Multi_key> <asciicircum> <space>	: "^"	asciicircum
 <Multi_key> <space> <asciicircum>	: "^"	asciicircum
-<Multi_key> <greater> <space>		: "^"	asciicirum
-<Multi_key> <space> <greater>		: "^"	asciicirum
+<Multi_key> <greater> <space>		: "^"	asciicircum
+<Multi_key> <space> <greater>		: "^"	asciicircum
 <Multi_key> <grave> <space>		: "`"	grave
 <Multi_key> <space> <grave>		: "`"	grave
 <Multi_key> <parenleft> <minus>		: "{"	braceleft
 <Multi_key> <minus> <parenleft>		: "{"	braceleft
 <Multi_key> <slash> <asciicircum>	: "|"	bar
 <Multi_key> <asciicircum> <slash>	: "|"	bar
 <Multi_key> <V> <L>			: "|"	bar
 <Multi_key> <L> <V>			: "|"	bar
 <Multi_key> <v> <l>			: "|"	bar
 <Multi_key> <l> <v>			: "|"	bar
 <Multi_key> <parenright> <minus>	: "}"	braceright
 <Multi_key> <minus> <parenright>	: "}"	braceright
 <Multi_key> <asciitilde> <space>	: "~"	asciitilde
 <Multi_key> <space> <asciitilde>	: "~"	asciitilde
 <Multi_key> <minus> <space>		: "~"	asciitilde
 <Multi_key> <space> <minus>		: "~"	asciitilde
 <Multi_key> <x> <o>			: "\244"	currency
 <Multi_key> <o> <x>			: "\244"	currency
 <Multi_key> <X> <O>			: "\244"	currency
 <Multi_key> <O> <X>			: "\244"	currency
Index: xc/nls/Compose/iso8859-3
===================================================================
RCS file: /cvs/xorg/xc/nls/Compose/iso8859-3,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 iso8859-3
--- xc/nls/Compose/iso8859-3	23 Apr 2004 18:44:33 -0000	1.2
+++ xc/nls/Compose/iso8859-3	19 Mar 2005 21:37:56 -0000
@@ -2,42 +2,42 @@
 XCOMM
 XCOMM ISO 8859-3 (Latin3) Compose Sequence
 XCOMM
 XCOMM Sequence Definition
 XCOMM
 XCOMM $XFree86: xc/nls/Compose/iso8859-3,v 1.1 1999/06/06 14:05:57 dawes Exp $
 XCOMM
 XCOMM <Multi_key> Means <Compose>
 XCOMM Special Character
 <Multi_key> <plus> <plus>		: "#"	numbersign
 <Multi_key> <apostrophe> <space>	: "'"	apostrophe
 <Multi_key> <space> <apostrophe>	: "'"	apostrophe
 <Multi_key> <A> <A>			: "@"	at
 <Multi_key> <parenleft> <parenleft>	: "["	bracketleft
 <Multi_key> <slash> <slash>		: "\\"	backslash
 <Multi_key> <slash> <less>		: "\\"	backslash
 <Multi_key> <less> <slash>		: "\\"	backslash
 <Multi_key> <parenright> <parenright>	: "]"	bracketright
 <Multi_key> <asciicircum> <space>	: "^"	asciicircum
 <Multi_key> <space> <asciicircum>	: "^"	asciicircum
-<Multi_key> <greater> <space>		: "^"	asciicirum
-<Multi_key> <space> <greater>		: "^"	asciicirum
+<Multi_key> <greater> <space>		: "^"	asciicircum
+<Multi_key> <space> <greater>		: "^"	asciicircum
 <Multi_key> <grave> <space>		: "`"	grave
 <Multi_key> <space> <grave>		: "`"	grave
 <Multi_key> <parenleft> <minus>		: "{"	braceleft
 <Multi_key> <minus> <parenleft>		: "{"	braceleft
 <Multi_key> <slash> <asciicircum>	: "|"	bar
 <Multi_key> <asciicircum> <slash>	: "|"	bar
 <Multi_key> <V> <L>			: "|"	bar
 <Multi_key> <L> <V>			: "|"	bar
 <Multi_key> <v> <l>			: "|"	bar
 <Multi_key> <l> <v>			: "|"	bar
 <Multi_key> <parenright> <minus>	: "}"	braceright
 <Multi_key> <minus> <parenright>	: "}"	braceright
 <Multi_key> <asciitilde> <space>	: "~"	asciitilde
 <Multi_key> <space> <asciitilde>	: "~"	asciitilde
 <Multi_key> <minus> <space>		: "~"	asciitilde
 <Multi_key> <space> <minus>		: "~"	asciitilde
 <Multi_key> <l> <minus>			: "\243"	sterling
 <Multi_key> <minus> <l>			: "\243"	sterling
 <Multi_key> <L> <minus>			: "\243"	sterling
 <Multi_key> <minus> <L>			: "\243"	sterling
Index: xc/nls/Compose/iso8859-9
===================================================================
RCS file: /cvs/xorg/xc/nls/Compose/iso8859-9,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 iso8859-9
--- xc/nls/Compose/iso8859-9	23 Apr 2004 18:44:33 -0000	1.2
+++ xc/nls/Compose/iso8859-9	19 Mar 2005 21:37:57 -0000
@@ -2,42 +2,42 @@
 XCOMM
 XCOMM ISO 8859-9 (Latin5) Compose Sequence
 XCOMM
 XCOMM Sequence Definition
 XCOMM
 XCOMM $XFree86: xc/nls/Compose/iso8859-9,v 1.1 1999/06/06 14:05:57 dawes Exp $
 XCOMM
 XCOMM <Multi_key> Means <Compose>
 XCOMM Special Character
 <Multi_key> <plus> <plus>		: "#"	numbersign
 <Multi_key> <apostrophe> <space>	: "'"	apostrophe
 <Multi_key> <space> <apostrophe>	: "'"	apostrophe
 <Multi_key> <A> <A>			: "@"	at
 <Multi_key> <parenleft> <parenleft>	: "["	bracketleft
 <Multi_key> <slash> <slash>		: "\\"	backslash
 <Multi_key> <slash> <less>		: "\\"	backslash
 <Multi_key> <less> <slash>		: "\\"	backslash
 <Multi_key> <parenright> <parenright>	: "]"	bracketright
 <Multi_key> <asciicircum> <space>	: "^"	asciicircum
 <Multi_key> <space> <asciicircum>	: "^"	asciicircum
-<Multi_key> <greater> <space>		: "^"	asciicirum
-<Multi_key> <space> <greater>		: "^"	asciicirum
+<Multi_key> <greater> <space>		: "^"	asciicircum
+<Multi_key> <space> <greater>		: "^"	asciicircum
 <Multi_key> <grave> <space>		: "`"	grave
 <Multi_key> <space> <grave>		: "`"	grave
 <Multi_key> <parenleft> <minus>		: "{"	braceleft
 <Multi_key> <minus> <parenleft>		: "{"	braceleft
 <Multi_key> <slash> <asciicircum>	: "|"	bar
 <Multi_key> <asciicircum> <slash>	: "|"	bar
 <Multi_key> <V> <L>			: "|"	bar
 <Multi_key> <L> <V>			: "|"	bar
 <Multi_key> <v> <l>			: "|"	bar
 <Multi_key> <l> <v>			: "|"	bar
 <Multi_key> <parenright> <minus>	: "}"	braceright
 <Multi_key> <minus> <parenright>	: "}"	braceright
 <Multi_key> <asciitilde> <space>	: "~"	asciitilde
 <Multi_key> <space> <asciitilde>	: "~"	asciitilde
 <Multi_key> <minus> <space>		: "~"	asciitilde
 <Multi_key> <space> <minus>		: "~"	asciitilde
 <Multi_key> <exclam> <exclam>		: "\241"	exclamdown
 <Multi_key> <c> <slash>			: "\242"	cent
 <Multi_key> <slash> <c>			: "\242"	cent
 <Multi_key> <C> <slash>			: "\242"	cent
Index: xc/nls/Compose/iso8859-9e
===================================================================
RCS file: /cvs/xorg/xc/nls/Compose/iso8859-9e,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 iso8859-9e
--- xc/nls/Compose/iso8859-9e	23 Apr 2004 18:44:33 -0000	1.2
+++ xc/nls/Compose/iso8859-9e	19 Mar 2005 21:37:58 -0000
@@ -1,42 +1,42 @@
 XCOMM
 XCOMM ISO 8859-9e (Latin??) Compose Sequence
 XCOMM
 XCOMM Sequence Definition
 XCOMM
 XCOMM $XFree86: xc/nls/Compose/iso8859-9e,v 1.1 2000/10/27 18:30:51 dawes Exp $
 XCOMM
 XCOMM <Multi_key> Means <Compose>
 XCOMM Special Character
 <Multi_key> <plus> <plus>		: "#"	numbersign
 <Multi_key> <apostrophe> <space>	: "'"	apostrophe
 <Multi_key> <space> <apostrophe>	: "'"	apostrophe
 <Multi_key> <A> <A>			: "@"	at
 <Multi_key> <parenleft> <parenleft>	: "["	bracketleft
 <Multi_key> <slash> <slash>		: "\\"	backslash
 <Multi_key> <slash> <less>		: "\\"	backslash
 <Multi_key> <less> <slash>		: "\\"	backslash
 <Multi_key> <parenright> <parenright>	: "]"	bracketright
 <Multi_key> <asciicircum> <space>	: "^"	asciicircum
 <Multi_key> <space> <asciicircum>	: "^"	asciicircum
-<Multi_key> <greater> <space>		: "^"	asciicirum
-<Multi_key> <space> <greater>		: "^"	asciicirum
+<Multi_key> <greater> <space>		: "^"	asciicircum
+<Multi_key> <space> <greater>		: "^"	asciicircum
 <Multi_key> <grave> <space>		: "`"	grave
 <Multi_key> <space> <grave>		: "`"	grave
 <Multi_key> <parenleft> <minus>		: "{"	braceleft
 <Multi_key> <minus> <parenleft>		: "{"	braceleft
 <Multi_key> <slash> <asciicircum>	: "|"	bar
 <Multi_key> <asciicircum> <slash>	: "|"	bar
 <Multi_key> <V> <L>			: "|"	bar
 <Multi_key> <L> <V>			: "|"	bar
 <Multi_key> <v> <l>			: "|"	bar
 <Multi_key> <l> <v>			: "|"	bar
 <Multi_key> <parenright> <minus>	: "}"	braceright
 <Multi_key> <minus> <parenright>	: "}"	braceright
 <Multi_key> <asciitilde> <space>	: "~"	asciitilde
 <Multi_key> <space> <asciitilde>	: "~"	asciitilde
 <Multi_key> <minus> <space>		: "~"	asciitilde
 <Multi_key> <space> <minus>		: "~"	asciitilde
 <Multi_key> <exclam> <exclam>		: "\241"	exclamdown
 <Multi_key> <c> <slash>			: "\242"	cent
 <Multi_key> <slash> <c>			: "\242"	cent
 <Multi_key> <C> <slash>			: "\242"	cent

xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch:
 connection.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch ---
--- xc/programs/lbxproxy/os/connection.c.lbxproxy-fdo2678-2051	2005-04-12 00:28:19.000000000 -0400
+++ xc/programs/lbxproxy/os/connection.c	2005-04-12 00:28:33.000000000 -0400
@@ -762,6 +762,8 @@
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
 
+    if(!oc)
+      return;
     if (oc->output && oc->output->count)
 	FlushClient(client, oc, (char *)NULL, 0);
     ConnectionTranslation[oc->fd] = 0;

xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch:
 nv_hw.c |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

--- NEW FILE xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c.nv-hw-fdo2533-1896	2005-04-12 01:36:00.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c	2005-04-12 01:36:59.000000000 -0400
@@ -928,23 +928,16 @@
 
     if(pNv->Architecture == NV_ARCH_04) {
         pNv->PFB[0x0200/4] = state->config;
+    } else if ((pNv->Chipset & 0xfff0) == 0x0090) {
+        for(i = 0; i < 15; i++) {
+           pNv->PFB[(0x0600 + (i * 0x10))/4] = 0;
+           pNv->PFB[(0x0604 + (i * 0x10))/4] = pNv->FbMapSize - 1;
+        }
     } else {
-        pNv->PFB[0x0240/4] = 0;
-        pNv->PFB[0x0244/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x0250/4] = 0;
-        pNv->PFB[0x0254/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x0260/4] = 0;
-        pNv->PFB[0x0264/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x0270/4] = 0;
-        pNv->PFB[0x0274/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x0280/4] = 0;
-        pNv->PFB[0x0284/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x0290/4] = 0;
-        pNv->PFB[0x0294/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x02A0/4] = 0;
-        pNv->PFB[0x02A4/4] = pNv->FbMapSize - 1;
-        pNv->PFB[0x02B0/4] = 0;
-        pNv->PFB[0x02B4/4] = pNv->FbMapSize - 1;
+        for(i = 0; i < 8; i++) {
+           pNv->PFB[(0x0240 + (i * 0x10))/4] = 0;
+           pNv->PFB[(0x0244 + (i * 0x10))/4] = pNv->FbMapSize - 1;
+        }
     }
 
     if(pNv->Architecture >= NV_ARCH_40) {
@@ -1189,6 +1182,8 @@
                  pNv->PGRAPH[0x0860/4] = 0;
                  pNv->PGRAPH[0x0864/4] = 0;
                  pNv->PRAMDAC[0x0608/4] |= 0x00100000;
+                 pNv->PGRAPH[0x0828/4] = 0x07830610;
+                 pNv->PGRAPH[0x082C/4] = 0x0000016A;
                  break;
               case 0x0140:
                  pNv->PGRAPH[0x0828/4] = 0x0072cb77;
@@ -1237,8 +1232,13 @@
               }
            }
 
-           for(i = 0; i < 32; i++)
-             pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0240/4) + i];
+           if((pNv->Chipset & 0xfff0) == 0x0090) {
+              for(i = 0; i < 60; i++)
+                pNv->PGRAPH[(0x0D00/4) + i] = pNv->PFB[(0x0600/4) + i];
+           } else {
+              for(i = 0; i < 32; i++)
+                pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0240/4) + i];
+           }
 
            if(pNv->Architecture >= NV_ARCH_40) {
               if((pNv->Chipset & 0xfff0) == 0x0040) {
@@ -1252,8 +1252,13 @@
                  pNv->PGRAPH[0x0864/4] = pNv->FbMapSize - 1;
                  pNv->PGRAPH[0x0868/4] = pNv->FbMapSize - 1;
               } else {
-                 pNv->PGRAPH[0x09F0/4] = pNv->PFB[0x0200/4];
-                 pNv->PGRAPH[0x09F4/4] = pNv->PFB[0x0204/4];
+                 if((pNv->Chipset & 0xfff0) == 0x0090) {
+                    pNv->PGRAPH[0x0DF0/4] = pNv->PFB[0x0200/4];
+                    pNv->PGRAPH[0x0DF4/4] = pNv->PFB[0x0204/4];
+                 } else {
+                    pNv->PGRAPH[0x09F0/4] = pNv->PFB[0x0200/4];
+                    pNv->PGRAPH[0x09F4/4] = pNv->PFB[0x0204/4];
+                 }
                  pNv->PGRAPH[0x69F0/4] = pNv->PFB[0x0200/4];
                  pNv->PGRAPH[0x69F4/4] = pNv->PFB[0x0204/4];
 

xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch:
 nv_driver.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 nv_hw.c     |   13 +++++++++++-
 2 files changed, 67 insertions(+), 11 deletions(-)

--- NEW FILE xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c.nv-patch-fdo2380-1752	2004-12-15 20:42:35.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c	2005-04-12 01:39:46.000000000 -0400
@@ -86,25 +86,33 @@
 static SymTabRec NVKnownChipsets[] =
 {
   { 0x12D20018, "RIVA 128" },
+
   { 0x10DE0020, "RIVA TNT" },
+
   { 0x10DE0028, "RIVA TNT2" },
   { 0x10DE002A, "Unknown TNT2" },
   { 0x10DE002C, "Vanta" },
   { 0x10DE0029, "RIVA TNT2 Ultra" },
   { 0x10DE002D, "RIVA TNT2 Model 64" },
+
   { 0x10DE00A0, "Aladdin TNT2" },
+
   { 0x10DE0100, "GeForce 256" },
   { 0x10DE0101, "GeForce DDR" },
   { 0x10DE0103, "Quadro" },
+
   { 0x10DE0110, "GeForce2 MX/MX 400" },
   { 0x10DE0111, "GeForce2 MX 100/200" },
   { 0x10DE0112, "GeForce2 Go" },
   { 0x10DE0113, "Quadro2 MXR/EX/Go" },
+
   { 0x10DE01A0, "GeForce2 Integrated GPU" },
+
   { 0x10DE0150, "GeForce2 GTS" },
   { 0x10DE0151, "GeForce2 Ti" },
   { 0x10DE0152, "GeForce2 Ultra" },
   { 0x10DE0153, "Quadro2 Pro" },
+
   { 0x10DE0170, "GeForce4 MX 460" },
   { 0x10DE0171, "GeForce4 MX 440" },
   { 0x10DE0172, "GeForce4 MX 420" },
@@ -122,6 +130,7 @@
   { 0x10DE017A, "Quadro4 NVS" },
   { 0x10DE017C, "Quadro4 500 GoGL" },
   { 0x10DE017D, "GeForce4 410 Go 16M" },
+
   { 0x10DE0181, "GeForce4 MX 440 with AGP8X" },
   { 0x10DE0182, "GeForce4 MX 440SE with AGP8X" },
   { 0x10DE0183, "GeForce4 MX 420 with AGP8X" },
@@ -136,11 +145,14 @@
   { 0x10DE018B, "Quadro4 380 XGL" },
   { 0x10DE018C, "Quadro NVS 50 PCI" },
   { 0x10DE018D, "GeForce4 448 Go" },
+
   { 0x10DE01F0, "GeForce4 MX Integrated GPU" },
+
   { 0x10DE0200, "GeForce3" },
   { 0x10DE0201, "GeForce3 Ti 200" },
   { 0x10DE0202, "GeForce3 Ti 500" },
   { 0x10DE0203, "Quadro DCC" },
+
   { 0x10DE0250, "GeForce4 Ti 4600" },
   { 0x10DE0251, "GeForce4 Ti 4400" },
   { 0x10DE0252, "0x0252" },
@@ -148,6 +160,7 @@
   { 0x10DE0258, "Quadro4 900 XGL" },
   { 0x10DE0259, "Quadro4 750 XGL" },
   { 0x10DE025B, "Quadro4 700 XGL" },
+
   { 0x10DE0280, "GeForce4 Ti 4800" },
   { 0x10DE0281, "GeForce4 Ti 4200 with AGP8X" },
   { 0x10DE0282, "GeForce4 Ti 4800 SE" },
@@ -155,10 +168,12 @@
   { 0x10DE028C, "Quadro4 700 GoGL" },
   { 0x10DE0288, "Quadro4 980 XGL" },
   { 0x10DE0289, "Quadro4 780 XGL" },
+
   { 0x10DE0301, "GeForce FX 5800 Ultra" },
   { 0x10DE0302, "GeForce FX 5800" },
   { 0x10DE0308, "Quadro FX 2000" },
   { 0x10DE0309, "Quadro FX 1000" },
+
   { 0x10DE0311, "GeForce FX 5600 Ultra" },
   { 0x10DE0312, "GeForce FX 5600" },
   { 0x10DE0313, "0x0313"},
@@ -171,6 +186,7 @@
   { 0x10DE031D, "0x031D" },
   { 0x10DE031E, "0x031E" },
   { 0x10DE031F, "0x031F" },
+
   { 0x10DE0320, "GeForce FX 5200" },
   { 0x10DE0321, "GeForce FX 5200 Ultra" },
   { 0x10DE0322, "GeForce FX 5200" },
@@ -190,6 +206,7 @@
   { 0x10DE032C, "GeForce FX Go53xx Series" },
   { 0x10DE032D, "GeForce FX Go5100" },
   { 0x10DE032F, "0x032F" },
+
   { 0x10DE0330, "GeForce FX 5900 Ultra" },
   { 0x10DE0331, "GeForce FX 5900" },
   { 0x10DE0332, "GeForce FX 5900XT" },
@@ -197,6 +214,7 @@
   { 0x10DE033F, "Quadro FX 700" },
   { 0x10DE0334, "GeForce FX 5900ZT" },
   { 0x10DE0338, "Quadro FX 3000" },
+
   { 0x10DE0341, "GeForce FX 5700 Ultra" },
   { 0x10DE0342, "GeForce FX 5700" },
   { 0x10DE0343, "GeForce FX 5700LE" },
@@ -209,6 +227,7 @@
   { 0x10DE034C, "Quadro FX Go1000" },
   { 0x10DE034E, "Quadro FX 1100" },
   { 0x10DE034F, "0x034F" },
+
   { 0x10DE0040, "GeForce 6800 Ultra" },
   { 0x10DE0041, "GeForce 6800" },
   { 0x10DE0042, "GeForce 6800 LE" },
@@ -216,14 +235,16 @@
   { 0x10DE0045, "GeForce 6800 GT" },
   { 0x10DE0049, "0x0049" },
   { 0x10DE004E, "Quadro FX 4000" },
-  { 0x10DE004D, "Quadro FX 4400" },
+
   { 0x10DE00C0, "0x00C0" },
-  { 0x10DE00C1, "0x00C1" },
+  { 0x10DE00C1, "GeForce 6800" },
   { 0x10DE00C2, "GeForce 6800 LE" },
-  { 0x10DE00C8, "0x00C8" },
-  { 0x10DE00C9, "0x00C9" },
-  { 0x10DE00CC, "0x00CC" },
-  { 0x10DE00CE, "0x00CE" },
+  { 0x10DE00C8, "GeForce Go 6800" },
+  { 0x10DE00C9, "GeForce Go 6800 Ultra" },
+  { 0x10DE00CC, "Quadro FX Go1400" },
+  { 0x10DE00CD, "0x00CD" },
+  { 0x10DE00CE, "Quadro FX 1400" },
+
   { 0x10DE0140, "GeForce 6600 GT" },
   { 0x10DE0141, "GeForce 6600" },
   { 0x10DE0142, "0x0142" },
@@ -239,12 +260,32 @@
   { 0x10DE014D, "0x014D" },
   { 0x10DE014E, "Quadro FX 540" },
   { 0x10DE014F, "GeForce 6200" },
+
   { 0x10DE0160, "0x0160" },
-  { 0x10DE0166, "0x0166" },
+  { 0x10DE0161, "GeForce 6200 TurboCache(TM)" },
+  { 0x10DE0162, "0x0162" },
+  { 0x10DE0163, "0x0163" },
+  { 0x10DE0164, "GeForce Go 6200" },
+  { 0x10DE0165, "0x0163" },
+  { 0x10DE0166, "GeForce Go 6250" },
+  { 0x10DE0167, "GeForce Go 6200" },
+  { 0x10DE0168, "GeForce Go 6250" },
+  { 0x10DE0169, "0x0169" },
+  { 0x10DE016B, "0x016B" },
+  { 0x10DE016C, "0x016C" },
+  { 0x10DE016D, "0x016D" },
+  { 0x10DE016E, "0x016E" },
+
   { 0x10DE0210, "0x0210" },
-  { 0x10DE0211, "0x0211" },
-  { 0x10DE021D, "0x021D" },
-  { 0x10DE021E, "0x021E" },
+  { 0x10DE0211, "GeForce 6800" },
+  { 0x10DE0212, "GeForce 6800 LE" },
+  { 0x10DE0215, "GeForce 6800 GT" },
+
+  { 0x10DE0220, "0x0220" },
+  { 0x10DE0221, "0x0221" },
+  { 0x10DE0222, "0x0222" },
+  { 0x10DE0228, "0x0228" },
+
   {-1, NULL}
 };
 
@@ -640,6 +681,8 @@
                case 0x01D0:
                case 0x0090:
                case 0x0210:
+               case 0x0220:
+               case 0x0230:
                    NVChipsets[numUsed].token = pciid;
                    NVChipsets[numUsed].name = "Unknown NVIDIA chip";
                    NVPciChipsets[numUsed].numChipset = pciid;
@@ -1328,6 +1371,8 @@
     case 0x01D0:
     case 0x0090:
     case 0x0210:
+    case 0x0220:
+    case 0x0230:
          pNv->Architecture =  NV_ARCH_40;
          break;
     default:
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c.nv-patch-fdo2380-1752	2005-04-12 01:36:59.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c	2005-04-12 01:39:46.000000000 -0400
@@ -36,7 +36,7 @@
 |*     those rights set forth herein.                                        *|
 |*                                                                           *|
  \***************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.13 2004/12/09 00:21:04 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.14 2005/01/20 01:01:00 mvojkovi Exp $ */
 
 #include "nv_local.h"
 #include "compiler.h"
@@ -1173,6 +1173,7 @@
 
               switch(pNv->Chipset & 0xfff0) {
               case 0x0040:
+              case 0x0210:
                  pNv->PGRAPH[0x09b8/4] = 0x0078e366;
                  pNv->PGRAPH[0x09bc/4] = 0x0000014c;
                  pNv->PFB[0x033C/4] &= 0xffff7fff;
@@ -1182,6 +1183,7 @@
                  pNv->PGRAPH[0x082C/4] = 0x00000108;
                  break;
               case 0x0160:
+              case 0x01D0:
                  pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4];
                  pNv->PMC[0x1704/4] = 0;
                  pNv->PMC[0x1708/4] = 0;
@@ -1194,6 +1196,15 @@
                  pNv->PGRAPH[0x0828/4] = 0x0072cb77;
                  pNv->PGRAPH[0x082C/4] = 0x00000108;
                  break;
+              case 0x0220:
+              case 0x0230:
+                 pNv->PGRAPH[0x0860/4] = 0;
+                 pNv->PGRAPH[0x0864/4] = 0;
+                 pNv->PRAMDAC[0x0608/4] |= 0x00100000;
+                 break;
+              case 0x0090:
+                 pNv->PRAMDAC[0x0608/4] |= 0x00100000;
+                 break;
               default:
                  break;
               };

xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch:
 radeon_cursor.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c.radeon-cursor-sync-fdo2844-2230	2004-08-04 09:17:31.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	2005-04-12 00:32:01.000000000 -0400
@@ -64,6 +64,10 @@
 #define CURSOR_WIDTH	64
 #define CURSOR_HEIGHT	64
 
+#define COMMON_CURSOR_SWAPPING_START()	  \
+    if (info->accel && info->accel->Sync) \
+	info->accel->Sync(pScrn);
+
 /*
  * The cursor bits are always 32bpp.  On MSBFirst buses,
  * configure byte swapping to swap 32 bit units when writing
@@ -74,17 +78,23 @@
 
 #define CURSOR_SWAPPING_DECL_MMIO   unsigned char *RADEONMMIO = info->MMIO;
 #define CURSOR_SWAPPING_START() \
+  do { \
     OUTREG(RADEON_SURFACE_CNTL, \
 	   (info->ModeReg.surface_cntl | \
 	    RADEON_NONSURF_AP0_SWP_32BPP) & \
-	   ~RADEON_NONSURF_AP0_SWP_16BPP)
+	   ~RADEON_NONSURF_AP0_SWP_16BPP); \
+    COMMON_CURSOR_SWAPPING_START(); \
+  } while (0)
 #define CURSOR_SWAPPING_END()	(OUTREG(RADEON_SURFACE_CNTL, \
 					info->ModeReg.surface_cntl))
 
 #else
 
 #define CURSOR_SWAPPING_DECL_MMIO
-#define CURSOR_SWAPPING_START()
+#define CURSOR_SWAPPING_START() \
+  do { \
+    COMMON_CURSOR_SWAPPING_START(); \
+  } while (0)
 #define CURSOR_SWAPPING_END()
 
 #endif

xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch:
 radeon_render.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_render.c.radeon-render-byteswap-fdo2164-1863	2005-01-24 22:20:12.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_render.c	2005-04-12 00:50:44.000000000 -0400
@@ -326,6 +326,7 @@
 		   "tex_bytepp == %d!\n", __func__, tex_bytepp);
 	return FALSE;
     }
+    return TRUE;
 }
 
 static void RADEONRestoreByteswap(RADEONInfoPtr info)

xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch:
 radeon_driver.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.radeon-set-fb-location-fdo2698-2079	2005-04-11 23:43:02.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	2005-04-12 00:33:34.000000000 -0400
@@ -7179,7 +7179,6 @@
 	RADEONDoAdjustFrame(pScrn, x, y, FALSE);
     }
 
-    RADEONSetFBLocation (pScrn);
 #ifdef XF86DRI
 	if (info->CPStarted) DRIUnlock(pScrn->pScreen);
 #endif

xorg-x11-6.8.3-saver-c-fdo2194-1613.patch:
 saver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-6.8.3-saver-c-fdo2194-1613.patch ---
--- xc/programs/Xserver/Xext/saver.c.saver-c-fdo2194-1613	2005-04-11 23:43:02.000000000 -0400
+++ xc/programs/Xserver/Xext/saver.c	2005-04-12 00:55:22.000000000 -0400
@@ -810,7 +810,7 @@
     Bool			fOK;
     DepthPtr			pDepth;
     WindowOptPtr		ancwopt;
-    unsigned long		*pVlist;
+    unsigned int		*pVlist;
     unsigned long		*values = 0;
     unsigned long		tmask, imask;
     unsigned long		val;
@@ -960,7 +960,7 @@
      * to them.
      */
     pAttr->mask = tmask = stuff->mask | CWOverrideRedirect;
-    pVlist = (unsigned long *) (stuff + 1);
+    pVlist = (unsigned int *) (stuff + 1);
     while (tmask) {
 	imask = lowbit (tmask);
 	tmask &= ~imask;

xorg-x11-6.8.3-uname-fdo2123-1587.patch:
 lib/Xmu/CvtStdSel.c                               |    2 +-
 programs/Xserver/hw/xfree86/common/xf86Init.c     |    6 +++++-
 programs/Xserver/hw/xfree86/os-support/bus/Sbus.c |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-6.8.3-uname-fdo2123-1587.patch ---
--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c.uname-fdo2123-1587	2005-04-11 23:43:02.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c	2005-04-12 01:11:20.000000000 -0400
@@ -1835,7 +1835,11 @@
   {
     struct utsname name;
 
-    if (uname(&name) == 0) {
+    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
+       and Irix) and Single Unix Spec 3 just say that non-negative is success.
+       All agree that failure is represented by a negative number.
+     */
+    if (uname(&name) >= 0) {
       ErrorF("Current Operating System: %s %s %s %s %s\n",
 	name.sysname, name.nodename, name.release, name.version, name.machine);
     }
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c.uname-fdo2123-1587	2004-04-23 15:54:08.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c	2005-04-12 01:11:20.000000000 -0400
@@ -166,7 +166,7 @@
 #elif defined(sun)
     struct utsname buffer;
 
-    if ((uname(&buffer) == 0) && !strcmp(buffer.machine, "sun4u"))
+    if ((uname(&buffer) >= 0) && !strcmp(buffer.machine, "sun4u"))
 	promP1275 = TRUE;
     else
 	promP1275 = FALSE;
--- xc/lib/Xmu/CvtStdSel.c.uname-fdo2123-1587	2004-04-23 14:43:45.000000000 -0400
+++ xc/lib/Xmu/CvtStdSel.c	2005-04-12 01:11:20.000000000 -0400
@@ -114,7 +114,7 @@
 #ifdef USE_UNAME
 	struct utsname utss;
 
-	if (uname (&utss) == 0) {
+	if (uname (&utss) >= 0) {
 	    char *os_name;
 	    int len = strlen(utss.sysname) + 1;
 #ifndef hpux				/* because of hostname length crock */

xorg-x11-6.8.3-void-fdo2467-1828.patch:
 void.c |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 102 insertions(+), 10 deletions(-)

--- NEW FILE xorg-x11-6.8.3-void-fdo2467-1828.patch ---
diff -Naur xc/programs/Xserver/hw/xfree86/input/void/void.c.O xc/programs/Xserver/hw/xfree86/input/void/void.c
--- xc/programs/Xserver/hw/xfree86/input/void/void.c.O	2000-08-11 12:10:48.000000000 -0700
+++ xc/programs/Xserver/hw/xfree86/input/void/void.c	2004-09-15 12:45:17.000000000 -0700
@@ -55,26 +55,108 @@
  *****************************************************************************/
 static KeySym void_map[] = 
 {
-    NoSymbol,	/* 0x00 */
-    NoSymbol,	/* 0x01 */
-    NoSymbol,	/* 0x02 */
-    NoSymbol,	/* 0x03 */
-    NoSymbol,	/* 0x04 */
-    NoSymbol,	/* 0x05 */
-    NoSymbol,	/* 0x06 */
-    NoSymbol	/* 0x07 */
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	XK_Escape,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	XK_space,	XK_exclam,	XK_quotedbl,	XK_numbersign,
+	XK_dollar,	XK_percent,	XK_ampersand,	XK_apostrophe,
+	XK_parenleft,	XK_parenright,	XK_asterisk,	XK_plus,
+	XK_comma,	XK_minus,	XK_period,	XK_slash,
+	XK_0,		XK_1,		XK_2,		XK_3,
+	XK_4,		XK_5,		XK_6,		XK_7,
+	XK_8,		XK_9,		XK_colon,	XK_semicolon,
+	XK_less,	XK_equal,	XK_greater,	XK_question,
+	XK_at,		XK_A,		XK_B,		XK_C,
+	XK_D,		XK_E,		XK_F,		XK_G,
+	XK_H,		XK_I,		XK_J,		XK_K,
+	XK_L,		XK_M,		XK_N,		XK_O,
+	XK_P,		XK_Q,		XK_R,		XK_S,
+	XK_T,		XK_U,		XK_V,		XK_W,
+	XK_X,		XK_Y,		XK_Z,		XK_bracketleft,
+	XK_backslash,	XK_bracketright,XK_asciicircum,	XK_underscore,
+	XK_grave,	XK_a,		XK_b,		XK_c,
+	XK_d,		XK_e,		XK_f,		XK_g,
+	XK_h,		XK_i,		XK_j,		XK_k,
+	XK_l,		XK_m,		XK_n,		XK_o,
+	XK_p,		XK_q,		XK_r,		XK_s,
+	XK_t,		XK_u,		XK_v,		XK_w,
+	XK_x,		XK_y,		XK_z,		XK_braceleft,
+	XK_bar,		XK_braceright,	XK_asciitilde,	XK_BackSpace,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+	XK_nobreakspace,XK_exclamdown,	XK_cent,	XK_sterling,
+	XK_currency,	XK_yen,		XK_brokenbar,	XK_section,
+	XK_diaeresis,	XK_copyright,	XK_ordfeminine,	XK_guillemotleft,
+	XK_notsign,	XK_hyphen,	XK_registered,	XK_macron,
+	XK_degree,	XK_plusminus,	XK_twosuperior,	XK_threesuperior,
+	XK_acute,	XK_mu,		XK_paragraph,	XK_periodcentered,
+	XK_cedilla,	XK_onesuperior,	XK_masculine,	XK_guillemotright,
+	XK_onequarter,	XK_onehalf,	XK_threequarters,XK_questiondown,
+	XK_Agrave,	XK_Aacute,	XK_Acircumflex,	XK_Atilde,
+	XK_Adiaeresis,	XK_Aring,	XK_AE,		XK_Ccedilla,
+	XK_Egrave,	XK_Eacute,	XK_Ecircumflex,	XK_Ediaeresis,
+	XK_Igrave,	XK_Iacute,	XK_Icircumflex,	XK_Idiaeresis,
+	XK_ETH,		XK_Ntilde,	XK_Ograve,	XK_Oacute,
+	XK_Ocircumflex,	XK_Otilde,	XK_Odiaeresis,	XK_multiply,
+	XK_Ooblique,	XK_Ugrave,	XK_Uacute,	XK_Ucircumflex,
+	XK_Udiaeresis,	XK_Yacute,	XK_THORN,	XK_ssharp,
+	XK_agrave,	XK_aacute,	XK_acircumflex,	XK_atilde,
+	XK_adiaeresis,	XK_aring,	XK_ae,		XK_ccedilla,
+	XK_egrave,	XK_eacute,	XK_ecircumflex,	XK_ediaeresis,
+	XK_igrave,	XK_iacute,	XK_icircumflex,	XK_idiaeresis,
+	XK_eth,		XK_ntilde,	XK_ograve,	XK_oacute,
+	XK_ocircumflex,	XK_otilde,	XK_odiaeresis,	XK_division,
+	XK_oslash,	XK_ugrave,	XK_uacute,	XK_ucircumflex,
+	XK_udiaeresis,	XK_yacute,	XK_thorn,	XK_ydiaeresis
 };
 
 /* minKeyCode = 8 because this is the min legal key code */
 static KeySymsRec void_keysyms = {
-  /* map	minKeyCode	maxKC	width */
-  void_map,	8,		8,	1
+  /* map	minKeyCode	maxKeyCode	width */
+  void_map,	8,		255,		1
 };
 
 static const char *DEFAULTS[] = {
     NULL
 };
 
+static void
+BellProc(
+    int percent,
+    DeviceIntPtr pDev,
+    pointer ctrl,
+    int unused)
+{
+    return;
+}
+
+static void
+KeyControlProc(
+    DeviceIntPtr pDev,
+    KeybdCtrl *ctrl)
+{
+    return;
+}
+
+static void
+PointerControlProc(
+    DeviceIntPtr dev,
+    PtrCtrl *ctrl)
+{
+    return;
+}
+
 /*
  * xf86VoidControlProc --
  *
@@ -105,6 +187,7 @@
 	  return !Success;
 	}
       
+/*
 	if (InitFocusClassDeviceStruct(device) == FALSE) {
 	  ErrorF("unable to init Focus class device\n");
 	  return !Success;
@@ -114,6 +197,11 @@
 	  ErrorF("unable to init key class device\n"); 
 	  return !Success;
 	}
+*/
+	if (InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, NULL, BellProc, KeyControlProc) == FALSE) {
+	  ErrorF("unable to init keyboard device\n");
+	  return !Success;
+	}
 
 	if (InitValuatorClassDeviceStruct(device, 
 					  2,
@@ -139,6 +227,10 @@
 	  /* allocate the motion history buffer if needed */
 	  xf86MotionHistoryAllocate(pInfo);
 	}
+	if (InitPtrFeedbackClassDeviceStruct(device, PointerControlProc) == FALSE) {
+	  ErrorF("unable to init pointer feedback class device\n"); 
+	  return !Success;
+	}
 	break;
 
     case DEVICE_ON:

xorg-x11-6.8.3-xnest-fdo2599-1964.patch:
 Screen.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE xorg-x11-6.8.3-xnest-fdo2599-1964.patch ---
--- xc/programs/Xserver/hw/xnest/Screen.c.xnest-fdo2599-1964	2005-04-11 23:43:02.000000000 -0400
+++ xc/programs/Xserver/hw/xnest/Screen.c	2005-04-12 01:16:46.000000000 -0400
@@ -249,6 +249,16 @@
     xnestHeight = gattributes.height;
   }
 
+  /* myNum */
+  /* id */
+  miScreenInit(pScreen, NULL, xnestWidth, xnestHeight, 1, 1, xnestWidth,
+	       rootDepth,
+	       numDepths, depths,
+	       defaultVisual, /* root visual */
+	       numVisuals, visuals);
+
+/*  miInitializeBackingStore(pScreen); */
+
   pScreen->defColormap = (Colormap) FakeClientID(0);
   pScreen->minInstalledCmaps = MINCMAPS;
   pScreen->maxInstalledCmaps = MAXCMAPS;
@@ -332,15 +342,6 @@
   pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr)NoopDDA;
   pScreen->blockData = NULL;
   pScreen->wakeupData = NULL;
-  /* myNum */
-  /* id */
-  miScreenInit(pScreen, NULL, xnestWidth, xnestHeight, 1, 1, xnestWidth,
-	       rootDepth,
-	       numDepths, depths,
-	       defaultVisual, /* root visual */
-	       numVisuals, visuals);
-
-/*  miInitializeBackingStore(pScreen); */
 
   miPointerInitialize (pScreen, &xnestPointerSpriteFuncs, 
 		       &xnestPointerCursorFuncs, True);

xorg-x11-6.8.3-xorgcfg-typo-fdo2896-2311.patch:
 screen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-6.8.3-xorgcfg-typo-fdo2896-2311.patch ---
--- xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c.xorgcfg-typo-fdo2896-2311	2004-04-23 15:54:18.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c	2005-04-12 01:18:06.000000000 -0400
@@ -695,7 +695,7 @@
 	if (lefscr == NULL && rigscr == NULL && topscr == NULL && lefscr == NULL) {
 	    XF86ConfScreenPtr s;
 
-	    if (adj->adj_where >= CONF_ADJ_RIGHTOF < adj->adj_where <= CONF_ADJ_BELOW) {
+	    if (adj->adj_where >= CONF_ADJ_RIGHTOF && adj->adj_where <= CONF_ADJ_BELOW) {
 		s = xf86findScreen(adj->adj_refscreen, XF86Config->conf_screen_lst);
 		for (i = 0; i < computer.num_screens; i++)
 		    if (computer.screens[i]->screen == s)

xorg-x11-6.8.3-xset-fdo2258-2166.patch:
 xset.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-6.8.3-xset-fdo2258-2166.patch ---
Index: xc/programs/xset/xset.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xset/xset.c,v
retrieving revision 1.6
diff -u -2 -0 -r1.6 xset.c
--- xc/programs/xset/xset.c	17 Oct 2004 23:08:07 -0000	1.6
+++ xc/programs/xset/xset.c	20 Mar 2005 20:38:43 -0000
@@ -1225,74 +1225,76 @@
       return onstr;
     else if (val == offval)
       return offstr;
 
     buf[0] = '\0';
     sprintf (buf, "<%d>", val);
     return buf;
 }
 
 
 /*  This is the information-getting function for telling the user what the
  *  current "xsettings" are.
  */
 static void
 query(Display *dpy)
 {
 int scr = DefaultScreen (dpy);
 XKeyboardState values;
 int acc_num, acc_denom, threshold;
 int timeout, interval, prefer_blank, allow_exp;
+int dummy;
 #ifdef XF86MISC
 XF86MiscKbdSettings kbdinfo;
 #endif
 #ifdef XKB
 XkbDescPtr xkb;
 int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
 int xkbopcode, xkbevent, xkberror;
 #endif
 char **font_path; int npaths;
 int i, j;
 char buf[20];				/* big enough for 16 bit number */
 
 XGetKeyboardControl(dpy, &values);
 XGetPointerControl(dpy, &acc_num, &acc_denom, &threshold);
 XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
 font_path = XGetFontPath(dpy, &npaths);
 
 printf ("Keyboard Control:\n");
 printf ("  auto repeat:  %s    key click percent:  %d    LED mask:  %08lx\n", 
 	on_or_off (values.global_auto_repeat,
 		   AutoRepeatModeOn, "on", AutoRepeatModeOff, "off", buf),
 	values.key_click_percent, values.led_mask);
 #ifdef XKB
 if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, &xkberror, &xkbmajor, &xkbminor)
     && (xkb = XkbAllocKeyboard()) != NULL
     && XkbGetControls(dpy, XkbRepeatKeysMask, xkb) == Success)
   printf ("  auto repeat delay:  %d    repeat rate:  %d\n",
           xkb->ctrls->repeat_delay,  1000/xkb->ctrls->repeat_interval);
 #ifdef XF86MISC
 else
 #endif
 #endif
 #ifdef XF86MISC
-if (XF86MiscGetKbdSettings(dpy, &kbdinfo))
+if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
+    XF86MiscGetKbdSettings(dpy, &kbdinfo))
   printf ("  auto repeat delay:  %d    repeat rate:  %d\n",
           kbdinfo.delay, kbdinfo.rate);
 #endif
 printf ("  auto repeating keys:  ");
 for (i = 0; i < 4; i++) {
     if (i) printf ("                        ");
     for (j = 0; j < 8; j++) {
 	printf ("%02x", (unsigned char)values.auto_repeats[i*8 + j]);
     }
     printf ("\n");
 }
 printf ("  bell percent:  %d    bell pitch:  %d    bell duration:  %d\n",
 	values.bell_percent, values.bell_pitch, values.bell_duration);
 
 printf ("Pointer Control:\n");
 printf ("  acceleration:  %d/%d    threshold:  %d\n",
 	acc_num, acc_denom, threshold);
 
 printf ("Screen Saver:\n");
 printf ("  prefer blanking:  %s    ",

xorg-x11-6.8.1-battle-libc-wrapper.patch:
 hw/xfree86/common/xf86.h |   10 ----------
 include/os.h             |   12 +-----------
 2 files changed, 1 insertion(+), 21 deletions(-)

Index: xorg-x11-6.8.1-battle-libc-wrapper.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.1-battle-libc-wrapper.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-6.8.1-battle-libc-wrapper.patch	2 Dec 2004 00:04:33 -0000	1.4
+++ xorg-x11-6.8.1-battle-libc-wrapper.patch	12 Apr 2005 18:32:36 -0000	1.5
@@ -14,6 +14,12 @@
 
 Kristian HÃ¸gsberg <krh at redhat.com>
 
+Update, Thu Apr 7, 2005:  Nominated for 6.8.3:
+
+	https://bugs.freedesktop.org/show_bug.cgi?id=2925
+
+attachment 2348.
+
 --- xc/programs/Xserver/hw/xfree86/common/xf86.h.battle-libc-wrapper	2004-01-29 03:08:26.000000000 -0500
 +++ xc/programs/Xserver/hw/xfree86/common/xf86.h	2004-12-01 18:14:18.576882135 -0500
 @@ -225,11 +225,6 @@

xorg-x11-6.8.2-cursor-flicker.patch:
 damage.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

Index: xorg-x11-6.8.2-cursor-flicker.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-cursor-flicker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-6.8.2-cursor-flicker.patch	16 Mar 2005 22:53:55 -0000	1.1
+++ xorg-x11-6.8.2-cursor-flicker.patch	12 Apr 2005 18:32:36 -0000	1.2
@@ -1,3 +1,9 @@
+This patch is taken from the 6.8.3 queue.
+
+	https://bugs.freedesktop.org/show_bug.cgi?id=2752
+
+Attachment #2130.
+
 Index: xc/programs/Xserver/miext/damage/damage.c
 ===================================================================
 RCS file: /cvs/xorg/xc/programs/Xserver/miext/damage/damage.c,v

xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch:
 helper_exec.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

Index: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch	3 Apr 2005 11:26:53 -0000	1.1
+++ xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch	12 Apr 2005 18:32:36 -0000	1.2
@@ -17,6 +17,11 @@
 
     Mike A. Harris <mharris at redhat.com>
 
+This bug is nominated for the 6.8.3 release as
+
+	https://bugs.freedesktop.org/show_bug.cgi?id=2880
+
+attachment 2285.
 
 --- xc/programs/Xserver/hw/xfree86/int10/helper_exec.c.ORIG	2002-11-25 16:05:49.000000000 -0500
 +++ xc/programs/Xserver/hw/xfree86/int10/helper_exec.c	2005-03-31 14:38:01.000000000 -0500

xorg-x11-6.8.2-xnest-shape-fix.patch:
 Screen.c   |    5 +++++
 Window.c   |    7 +++++++
 XNWindow.h |    1 +
 3 files changed, 13 insertions(+)

Index: xorg-x11-6.8.2-xnest-shape-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-xnest-shape-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-6.8.2-xnest-shape-fix.patch	11 Mar 2005 09:10:52 -0000	1.3
+++ xorg-x11-6.8.2-xnest-shape-fix.patch	12 Apr 2005 18:32:36 -0000	1.4
@@ -1,3 +1,5 @@
+Nominated as fdo2546-2005.
+
 --- ./xc/programs/Xserver/hw/xnest/Window.c.xnest-shape-ext-update-regions	2005-02-15 13:13:59.000000000 +0000
 +++ ./xc/programs/Xserver/hw/xnest/Window.c	2005-02-15 13:16:30.000000000 +0000
 @@ -449,6 +449,13 @@


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- xorg-x11.spec	11 Apr 2005 00:57:26 -0000	1.176
+++ xorg-x11.spec	12 Apr 2005 18:32:36 -0000	1.177
@@ -21,7 +21,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 21
+Release: 22
 #Release: 1.FC3.10test
 #Release: 0.%{cvs_release}.0
 
@@ -471,21 +471,54 @@
 Patch9326: xorg-x11-6.8.2-ati-radeon-disable-broken-renderaccel-by-default.patch
 Patch9327: xorg-x11-6.8.2-ati-radeon-gcc4-fix.patch
 Patch9328: xorg-x11-6.8.2-fix-font-crash.patch
+# Nominated as fdo2546-2005
 Patch9329: xorg-x11-6.8.2-xnest-shape-fix.patch
 Patch9330: xorg-x11-6.8.2-config-StaticNeedsPicForShared.patch
 Patch9331: xorg-x11-6.8.2-XScreenSaverQueryInfo-crash-fix.patch
 Patch9333: XFree86-4.1.0-xpm-security-fix-CAN-2005-0605.patch
 Patch9334: xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch
 
+
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently).
 # Once a patch is determined to be safe to apply to other releases, it can
 # be moved to the normal section above in sequence.
 # These are currently build_fc4 only:
-Patch9500: xorg-x11-6.8.1-battle-libc-wrapper.patch
-Patch9501: xorg-x11-6.8.2-cursor-flicker.patch
-Patch9502: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
-Patch9503: xorg-x11-6.8.2-gcc4-fix.patch
-# end of build_fc4 only
+
+# BenH said he'd nominate this and other Radeon + PPC patches for 6.8.3
+Patch9500: xorg-x11-6.8.3-deassert-ddc-lines.patch
+# Should this be nominated for 6.8.3?
+Patch9501: xorg-x11-6.8.2-gcc4-fix.patch
+
+# PATCHES NOMINATED FOR 6.8.3
+
+# Of the patches only enabled for fedora-devel, some of them are
+# nominated for 6.8.3.  The patch filenames typically end in
+# fdoXXXX-YYYY where XXXX is the bugs.freedesktop.org bug number and
+# YYYY is the attachement number the patch was taken from.
+
+Patch9700: xorg-x11-6.8.3-alpha-srel32-fix-fdo1765-2174.patch
+Patch9701: xorg-x11-6.8.3-canonicalize-builderaddr-1-fdo2884-2293.patch
+Patch9702: xorg-x11-6.8.2-cursor-flicker.patch
+Patch9703: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
+Patch9704: xorg-x11-6.8.3-intrinsics-gcc4-fdo2893-2305.patch
+Patch9705: xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch
+Patch9706: xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch
+Patch9707: xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
+Patch9708: xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch
+Patch9709: xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch
+Patch9710: xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch
+Patch9711: xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch
+Patch9712: xorg-x11-6.8.3-saver-c-fdo2194-1613.patch
+Patch9713: xorg-x11-6.8.3-uname-fdo2123-1587.patch
+Patch9714: xorg-x11-6.8.3-void-fdo2467-1828.patch
+Patch9716: xorg-x11-6.8.3-xnest-fdo2599-1964.patch
+Patch9717: xorg-x11-6.8.3-xorgcfg-typo-fdo2896-2311.patch
+Patch9718: xorg-x11-6.8.3-xset-fdo2258-2166.patch
+Patch9719: xorg-x11-6.8.1-battle-libc-wrapper.patch
+
+# END OF 6.8.3 CANDIDATES
+
+# END OF DEVEL PATCHES
 
 ######################################################################
 # Red Hat customizations, not intended for submission upstream
@@ -1121,10 +1154,30 @@
 
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently)
 %if %{build_fc4}
-%patch9500 -p0 -b .battle-libc-wrapper
-%patch9501 -p0 -b .cursor-flicker.patch
-%patch9502 -p0 -b .use-linux-native-pciscan-by-default
-%patch9503 -p0 -b .gcc4-fix.patch
+
+%patch9500 -p0 -b .deassert-ddc-lines
+%patch9501 -p0 -b .gcc4-fix
+
+%patch9700 -p0 -b .alpha-srel32-fix-fdo1765-2174
+%patch9701 -p0 -b .canonicalize-builderaddr-1-fdo2884-2293
+%patch9702 -p0 -b .cursor-flicker
+%patch9703 -p0 -b .use-linux-native-pciscan-by-default
+%patch9704 -p0 -b .intrinsics-gcc4-fdo2893-2305
+%patch9705 -p0 -b .iso8859-compose-files-fdo2592-2156
+%patch9706 -p0 -b .lbxproxy-fdo2678-2051
+%patch9707 -p0 -b .nv-hw-fdo2533-1896
+%patch9708 -p0 -b .nv-patch-fdo2380-1752
+%patch9709 -p0 -b .radeon-cursor-sync-fdo2844-2230
+%patch9710 -p0 -b .radeon-render-byteswap-fdo2164-1863
+%patch9711 -p0 -b .radeon-set-fb-location-fdo2698-2079
+%patch9712 -p0 -b .saver-c-fdo2194-1613
+%patch9713 -p0 -b .uname-fdo2123-1587
+%patch9714 -p0 -b .void-fdo2467-1828
+%patch9716 -p0 -b .xnest-fdo2599-1964
+%patch9717 -p0 -b .xorgcfg-typo-fdo2896-2311
+%patch9718 -p0 -b .xset-fdo2258-2166
+%patch9719 -p0 -b .battle-libc-wrapper
+
 %endif
 
 ########################################################################
@@ -3555,6 +3608,27 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Tue Apr 12 2005 Kristian HÃ¸gsberg <krh at redhat.com> 6.8.2-22
+- Add patches nominated for 6.8.3:
+   - xorg-x11-6.8.3-alpha-srel32-fix-fdo1765-2174.patch
+   - xorg-x11-6.8.3-canonicalize-builderaddr-1-fdo2884-2293.patch
+   - xorg-x11-6.8.3-intrinsics-gcc4-fdo2893-2305.patch
+   - xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch
+   - xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch
+   - xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
+   - xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch
+   - xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch
+   - xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch
+   - xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch
+   - xorg-x11-6.8.3-saver-c-fdo2194-1613.patch
+   - xorg-x11-6.8.3-uname-fdo2123-1587.patch
+   - xorg-x11-6.8.3-void-fdo2467-1828.patch
+   - xorg-x11-6.8.3-xnest-fdo2599-1964.patch
+   - xorg-x11-6.8.3-xorgcfg-typo-fdo2896-2311.patch
+   - xorg-x11-6.8.3-xset-fdo2258-2166.patch
+  Add patch to deassert i2s lines after ddc probe
+  (xorg-x11-6.8.3-deassert-ddc-lines.patch).
+
 * Tue Apr  5 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-21
 - Added xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch
   to fix bug (#69335)


