X Strike Force XFree86 SVN commit: r1138 - in trunk/debian: . patches
Author: branden
Date: 2004-03-04 23:12:08 -0500 (Thu, 04 Mar 2004)
New Revision: 1138
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff
Log:
Revert changeset from upstream CVS HEAD that didn't compile (fixes FTBFS
on hurd-i386, i386, and ia64).
+ For drivers that support 'Option "dri"' have the driver request
loading the dri module when this option is true. This brings
it in to line with how other things are handled. Other drivers
that have DRI support need to have the "dri" option added (David
Dawes).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-05 04:10:41 UTC (rev 1137)
+++ trunk/debian/changelog 2004-03-05 04:12:08 UTC (rev 1138)
@@ -1,5 +1,7 @@
-xfree86 (4.3.0-5) unstable; urgency=low
+xfree86 (4.3.0-5) unstable; urgency=medium
+ * Urgency due to fix for FTBFS on some architectures.
+
* Fix more non-idiomatic and incorrect usages of printf.
- debian/xlibs.bug
- debian/xserver-xfree86.bug
@@ -8,8 +10,17 @@
(Closes: #235853)
- debian/po/da.po
- -- Branden Robinson <branden@debian.org> Thu, 4 Mar 2004 22:01:12 -0500
+ * Revert changeset from upstream CVS HEAD that didn't compile (fixes FTBFS
+ on hurd-i386, i386, and ia64).
+ + For drivers that support 'Option "dri"' have the driver request
+ loading the dri module when this option is true. This brings
+ it in to line with how other things are handled. Other drivers
+ that have DRI support need to have the "dri" option added (David
+ Dawes).
+ - debian/patches/000_stolen_from_HEAD_i830_driver.diff
+ -- Branden Robinson <branden@debian.org> Thu, 4 Mar 2004 23:08:44 -0500
+
xfree86 (4.3.0-4) unstable; urgency=medium
* Urgency due to fix for grave bug which prevents packages from installing
@@ -51,7 +62,8 @@
+ For drivers that support 'Option "dri"' have the driver request
loading the dri module when this option is true. This brings
it in to line with how other things are handled. Other drivers
- that have DRI support need to have the "dri" option added (David Dawes).
+ that have DRI support need to have the "dri" option added (David
+ Dawes).
+ Update manpage to clarify that XVideo is only enabled by default when
the configurations supports it. (David Dawes)
+ Add a "VBERestore" option for the i830 part of the i810 driver, to
Modified: trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff 2004-03-05 04:10:41 UTC (rev 1137)
+++ trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff 2004-03-05 04:12:08 UTC (rev 1138)
@@ -4,13 +4,6 @@
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.36
415. Remove some static variables that should be per-screen (David Dawes).
-xc/programs/Xserver/hw/xfree86/drivers/i810/common.h @ 1.8
-xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.37
- 451. For drivers that support 'Option "dri"' have the driver request
- loading the dri module when this option is true. This brings
- it in to line with how other things are handled. Other drivers
- that have DRI support need to have the "dri" option added (David Dawes).
-
xc/programs/Xserver/hw/xfree86/drivers/i810/common.h @ 1.9
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.38
453. Add gcc format checking for the X server's message and logging
@@ -52,37 +45,10 @@
to turn it back on in the i810 driver. This fixes some lockup
problems found with some Dell BIOS' (Alan Hourihane, Alain Poirier).
-Index: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h
-===================================================================
-RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v
-retrieving revision 1.6.2.1
-retrieving revision 1.10
-diff -u -r1.6.2.1 -r1.10
--- xc/programs/Xserver/hw/xfree86/drivers/i810/common.h 21 Oct 2003 02:22:37 -0000 1.6.2.1
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/common.h 3 Jan 2004 02:11:53 -0000 1.10
-@@ -27,7 +27,7 @@
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+@@ -111,7 +111,8 @@
- **************************************************************************/
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.6.2.1 2003/10/21 02:22:37 dawes Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.10 2004/01/03 02:11:53 dawes Exp $ */
-
- /*
- * Authors:
-@@ -79,7 +79,11 @@
- extern const char *I810ddcSymbols[];
- extern const char *I810fbSymbols[];
- extern const char *I810xaaSymbols[];
-+#ifdef XF86DRI
-+extern const char *I810driSymbols[];
-+extern const char *I810drmSymbols[];
- extern const char *I810shadowSymbols[];
-+#endif
-
- extern void I830DPRINTF_stub(const char *filename, int line,
- const char *function, const char *fmt, ...);
-@@ -111,7 +115,8 @@
-
#define OUT_RING(n) do { \
if (I810_DEBUG & DEBUG_VERBOSE_RING) \
- ErrorF( "OUT_RING %x: %x, (mask %x)\n", outring, n, ringmask); \
@@ -91,7 +57,7 @@
*(volatile unsigned int *)(virt + outring) = n; \
outring += 4; \
outring &= ringmask; \
-@@ -227,21 +232,24 @@
+@@ -227,21 +228,24 @@
#define OUTREG8(addr, val) do { \
*(volatile CARD8 *)(RecPtr->MMIOBase + (addr)) = (val); \
if (I810_DEBUG&DEBUG_VERBOSE_OUTREG) { \
@@ -119,7 +85,7 @@
} \
} while (0)
-@@ -249,8 +257,10 @@
+@@ -249,8 +253,10 @@
* preprocessor symbol, and equal to zero.
*/
#if 1
@@ -225,20 +191,8 @@
+#define DRAM_WRITE 0x33330000
#endif /* _I830_H_ */
-Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
-===================================================================
-RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
-retrieving revision 1.27.2.3
-retrieving revision 1.51
-diff -u -r1.27.2.3 -r1.51
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 19 Dec 2003 23:41:32 -0000 1.27.2.3
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 25 Feb 2004 12:53:14 -0000 1.51
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.27.2.3 2003/12/19 23:41:32 dawes Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.51 2004/02/25 12:53:14 eich Exp $ */
- /**************************************************************************
-
- Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -154,7 +154,7 @@
#include "micmap.h"
@@ -534,7 +488,7 @@
"\tReduce VideoRam amount to avoid this!\n",
pI830->FbMapSize / 1024,
-pI830->MemoryAperture.Size / 1024);
-@@ -2034,7 +2145,25 @@
+@@ -2034,6 +2145,16 @@
VBEFreeVBEInfo(pI830->vbeInfo);
vbeFree(pVbe);
@@ -549,18 +503,9 @@
+ pI830->vbeRestoreWorkaround ? "enabled" : "disabled");
+
#if defined(XF86DRI)
-+ /* Load the dri module if requested. */
-+ if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
-+ !pI830->directRenderingDisabled) {
-+ if (xf86LoadSubModule(pScrn, "dri")) {
-+ xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
-+ }
-+ }
-+
if (!pI830->directRenderingDisabled) {
if (!xf86LoadSubModule(pScrn, "shadow")) {
- PreInitCleanup(pScrn);
-@@ -2061,26 +2190,26 @@
+@@ -2061,26 +2182,26 @@
/* Check first for page table errors */
temp = INREG(PGE_ERR);
if (temp != 0) {
@@ -591,7 +536,7 @@
"ring buffer not flushed\n", head, tail);
errors++;
}
-@@ -2165,7 +2294,7 @@
+@@ -2165,7 +2286,7 @@
if ((pI830->LpRing.mem.Start & I830_RING_START_MASK) !=
pI830->LpRing.mem.Start) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -600,7 +545,7 @@
"mask (%x)\n", pI830->LpRing.mem.Start, I830_RING_START_MASK);
}
/* Don't care about the old value. Reserved bits must be zero anyway. */
-@@ -2175,7 +2304,7 @@
+@@ -2175,7 +2296,7 @@
if (((pI830->LpRing.mem.Size - 4096) & I830_RING_NR_PAGES) !=
pI830->LpRing.mem.Size - 4096) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -609,7 +554,7 @@
"mask (%x)\n", pI830->LpRing.mem.Size - 4096,
I830_RING_NR_PAGES);
}
-@@ -2231,10 +2360,6 @@
+@@ -2231,10 +2352,6 @@
vgaHWUnlock(hwp);
vgaHWSave(pScrn, vgaReg, VGA_SR_FONTS);
@@ -620,7 +565,7 @@
pVesa = pI830->vesa;
/*
* This save/restore method doesn't work for 845G BIOS, or for some
-@@ -2246,7 +2371,7 @@
+@@ -2246,7 +2363,7 @@
* registers, turning off the irq & breaking the kernel module
* behaviour.
*/
@@ -629,7 +574,7 @@
CARD16 imr = INREG16(IMR);
CARD16 ier = INREG16(IER);
CARD16 hwstam = INREG16(HWSTAM);
-@@ -2442,6 +2567,22 @@
+@@ -2442,6 +2559,22 @@
}
/*
@@ -652,7 +597,7 @@
* The BIOS may not set a scanline pitch that would require more video
* memory than it's aware of. We check for this later, and set it
* explicitly if necessary.
-@@ -2545,10 +2686,10 @@
+@@ -2545,10 +2678,10 @@
* Print out the PIPEACONF and PIPEBCONF registers.
*/
temp = INREG(PIPEACONF);
@@ -665,7 +610,7 @@
}
#if PRINT_MODE_INFO
-@@ -2593,7 +2734,7 @@
+@@ -2593,7 +2726,7 @@
if (temp / pI830->cpp != pScrn->displayWidth) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i),
@@ -674,7 +619,7 @@
OUTREG(stridereg, pScrn->displayWidth * pI830->cpp);
/* Trigger update */
temp = INREG(basereg);
-@@ -2891,7 +3032,8 @@
+@@ -2891,7 +3024,8 @@
* first, then re-initialise the VBE information.
*/
pI830->pVbe = VBEInit(NULL, pI830->pEnt->index);
@@ -684,7 +629,7 @@
if (!pI830->pVbe)
return FALSE;
pI830->vbeInfo = VBEGetVBEInfo(pI830->pVbe);
-@@ -2990,9 +3132,13 @@
+@@ -2990,9 +3124,13 @@
if (pI830->directRenderingEnabled)
pI830->directRenderingEnabled = I830DRIScreenInit(pScreen);
@@ -700,7 +645,7 @@
#else
pI830->directRenderingEnabled = FALSE;
-@@ -3026,6 +3172,9 @@
+@@ -3026,6 +3164,9 @@
pScrn->memPhysBase = (unsigned long)pI830->FbBase;
pScrn->fbOffset = pI830->FrontBuffer.Start;
@@ -710,7 +655,7 @@
vgaHWSetMmioFuncs(hwp, pI830->MMIOBase, 0);
vgaHWGetIOBase(hwp);
DPRINTF(PFX, "assert( if(!vgaHWMapMem(pScrn)) )\n");
-@@ -3107,9 +3256,7 @@
+@@ -3107,9 +3248,7 @@
return FALSE;
}
@@ -720,7 +665,7 @@
#ifdef I830_XV
/* Init video */
-@@ -3163,34 +3310,15 @@
+@@ -3163,34 +3302,15 @@
ScrnInfoPtr pScrn;
I830Ptr pI830;
vbeInfoPtr pVbe;
@@ -757,7 +702,7 @@
}
static void
-@@ -3266,7 +3394,6 @@
+@@ -3266,7 +3386,6 @@
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
I830Ptr pI830 = I830PTR(pScrn);
@@ -765,7 +710,7 @@
DPRINTF(PFX, "Enter VT\n");
-@@ -3274,14 +3401,15 @@
+@@ -3274,14 +3393,15 @@
return FALSE;
CheckInheritedState(pScrn);
@@ -784,7 +729,7 @@
SaveHWState(pScrn);
}
ResetState(pScrn, FALSE);
-@@ -3347,11 +3475,6 @@
+@@ -3347,11 +3467,6 @@
} while (_head != _tail);
}
@@ -796,7 +741,7 @@
#ifndef BINDUNBIND
#define BINDUNBIND 0
#endif
-@@ -3498,7 +3621,7 @@
+@@ -3498,7 +3613,7 @@
return (*pScreen->CloseScreen) (scrnIndex, pScreen);
}
Reply to: