File mga-g200se_pci-fix.diff of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File mga-g200se_pci-fix.diff of Package xorg-x11-driver-video (Revision 324c92bfcca3fbb6e6e1407a4e6e6817)

Currently displaying revision 324c92bfcca3fbb6e6e1407a4e6e6817 , Show latest

diff -u -r mga.orig/mga_driver.c mga/mga_driver.c
--- mga.orig/mga_driver.c	2006-06-01 15:57:34.000000000 +0200
+++ mga/mga_driver.c	2006-06-01 16:07:06.000000000 +0200
@@ -813,6 +813,12 @@
 	    CARD32 TestMemoryLocA, TestMemoryLocB;
 	    CARD32 TestMemoryLoc0, TestMemoryLoc1;
 	    CARD32 TestA, TestB;
+            CARD8  seq1;
+
+            OUTREG8(MGAREG_SEQ_INDEX, 0x01);
+            seq1 = INREG8(MGAREG_SEQ_DATA);
+            seq1 |= 0x20;
+            OUTREG8(MGAREG_SEQ_DATA, seq1);
 
 	    MemoryAt0 = base[0];
 	    MemoryAt1 = base[1];
@@ -855,6 +861,11 @@
 	    base[1] = MemoryAt1;
 
 	    SizeFound = (Offset / 1024) - 64;
+
+            OUTREG8(MGAREG_SEQ_INDEX, 0x01);
+            seq1 = INREG8(MGAREG_SEQ_DATA);
+            seq1 &= ~0x20;
+            OUTREG8(MGAREG_SEQ_DATA, seq1);
 	} else {
 	    /* write, read and compare method
 	       split into two loops to make it more reliable on RS/6k -ReneR */
@@ -2852,6 +2863,14 @@
 	    outb(0xfac, 0x02);
     }
 
+    MGA_NOT_HAL(
+        if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) ||
+            (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) {
+            OUTREG8(0x1FDE, 0x06);
+            OUTREG8(0x1FDF, 0x14);
+        }
+    );
+
     pMga->CurrentLayout.mode = mode;
 
     if(pMga->MergedFB && mode->Private && (mode->PrivSize == 0)) {
--- src/mga_dacG.c.orig	2006-12-03 23:06:32.908071711 +0100
+++ src/mga_dacG.c	2006-12-03 23:07:36.086463534 +0100
@@ -422,10 +422,7 @@
                     MGA1064_MISC_CTL_VGA8 |
                     MGA1064_MISC_CTL_DAC_RAM_CS;
 
-		if(pMga->HasSDRAM)
-		    pReg->Option = 0x40499121;
-		else
-		    pReg->Option = 0x4049cd21;
+        pReg->Option = 0x40049120;
         pReg->Option2 = 0x00008000;
 		break;
 	case PCI_CHIP_MGAG200:

Places

File mga-g200se_pci-fix.diff of Package xorg-x11-driver-video (Revision 324c92bfcca3fbb6e6e1407a4e6e6817)

Places