Attachment 48237 Details for Bug 113810

[patch] savage patch new in 10.0

pc_savage.diff (text/plain), 3.67 KB, created by Stefan Dirsch on 2005-08-30 21:23:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2005-08-30 21:23:05 UTC

Size: 3.67 KB

patch

obsolete

>--- programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c	23 Nov 2004 05:21:02 -0000	1.6
>+++ programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c	17 May 2005 08:30:00 -0000	1.7
>@@ -98,8 +98,12 @@
>       )
> 	infoPtr->Flags |= HARDWARE_CURSOR_TRUECOLOR_AT_8BPP; 
> #endif
>-    /* With streams engine the Cursor seems to be ALWAYS TrueColor */
>-    infoPtr->Flags |= HARDWARE_CURSOR_TRUECOLOR_AT_8BPP; 
>+    /*
>+     * With streams engine the Cursor seems to be ALWAYS TrueColor 
>+     *except at least the Savage4
>+     */
>+    if (psav->Chipset != S3_SAVAGE4)
>+	infoPtr->Flags |= HARDWARE_CURSOR_TRUECOLOR_AT_8BPP; 
> 
>     infoPtr->SetCursorColors = SavageSetCursorColors;
>     infoPtr->SetCursorPosition = SavageSetCursorPosition;
>--- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.orig	2005-01-04 00:25:04.000000000 +0100
>+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	2005-05-17 18:14:17.000000000 +0200
>@@ -802,7 +802,7 @@
>     xf86CollectOptions(pScrn, NULL);
> 
>     if (pScrn->depth == 8)
>-	pScrn->rgbBits = 8/*6*/;
>+	pScrn->rgbBits = 8;
> 
>     if (!(psav->Options = xalloc(sizeof(SavageOptions))))
> 	return FALSE;
>@@ -1804,14 +1804,14 @@
> 	VGAOUT8(vgaCRIndex, 0x67);
> 	VGAOUT8(vgaCRReg, restore->CR67);
> 
>-	/* Enable gamma correction. */
>+	/* Enable gamma correction, set CLUT to 8 bit */
> 
> 	VGAOUT8(0x3c4, 0x1b);
> 	if( (pScrn->bitsPerPixel == 32) && !psav->DGAactive 
> 	    && ! psav->FBStart2nd )
>-		VGAOUT8(0x3c5, 0x28 );
>+		VGAOUT8(0x3c5, 0x18 );
> 	else
>-		VGAOUT8(0x3c5, 0x00 );
>+		VGAOUT8(0x3c5, 0x10 );
> 
> 	/* We may need TV/panel fixups here.  See s3bios.c line 2904. */
> 
>@@ -2100,7 +2100,7 @@
>     VGAOUT8(0x3c5, restore->SR18);
>     VGAOUT8(0x3c4, 0x1b);
>     if( psav->DGAactive )
>-	VGAOUT8(0x3c5, restore->SR1B & ~0x28);
>+	VGAOUT8(0x3c5, restore->SR1B & ~0x08);
>     else
> 	VGAOUT8(0x3c5, restore->SR1B);
> 
>@@ -2642,7 +2642,7 @@
> 
>     TRACE(("SavageModeInit(%dx%d, %dHz)\n", 
> 	mode->HDisplay, mode->VDisplay, mode->Clock));
>-
>+    
> #if 0
>     ErrorF("Clock = %d, HDisplay = %d, HSStart = %d\n",
> 	    mode->Clock, mode->HDisplay, mode->HSyncStart);
>@@ -2801,17 +2801,14 @@
> 	new->SR15 = 0x03 | 0x80;
> 	new->SR18 = 0x00;
> 
>-/*	VGAOUT8(0x3c4, 0x1b);
>-	new->SR1B = VGAIN8(0x3c5);
>-	if( pScrn->depth == 24 )
>-		new->SR1B |= 0x28;
>-*/
> 	if( pScrn->depth == 24 )
> 	    new->SR1B = 0x28;
> 	else
> 	    new->SR1B = 0x00;
> 
>-
>+	/* set 8-bit CLUT */
>+	new->SR1B |= 0x10;
>+	
> 	new->CR43 = new->CR45 = new->CR65 = 0x00;
> 
> 	VGAOUT8(vgaCRIndex, 0x40);
>@@ -2882,7 +2879,7 @@
> 
> 	new->CR3B = j & 0xff;
> 	i |= (j & 0x100) >> 2;
>-	new->CR3C = (vganew->CRTC[0] + ((i & 0x01) << 8)) / 2;
>+	new->CR3C = (vganew->CRTC[0] + ((i & 0x01) << 8))  / 2 ;
> 	new->CR5D = i;
> 	new->CR5E = (((mode->CrtcVTotal - 2) & 0x400) >> 10) |
> 		    (((mode->CrtcVDisplay - 1) & 0x400) >> 9) |
>@@ -3159,7 +3156,6 @@
>     int i, index;
>     int updateKey = -1;
>     
>-    vgaHWPtr hwp = VGAHWPTR(pScrn);
>     VerticalRetraceWait(psav);
> 
>     for (i=0; i<numColors; i++) {
>@@ -3443,7 +3439,9 @@
> SavageProbeDDC(ScrnInfoPtr pScrn, int index)
> {
>     vbeInfoPtr pVbe;
>+
>     if (xf86LoadSubModule(pScrn, "vbe")) {
>+        xf86LoaderReqSymLists(vbeSymbols, NULL);
>         pVbe = VBEInit(NULL,index);
>         ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
> 	vbeFree(pVbe);
>--- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.old	2005-05-17 16:46:15.000000000 +0000
>+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	2005-05-17 16:53:02.000000000 +0000
>@@ -3147,7 +3147,7 @@
>     }
> }
> 
>-#define inStatus1() (hwp->readST01( hwp ))
>+#define inStatus1() (VGAHWPTR(pScrn))->readST01( VGAHWPTR(pScrn) )
> 
> void SavageLoadPaletteSavage4(ScrnInfoPtr pScrn, int numColors, int *indicies,
> 		       LOCO *colors, VisualPtr pVisual)

Actions: View | Diff

Attachments on bug 113810: 48147 | 48237 | 48403 | 48901 | 49018