mmm.patch

是由intel提供的针对intel显卡915以上系列的linux驱动

Index: i830_accel.c
===================================================================
RCS file: /home/tg-cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_accel.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 i830_accel.c
--- i830_accel.c	14 Dec 2004 16:25:54 -0000	1.1.1.1
+++ i830_accel.c	5 Dec 2005 17:16:54 -0000
@@ -202,7 +202,9 @@
    I830Ptr pI830 = I830PTR(pScrn);
 
    pI830->LpRing->head = INREG(LP_RING + RING_HEAD) & I830_HEAD_MASK;
+   ErrorF("RING HEAD 0x%x\n",pI830->LpRing->head);
    pI830->LpRing->tail = INREG(LP_RING + RING_TAIL);
+   ErrorF("RING TAIL 0x%x\n",pI830->LpRing->tail);
    pI830->LpRing->space = pI830->LpRing->head - (pI830->LpRing->tail + 8);
    if (pI830->LpRing->space < 0)
       pI830->LpRing->space += pI830->LpRing->mem.Size;
Index: i830_driver.c
===================================================================
RCS file: /home/tg-cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
retrieving revision 1.1.1.1.2.6.2.45
diff -u -r1.1.1.1.2.6.2.45 i830_driver.c
--- i830_driver.c	11 Nov 2005 15:58:23 -0000	1.1.1.1.2.6.2.45
+++ i830_driver.c	5 Dec 2005 17:17:01 -0000
@@ -4360,6 +4348,7 @@
    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Mode bandwidth is %d Mpixel/s\n",
 	      pMode->HDisplay * pMode->VDisplay * refresh / 1000000);
 
+#if 0
    {
       int maxBandwidth, bandwidthA, bandwidthB;
 
@@ -4371,7 +4360,6 @@
       }
    }
 
-#if 0
    {
       int ret;
 
@@ -5618,7 +5608,7 @@
    }
 
    /* Setup for device monitoring status */
-   pI830->monitorSwitch = INREG(SWF0) & 0x0000FFFF;
+   pI830->monitorSwitch = pI830->toggleDevices = INREG(SWF0) & 0x0000FFFF;
 
    if (I830IsPrimary(pScrn))
       if (!I830BindAGPMemory(pScrn))
@@ -5998,7 +5985,27 @@
          pI830->checkDevices = FALSE; 
       }
 #endif
+      {
+      I830Ptr pI8301;
+      I830Ptr pI8302 = NULL;
+
+      if (I830IsPrimary(pScrn))
+         pI8301 = pI830;
+      else 
+         pI8301 = I830PTR(pI830->entityPrivate->pScrn_1);
+
+      if (xf86IsEntityShared(pScrn->entityList[0]))
+         pI8302 = I830PTR(pI830->entityPrivate->pScrn_2);
+
+      /* ACPI Toggle */
+      pI8301->toggleDevices = GetNextDisplayDeviceList(pScrn, 1);
+      if (xf86IsEntityShared(pScrn->entityList[0]))
+         pI8302->toggleDevices = pI8301->toggleDevices;
+      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ACPI Toggle to 0x%x\n",pI830->toggleDevices);
+      }
+#if 0
       I830CheckDevicesTimer(NULL, 0, pScrn);
+#endif
       break;
    default:
       ErrorF("I830PMEvent: received APM event %d\n", event);
@@ -6034,6 +6041,7 @@
       I830Ptr pI8301;
       I830Ptr pI8302 = NULL;
 
+      ErrorF("CHECKING\n");
       if (I830IsPrimary(pScrn))
          pI8301 = pI830;
       else 
@@ -6043,20 +6051,34 @@
          pI8302 = I830PTR(pI830->entityPrivate->pScrn_2);
 
       /* ACPI Toggle */
-      if (now == 0 && timer == NULL && pI8301->_DOS == 0) {
+#if 0
+      if (now == 0 && timer == NULL) {
          pI8301->toggleDevices = GetNextDisplayDeviceList(pScrn, 1);
          if (xf86IsEntityShared(pScrn->entityList[0]))
             pI8302->toggleDevices = pI8301->toggleDevices;
          xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ACPI Toggle to 0x%x\n",pI830->toggleDevices);
          temp = pI8301->toggleDevices;
       }
+#endif
 
       /* this avoids several BIOS calls if possible */
-      if (pI830->monitorSwitch != temp) {
+      ErrorF("0x%x 0x%x 0x%x\n",pI830->monitorSwitch,temp,pI830->toggleDevices);
+      if (pI830->monitorSwitch != temp || pI830->monitorSwitch != pI830->toggleDevices) {
+
+#if 0
+	 /* Sync the engine now before the hotkey switch */
+         if (pI830->AccelInfoRec && pI830->AccelInfoRec->NeedToSync) {
+            (*pI830->AccelInfoRec->Sync)(pScrn);
+            pI830->AccelInfoRec->NeedToSync = FALSE;
+         }
+#endif
+
          xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 			"Hotkey switch to 0x%lx.\n", temp);
 
+#if 0
          GetAttachableDisplayDeviceList(pScrn);
+#endif
          
          pI8301->lastDevice1 = pI8301->lastDevice2;
          pI8301->lastDevice2 = pI8301->monitorSwitch;
@@ -6188,10 +6207,12 @@
 
          pI8301->monitorSwitch = temp;
 	 pI8301->operatingDevices = temp;
+	 pI8301->toggleDevices = temp;
 
          if (xf86IsEntityShared(pScrn->entityList[0])) {
 	    pI8302->operatingDevices = pI8301->operatingDevices;
             pI8302->monitorSwitch = pI8301->monitorSwitch;
+	    pI8302->toggleDevices = pI8301->toggleDevices;
          }
 
          fixup = 1;
@@ -6225,6 +6246,15 @@
          ScreenPtr   pCursorScreen;
          int x = 0, y = 0;
 
+#if 0 
+	 ErrorF("1\n");
+   ResetState(pScrn, TRUE);
+	 ErrorF("2\n");
+   SetHWOperatingState(pScrn);
+	 ErrorF("3\n");
+   CheckInheritedState(pScrn);
+#endif
+
          pCursorScreen = miPointerCurrentScreen();
          if (pScrn->pScreen == pCursorScreen)
             miPointerPosition(&x, &y);