View | Details | Raw Unified | Return to bug 113810
Collapse All | Expand All

(-)savage_driver.c.orig (-6 / +6 lines)
Lines 1809-1817 Link Here
1809
	VGAOUT8(0x3c4, 0x1b);
1809
	VGAOUT8(0x3c4, 0x1b);
1810
	if( (pScrn->bitsPerPixel == 32) && !psav->DGAactive 
1810
	if( (pScrn->bitsPerPixel == 32) && !psav->DGAactive 
1811
	    && ! psav->FBStart2nd )
1811
	    && ! psav->FBStart2nd )
1812
		VGAOUT8(0x3c5, 0x18 );
1812
		VGAOUT8(0x3c5, 0x78 );
1813
	else
1813
	else
1814
		VGAOUT8(0x3c5, 0x10 );
1814
		VGAOUT8(0x3c5, 0x50 );
1815
1815
1816
	/* We may need TV/panel fixups here.  See s3bios.c line 2904. */
1816
	/* We may need TV/panel fixups here.  See s3bios.c line 2904. */
1817
1817
Lines 2100-2106 Link Here
2100
    VGAOUT8(0x3c5, restore->SR18);
2100
    VGAOUT8(0x3c5, restore->SR18);
2101
    VGAOUT8(0x3c4, 0x1b);
2101
    VGAOUT8(0x3c4, 0x1b);
2102
    if( psav->DGAactive )
2102
    if( psav->DGAactive )
2103
	VGAOUT8(0x3c5, restore->SR1B & ~0x08);
2103
	VGAOUT8(0x3c5, restore->SR1B & ~0x28);
2104
    else
2104
    else
2105
	VGAOUT8(0x3c5, restore->SR1B);
2105
	VGAOUT8(0x3c5, restore->SR1B);
2106
2106
Lines 2494-2504 Link Here
2494
	| ((psav->FBStart2nd) ? 0 : CMAP_PALETTED_TRUECOLOR);
2494
	| ((psav->FBStart2nd) ? 0 : CMAP_PALETTED_TRUECOLOR);
2495
    
2495
    
2496
    if (psav->Chipset == S3_SAVAGE4) {
2496
    if (psav->Chipset == S3_SAVAGE4) {
2497
        if (!xf86HandleColormaps(pScreen, 256, 6, SavageLoadPaletteSavage4,
2497
        if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, SavageLoadPaletteSavage4,
2498
				 NULL, colormapFlags ))
2498
				 NULL, colormapFlags ))
2499
	    return FALSE;
2499
	    return FALSE;
2500
    } else {
2500
    } else {
2501
        if (!xf86HandleColormaps(pScreen, 256, 6, SavageLoadPalette, NULL,
2501
        if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, SavageLoadPalette, NULL,
2502
				 colormapFlags ))
2502
				 colormapFlags ))
2503
 	    return FALSE;
2503
 	    return FALSE;
2504
    }
2504
    }
Lines 2807-2813 Link Here
2807
	    new->SR1B = 0x00;
2807
	    new->SR1B = 0x00;
2808
2808
2809
	/* set 8-bit CLUT */
2809
	/* set 8-bit CLUT */
2810
	new->SR1B |= 0x10;
2810
	new->SR1B |= 0x50;
2811
	
2811
	
2812
	new->CR43 = new->CR45 = new->CR65 = 0x00;
2812
	new->CR43 = new->CR45 = new->CR65 = 0x00;
2813
2813

Return to bug 113810