Index: mga_storm.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v
retrieving revision 1.6
diff -u -r1.6 mga_storm.c
--- mga_storm.c	13 Aug 2004 18:24:08 -0000	1.6
+++ mga_storm.c	14 Sep 2004 16:13:19 -0000
@@ -152,7 +152,8 @@
 	CARD16		green,
 	CARD16		blue,
 	CARD16		alpha,
-	int		alphaType,
+	CARD32		maskFormat,
+	CARD32		dstFormat,
 	CARD8		*alphaPtr,
 	int		alphaPitch,
 	int		width,
@@ -168,7 +169,8 @@
 	CARD16		green,
 	CARD16		blue,
 	CARD16		alpha,
-	int		alphaType,
+	CARD32		maskFormat,
+	CARD32		dstFormat,
 	CARD8		*alphaPtr,
 	int		alphaPitch,
 	int		width,
@@ -181,7 +183,8 @@
 MGASetupForCPUToScreenTexture (
 	ScrnInfoPtr	pScrn,
 	int		op,
-	int		texType,
+	CARD32		srcFormat,
+	CARD32		dstFormat,
 	CARD8		*texPtr,
 	int		texPitch,
 	int		width,
@@ -291,7 +294,8 @@
    CARD16	green,
    CARD16	blue,
    CARD16	alpha,
-   int		alphaType,
+   CARD32	maskFormat,
+   CARD32	dstFormat,
    CARD8	*alphaPtr,
    int		alphaPitch,
    int		width,
@@ -371,7 +375,8 @@
    CARD16	green,
    CARD16	blue,
    CARD16	alpha,
-   int		alphaType,
+   CARD32	maskFormat,
+   CARD32	dstFormat,
    CARD8	*alphaPtr,
    int		alphaPitch,
    int		width,
@@ -467,7 +472,8 @@
 MGASetupForCPUToScreenTexture (
    ScrnInfoPtr	pScrn,
    int		op,
-   int		texType,
+   CARD32	srcFormat,
+   CARD32	dstFormat,
    CARD8	*texPtr,
    int		texPitch,
    int		width,
@@ -609,7 +615,8 @@
 	/* fallthrough */
     case PCI_CHIP_MGAG200:
     case PCI_CHIP_MGAG200_PCI:
-	doRender = FALSE;
+        if (pMga->SecondCrtc == FALSE)
+            doRender = TRUE;
         pMga->AccelFlags = TRANSC_SOLID_FILL |
 			   TWO_PASS_COLOR_EXPAND;
 
@@ -957,22 +964,26 @@
    {
        if(pMga->Chipset == PCI_CHIP_MGAG400 || pMga->Chipset == PCI_CHIP_MGAG550) {
            infoPtr->CPUToScreenAlphaTextureFlags = XAA_RENDER_NO_TILE;
-           infoPtr->SetupForCPUToScreenAlphaTexture =
+           infoPtr->SetupForCPUToScreenAlphaTexture2 =
 				MGASetupForCPUToScreenAlphaTexture;
        } else {
            infoPtr->CPUToScreenAlphaTextureFlags = XAA_RENDER_NO_TILE |
 					       XAA_RENDER_NO_SRC_ALPHA;
-           infoPtr->SetupForCPUToScreenAlphaTexture =
+           infoPtr->SetupForCPUToScreenAlphaTexture2 =
 				MGASetupForCPUToScreenAlphaTextureFaked;
        }
        infoPtr->SubsequentCPUToScreenAlphaTexture =
 				MGASubsequentCPUToScreenTexture;
+       /* XXX these should probably be split */
        infoPtr->CPUToScreenAlphaTextureFormats = MGAAlphaTextureFormats;
+       infoPtr->CPUToScreenAlphaTextureDstFormats = MGAAlphaTextureFormats;
 
-       infoPtr->SetupForCPUToScreenTexture = MGASetupForCPUToScreenTexture;
+       infoPtr->SetupForCPUToScreenTexture2 = MGASetupForCPUToScreenTexture;
        infoPtr->SubsequentCPUToScreenTexture = MGASubsequentCPUToScreenTexture;
        infoPtr->CPUToScreenTextureFlags = XAA_RENDER_NO_TILE;
+       /* XXX these too */
        infoPtr->CPUToScreenTextureFormats = MGATextureFormats;
+       infoPtr->CPUToScreenTextureDstFormats = MGATextureFormats;
     }
 #endif