Attachment 48901 Details for Bug 113810

[patch] Test patch for Harald

diff.savage_koenig (text/plain), 3.52 KB, created by Egbert Eich on 2005-09-06 10:44:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2005-09-06 10:44:01 UTC

Size: 3.52 KB

patch

obsolete

>Index: savage_cursor.c
>===================================================================
>RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v
>retrieving revision 1.1.1.11
>diff -u -r1.1.1.11 savage_cursor.c
>--- savage_cursor.c	25 Nov 2004 16:54:09 -0000	1.1.1.11
>+++ savage_cursor.c	6 Sep 2005 10:10:22 -0000
>@@ -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;
>Index: savage_driver.c
>===================================================================
>RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v
>retrieving revision 1.1.1.39
>diff -u -r1.1.1.39 savage_driver.c
>--- savage_driver.c	27 Apr 2005 15:59:48 -0000	1.1.1.39
>+++ savage_driver.c	6 Sep 2005 10:10:22 -0000
>@@ -1089,7 +1089,7 @@
>     xf86CollectOptions(pScrn, NULL);
> 
>     if (pScrn->depth == 8)
>-	pScrn->rgbBits = 8/*6*/;
>+	pScrn->rgbBits = 8;
> 
>     if (!(psav->Options = xalloc(sizeof(SavageOptions))))
> 	return FALSE;
>@@ -2362,14 +2360,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, 0x78 );
> 	else
>-		VGAOUT8(0x3c5, 0x00 );
>+		VGAOUT8(0x3c5, 0x10 );
> 
> 	/* We may need TV/panel fixups here.  See s3bios.c line 2904. */
> 
>@@ -2481,6 +2479,12 @@
> 	    }
> 	}
> 
>+	VGAOUT8(0x3c4,0x1b);
>+	if( psav->DGAactive )
>+	    VGAOUT8(0x3c5, (VGAIN8(0x3C5) & ~0x28) | 0x50 );
>+	else
>+	    VGAOUT8(0x3c5, (VGAIN8(0x3C5)) | 0x50);
>+
> 	SavageInitialize2DEngine(pScrn);
> 
> 	VGAOUT16(vgaCRIndex, 0x0140);
>@@ -3590,19 +3595,16 @@
> 	new->SR15 = 0x03 | 0x80;
> 	new->SR18 = 0x00;
> 
>-/*	VGAOUT8(0x3c4, 0x1b);
>-	new->SR1B = VGAIN8(0x3c5);
>-	if( pScrn->depth == 24 )
>-		new->SR1B |= 0x28;
>-*/
> 
> 	/* enable gamma correction */
> 	if( pScrn->depth == 24 )
>	    new->SR1B = 0x28;
> 	else
> 	    new->SR1B = 0x00;
> 
>-
>+	/* set 8-bit CLUT */
>+	new->SR1B |= 0x50;
>+	
> 	new->CR43 = new->CR45 = new->CR65 = 0x00;
> 
> 	VGAOUT8(vgaCRIndex, 0x40);
>@@ -3990,7 +3992,10 @@
>     SavagePtr psav = SAVPTR(pScrn);
>     int i, index;
>     int updateKey = -1;
>-    unsigned char byte;
>+    unsigned char byte = 0;
>+
>+    VGAOUT8(0x3c4, 0x1b);
>+    ErrorF("SavageLoadPalette - SR1B: 0x%x\n",VGAIN8(0x3c5));
> 
>     /* choose CLUT */
>     if (psav->IsPrimary) {
>@@ -4062,8 +4067,7 @@
>     SavagePtr psav = SAVPTR(pScrn);
>     int i, index;
>     int updateKey = -1;
>-    
>-    vgaHWPtr hwp = VGAHWPTR(pScrn);
>+
>     VerticalRetraceWait();
> 
>     for (i=0; i<numColors; i++) {
>--- 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