On Wed, Aug 28, 2002 at 10:04:09AM +0200, Chris Halls wrote: > Here's a patch which replaces the files in
Ahem, I was so busy thinking about the docs that I forgot the patch /me blushes Chris
This patch generated from http://www.probo.com/timr/savage40.html, version 1.1.23t diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_accel.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_accel.c 2001-12-13 19:01:50.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c 2002-03-08 19:18:08.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.13 2001/11/30 12:11:59 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.11 2001/08/09 19:14:13 dawes Exp $ */ /* * diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_cursor.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_cursor.c 2001-11-02 17:24:51.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c 2001-10-24 23:05:42.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.5 2001/10/28 03:33:46 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */ /* * Hardware cursor support for S3 Savage 4.0 driver. Taken with @@ -128,7 +128,6 @@ * loading the cursor. */ volatile unsigned int i = ALT_STATUS_WORD0; - (void)i; /* Not to be optimised out */ } } diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_dga.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_dga.c 2001-05-19 01:35:32.000000000 +0200 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c 2002-03-08 19:23:05.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.2 2001/04/18 15:29:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.3 2001/05/18 23:35:32 dawes Exp $ */ /* Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. @@ -155,7 +155,8 @@ ); if(oneMore) { /* first one is narrow width */ - mode->bytesPerScanline = ((pMode->HDisplay * Bpp) + 3) & ~3L; + /* Force stride to multiple of 16 pixels. */ + mode->bytesPerScanline = ((pMode->HDisplay + 15) & ~15) * Bpp; mode->imageWidth = pMode->HDisplay; mode->imageHeight = pMode->VDisplay; mode->pixmapWidth = mode->imageWidth; @@ -172,7 +173,7 @@ goto SECOND_PASS; } else { - mode->bytesPerScanline = ((pScrn->displayWidth * Bpp) + 3) & ~3L; + mode->bytesPerScanline = ((pScrn->displayWidth + 15) & ~15) * Bpp; mode->imageWidth = pScrn->displayWidth; mode->imageHeight = psav->videoRambytes / mode->bytesPerScanline; mode->pixmapWidth = mode->imageWidth; @@ -260,6 +261,7 @@ static int OldDisplayWidth[MAXSCREENS]; static int OldBitsPerPixel[MAXSCREENS]; static int OldDepth[MAXSCREENS]; + static DisplayModePtr OldMode[MAXSCREENS]; int index = pScrn->pScreen->myNum; SavagePtr psav = SAVPTR(pScrn); @@ -269,6 +271,7 @@ pScrn->displayWidth = OldDisplayWidth[index]; pScrn->bitsPerPixel = OldBitsPerPixel[index]; pScrn->depth = OldDepth[index]; + pScrn->currentMode = OldMode[index]; SavageSwitchMode(index, pScrn->currentMode, 0); if( psav->hwcursor ) @@ -293,6 +296,7 @@ OldDisplayWidth[index] = pScrn->displayWidth; OldBitsPerPixel[index] = pScrn->bitsPerPixel; OldDepth[index] = pScrn->depth; + OldMode[index] = pScrn->currentMode; psav->DGAactive = TRUE; } @@ -302,7 +306,7 @@ pScrn->displayWidth = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3); - psav->UseBIOS = FALSE; +/* psav->UseBIOS = FALSE; */ SavageSwitchMode(index, pMode->mode, 0); psav->UseBIOS = holdBIOS; } diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_driver.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_driver.c 2001-11-02 17:24:51.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2002-03-09 00:14:39.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.23 2001/10/01 13:44:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.22 2001/08/09 19:14:13 dawes Exp $ */ /* * vim: sw=4 ts=8 ai ic: * @@ -74,16 +74,18 @@ static Bool SavageDDC1(int scrnIndex); static unsigned int SavageDDC1Read(ScrnInfoPtr pScrn); static void SavageProbeDDC(ScrnInfoPtr pScrn, int index); +static void SavageGetTvMaxSize(SavagePtr psav); +static Bool SavagePanningCheck(ScrnInfoPtr pScrn); extern ScrnInfoPtr gpScrn; #define iabs(a) ((int)(a)>0?(a):(-(a))) #define DRIVER_NAME "savage" -#define DRIVER_VERSION "1.1.20" +#define DRIVER_VERSION "1.1.23t" #define VERSION_MAJOR 1 #define VERSION_MINOR 1 -#define PATCHLEVEL 20 +#define PATCHLEVEL 23 #define SAVAGE_VERSION ((VERSION_MAJOR << 24) | \ (VERSION_MINOR << 16) | \ PATCHLEVEL) @@ -132,6 +134,8 @@ { PCI_CHIP_SUPSAV_IX64DDR, "SuperSavage/IX 64" }, { PCI_CHIP_SUPSAV_IXCSDR, "SuperSavage/IXC 64" }, { PCI_CHIP_SUPSAV_IXCDDR, "SuperSavage/IXC 64" }, + { PCI_CHIP_PROSAVAGE_DDR, "ProSavage DDR" }, + { PCI_CHIP_PROSAVAGE_DDRK, "ProSavage DDR-K" }, { -1, NULL } }; @@ -160,6 +164,8 @@ { S3_PROSAVAGE, PCI_CHIP_PROSAVAGE_KM, RES_SHARED_VGA }, { S3_PROSAVAGE, PCI_CHIP_S3TWISTER_P, RES_SHARED_VGA }, { S3_PROSAVAGE, PCI_CHIP_S3TWISTER_K, RES_SHARED_VGA }, + { S3_PROSAVAGE, PCI_CHIP_PROSAVAGE_DDR, RES_SHARED_VGA }, + { S3_PROSAVAGE, PCI_CHIP_PROSAVAGE_DDRK, RES_SHARED_VGA }, { S3_SUPERSAVAGE, PCI_CHIP_SUPSAV_MX128, RES_SHARED_VGA }, { S3_SUPERSAVAGE, PCI_CHIP_SUPSAV_MX64, RES_SHARED_VGA }, { S3_SUPERSAVAGE, PCI_CHIP_SUPSAV_MX64C, RES_SHARED_VGA }, @@ -187,7 +193,10 @@ OPTION_ROTATE, OPTION_USEBIOS, OPTION_SHADOW_STATUS, - OPTION_VIDEORAM + OPTION_VIDEORAM, + OPTION_CRT_ONLY, + OPTION_TV_ON, + OPTION_TV_PAL } SavageOpts; @@ -202,6 +211,9 @@ { OPTION_LCDCLOCK, "LCDClock", OPTV_FREQ, {0}, FALSE }, { OPTION_SHADOW_STATUS, "ShadowStatus", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_VIDEORAM, "VideoRAM", OPTV_INTEGER, {0}, FALSE }, + { OPTION_CRT_ONLY, "CrtOnly", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_TV_ON, "TvOn", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_TV_PAL, "PAL", OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; @@ -719,6 +731,7 @@ return FALSE; else { int requiredBpp; + int altBpp = 0; switch (pScrn->depth) { case 8: @@ -730,6 +743,7 @@ break; case 24: requiredBpp = 32; + altBpp = 24; break; default: @@ -739,7 +753,10 @@ return FALSE; } - if( pScrn->bitsPerPixel != requiredBpp ) { + if( + (pScrn->bitsPerPixel != requiredBpp) && + (pScrn->bitsPerPixel != altBpp) + ) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Depth %d must specify %d bpp; %d was given\n", pScrn->depth, requiredBpp, pScrn->bitsPerPixel ); @@ -839,6 +856,13 @@ psav->NoAccel = TRUE; } + if (pScrn->bitsPerPixel == 24 && !psav->NoAccel) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "HW acceleration not possible with depth 32 and bpp 24.\n"); + psav->NoAccel = TRUE; + } + + /* * The SWCursor setting takes priority over HWCursor. The default * if neither is specified is HW, unless ShadowFB is specified, @@ -880,6 +904,25 @@ "Option: ShadowStatus enabled\n" ); + if( xf86GetOptValBool( psav->Options, OPTION_CRT_ONLY, &psav->CrtOnly)) + xf86DrvMsg( pScrn->scrnIndex, X_CONFIG, + "Option: CrtOnly enabled\n" ); + + if( xf86GetOptValBool( psav->Options, OPTION_TV_ON, &psav->TvOn)) { + psav->PAL = FALSE; + SavageGetTvMaxSize(psav); + } + + if( xf86GetOptValBool( psav->Options, OPTION_TV_PAL, &psav->PAL)) { + SavageGetTvMaxSize(psav); + psav->TvOn = TRUE; + } + + if( psav->TvOn ) + xf86DrvMsg( pScrn->scrnIndex, X_CONFIG, + "TV enabled in %s format\n", + psav->PAL ? "PAL" : "NTSC" ); + /* Add more options here. */ if (pScrn->numEntities > 1) { @@ -1004,7 +1047,7 @@ psav->MemOffScreen = 0; - if( psav->pVbe ) + if( !pScrn->videoRam && psav->pVbe ) { /* If VBE is available, it is the best judge of onboard memory. */ @@ -1108,10 +1151,15 @@ } else { - /* We use 128kB for the COB on all chips. */ + /* We use 128kB for the COB on all chips. */ - psav->cobIndex = 7; - psav->cobSize = 0x400 << psav->cobIndex; + psav->cobSize = 1 << 17; + if (psav->Chipset == S3_SUPERSAVAGE) { + psav->cobIndex = 2; + } + else { + psav->cobIndex = 7; + } psav->cobOffset = psav->videoRambytes - psav->cobSize; } @@ -1182,11 +1230,13 @@ if ( xf86LoadSubModule(pScrn, "i2c") ) { xf86LoaderReqSymLists(i2cSymbols,NULL); if (SavageI2CInit(pScrn)) { - CARD32 temp = (INREG(DDC_REG)); - OUTREG(DDC_REG,(temp | 0x13)); + unsigned char tmp; + + InI2CREG(tmp); + OutI2CREG(tmp | 0x13); xf86SetDDCproperties(pScrn,xf86PrintEDID( xf86DoEDID_DDC2(pScrn->scrnIndex,psav->I2C))); - OUTREG(DDC_REG,temp); + OutI2CREG(tmp); } } } @@ -1240,7 +1290,7 @@ /* Check LCD panel information */ - if( S3_SAVAGE_MOBILE_SERIES(psav->Chipset) ) + if( S3_SAVAGE_MOBILE_SERIES(psav->Chipset) && !psav->CrtOnly ) { unsigned char cr6b = hwp->readCrtc( hwp, 0x6b ); @@ -1422,7 +1472,7 @@ xf86LoaderReqSymLists(shadowSymbols, NULL); } vbeFree(psav->pVbe); - + return TRUE; } @@ -1650,7 +1700,7 @@ TRACE(("SavageWriteMode(%x)\n", restore->mode)); - if( Entering ) + if( Entering && !S3_SAVAGE_MOBILE_SERIES(psav->Chipset) ) SavageInitialize2DEngine(pScrn); /* @@ -2302,7 +2352,7 @@ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "DPMS initialization failed\n"); #ifdef XvExtension - if( !psav->NoAccel ) + if( !psav->NoAccel && !SavagePanningCheck(pScrn) ) SavageInitVideo( pScreen ); #endif @@ -2366,8 +2416,18 @@ /* We prohibit modes bigger than the LCD panel. */ /* TODO We should do this only if the panel is active. */ + if( psav->TvOn ) + { + if( pMode->HDisplay > psav->TVSizeX ) + return MODE_VIRTUAL_X; + + if( pMode->VDisplay > psav->TVSizeY ) + return MODE_VIRTUAL_Y; + + } if( - (psav->PanelX) && + !psav->CrtOnly && + psav->PanelX && ( (pMode->HDisplay > psav->PanelX) || (pMode->VDisplay > psav->PanelY) @@ -2470,7 +2530,10 @@ new->CR67 = 0x40; /* 16bpp, 1 pixels/clock */ break; case 24: - new->CR67 = 0xd0; + if (pScrn->bitsPerPixel == 24 ) + new->CR67 = 0x70; + else + new->CR67 = 0xd0; break; } @@ -3116,13 +3179,21 @@ SavageDDC1Read(ScrnInfoPtr pScrn) { register vgaHWPtr hwp = VGAHWPTR(pScrn); - register CARD32 tmp; + register unsigned char tmp; SavagePtr psav = SAVPTR(pScrn); + int vgaCRIndex, vgaCRReg, vgaIOBase; + + vgaHWGetIOBase(hwp); + vgaIOBase = hwp->IOBase; + vgaCRIndex = vgaIOBase + 4; + vgaCRReg = vgaIOBase + 5; + VerticalRetraceWait(); + + InI2CREG(tmp); while (hwp->readST01(hwp)&0x8) {}; while (!(hwp->readST01(hwp)&0x8)) {}; - tmp = (INREG(DDC_REG)); return ((unsigned int) (tmp & 0x08)); } @@ -3130,14 +3201,18 @@ SavageDDC1(int scrnIndex) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + vgaHWPtr hwp = VGAHWPTR(pScrn); SavagePtr psav = SAVPTR(pScrn); - CARD32 tmp; + unsigned char tmp; Bool success = FALSE; xf86MonPtr pMon; + int vgaIOBase; /* initialize chipset */ - tmp = INREG(DDC_REG); - OUTREG(DDC_REG,(tmp | 0x12)); + vgaHWGetIOBase(hwp); + vgaIOBase = hwp->IOBase; + InI2CREG(tmp); + OutI2CREG(tmp | 0x12); if ((pMon = xf86PrintEDID( xf86DoEDID_DDC1(scrnIndex,vgaHWddc1SetSpeed,SavageDDC1Read))) != NULL) @@ -3145,7 +3220,7 @@ xf86SetDDCproperties(pScrn,pMon); /* undo initialization */ - OUTREG(DDC_REG,(tmp)); + OutI2CREG(tmp); return success; } @@ -3161,3 +3236,34 @@ } } + +static void +SavageGetTvMaxSize(SavagePtr psav) +{ + if( psav->PAL ) { + psav->TVSizeX = 800; + psav->TVSizeY = 600; + } + else { + psav->TVSizeX = 640; + psav->TVSizeY = 480; + } +} + + +static Bool +SavagePanningCheck(ScrnInfoPtr pScrn) +{ + SavagePtr psav = SAVPTR(pScrn); + DisplayModePtr pMode; + + pMode = pScrn->currentMode; + psav->iResX = pMode->CrtcHDisplay; + psav->iResY = pMode->CrtcVDisplay; + if( psav->iResX < pScrn->virtualX || psav->iResY < pScrn->virtualY ) + return TRUE; + else + return FALSE; +} + + diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_driver.h xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_driver.h 2001-08-09 21:14:13.000000000 +0200 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h 2001-12-05 23:55:56.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.10 2001/05/18 23:35:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.11 2001/08/09 19:14:13 dawes Exp $ */ #ifndef SAVAGE_VGAHWMMIO_H #define SAVAGE_VGAHWMMIO_H @@ -35,6 +35,9 @@ #define INREG16(addr) MMIO_IN16(psav->MapBase, addr) #define OUTREG16(addr,val) MMIO_OUT16(psav->MapBase, addr, val) +#define SAVAGE_CRT_ON 1 +#define SAVAGE_LCD_ON 2 +#define SAVAGE_TV_ON 4 typedef struct _S3VMODEENTRY { unsigned short Width; @@ -121,8 +124,29 @@ int rotate; double LCDClock; Bool ShadowStatus; - int PanelX; - int PanelY; + Bool CrtOnly; + Bool TvOn; + Bool PAL; + int iDevInfo; + int iDevInfoPrim; + + int PanelX; /* panel width */ + int PanelY; /* panel height */ + int iResX; /* crtc X display */ + int iResY; /* crtc Y display */ + int XFactor; /* overlay X factor */ + int YFactor; /* overlay Y factor */ + int displayXoffset; /* overlay X offset */ + int displayYoffset; /* overlay Y offset */ + int XExpansion; /* expansion factor in x */ + int XExp1; + int XExp2; + int YExpansion; /* expansion factor in x */ + int YExp1; + int YExp2; + int cxScreen; + int TVSizeX; + int TVSizeY; CloseScreenProcPtr CloseScreen; pciVideoPtr PciInfo; diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_i2c.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_i2c.c 2001-02-13 22:15:19.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c 2001-12-05 01:43:48.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c,v 1.1 2001/02/13 21:15:19 dawes Exp $ */ /* Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. @@ -41,23 +41,37 @@ static void SavageI2CPutBits(I2CBusPtr b, int clock, int data) { - SavagePtr psav = SAVPTR(xf86Screens[b->scrnIndex]); - unsigned int reg = 0x10; + ScrnInfoPtr pScrn = (ScrnInfoPtr)(xf86Screens[b->scrnIndex]); + SavagePtr psav = SAVPTR(pScrn); + vgaHWPtr hwp; + int vgaIOBase; + unsigned char reg = 0x10; + + hwp = VGAHWPTR(pScrn); + vgaHWGetIOBase(hwp); + vgaIOBase = hwp->IOBase; if(clock) reg |= 0x1; if(data) reg |= 0x2; - OUTREG(DDC_REG,reg); + OutI2CREG(reg); /*ErrorF("SavageI2CPutBits: %d %d\n", clock, data); */ } static void SavageI2CGetBits(I2CBusPtr b, int *clock, int *data) { - SavagePtr psav = SAVPTR(xf86Screens[b->scrnIndex]); - unsigned int reg; + ScrnInfoPtr pScrn = (ScrnInfoPtr)(xf86Screens[b->scrnIndex]); + SavagePtr psav = SAVPTR(pScrn); + vgaHWPtr hwp; + int vgaIOBase; + unsigned char reg = 0x10; - reg = (INREG(DDC_REG)); + hwp = VGAHWPTR(pScrn); + vgaHWGetIOBase(hwp); + vgaIOBase = hwp->IOBase; + + InI2CREG(reg); *clock = reg & 0x4; *data = reg & 0x8; diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_image.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_image.c 2001-08-09 21:14:13.000000000 +0200 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c 2001-08-11 21:26:36.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.5 2001/08/09 19:14:13 dawes Exp $ */ #include "savage_driver.h" #include "xaarop.h" diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_regs.h xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_regs.h 2001-11-04 23:17:48.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2002-03-08 19:01:07.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.9 2001/11/02 16:24:51 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.8 2001/05/15 10:19:39 eich Exp $ */ #ifndef _SAVAGE_REGS_H #define _SAVAGE_REGS_H @@ -22,6 +22,10 @@ #define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e #define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f #endif +#ifndef PCI_CHIP_PROSAVAGE_DDR +#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 +#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 +#endif #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) @@ -164,9 +168,6 @@ #define MONO_PAT_0 0xa4e8 #define MONO_PAT_1 0xa4ec -#define DDC_REG 0xff20 - - /* Constants for CR69. */ #define CRT_ACTIVE 0x01 @@ -202,4 +203,20 @@ } \ } +#define I2C_REG 0xa0 +#define InI2CREG(a) \ +{ \ + VGAOUT8(vgaIOBase + 4, I2C_REG); \ + a = VGAIN8(vgaIOBase + 5); \ +} + +#define OutI2CREG(a) \ +{ \ + VGAOUT8(vgaIOBase + 4, I2C_REG); \ + VGAOUT8(vgaIOBase + 5, a); \ +} + +#define HZEXP_FACTOR_IGA1 0x59 +#define VTEXP_FACTOR_IGA1 0x5b + #endif /* _SAVAGE_REGS_H */ diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_shadow.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_shadow.c 2000-12-02 02:16:14.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c 2001-08-11 21:26:36.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c,v 1.1 2000/12/02 01:16:14 dawes Exp $ */ /* Copyright (c) 1999,2000 The XFree86 Project Inc. diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_vbe.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_vbe.c 2001-05-19 04:05:55.000000000 +0200 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c 2001-12-06 00:02:32.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.9 2001/05/19 02:05:55 dawes Exp $ */ #include "savage_driver.h" #include "savage_vbe.h" @@ -14,6 +14,8 @@ #define L_ADD(x) (B_O32(x) & 0xffff) + ((B_O32(x) >> 12) & 0xffff00) Bool vbeModeInit( vbeInfoPtr, int ); +static int SavageGetDevice( SavagePtr psav ); +/*static int SavageGetTVType( SavagePtr psav );*/ static void SavageClearVM86Regs( xf86Int10InfoPtr pInt ) @@ -31,6 +33,15 @@ void SavageSetTextMode( SavagePtr psav ) { + /* Restore display device if changed. */ + if( psav->iDevInfo != psav->iDevInfoPrim ) { + SavageClearVM86Regs( psav->pInt10 ); + psav->pInt10->ax = 0x4f14; + psav->pInt10->bx = 0x0003; + psav->pInt10->cx = psav->iDevInfoPrim; + xf86ExecX86int10( psav->pInt10 ); + } + SavageClearVM86Regs( psav->pInt10 ); psav->pInt10->ax = 0x83; @@ -42,16 +53,55 @@ void SavageSetVESAMode( SavagePtr psav, int n, int Refresh ) { - /* First, establish the refresh rate for this mode. */ + int iDevInfo; + static int iCount = 0; + + /* Get current display device status. */ + + iDevInfo = SavageGetDevice(psav); + psav->iDevInfo = iDevInfo; + if( !iCount++ ) + psav->iDevInfoPrim = psav->iDevInfo; + if( psav->CrtOnly ) + psav->iDevInfo = CRT_ACTIVE; + if( psav->TvOn ) + psav->iDevInfo = TV_ACTIVE; + + /* Establish the refresh rate for this mode. */ SavageClearVM86Regs( psav->pInt10 ); psav->pInt10->ax = 0x4f14; /* S3 extensions */ psav->pInt10->bx = 0x0001; /* Set default refresh rate */ psav->pInt10->cx = n; - psav->pInt10->di = Refresh; + psav->pInt10->di = Refresh & 0xffff; xf86ExecX86int10( psav->pInt10 ); + /* Set TV type if TV is on. */ + if( psav->TvOn ) { + SavageClearVM86Regs( psav->pInt10 ); + psav->pInt10->ax = 0x4f14; /* S3 extensions */ + psav->pInt10->bx = 0x0007; /* TV extensions */ + psav->pInt10->cx = psav->PAL ? 0x08 : 0x04; + psav->pInt10->dx = 0x0c; + xf86ExecX86int10( psav->pInt10 ); + } + + /* Manipulate output device set. */ + if( psav->iDevInfo != iDevInfo ) { + SavageClearVM86Regs( psav->pInt10 ); + psav->pInt10->ax = 0x4f14; /* S3 extensions */ + psav->pInt10->bx = 0x0003; /* set active devices */ + psav->pInt10->cx = psav->PAL ? 0x08 : 0x04; + xf86ExecX86int10( psav->pInt10 ); + + /* Re-fetch actual device set. */ + psav->iDevInfo = SavageGetDevice( psav ); + iDevInfo = psav->iDevInfo; + psav->CrtOnly = (iDevInfo == 1); + psav->TvOn = !!(iDevInfo & 4); + } + /* Now, make this mode current. */ if( xf86LoaderCheckSymbol( "VBESetVBEMode" ) ) @@ -73,6 +123,20 @@ } +/* Function to get supported device list. */ + +static int SavageGetDevice( SavagePtr psav ) +{ + SavageClearVM86Regs( psav->pInt10 ); + psav->pInt10->ax = 0x4f14; /* S3 extensions */ + psav->pInt10->bx = 0x0103; /* get active devices */ + + xf86ExecX86int10( psav->pInt10 ); + + return ((psav->pInt10->cx) & 0xf); +} + + void SavageFreeBIOSModeTable( SavagePtr psav, SavageModeTablePtr* ppTable ) { @@ -128,6 +192,11 @@ vbe = (vbeControllerInfoPtr) psav->pVbe->memory; vbeLinear = xf86Int10AllocPages( psav->pInt10, 1, &vbeReal ); + if( !vbeLinear ) + { + ErrorF( "Cannot allocate scratch page in real mode memory." ); + return 0; + } vmib = (struct vbe_mode_info_block *) vbeLinear; for ( diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_vbe.h xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_vbe.h 2000-12-04 23:41:54.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h 2001-08-11 21:26:36.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.1 2000/12/02 01:16:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.2 2000/12/04 22:41:54 dawes Exp $ */ /* This file was originally part of the Linux Real-Mode Interface, or LRMI. diff -Nurd xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_video.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c --- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_video.c 2001-11-21 23:43:01.000000000 +0100 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c 2002-03-08 23:59:39.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.6 2001/11/02 16:24:51 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.4 2001/06/15 21:22:57 dawes Exp $ */ #include "Xv.h" #include "dix.h" @@ -78,6 +78,9 @@ short drw_w, short drw_h ) = NULL; +static void OverlayParamInit(ScrnInfoPtr pScrn); +static void InitStreamsForExpansion(SavagePtr psav); + /*static void SavageBlockHandler(int, pointer, pointer, pointer);*/ #define XVTRACE 4 @@ -226,6 +229,13 @@ /* CR67[3] = 1 : Mem-mapped regs */ #define USE_MM_FOR_PRI_STREAM 0x08 +#define HDM_SHIFT 16 +#define HDSCALE_4 (2 << HDM_SHIFT) +#define HDSCALE_8 (3 << HDM_SHIFT) +#define HDSCALE_16 (4 << HDM_SHIFT) +#define HDSCALE_32 (5 << HDM_SHIFT) +#define HDSCALE_64 (6 << HDM_SHIFT) + /* Old Streams */ #define ENABLE_STREAMS_OLD 0x0c @@ -264,6 +274,7 @@ #define PSTREAM_WINDOW_SIZE_REG 0x81F4 #define SSTREAM_WINDOW_START_REG 0x81F8 #define SSTREAM_WINDOW_SIZE_REG 0x81FC +#define FIFO_CONTROL 0x8200 #define PSTREAM_FBSIZE_REG 0x8300 #define SSTREAM_FBSIZE_REG 0x8304 #define SSTREAM_FBADDR2_REG 0x8308 @@ -363,6 +374,14 @@ xf86ErrorFVerb(XVTRACE, "SavageInitStreams\n" ); + if( + S3_SAVAGE_MOBILE_SERIES(psav->Chipset) && + !psav->CrtOnly && + !psav->TvOn + ) { + OverlayParamInit( pScrn ); + } + /* Primary stream reflects the frame buffer. */ jDelta = pScrn->displayWidth * pScrn->bitsPerPixel / 8; @@ -419,7 +438,7 @@ VGAOUT8( vgaCRIndex, EXT_MISC_CTRL2 ); - if( (psav->Chipset == S3_SAVAGE_MX) || + if( S3_SAVAGE_MOBILE_SERIES(psav->Chipset) || (psav->Chipset == S3_SUPERSAVAGE) || (psav->Chipset == S3_SAVAGE2000) ) { @@ -495,7 +514,7 @@ VGAOUT16(0x3c4, 0x0608); VGAOUT8( vgaCRIndex, EXT_MISC_CTRL2 ); - if( (psav->Chipset == S3_SAVAGE_MX) || + if( S3_SAVAGE_MOBILE_SERIES(psav->Chipset) || (psav->Chipset == S3_SUPERSAVAGE) || (psav->Chipset == S3_SAVAGE2000) ) jStreamsControl = VGAIN8( vgaCRReg ) & NO_STREAMS; @@ -528,8 +547,8 @@ xf86ErrorFVerb(XVTRACE,"SavageInitVideo\n"); if( - (psav->Chipset == S3_SAVAGE_MX) || - (psav->Chipset == S3_SUPERSAVAGE) || + S3_SAVAGE_MOBILE_SERIES(psav->Chipset) || + (psav->Chipset == S3_SUPERSAVAGE) || (psav->Chipset == S3_SAVAGE2000) ) { @@ -846,6 +865,15 @@ pPriv->brightness = 0; pPriv->contrast = 128; pPriv->saturation = 128; +#if 0 + /* + * The S3 driver has these values for some of the chips. I have yet + * to find any Savage where these make sense. + */ + pPriv->brightness = 64; + pPriv->contrast = 16; + pPriv->saturation = 128; +#endif pPriv->hue = 0; pPriv->lastKnownPitch = 0; @@ -1163,6 +1191,7 @@ pScreen = screenInfo.screens[pScrn->scrnIndex]; + xf86PurgeUnlockedOffscreenAreas(pScreen); new_area = xf86AllocateOffscreenArea(pScreen, pScrn->displayWidth, numlines, 0, NULL, NULL, NULL); @@ -1200,6 +1229,7 @@ SavagePortPrivPtr pPriv = psav->adaptor->pPortPrivates[0].ptr; /*DisplayModePtr mode = pScrn->currentMode;*/ int vgaCRIndex, vgaCRReg, vgaIOBase; + unsigned int ssControl; vgaIOBase = hwp->IOBase; @@ -1222,22 +1252,45 @@ /* Calculate horizontal scale factor. */ - OUTREG(SSTREAM_STRETCH_REG, 32768 * src_w / drw_w ); + OUTREG(SSTREAM_STRETCH_REG, (src_w << 15) / drw_w ); /* Calculate vertical scale factor. */ OUTREG(SSTREAM_LINES_REG, src_h ); OUTREG(SSTREAM_VINITIAL_REG, 0 ); - OUTREG(SSTREAM_VSCALE_REG, 32768 * src_h / drw_h ); + OUTREG(SSTREAM_VSCALE_REG, (src_h << 15) / drw_h ); /* Set surface location and stride. */ OUTREG(SSTREAM_FBADDR0_REG, (offset + (x1>>15)) & 0x3ffff0 ); + OUTREG(SSTREAM_FBADDR1_REG, 0 ); + OUTREG(SSTREAM_STRIDE_REG, pitch & 0xfff ); OUTREG(SSTREAM_WINDOW_START_REG, OS_XY(dstBox->x1, dstBox->y1) ); OUTREG(SSTREAM_WINDOW_SIZE_REG, OS_WH(drw_w, drw_h) ); + ssControl = 0; + + if( src_w > (drw_w << 1) ) + { + /* BUGBUG shouldn't this be >=? */ + if( src_w <= (drw_w << 2) ) + ssControl |= HDSCALE_4; + else if( src_w > (drw_w << 3) ) + ssControl |= HDSCALE_8; + else if( src_w > (drw_w << 4) ) + ssControl |= HDSCALE_16; + else if( src_w > (drw_w << 5) ) + ssControl |= HDSCALE_32; + else if( src_w > (drw_w << 6) ) + ssControl |= HDSCALE_64; + } + + ssControl |= src_w; + ssControl |= (1 << 24); + OUTREG(SSTREAM_CONTROL_REG, ssControl); + /* Set color key on primary. */ SavageSetColorKey( pScrn ); @@ -1308,6 +1361,19 @@ } else { + if( + S3_SAVAGE_MOBILE_SERIES(psav->Chipset) && + !psav->CrtOnly && + !psav->TvOn + ) { + drw_w = (float)(drw_w * psav->XExp1)/(float)psav->XExp2 + 1; + drw_h = (float)(drw_h * psav->YExp1)/(float)psav->YExp2 + 1; + dstBox->x1 = (float)(dstBox->x1 * psav->XExp1)/(float)psav->XExp2; + dstBox->y1 = (float)(dstBox->y1 * psav->YExp1)/(float)psav->YExp2; + dstBox->x1 += psav->displayXoffset; + dstBox->y1 += psav->displayYoffset; + } + OUTREG(SEC_STREAM_HSCALING, ((src_w&0xfff)<<20) | ((65536 * src_w / drw_w) & 0x1FFFF )); /* BUGBUG need to add 00040000 if src stride > 2048 */ @@ -1383,6 +1449,11 @@ SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2, REGION_EXTENTS(pScreen, clipBoxes), width, height); + drw_w = dstBox.x2 - dstBox.x1; + drw_h = dstBox.y2 - dstBox.y1; + src_w = ( x2 - x1 ) >> 16; + src_h = ( y2 - y1 ) >> 16; + if((x1 >= x2) || (y1 >= y2)) return Success; @@ -1762,4 +1833,152 @@ xf86XVRegisterOffscreenImages(pScreen, offscreenImages, 1); } -#endif /* !XvExtension */ +/* Function to get lcd factor, display offset for overlay use + * Input: pScrn; Output: x,yfactor, displayoffset in pScrn + */ +static void OverlayParamInit(ScrnInfoPtr pScrn) +{ + SavagePtr psav = SAVPTR(pScrn); + + psav = SAVPTR(pScrn); + psav->cxScreen = psav->iResX; + InitStreamsForExpansion(psav); +} + +/* Function to calculate lcd expansion x,yfactor and offset for overlay + */ +static void InitStreamsForExpansion(SavagePtr psav) +{ + int PanelSizeX,PanelSizeY; + int ViewPortWidth,ViewPortHeight; + int XFactor, YFactor; + + PanelSizeX = psav->PanelX; + PanelSizeY = psav->PanelY; + ViewPortWidth = psav->iResX; + ViewPortHeight = psav->iResY; + if( PanelSizeX == 1408 ) + PanelSizeX = 1400; + psav->XExpansion = 0x00010001; + psav->YExpansion = 0x00010001; + psav->displayXoffset = 0; + psav->displayYoffset = 0; + + VGAOUT8(0x3C4, HZEXP_FACTOR_IGA1); + XFactor = VGAIN8(0x3C5) >> 4; + VGAOUT8(0x3C4, VTEXP_FACTOR_IGA1); + YFactor = VGAIN8(0x3C5) >> 4; + + switch( XFactor ) + { + case 1: + psav->XExpansion = 0x00010001; + psav->displayXoffset = + (((PanelSizeX - ViewPortWidth) / 2) + 0x7) & 0xFFF8; + break; + + case 3: + psav->XExpansion = 0x00090008; + psav->displayXoffset = + (((PanelSizeX - ((9 * ViewPortWidth)/8)) / 2) + 0x7) & 0xFFF8; + break; + + case 4: + psav->XExpansion = 0x00050004; + + if ((psav->cxScreen == 800) && (PanelSizeX !=1400)) + { + psav->displayXoffset = + (((PanelSizeX - ((5 * ViewPortWidth)/4)) / 2) ) & 0xFFF8; + } + else + { + psav->displayXoffset = + (((PanelSizeX - ((5 * ViewPortWidth)/4)) / 2) +0x7) & 0xFFF8; + } + break; + + case 6: + psav->XExpansion = 0x00030002; + psav->displayXoffset = + (((PanelSizeX - ((3 * ViewPortWidth)/2)) / 2) + 0x7) & 0xFFF8; + break; + + case 7: + psav->XExpansion = 0x00020001; + psav->displayXoffset = + (((PanelSizeX - (2 * ViewPortWidth)) / 2) + 0x7) & 0xFFF8; + break; + } + + switch( YFactor ) + { + case 0: + psav->YExpansion = 0x00010001; + psav->displayYoffset = (PanelSizeY - ViewPortHeight) / 2; + break; + case 1: + psav->YExpansion = 0x00010001; + psav->displayYoffset = (PanelSizeY - ViewPortHeight) / 2; + break; + case 2: + psav->YExpansion = 0x00040003; + psav->displayYoffset = (PanelSizeY - ((4 * ViewPortHeight)/3)) / 2; + break; + case 4: + psav->YExpansion = 0x00050004; + psav->displayYoffset = (PanelSizeY - ((5 * ViewPortHeight)/4)) / 2; + break; + case 5: + psav->YExpansion = 0x00040003; + + if((psav->cxScreen == 1024)&&(PanelSizeX ==1400)) + { + psav->displayYoffset = + ((PanelSizeY - ((4 * ViewPortHeight)/3)) / 2) - 0x1 ; + } + else + { + psav->displayYoffset = (PanelSizeY - ((4 * ViewPortHeight)/3)) / 2; + } + break; + case 6: + psav->YExpansion = 0x00050004; + psav->displayYoffset = (PanelSizeY - ((5 * ViewPortHeight)/4)) / 2; + break; + case 7: + psav->YExpansion = 0x00030002; + psav->displayYoffset = (PanelSizeY - ((3 * ViewPortHeight)/2)) / 2; + break; + case 8: + psav->YExpansion = 0x00020001; + psav->displayYoffset = (PanelSizeY - (2 * ViewPortHeight)) /2; + break; + case 9: + psav->YExpansion = 0x00090004; + psav->displayYoffset = (PanelSizeY - ((9 * ViewPortHeight)/4)) /2; + break; + case 11: + psav->YExpansion = 0x00110005; + psav->displayYoffset = (PanelSizeY - ((11 * ViewPortHeight)/5)) /2; + break; + case 12: + psav->YExpansion = 0x00070003; + psav->displayYoffset = (PanelSizeY - ((7 * ViewPortHeight)/3)) /2; + break; + case 14: + psav->YExpansion = 0x00050002; + psav->displayYoffset = (PanelSizeY - ((5 * ViewPortHeight)/2)) /2; + break; + case 15: + psav->YExpansion = 0x00040001; + psav->displayYoffset = (PanelSizeY - (4 * ViewPortHeight)) /2; + break; + } + psav->XExp1 = psav->XExpansion >> 16; + psav->XExp2 = psav->XExpansion & 0xFFFF; + psav->YExp1 = psav->YExpansion >> 16; + psav->YExp2 = psav->YExpansion & 0xFFFF; +} /* InitStreamsForExpansionPM */ + +#endif /* XvExtension */
pgp6ej5VipWSi.pgp
Description: PGP signature
