50c0b241d4
preserving the upcoming 4.5 release. Bump PORTEPOCH to denote portversion going backwards. All files have been reverted to exactly what they were 3 days ago, before the 4.2.0 upgrade, except PORTEPOCH bump. Approved by: re, portmgr, maintainer timeout
42 lines
1,002 B
Text
42 lines
1,002 B
Text
--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Wed May 30 06:51:29 2001
|
|
+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Thu Jan 3 11:11:42 2002
|
|
@@ -1019,10 +1019,15 @@
|
|
{
|
|
vgaHWPtr hwp;
|
|
I810Ptr pI810;
|
|
+ unsigned temp;
|
|
|
|
hwp = VGAHWPTR(pScrn);
|
|
pI810 = I810PTR(pScrn);
|
|
DoSave(pScrn, &hwp->SavedReg, &pI810->SavedReg, TRUE);
|
|
+
|
|
+ temp = INREG(MEMMODE);
|
|
+ temp |= 4;
|
|
+ OUTREG(MEMMODE, temp);
|
|
}
|
|
|
|
|
|
@@ -2006,9 +2011,10 @@
|
|
if (I810_DEBUG & DEBUG_VERBOSE_DRI)
|
|
ErrorF("\n\nENTER VT\n");
|
|
|
|
+/*********BUGGY*********************
|
|
if (! I810BindGARTMemory(pScrn))
|
|
return FALSE;
|
|
-
|
|
+***********************************/
|
|
#ifdef XF86DRI
|
|
if (pI810->directRenderingEnabled) {
|
|
if (I810_DEBUG & DEBUG_VERBOSE_DRI)
|
|
@@ -2047,9 +2053,10 @@
|
|
}
|
|
I810Restore(pScrn);
|
|
|
|
+/*********BUGGY***********************
|
|
if (! I810UnbindGARTMemory(pScrn))
|
|
return;
|
|
-
|
|
+*************************************/
|
|
vgaHWLock(hwp);
|
|
}
|
|
|