diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
| commit | 19b52aa1dad10b98343d806595b26004e0bd863d (patch) | |
| tree | 608c8a66859094452ef3d8285f13308335109e65 | |
| parent | 49af7dac2ec8babe482a6660b175521959418ca1 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | src/s3_accel.c | 2 | ||||
| -rw-r--r-- | src/s3_driver.c | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/s3_accel.c b/src/s3_accel.c index 6d4f9c3..cd77330 100644 --- a/src/s3_accel.c +++ b/src/s3_accel.c @@ -24,7 +24,7 @@ * * */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.1.4.1.4.2 2004/03/04 20:16:30 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */ diff --git a/src/s3_driver.c b/src/s3_driver.c index 4786d1b..ea8f0c2 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -171,6 +171,8 @@ static OptionInfoRec S3Options[] = { RamDacSupportedInfoRec S3IBMRamdacs[] = { { IBM524_RAMDAC }, { IBM524A_RAMDAC }, + { IBM526_RAMDAC }, + { IBM526DB_RAMDAC }, { -1 } }; @@ -234,7 +236,7 @@ static const char *ramdacSymbols[] = { "RamDacGetHWIndex", "IBMramdacProbe", "IBMramdac526CalculateMNPCForClock", - "IBMramdac526SetBpp", + "IBMramdac526SetBppWeak", NULL }; @@ -256,7 +258,7 @@ static XF86ModuleVersionInfo S3VersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -544,6 +546,9 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) } pS3->FBAddress = pS3->PciInfo->memBase[0]; + pScrn->memPhysBase = pS3->FBAddress; + pScrn->fbOffset = 0; + if (pS3->S3NewMMIO) pS3->IOAddress = pS3->FBAddress + S3_NEWMMIO_REGBASE; @@ -657,7 +662,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) pS3->DacSave = S3IBMRGB_Save; pS3->DacRestore = S3IBMRGB_Restore; pS3->CursorInit = S3IBMRGB_CursorInit; - pS3->RamDac->SetBpp = IBMramdac526SetBpp; + pS3->RamDac->SetBpp = IBMramdac526SetBppWeak(); pS3->MaxClock = 170000; pScrn->rgbBits = 8; pS3->LoadPalette = S3GenericLoadPalette; |