Author: daniel
Date: 2003-11-15 17:57:28 -0500 (Sat, 15 Nov 2003)
New Revision: 774
Modified:
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff
Log:
Fixing up r770, which didn't actually compile. This one does.
- debian/patches/000_stolen_from_HEAD_i830_driver.diff: updated
Modified:
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff
2003-11-15 21:11:56 UTC (rev 773)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_i830_driver.diff
2003-11-15 22:57:28 UTC (rev 774)
@@ -15,7 +15,15 @@
/* These change according to what has been allocated. */
long FreeMemory;
-@@ -295,6 +296,11 @@
+@@ -182,6 +183,7 @@
+
+ Bool NeedRingBufferLow;
+ Bool allowPageFlip;
++ Bool disableTiling;
+
+ int auxPitch;
+ int auxPitchBits;
+@@ -295,6 +297,11 @@
Bool closing;
Bool suspended;
@@ -27,7 +35,7 @@
} I830Rec;
#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
-@@ -391,5 +397,8 @@
+@@ -391,5 +398,8 @@
#define ALLOCATE_DRY_RUN 0x80000000
@@ -36,10 +44,19 @@
+#define DRAM_WRITE 0x33330000
#endif /* _I830_H_ */
-diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
--- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
2003-11-15 18:12:41.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2003-11-15
18:14:32.000000000 +1100
-@@ -1066,6 +1066,93 @@
+@@ -230,9 +230,6 @@
+ static Bool I830VESASetVBEMode(ScrnInfoPtr pScrn, int mode,
+ VbeCRTCInfoBlock *block);
+
+-static Bool OffsetFrame = FALSE;
+-
+-
+
+ #ifdef I830DEBUG
+ void
+@@ -1063,6 +1063,93 @@
return FALSE;
}
@@ -133,7 +150,7 @@
static void
RestoreBIOSMemSize(ScrnInfoPtr pScrn)
{
-@@ -1074,6 +1161,9 @@
+@@ -1071,6 +1158,9 @@
DPRINTF(PFX, "RestoreBIOSMemSize\n");
@@ -143,7 +160,7 @@
if (!pI830->overrideBIOSMemSize)
return;
-@@ -1246,6 +1336,7 @@
+@@ -1243,6 +1333,7 @@
return FALSE;
pI830 = I830PTR(pScrn);
@@ -151,7 +168,7 @@
pI830->pEnt = pEnt;
if (pI830->pEnt->location.type != BUS_PCI)
-@@ -1608,10 +1699,13 @@
+@@ -1605,10 +1696,13 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"BIOS now sees %d kB VideoRAM\n",
pI830->BIOSMemorySize / 1024);
@@ -169,7 +186,7 @@
}
}
}
-@@ -1945,6 +2039,7 @@
+@@ -1942,6 +2036,7 @@
* Tiling can't be enabled. Check if there's enough memory for DRI
* without tiling.
*/
@@ -177,7 +194,7 @@
I830ResetAllocations(pScrn, 0);
if (I830Allocate2DMemory(pScrn, ALLOCATE_DRY_RUN | ALLOC_INITIAL) &&
I830Allocate3DMemory(pScrn, ALLOCATE_DRY_RUN | ALLOC_NO_TILING)) {
-@@ -2593,7 +2688,7 @@
+@@ -2590,7 +2685,7 @@
if (temp / pI830->cpp != pScrn->displayWidth) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i),
@@ -186,7 +203,7 @@
OUTREG(stridereg, pScrn->displayWidth * pI830->cpp);
/* Trigger update */
temp = INREG(basereg);
-@@ -2891,7 +2986,8 @@
+@@ -2888,7 +2983,8 @@
* first, then re-initialise the VBE information.
*/
pI830->pVbe = VBEInit(NULL, pI830->pEnt->index);
@@ -196,7 +213,7 @@
if (!pI830->pVbe)
return FALSE;
pI830->vbeInfo = VBEGetVBEInfo(pI830->pVbe);
-@@ -2990,9 +3086,13 @@
+@@ -2987,9 +3083,13 @@
if (pI830->directRenderingEnabled)
pI830->directRenderingEnabled = I830DRIScreenInit(pScreen);
@@ -212,7 +229,7 @@
#else
pI830->directRenderingEnabled = FALSE;
-@@ -3026,6 +3126,9 @@
+@@ -3023,6 +3123,9 @@
pScrn->memPhysBase = (unsigned long)pI830->FbBase;
pScrn->fbOffset = pI830->FrontBuffer.Start;
@@ -222,7 +239,7 @@
vgaHWSetMmioFuncs(hwp, pI830->MMIOBase, 0);
vgaHWGetIOBase(hwp);
DPRINTF(PFX, "assert( if(!vgaHWMapMem(pScrn)) )\n");
-@@ -3163,34 +3266,15 @@
+@@ -3160,34 +3263,15 @@
ScrnInfoPtr pScrn;
I830Ptr pI830;
vbeInfoPtr pVbe;
@@ -259,7 +276,7 @@
}
static void
-@@ -3253,6 +3337,10 @@
+@@ -3250,6 +3334,10 @@
#endif
ResetState(pScrn, TRUE);
@@ -270,7 +287,15 @@
RestoreHWState(pScrn);
RestoreBIOSMemSize(pScrn);
I830UnbindGARTMemory(pScrn);
-@@ -3280,14 +3368,15 @@
+@@ -3266,7 +3353,6 @@
+ {
+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ I830Ptr pI830 = I830PTR(pScrn);
+- static int SaveGeneration = -1;
+
+ DPRINTF(PFX, "Enter VT\n");
+
+@@ -3277,14 +3365,15 @@
return FALSE;
CheckInheritedState(pScrn);
