Author: branden Date: 2003-09-15 02:35:26 -0500 (Mon, 15 Sep 2003) New Revision: 527
Removed: branches/4.3.0/sid/debian/patches/000_xf-4.3-branch.diff branches/4.3.0/sid/debian/patches/046_radeon_dualhead_cursor_crash.diff branches/4.3.0/sid/debian/patches/047_radeon_r200_flush_vertices.diff branches/4.3.0/sid/debian/patches/050_radeon_reset_no_lockup.diff Modified: branches/4.3.0/sid/debian/changelog branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_bsdsupport.diff branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_nv_driver.diff branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_sis_driver.diff branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff Log: Update patch files in the wake of 000_post430.diff. - resynced: + debian/patches/000_stolen_from_HEAD.diff + debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff + debian/patches/061_savage_driver_1.1.27t.diff + debian/patches/000_stolen_from_HEAD_int10.diff + debian/patches/000_stolen_from_HEAD_bsdsupport.diff + debian/patches/000_stolen_from_HEAD_sis_driver.diff + debian/patches/000_stolen_from_HEAD_nv_driver.diff - deleted: + debian/patches/047_radeon_r200_flush_vertices.diff + debian/patches/050_radeon_reset_no_lockup.diff + debian/patches/000_xf-4.3-branch.diff + debian/patches/046_radeon_dualhead_cursor_crash.diff - added $Id$ expandos to modified files - set svn:keywords property to Id on modified files Modified: branches/4.3.0/sid/debian/changelog =================================================================== --- branches/4.3.0/sid/debian/changelog 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/changelog 2003-09-15 07:35:26 UTC (rev 527) @@ -51,80 +51,93 @@ * debian/xserver-xfree86.install.*: ship keyboard(4x) manpage (thanks, Michel Dänzer) - * debian/patches/000_post430.diff: grab all fixes to xf-4_3-branch since - 4.3.0 was tagged; fixes of interest include: - + fix R300 PLL value (Enrik Berkhan) - + Fix for possible buffer overflow in _XlcLocaleDirName(). privilegied - binaries ignore the XLOCALEDIR environment variable and are not - vulnerable. - + Resync with the trunk's setjmp & libc5 changes. - + Another setjmp fix - + Fix typo that caused incorrect initialization of xkb memory (John - Heasley). - + int10 fix for all ix86 non-Linux systems (Marc La France). - + Another int10 fix. This time for adapters found at PCI:0:0:0. This - fix is particularly important for ZX1-based systems (Marc La France). - + Fix bug in mode validation that occurs when the XF86Config doesn't - specify any mode or virtual resolution information (Marc La France). - + Now ShadowComposite correctly clips the refresh box. Fix server crash - when using render outside of the visible screen with shadowfb. - + fix XFree86ManVersionString in the case of a release. - + Fix programming error in ix86 motherboard chipset determination - (Marc La France). - + Fix to prevent PCI and CardBus resets when switching out of the server's - virtual console (Marc La France). - + Fix infinite loop that occurs on systems whose PCI configuration space - doesn't advertise a host bridge (Marc La France). - + Workaround for broken devices that don't implement the header type field - in their PCI configuration space (Marc La France). - + Fix lockup on server reset in radeon driver (Michel Dänzer, Keith - Whitwell). - + Set Mesa hooks to flush vertices on state changes in Radeon 3D drivers - (Keith Whitwell). - + Check for NULL tObj in the i830 3D driver's TexEnv function. This fixes - a FlightGear crash (Keith Whitwell). - + Fix double free bug when a Mac-specific font fails to load with - Freetype. - + Prevent a SIGFPE with the glint/pm3 driver when attempting to display an - XVideo image less than 8 pixels wide (Måns Rullgård). - + Fix a SEGV that can happen with Riva128 cards (Mark Vojkovich). - + Fix SiliconMotion driver for mode switching and SEGV problem when - initializing Xv functionality (Bugzilla #50, Alan Hourihane). - + Fix a problem with savage driver when UseBIOS is off, such that the - performance drops dramatically. Now the performance matches or - exceeds that of the option UseBIOS (Alan Hourihane). - + Typo fix in radeon driver cursor code, fixes the primary head switching - off when the cursor moves to the secondary head on dualhead cards - (Michel Dänzer) - + i810/815 depth buffer needs to be a multiple of the tile size. This - fixes 3D corruption near the bottom of the screen at [EMAIL PROTECTED] - (Bugzilla #283, Dave Airlie). - + Fixed Imakefiles so the driver SDK builds again (Sven Luther). - + Fix XDMCP queries when using getifaddrs() (Bugzilla #277, Joel Ray - Holveck) - + Fix repeated image problem when using a vesa video mode before starting - the Xserver on the S3 Trio3D cards (Alan Hourihane). - + Fix for a crash if a scalable font has a bitmap entry in fonts.dir - (#5687, Bugzilla #332, Juliusz Chroboczek). - + Fix for xfs crashes in Freetype backend (Bugzilla #242, Juliusz - Chroboczek). - + Pull twm fixes (signal handler, empty windows menu) from -current. - + Fix calculation of CRTC2 frame offset with page flipping in radeon - driver (Michel Daenzer) - + Fix an XAA pixmap cache server crash that can happen in some cases - when the off-screen memory is heavily fragmented (David Dawes, based - on #5752, Koike Kazuhiko, Chisato Yamauchi). - + Fixed a crash when _XIMProtoOpenIM(), hich is called through XOpenIM() - API when protocol IM is being set up, fails (Bugzilla #618, Hisashi - MIYASHITA). - + Don't call FBIOPAN_DISPLAY ioctl with arguments that will cause a - confusing if harmless error (Michel Dänzer) - + Fixes for potential integer overflows in font libraries. (blexim, - Matthieu Herrb). - + for integer overflow tests, use SIZE_MAX which is more standard than - SIZE_T_MAX, and default to ULONG_MAX for the case of LP64 systems. - Based on reports by Matthias Scheler and Alan Coopersmith (Bugzilla - #646). + * Grab all fixes to xf-4_3-branch since 4.3.0 was tagged. + - debian/patches/000_post430.diff: fixes of interest include: + + fix R300 PLL value (Enrik Berkhan) + + Fix for possible buffer overflow in _XlcLocaleDirName(). privilegied + binaries ignore the XLOCALEDIR environment variable and are not + vulnerable. + + Resync with the trunk's setjmp & libc5 changes. + + Another setjmp fix + + Fix typo that caused incorrect initialization of xkb memory (John + Heasley). + + int10 fix for all ix86 non-Linux systems (Marc La France). + + Another int10 fix. This time for adapters found at PCI:0:0:0. This + fix is particularly important for ZX1-based systems (Marc La France). + + Fix bug in mode validation that occurs when the XF86Config doesn't + specify any mode or virtual resolution information (Marc La France). + + Now ShadowComposite correctly clips the refresh box. Fix server crash + when using render outside of the visible screen with shadowfb. + + fix XFree86ManVersionString in the case of a release. + + Fix programming error in ix86 motherboard chipset determination + (Marc La France). + + Fix to prevent PCI and CardBus resets when switching out of the + server's virtual console (Marc La France). + + Fix infinite loop that occurs on systems whose PCI configuration space + doesn't advertise a host bridge (Marc La France). + + Workaround for broken devices that don't implement the header type + field in their PCI configuration space (Marc La France). + + Fix lockup on server reset in radeon driver (Michel Dänzer, Keith + Whitwell). + + Set Mesa hooks to flush vertices on state changes in Radeon 3D drivers + (Keith Whitwell). + + Check for NULL tObj in the i830 3D driver's TexEnv function. This + fixes a FlightGear crash (Keith Whitwell). + + Fix double free bug when a Mac-specific font fails to load with + Freetype. + + Prevent a SIGFPE with the glint/pm3 driver when attempting to display + an XVideo image less than 8 pixels wide (Måns Rullgård). + + Fix a SEGV that can happen with Riva128 cards (Mark Vojkovich). + + Fix SiliconMotion driver for mode switching and SEGV problem when + initializing Xv functionality (Bugzilla #50, Alan Hourihane). + + Fix a problem with savage driver when UseBIOS is off, such that the + performance drops dramatically. Now the performance matches or + exceeds that of the option UseBIOS (Alan Hourihane). + + Typo fix in radeon driver cursor code, fixes the primary head + switching off when the cursor moves to the secondary head on dualhead + cards (Michel Dänzer) + + i810/815 depth buffer needs to be a multiple of the tile size. This + fixes 3D corruption near the bottom of the screen at [EMAIL PROTECTED] + (Bugzilla #283, Dave Airlie). + + Fixed Imakefiles so the driver SDK builds again (Sven Luther). + + Fix XDMCP queries when using getifaddrs() (Bugzilla #277, Joel Ray + Holveck) + + Fix repeated image problem when using a vesa video mode before + starting the Xserver on the S3 Trio3D cards (Alan Hourihane). + + Fix for a crash if a scalable font has a bitmap entry in fonts.dir + (#5687, Bugzilla #332, Juliusz Chroboczek). + + Fix for xfs crashes in Freetype backend (Bugzilla #242, Juliusz + Chroboczek). + + Pull twm fixes (signal handler, empty windows menu) from -current. + + Fix calculation of CRTC2 frame offset with page flipping in radeon + driver (Michel Daenzer) + + Fix an XAA pixmap cache server crash that can happen in some cases + when the off-screen memory is heavily fragmented (David Dawes, based + on #5752, Koike Kazuhiko, Chisato Yamauchi). + + Fixed a crash when _XIMProtoOpenIM(), hich is called through XOpenIM() + API when protocol IM is being set up, fails (Bugzilla #618, Hisashi + MIYASHITA). + + Don't call FBIOPAN_DISPLAY ioctl with arguments that will cause a + confusing if harmless error (Michel Dänzer) + + Fixes for potential integer overflows in font libraries. (blexim, + Matthieu Herrb). + + for integer overflow tests, use SIZE_MAX which is more standard than + SIZE_T_MAX, and default to ULONG_MAX for the case of LP64 systems. + Based on reports by Matthias Scheler and Alan Coopersmith (Bugzilla + #646). + - resynced: + + debian/patches/000_stolen_from_HEAD.diff + + debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff + + debian/patches/061_savage_driver_1.1.27t.diff + + debian/patches/000_stolen_from_HEAD_int10.diff + + debian/patches/000_stolen_from_HEAD_bsdsupport.diff + + debian/patches/000_stolen_from_HEAD_sis_driver.diff + + debian/patches/000_stolen_from_HEAD_nv_driver.diff + - deleted: + + debian/patches/047_radeon_r200_flush_vertices.diff + + debian/patches/050_radeon_reset_no_lockup.diff + + debian/patches/000_xf-4.3-branch.diff + + debian/patches/046_radeon_dualhead_cursor_crash.diff -- Branden Robinson <[EMAIL PROTECTED]> Mon, 25 Aug 2003 17:45:54 -0500 Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,3 +1,5 @@ +$Id$ + A few improvements from XFree86 HEAD, including: * Fix overlapping memmove's in imake. * More strict checking of replies (mainly wrt length) in core X11 handling. @@ -5,8 +7,6 @@ * Drivers shouldn't have to care about recolouring ARGB cursors. * Fix Xv regression in trident driver. * Implement two missing relocations in the ia64 module loader. - * Fix a libxaa bug that could cause NULL pointers to be passed to drivers, and - a complete deadlock. diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c --- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100 @@ -562,19 +562,3 @@ } } return lookup; ---- xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c 25 Sep 2000 23:56:14 -0000 1.30 -+++ xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c 16 Aug 2003 01:11:40 -0000 1.31 -@@ -765,2 +765,3 @@ - 3) Don't make more than MAX_512. -+ 4) Don't have any of there are no 256x256s. - -@@ -787,2 +788,9 @@ - if(Target256 < 4) Target256 = 0; -+ -+ if(Num512 && Num256 < 4) { -+ while(Num512 && Num256 < Target256) { -+ SubdivideList(&List512, &List256); -+ Num256 += 4; Num512--; -+ } -+ } - Property changes on: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_bsdsupport.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_bsdsupport.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_bsdsupport.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,3 +1,5 @@ +$Id$ + A few BSD fixes, including fixing up GLU support, framebuffer support, /dev/mem access, and more. @@ -21,75 +23,6 @@ #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) -diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c ---- xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c 2002-10-30 10:19:13.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c 2003-04-09 04:42:05.000000000 +1000 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.4 2003/03/18 18:24:43 alanh Exp $ */ - /* - * Copyright 1992 by Rich Murphey <[EMAIL PROTECTED]> - * Copyright 1993 by David Wexelblat <[EMAIL PROTECTED]> -@@ -248,7 +248,6 @@ - #ifndef HAS_APERTURE_DRV - xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n", - DEV_MEM, strerror(errno)); -- xf86ErrorF("\tlinear framebuffer access unavailable\n"); - #else - #ifndef __OpenBSD__ - xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n" -@@ -258,12 +257,11 @@ - "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno), - SYSCTL_MSG); - #endif /* __OpenBSD__ */ -- -+#endif - xf86ErrorF("\tlinear framebuffer access unavailable\n"); - } - useDevMem = FALSE; - return; --#endif - } - - void -@@ -304,8 +302,10 @@ - FatalError("xf86MapVidMem: failed to open %s (%s)\n", - DEV_MEM, strerror(errno)); - } -- base = mmap((caddr_t)0, Size, PROT_READ|PROT_WRITE, -- MAP_FLAGS, devMemFd, (off_t)Base + BUS_BASE_BWX); -+ base = mmap((caddr_t)0, Size, -+ (flags & VIDMEM_READONLY) ? -+ PROT_READ : (PROT_READ | PROT_WRITE), -+ MAP_FLAGS, devMemFd, (off_t)Base + BUS_BASE_BWX); - if (base == MAP_FAILED) - { - FatalError("%s: could not mmap %s [s=%x,a=%x] (%s)\n", -@@ -321,9 +321,11 @@ - FatalError("%s: Address 0x%x outside allowable range\n", - "xf86MapVidMem", Base); - } -- base = mmap(0, Size, PROT_READ|PROT_WRITE, MAP_FLAGS, -- xf86Info.screenFd, -- (unsigned long)Base + BUS_BASE); -+ base = mmap(0, Size, -+ (flags & VIDMEM_READONLY) ? -+ PROT_READ : (PROT_READ | PROT_WRITE), -+ MAP_FLAGS, xf86Info.screenFd, -+ (unsigned long)Base + BUS_BASE); - if (base == MAP_FAILED) - { - FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n", -@@ -486,6 +488,9 @@ - sethae(u_int64_t hae) - { - #ifdef __FreeBSD__ -+#ifndef ALPHA_SETHAE -+#define ALPHA_SETHAE 0 -+#endif - struct parms p; - p.hae = hae; - return (sysarch(ALPHA_SETHAE, (char *)&p)); diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c --- xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c 2002-08-06 23:08:38.000000000 +1000 +++ xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c 2003-04-09 04:42:05.000000000 +1000 Property changes on: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_bsdsupport.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,3 +1,5 @@ +$Id$ + A number of documentation fixes from upstream, including: * Lower-case file extensions, e.g. .ps instead of .PS. * New HTML and PostScript documentation (and PDF, seemingly). @@ -108,15 +110,6 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl --- xc.orig/config/cf/X11.tmpl 2003-02-27 17:34:04.000000000 +1100 +++ xc/config/cf/X11.tmpl 2003-04-09 04:43:11.000000000 +1000 -@@ -5,7 +5,7 @@ - XCOMM - XCOMM - XCOMM --XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.196 2003/02/25 21:57:52 dawes Exp $ -+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.197 2003/03/19 01:49:24 dawes Exp $ - - /*************************************************************************** - * * @@ -1385,6 +1385,9 @@ #ifndef DocPsDir #define DocPsDir $(DOCDIR)/PostScript @@ -625,19 +618,6 @@ <!ENTITY drvsuffix CDATA __drivermansuffix__ > <!ENTITY filesuffix CDATA __filemansuffix__ > <!ENTITY miscsuffix CDATA __miscmansuffix__ > -diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86Date.h xc/programs/Xserver/hw/xfree86/xf86Date.h ---- xc.orig/programs/Xserver/hw/xfree86/xf86Date.h 2003-02-27 15:56:45.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/xf86Date.h 2003-04-09 04:43:11.000000000 +1000 -@@ -1,7 +1,7 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.3 2003/02/27 04:56:45 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.4 2003/03/19 01:49:27 dawes Exp $ */ - - #ifndef XF86_DATE - --#define XF86_DATE "27 February 2003" -+#define XF86_DATE "18 March 2003" - - #endif diff -urN xc.orig/programs/ico/ico.man xc/programs/ico/ico.man --- xc.orig/programs/ico/ico.man 2001-01-28 05:21:03.000000000 +1100 +++ xc/programs/ico/ico.man 2003-04-09 04:43:11.000000000 +1000 Property changes on: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,148 +1,10 @@ -Numerous int10 fixes from upstream that should hopefully fix int10 on -non-Linux/x86 systems. +$Id$ -diff -urN xc.orig/programs/Xserver/hw/xfree86/int10/generic.c xc/programs/Xserver/hw/xfree86/int10/generic.c ---- xc.orig/programs/Xserver/hw/xfree86/int10/generic.c 2002-04-05 00:05:51.000000000 +1000 -+++ xc/programs/Xserver/hw/xfree86/int10/generic.c 2003-04-09 04:48:51.000000000 +1000 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.25 2002/04/04 14:05:51 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.25.2.1 2003/03/20 15:14:25 tsi Exp $ */ - /* - * XFree86 int10 module - * execute BIOS int 10h calls in x86 real mode environment -@@ -108,7 +108,7 @@ - MapVRam(pInt); - #ifdef _PC - if (!sysMem) -- sysMem = xf86MapVidMem(screen, VIDMEM_FRAMEBUFFER, V_BIOS, -+ sysMem = xf86MapVidMem(screen, VIDMEM_MMIO, V_BIOS, - BIOS_SIZE + SYS_BIOS - V_BIOS); - INTPriv(pInt)->sysMem = sysMem; - -@@ -446,12 +446,14 @@ - #define OFF(addr) ((addr) & 0xffff) - #if defined _PC - # define HIGH_OFFSET (INTPriv(pInt)->highMemory) -+# define HIGH_BASE V_BIOS - #else - # define HIGH_OFFSET SYS_BIOS -+# define HIGH_BASE SYS_BIOS - #endif - # define SYS(addr) ((addr) >= HIGH_OFFSET) - #define V_ADDR(addr) \ -- (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_OFFSET) \ -+ (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_BASE) \ - : (((char*)(INTPriv(pInt)->base) + addr))) - #define VRAM_ADDR(addr) (addr - V_RAM) - #define VRAM_BASE (INTPriv(pInt)->vRam) -diff -urN xc.orig/programs/Xserver/hw/xfree86/int10/xf86int10.c xc/programs/Xserver/hw/xfree86/int10/xf86int10.c ---- xc.orig/programs/Xserver/hw/xfree86/int10/xf86int10.c 2002-11-26 01:05:01.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/int10/xf86int10.c 2003-04-09 04:48:51.000000000 +1000 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10 2002/11/25 14:05:01 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10.2.1 2003/03/21 22:29:59 tsi Exp $ */ - /* - * XFree86 int10 module - * execute BIOS int 10h calls in x86 real mode environment -@@ -664,7 +664,7 @@ - #endif - return 1; - case 0xb108: -- if ((tag = findPci(pInt, X86_EBX))) { -+ if ((tag = findPci(pInt, X86_EBX)) != PCI_NOT_FOUND) { - X86_CL = pciReadByte(tag, X86_EDI); - X86_EAX = X86_AL | (SUCCESSFUL << 8); - X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ -@@ -677,7 +677,7 @@ - #endif - return 1; - case 0xb109: -- if ((tag = findPci(pInt, X86_EBX))) { -+ if ((tag = findPci(pInt, X86_EBX)) != PCI_NOT_FOUND) { - X86_CX = pciReadWord(tag, X86_EDI); - X86_EAX = X86_AL | (SUCCESSFUL << 8); - X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ -@@ -690,7 +690,7 @@ - #endif - return 1; - case 0xb10a: -- if ((tag = findPci(pInt, X86_EBX))) { -+ if ((tag = findPci(pInt, X86_EBX)) != PCI_NOT_FOUND) { - X86_ECX = pciReadLong(tag, X86_EDI); - X86_EAX = X86_AL | (SUCCESSFUL << 8); - X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ -@@ -703,7 +703,7 @@ - #endif - return 1; - case 0xb10b: -- if ((tag = findPci(pInt, X86_EBX))) { -+ if ((tag = findPci(pInt, X86_EBX)) != PCI_NOT_FOUND) { - pciWriteByte(tag, X86_EDI, X86_CL); - X86_EAX = X86_AL | (SUCCESSFUL << 8); - X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ -@@ -716,7 +716,7 @@ - #endif - return 1; - case 0xb10c: -- if ((tag = findPci(pInt, X86_EBX))) { -+ if ((tag = findPci(pInt, X86_EBX)) != PCI_NOT_FOUND) { - pciWriteWord(tag, X86_EDI, X86_CX); - X86_EAX = X86_AL | (SUCCESSFUL << 8); - X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ -@@ -729,7 +729,7 @@ - #endif - return 1; - case 0xb10d: -- if ((tag = findPci(pInt, X86_EBX))) { -+ if ((tag = findPci(pInt, X86_EBX)) != PCI_NOT_FOUND) { - pciWriteLong(tag, X86_EDI, X86_ECX); - X86_EAX = X86_AL | (SUCCESSFUL << 8); - X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ -@@ -759,7 +759,7 @@ - int func = bx & 0x7; - if (xf86IsPciDevPresent(bus, dev, func)) - return pciTag(bus, dev, func); -- return 0; -+ return PCI_NOT_FOUND; - } - - static CARD32 -diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/bus/Pci.h xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h ---- xc.orig/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2002-12-24 02:37:26.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2003-04-09 04:48:51.000000000 +1000 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.36 2002/12/23 15:37:26 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.36.2.1 2003/03/21 22:29:59 tsi Exp $ */ - /* - * Copyright 1998 by Concurrent Computer Corporation - * -@@ -97,8 +97,6 @@ - # define MAX_PCI_BUSES 256 /* Max number of PCI buses */ - #endif - --#define PCI_NOT_FOUND 0xffffffff -- - #define DEVID(vendor, device) \ - ((CARD32)((PCI_CHIP_##device << 16) | PCI_VENDOR_##vendor)) - -diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h ---- xc.orig/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 2003-02-19 02:42:12.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 2003-04-09 04:48:51.000000000 +1000 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.36 2003/02/18 15:42:12 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.36.2.1 2003/03/21 22:29:59 tsi Exp $ */ - /* - * Copyright 1998 by Concurrent Computer Corporation - * -@@ -81,6 +81,8 @@ - #include "Xfuncproto.h" - #include "misc.h" - -+#define PCI_NOT_FOUND 0xFFFFFFFFU -+ - /* - * PCI cfg space definitions (e.g. stuff right out of the PCI spec) - */ +(xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c, + xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c): + 976. Change most of os-support/ to respect VIDMEM_READONLY (Marc La + France). + diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c --- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c 2002-10-17 07:13:47.000000000 +1000 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c 2003-04-09 04:48:51.000000000 +1000 Property changes on: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_nv_driver.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_nv_driver.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_nv_driver.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,3 +1,5 @@ +$Id$ + Numerous nv driver updates, including manpage updates, general bug fixes, and more supported cards. @@ -171,15 +173,6 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c --- xc.orig/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c 2003-02-11 10:42:51.000000000 +1100 +++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c 2003-04-09 05:01:10.000000000 +1000 -@@ -24,7 +24,7 @@ - /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen - <[EMAIL PROTECTED]> */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.27 2003/02/10 23:42:51 mvojkovi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.28 2003/03/12 21:27:18 mvojkovi Exp $ */ - - #include "nv_include.h" - @@ -229,8 +229,12 @@ case 0x031D: case 0x031E: Property changes on: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_nv_driver.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_sis_driver.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_sis_driver.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_sis_driver.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,3 +1,5 @@ +$Id$ + diff -urN xc/programs/Xserver/hw/xfree86/drivers/sis.old/300vtbl.h xc/programs/Xserver/hw/xfree86/drivers/sis/300vtbl.h --- xc/programs/Xserver/hw/xfree86/drivers/sis.old/300vtbl.h 2003-06-22 12:30:03.000000000 +1000 +++ xc/programs/Xserver/hw/xfree86/drivers/sis/300vtbl.h 2003-06-22 12:31:06.000000000 +1000 @@ -6808,32 +6810,6 @@ static const UCHAR SiS310_CHTVVCLKOPALN[] = {0x47,0x47,0x47,0x47,0x48,0x4f,0x52}; -/* TW: New end */ -diff -urN xc/programs/Xserver/hw/xfree86/drivers/sis.old/Imakefile xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile ---- xc/programs/Xserver/hw/xfree86/drivers/sis.old/Imakefile 2003-06-22 12:30:03.000000000 +1000 -+++ xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile 2003-06-22 12:31:06.000000000 +1000 -@@ -1,4 +1,4 @@ --XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v 1.31 2003/02/17 17:06:44 dawes Exp $ -+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v 1.32 2003/04/21 12:32:11 sven Exp $ - XCOMM - XCOMM This is an Imakefile for the SIS driver. - XCOMM -@@ -73,6 +73,7 @@ - InstallDriverSDKNonExecFile(sis300_accel.h,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(sis310_accel.c,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(sis310_accel.h,$(DRIVERSDKDIR)/drivers/sis) -+InstallDriverSDKNonExecFile(sis_accel.h,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(init.c,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(init.h,$(DRIVERSDKDIR)/drivers/sis) -@@ -103,5 +104,8 @@ - InstallDriverSDKNonExecFile(sis_vga.c,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(sis_video.c,$(DRIVERSDKDIR)/drivers/sis) - InstallDriverSDKNonExecFile(sis6326_video.c,$(DRIVERSDKDIR)/drivers/sis) -+InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis) -+InstallDriverSDKNonExecFile(vgatypes.h,$(DRIVERSDKDIR)/drivers/sis) -+InstallDriverSDKNonExecFile(vstruct.h,$(DRIVERSDKDIR)/drivers/sis) - - InstallDriverSDKObjectModule(sis,$(DRIVERSDKMODULEDIR),drivers) diff -urN xc/programs/Xserver/hw/xfree86/drivers/sis.old/init.c xc/programs/Xserver/hw/xfree86/drivers/sis/init.c --- xc/programs/Xserver/hw/xfree86/drivers/sis.old/init.c 2003-06-22 12:30:03.000000000 +1000 +++ xc/programs/Xserver/hw/xfree86/drivers/sis/init.c 2003-06-22 12:31:06.000000000 +1000 Property changes on: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_sis_driver.diff ___________________________________________________________________ Name: svn:keywords + Id Deleted: branches/4.3.0/sid/debian/patches/000_xf-4.3-branch.diff =================================================================== --- branches/4.3.0/sid/debian/patches/000_xf-4.3-branch.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/000_xf-4.3-branch.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,199 +0,0 @@ -Fixes from upstream's xf4.3-branch, including: - * Glw -> GLw typo fix. - * Making XlcLocaleDir more strict. - * radeon fix: make R300 mode calculations actually work. - -diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl ---- xc.orig/config/cf/X11.tmpl 2003-02-27 17:34:04.000000000 +1100 -+++ xc/config/cf/X11.tmpl 2003-04-09 04:56:26.000000000 +1000 -@@ -5,7 +5,7 @@ - XCOMM - XCOMM - XCOMM --XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.197 2003/03/19 01:49:24 dawes Exp $ -+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.196.2.1 2003/03/27 11:43:07 alanh Exp $ - - /*************************************************************************** - * * -@@ -2185,14 +2185,14 @@ - #define GLwUseXmStubs NO /* create stub (weak) Motif symbols */ - #endif - #else --#undef SharedLibGlw --#define SharedLibGlw NO --#undef NormalLibGlw --#define NormalLibGlw NO --#undef DebugLibGlw --#define DebugLibGlw NO --#undef ProfileLibGlw --#define ProfileLibGlw NO -+#undef SharedLibGLw -+#define SharedLibGLw NO -+#undef NormalLibGLw -+#define NormalLibGLw NO -+#undef DebugLibGLw -+#define DebugLibGLw NO -+#undef ProfileLibGLw -+#define ProfileLibGLw NO - #endif - - #ifndef SharedLibXext -diff -urN xc.orig/lib/X11/XlcDL.c xc/lib/X11/XlcDL.c ---- xc.orig/lib/X11/XlcDL.c 2002-11-26 01:04:53.000000000 +1100 -+++ xc/lib/X11/XlcDL.c 2003-04-09 04:56:26.000000000 +1000 -@@ -41,7 +41,7 @@ - Sun Microsystems, Inc. or its licensors is granted. - - */ --/* $XFree86: xc/lib/X11/XlcDL.c,v 1.9 2002/11/25 14:04:53 eich Exp $ */ -+/* $XFree86: xc/lib/X11/XlcDL.c,v 1.9.2.1 2003/03/11 23:18:49 herrb Exp $ */ - - #include <stdio.h> - #if defined(hpux) -@@ -406,7 +406,7 @@ - - if (lc_name == NULL) return (XLCd)NULL; - -- if (_XlcLocaleDirName(lc_dir, (char *)lc_name) == (char*)NULL) -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, (char *)lc_name) == (char*)NULL) - return (XLCd)NULL; - - resolve_object(lc_dir, lc_name); -@@ -452,7 +452,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XIM)0; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XIM)0; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -498,7 +498,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -543,7 +543,7 @@ - #endif - - lc_name = lcd->core->name; -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -610,7 +610,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XOM)0; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XOM)0; - - count = lc_count; - for (; count-- > 0; objects_list++) { -diff -urN xc.orig/lib/X11/XlcPubI.h xc/lib/X11/XlcPubI.h ---- xc.orig/lib/X11/XlcPubI.h 2001-11-16 11:52:27.000000000 +1100 -+++ xc/lib/X11/XlcPubI.h 2003-04-09 04:56:26.000000000 +1000 -@@ -23,7 +23,7 @@ - * Author: Katsuhisa Yano TOSHIBA Corp. - * [EMAIL PROTECTED] - */ --/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.9 2001/11/16 00:52:27 dawes Exp $ */ -+/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.9.6.1 2003/03/11 23:18:49 herrb Exp $ */ - - #ifndef _XLCPUBLICI_H_ - #define _XLCPUBLICI_H_ -@@ -217,6 +217,7 @@ - extern char *_XlcLocaleDirName( - #if NeedFunctionPrototypes - char* /* dir_name */, -+ size_t, /* dir_len */ - char* /* lc_name */ - #endif - ); -diff -urN xc.orig/lib/X11/lcFile.c xc/lib/X11/lcFile.c ---- xc.orig/lib/X11/lcFile.c 2002-11-26 01:04:53.000000000 +1100 -+++ xc/lib/X11/lcFile.c 2003-04-09 04:56:26.000000000 +1000 -@@ -23,7 +23,7 @@ - * SOFTWARE. - * - */ --/* $XFree86: xc/lib/X11/lcFile.c,v 3.30 2002/11/25 14:04:53 eich Exp $ */ -+/* $XFree86: xc/lib/X11/lcFile.c,v 3.30.2.1 2003/03/11 23:18:49 herrb Exp $ */ - - #include <stdlib.h> - #include <stdio.h> -@@ -429,8 +429,9 @@ - } - - char * --_XlcLocaleDirName(dir_name, lc_name) -+_XlcLocaleDirName(dir_name, dir_len, lc_name) - char *dir_name; -+ size_t dir_len; - char *lc_name; - { - char dir[PATH_MAX], buf[PATH_MAX], *name = NULL; -@@ -486,9 +487,16 @@ - target_dir = args[0]; - target_name = lc_name; - } -- strcpy(dir_name, target_dir); -- strcat(dir_name, "/"); -- strcat(dir_name, target_name); -+ /* snprintf(dir_name, dir_len, "%s/%", target_dir, target_name); */ -+ strncpy(dir_name, target_dir, dir_len - 1); -+ if (strlen(target_dir) >= dir_len - 1) { -+ dir_name[dir_len - 1] = '\0'; -+ } else { -+ strcat(dir_name, "/"); -+ strncat(dir_name, target_name, dir_len - strlen(dir_name) - 1); -+ if (strlen(target_name) >= dir_len - strlen(dir_name) - 1) -+ dir_name[dir_len - 1] = '\0'; -+ } - if (target_name != lc_name) - Xfree(target_name); - return dir_name; -diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h ---- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 2003-02-08 05:08:59.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 2003-04-09 04:56:26.000000000 +1000 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.25 2003/02/07 18:08:59 martin Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.25.2.1 2003/03/07 12:13:59 alanh Exp $ */ - /* - * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and - * VA Linux Systems Inc., Fremont, California. -@@ -879,7 +879,7 @@ - # define RADEON_P2PLL_REF_DIV_MASK 0x03ff - # define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */ - # define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */ --# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff < 18) -+# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff << 18) - # define R300_PPLL_REF_DIV_ACC_SHIFT 18 - #define RADEON_PALETTE_DATA 0x00b4 - #define RADEON_PALETTE_30_DATA 0x00b8 -diff -urN xc.orig/programs/Xserver/xkb/xkbInit.c xc/programs/Xserver/xkb/xkbInit.c ---- xc.orig/programs/Xserver/xkb/xkbInit.c 2003-02-09 17:29:20.000000000 +1100 -+++ xc/programs/Xserver/xkb/xkbInit.c 2003-04-09 04:56:26.000000000 +1000 -@@ -24,7 +24,7 @@ - THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ********************************************************/ --/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.26 2003/02/09 06:29:20 paulo Exp $ */ -+/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.26.2.1 2003/03/17 23:53:14 paulo Exp $ */ - - #include <stdio.h> - #include <stdlib.h> -@@ -713,7 +713,7 @@ - if (names->types) names->types = _XkbDupString(names->types); - if (names->compat) names->compat = _XkbDupString(names->compat); - if (names->geometry) names->geometry = _XkbDupString(names->geometry); -- if (names->symbols) names->geometry = _XkbDupString(names->symbols); -+ if (names->symbols) names->symbols = _XkbDupString(names->symbols); - - if (defs.model && defs.layout && rules) { - XkbComponentNamesRec rNames; Deleted: branches/4.3.0/sid/debian/patches/046_radeon_dualhead_cursor_crash.diff =================================================================== --- branches/4.3.0/sid/debian/patches/046_radeon_dualhead_cursor_crash.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/046_radeon_dualhead_cursor_crash.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,18 +0,0 @@ -Patch by Michel Daenzer for 4.3.0 - -http://bugs.xfree86.org//cgi-bin/bugzilla/show_bug.cgi?id=90 -https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=87854 -https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=88748 - -diff -p -u -r1.23 radeon_cursor.c ---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c 2003/02/24 20:34:55 1.23 -+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c 2003/04/03 01:19:29 -@@ -370,7 +370,7 @@ static void RADEONLoadCursorARGB (ScrnIn - } - - if (info->IsSecondary || info->Clone) { -- save2 = INREG(RADEON_CRTC_GEN_CNTL) & ~(CARD32) (3 << 20); -+ save2 = INREG(RADEON_CRTC2_GEN_CNTL) & ~(CARD32) (3 << 20); - save2 |= (CARD32) (2 << 20); - OUTREG(RADEON_CRTC2_GEN_CNTL, save2 & (CARD32)~RADEON_CRTC2_CUR_EN); - } Deleted: branches/4.3.0/sid/debian/patches/047_radeon_r200_flush_vertices.diff =================================================================== --- branches/4.3.0/sid/debian/patches/047_radeon_r200_flush_vertices.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/047_radeon_r200_flush_vertices.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,266 +0,0 @@ -Index: lib/GL/mesa/src/drv/radeon/radeon_context.c -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v -retrieving revision 1.7 -diff -p -u -r1.7 radeon_context.c ---- xc/lib/GL/mesa/src/drv/radeon/radeon_context.c 2003/02/08 21:26:45 1.7 -+++ xc/lib/GL/mesa/src/drv/radeon/radeon_context.c 2003/03/16 14:16:18 -@@ -382,6 +382,7 @@ radeonCreateContext( Display *dpy, const - */ - _tnl_destroy_pipeline( ctx ); - _tnl_install_pipeline( ctx, radeon_pipeline ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - /* Try and keep materials and vertices separate: - */ -Index: lib/GL/mesa/src/drv/radeon/radeon_swtcl.c -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c,v -retrieving revision 1.4 -diff -p -u -r1.4 radeon_swtcl.c ---- xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c 2003/02/15 22:18:48 1.4 -+++ xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c 2003/03/16 14:16:19 -@@ -45,6 +45,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "math/m_translate.h" - #include "tnl/tnl.h" - #include "tnl/t_context.h" -+#include "tnl/t_imm_exec.h" - #include "tnl/t_pipeline.h" - - #include "radeon_context.h" -@@ -1133,6 +1134,14 @@ void radeonFallback( GLcontext *ctx, GLu - } - } - -+ -+void radeonFlushVertices( GLcontext *ctx, GLuint flags ) -+{ -+ _tnl_flush_vertices( ctx, flags ); -+ -+ if (flags & FLUSH_STORED_VERTICES) -+ RADEON_FIREVERTICES( RADEON_CONTEXT( ctx ) ); -+} - - /**********************************************************************/ - /* Initialization. */ -Index: lib/GL/mesa/src/drv/radeon/radeon_swtcl.h -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h,v -retrieving revision 1.1 -diff -p -u -r1.1 radeon_swtcl.h ---- xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h 2002/10/30 12:51:57 1.1 -+++ xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h 2003/03/16 14:16:19 -@@ -43,6 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - extern void radeonInitSwtcl( GLcontext *ctx ); - extern void radeonDestroySwtcl( GLcontext *ctx ); - -+extern void radeonFlushVertices( GLcontext *ctx, GLuint flags ); - extern void radeonChooseRenderState( GLcontext *ctx ); - extern void radeonChooseVertexState( GLcontext *ctx ); - -Index: lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c,v -retrieving revision 1.5 -diff -p -u -r1.5 radeon_vtxfmt.c ---- xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c 2002/12/16 16:18:59 1.5 -+++ xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c 2003/03/16 14:16:19 -@@ -38,6 +38,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "radeon_ioctl.h" - #include "radeon_tex.h" - #include "radeon_tcl.h" -+#include "radeon_swtcl.h" - #include "radeon_vtxfmt.h" - - #include "api_noop.h" -@@ -59,7 +60,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - - struct radeon_vb vb; - --static void radeonFlushVertices( GLcontext *, GLuint ); -+static void radeonVtxfmtFlushVertices( GLcontext *, GLuint ); - - static void count_func( const char *name, struct dynfn *l ) - { -@@ -336,12 +337,13 @@ static void VFMT_FALLBACK_OUTSIDE_BEGIN_ - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); - - if (ctx->Driver.NeedFlush) -- radeonFlushVertices( ctx, ctx->Driver.NeedFlush ); -+ radeonVtxfmtFlushVertices( ctx, ctx->Driver.NeedFlush ); - - if (ctx->NewState) - _mesa_update_state( ctx ); /* clear state so fell_back sticks */ - - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - assert( rmesa->dma.flush == 0 ); - rmesa->vb.fell_back = GL_TRUE; -@@ -382,6 +384,7 @@ static void VFMT_FALLBACK( const char *c - prim = rmesa->vb.prim[0]; - ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1; - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - assert(rmesa->dma.flush == 0); - rmesa->vb.fell_back = GL_TRUE; -@@ -731,7 +734,7 @@ static void radeonVtxfmtValidate( GLcont - fprintf(stderr, "reinstall (new install)\n"); - - _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt ); -- ctx->Driver.FlushVertices = radeonFlushVertices; -+ ctx->Driver.FlushVertices = radeonVtxfmtFlushVertices; - ctx->Driver.NewList = radeonNewList; - rmesa->vb.installed = GL_TRUE; - vb.context = ctx; -@@ -747,6 +750,7 @@ static void radeonVtxfmtValidate( GLcont - if (rmesa->dma.flush) - rmesa->dma.flush( rmesa ); - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - rmesa->vb.installed = GL_FALSE; - vb.context = 0; - } -@@ -905,7 +909,7 @@ static GLboolean radeonNotifyBegin( GLco - return GL_TRUE; - } - --static void radeonFlushVertices( GLcontext *ctx, GLuint flags ) -+static void radeonVtxfmtFlushVertices( GLcontext *ctx, GLuint flags ) - { - radeonContextPtr rmesa = RADEON_CONTEXT( ctx ); - -Index: lib/GL/mesa/src/drv/r200/r200_context.c -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_context.c,v -retrieving revision 1.2 -diff -p -u -r1.2 r200_context.c ---- xc/lib/GL/mesa/src/drv/r200/r200_context.c 2002/12/16 16:18:53 1.2 -+++ xc/lib/GL/mesa/src/drv/r200/r200_context.c 2003/03/16 14:16:20 -@@ -391,6 +391,7 @@ GLboolean r200CreateContext( Display *dp - */ - _tnl_destroy_pipeline( ctx ); - _tnl_install_pipeline( ctx, r200_pipeline ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - /* Try and keep materials and vertices separate: - */ -Index: lib/GL/mesa/src/drv/r200/r200_swtcl.c -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c,v -retrieving revision 1.3 -diff -p -u -r1.3 r200_swtcl.c ---- xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c 2002/12/23 15:29:26 1.3 -+++ xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c 2003/03/16 14:16:20 -@@ -46,6 +46,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE - #include "math/m_translate.h" - #include "tnl/tnl.h" - #include "tnl/t_context.h" -+#include "tnl/t_imm_exec.h" - #include "tnl/t_pipeline.h" - - #include "r200_context.h" -@@ -1222,6 +1223,14 @@ r200PointsBitmap( GLcontext *ctx, GLint - r200ChooseVertexState( ctx ); - } - -+ -+void r200FlushVertices( GLcontext *ctx, GLuint flags ) -+{ -+ _tnl_flush_vertices( ctx, flags ); -+ -+ if (flags & FLUSH_STORED_VERTICES) -+ R200_FIREVERTICES( R200_CONTEXT( ctx ) ); -+} - - /**********************************************************************/ - /* Initialization. */ -Index: lib/GL/mesa/src/drv/r200/r200_swtcl.h -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h,v -retrieving revision 1.2 -diff -p -u -r1.2 r200_swtcl.h ---- xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h 2002/12/16 16:18:55 1.2 -+++ xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h 2003/03/16 14:16:20 -@@ -42,6 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE - extern void r200InitSwtcl( GLcontext *ctx ); - extern void r200DestroySwtcl( GLcontext *ctx ); - -+extern void r200FlushVertices( GLcontext *ctx, GLuint flags ); - extern void r200ChooseRenderState( GLcontext *ctx ); - extern void r200ChooseVertexState( GLcontext *ctx ); - -Index: lib/GL/mesa/src/drv/r200/r200_vtxfmt.c -=================================================================== -RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c,v -retrieving revision 1.3 -diff -p -u -r1.3 r200_vtxfmt.c ---- xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c 2002/12/16 16:18:55 1.3 -+++ xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c 2003/03/16 14:16:21 -@@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE - #include "r200_ioctl.h" - #include "r200_tex.h" - #include "r200_tcl.h" -+#include "r200_swtcl.h" - #include "r200_vtxfmt.h" - - #include "api_noop.h" -@@ -59,7 +60,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE - - struct r200_vb vb; - --static void r200FlushVertices( GLcontext *, GLuint ); -+static void r200VtxFmtFlushVertices( GLcontext *, GLuint ); - - static void count_func( const char *name, struct dynfn *l ) - { -@@ -357,12 +358,13 @@ static void VFMT_FALLBACK_OUTSIDE_BEGIN_ - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); - - if (ctx->Driver.NeedFlush) -- r200FlushVertices( ctx, ctx->Driver.NeedFlush ); -+ r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush ); - - if (ctx->NewState) - _mesa_update_state( ctx ); /* clear state so fell_back sticks */ - - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - assert( rmesa->dma.flush == 0 ); - rmesa->vb.fell_back = GL_TRUE; -@@ -404,6 +406,7 @@ static void VFMT_FALLBACK( const char *c - prim = rmesa->vb.prim[0]; - ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1; - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - assert(rmesa->dma.flush == 0); - rmesa->vb.fell_back = GL_TRUE; -@@ -756,7 +759,7 @@ static void r200VtxfmtValidate( GLcontex - fprintf(stderr, "reinstall (new install)\n"); - - _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt ); -- ctx->Driver.FlushVertices = r200FlushVertices; -+ ctx->Driver.FlushVertices = r200VtxFmtFlushVertices; - ctx->Driver.NewList = r200NewList; - rmesa->vb.installed = GL_TRUE; - vb.context = ctx; -@@ -772,6 +775,7 @@ static void r200VtxfmtValidate( GLcontex - if (rmesa->dma.flush) - rmesa->dma.flush( rmesa ); - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - rmesa->vb.installed = GL_FALSE; - vb.context = 0; - } -@@ -931,7 +935,7 @@ static GLboolean r200NotifyBegin( GLcont - return GL_TRUE; - } - --static void r200FlushVertices( GLcontext *ctx, GLuint flags ) -+static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags ) - { - r200ContextPtr rmesa = R200_CONTEXT( ctx ); - Deleted: branches/4.3.0/sid/debian/patches/050_radeon_reset_no_lockup.diff =================================================================== --- branches/4.3.0/sid/debian/patches/050_radeon_reset_no_lockup.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/050_radeon_reset_no_lockup.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,15 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v -retrieving revision 1.32 -diff -p -u -r1.32 radeon_dri.c ---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003/02/19 09:17:30 1.32 -+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003/03/17 01:43:24 -@@ -1665,6 +1665,7 @@ void RADEONDRICloseScreen(ScreenPtr pScr - if (info->irq) { - drmCtlUninstHandler(info->drmFD); - info->irq = 0; -+ info->ModeReg.gen_int_cntl = 0; - } - - /* De-allocate vertex buffers */ Modified: branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff =================================================================== --- branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff 2003-09-15 07:00:54 UTC (rev 526) +++ branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff 2003-09-15 07:35:26 UTC (rev 527) @@ -1,3 +1,5 @@ +$Id$ + diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_accel.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c --- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_accel.c 2002-11-09 05:03:32.000000000 +1100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c 2002-10-08 05:17:32.000000000 +1000 @@ -134,12 +136,6 @@ diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_driver.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c --- xc/programs/Xserver/hw/xfree86/drivers/savage.old/savage_driver.c 2003-06-21 00:05:26.000000000 +1000 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-17 08:25:58.000000000 +1100 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.34 2003/02/25 04:08:21 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.24 2001/11/02 16:24:51 alanh Exp $ */ - /* - * vim: sw=4 ts=8 ai ic: - * @@ -82,10 +82,10 @@ #define iabs(a) ((int)(a)>0?(a):(-(a))) @@ -213,7 +209,7 @@ clockRanges->next = NULL; clockRanges->minClock = psav->minClock; clockRanges->maxClock = psav->maxClock; -@@ -2833,16 +2839,15 @@ +@@ -2843,16 +2849,15 @@ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; TRACE(("SavageSaveScreen(0x%x)\n", mode)); Property changes on: branches/4.3.0/sid/debian/patches/061_savage_driver_1.1.27t.diff ___________________________________________________________________ Name: svn:keywords + Id -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]