Module Name: xsrc
Committed By: mrg
Date: Sun Jun 2 07:44:10 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c ct_driver.h
Removed Files:
xsrc/external/mit/xf86-video-chips/dist: compile
Log Message:
merge xf86-video-chips 1.2.5
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-chips/dist/compile
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.12 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.13
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.12 Wed Aug 3 01:30:42 2011
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sun Jun 2 07:44:10 2013
@@ -79,9 +79,6 @@
/* Everything using inb/outb, etc needs "compiler.h" */
#include "compiler.h"
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
@@ -140,6 +137,7 @@
#include "dixstruct.h"
+#include "xf86fbman.h"
/* Driver specific headers */
#include "ct_driver.h"
@@ -148,17 +146,16 @@ static const OptionInfoRec * CHIPSAvaila
static void CHIPSIdentify(int flags);
static Bool CHIPSPciProbe(DriverPtr drv, int entity_num,
struct pci_device *dev, intptr_t match_data);
-#ifdef HAVE_ISA
+#if defined(HAVE_ISA) || defined(XSERVER_LIBPCIACCESS)
static Bool CHIPSProbe(DriverPtr drv, int flags);
#endif
static Bool CHIPSPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool CHIPSScreenInit(int Index, ScreenPtr pScreen, int argc,
- char **argv);
-static Bool CHIPSEnterVT(int scrnIndex, int flags);
-static void CHIPSLeaveVT(int scrnIndex, int flags);
-static Bool CHIPSCloseScreen(int scrnIndex, ScreenPtr pScreen);
-static void CHIPSFreeScreen(int scrnIndex, int flags);
-static ModeStatus CHIPSValidMode(int scrnIndex, DisplayModePtr mode,
+static Bool CHIPSScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool CHIPSEnterVT(VT_FUNC_ARGS_DECL);
+static void CHIPSLeaveVT(VT_FUNC_ARGS_DECL);
+static Bool CHIPSCloseScreen(CLOSE_SCREEN_ARGS_DECL);
+static void CHIPSFreeScreen(FREE_SCREEN_ARGS_DECL);
+static ModeStatus CHIPSValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
Bool verbose, int flags);
static Bool CHIPSSaveScreen(ScreenPtr pScreen, int mode);
@@ -208,7 +205,7 @@ static void chipsLoadPalette(ScrnInf
static void chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors,
int *indices, LOCO *colors, VisualPtr pVisual);
static void chipsSetPanelType(CHIPSPtr cPtr);
-static void chipsBlockHandler(int, pointer, pointer, pointer);
+static void chipsBlockHandler(BLOCKHANDLER_ARGS_DECL);
/*
* This is intentionally screen-independent. It indicates the binding
@@ -487,6 +484,19 @@ static DisplayModeRec ChipsNTSCMode = {
#ifdef XSERVER_LIBPCIACCESS
+#ifndef _XF86_PCIINFO_H
+#define PCI_VENDOR_CHIPSTECH 0x102C
+/* Chips & Tech */
+#define PCI_CHIP_65545 0x00D8
+#define PCI_CHIP_65548 0x00DC
+#define PCI_CHIP_65550 0x00E0
+#define PCI_CHIP_65554 0x00E4
+#define PCI_CHIP_65555 0x00E5
+#define PCI_CHIP_68554 0x00F4
+#define PCI_CHIP_69000 0x00C0
+#define PCI_CHIP_69030 0x0C30
+#endif
+
#define CHIPS_DEVICE_MATCH(d, i) \
{ PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
@@ -515,7 +525,7 @@ _X_EXPORT DriverRec CHIPS = {
CHIPS_VERSION,
CHIPS_DRIVER_NAME,
CHIPSIdentify,
-#ifdef HAVE_ISA
+#if defined(HAVE_ISA) || defined(XSERVER_LIBPCIACCESS)
CHIPSProbe,
#else
NULL,
@@ -850,7 +860,7 @@ CHIPSPciProbe(DriverPtr drv, int entity_
return (pScrn != NULL);
}
-#ifdef HAVE_ISA
+#if defined(HAVE_ISA) || defined(XSERVER_LIBPCIACCESS)
static Bool
CHIPSProbe(DriverPtr drv, int flags)
{
@@ -888,32 +898,30 @@ CHIPSProbe(DriverPtr drv, int flags)
continue;
}
- pScrn = NULL;
- entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
- pScrn = xf86ConfigFbEntity(NULL, 0, entity, NULL, NULL,
- NULL, NULL);
- pScrn->driverVersion = CHIPS_VERSION;
- pScrn->driverName = CHIPS_DRIVER_NAME;
- pScrn->name = CHIPS_NAME;
- pScrn->Probe = CHIPSProbe;
- pScrn->PreInit = CHIPSPreInit;
- pScrn->ScreenInit = CHIPSScreenInit;
- pScrn->SwitchMode = CHIPSSwitchMode;
- pScrn->AdjustFrame = CHIPSAdjustFrame;
- pScrn->EnterVT = CHIPSEnterVT;
- pScrn->LeaveVT = CHIPSLeaveVT;
- pScrn->FreeScreen = CHIPSFreeScreen;
- pScrn->ValidMode = CHIPSValidMode;
- if (!CHIPSGetRec(pScrn)) {
- return FALSE;
- }
- cPtr = CHIPSPTR(pScrn);
- cPtr->Chipset = chipset;
}
+ free(usedChips);
+ }
+ }
+
+#ifdef HAVE_ISA
+ /* Isa Bus */
+ numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets,
+ drv,chipsFindIsaDevice,devSections,
+ numDevSections,&usedChips);
+ if (numUsed > 0) {
+ if (flags & PROBE_DETECT)
+ foundScreen = TRUE;
+ else for (i = 0; i < numUsed; i++) {
+ ScrnInfoPtr pScrn = NULL;
+ if ((pScrn = xf86ConfigIsaEntity(pScrn,0,
+ usedChips[i],
+ CHIPSISAchipsets,NULL,
+ NULL,NULL,NULL,NULL))) {
+ free(usedChips);
}
}
- xfree(devSections);
+ free(devSections);
return foundScreen;
}
@@ -1270,10 +1278,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
if (cPtr->Flags & ChipsAccelSupport) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- vbeFree(cPtr->pVbe);
- cPtr->pVbe = NULL;
- CHIPSFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
+ cPtr->Flags &= ~(ChipsAccelSupport);
+ cPtr->Flags |= ChipsShadowFB;
}
}
@@ -1370,8 +1377,14 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
return FALSE;
hwp = VGAHWPTR(pScrn);
+ vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
cPtr->PIOBase = hwp->PIOOffset;
+#else
+ cPtr->PIOBase = 0;
+#endif
+
/*
* Must allow ensure that storage for the 2nd set of vga registers is
* allocated for dual channel cards
@@ -1564,55 +1577,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
}
}
- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
- if (pScrn->bitsPerPixel == 16) {
- if (cPtr->Flags & ChipsLinearSupport) {
- cPtr->Flags |= ChipsOverlay8plus16;
- if(!xf86GetOptValInteger(
- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
- pScrn->colorKey = TRANSPARENCY_KEY;
- pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "PseudoColor overlay enabled.\n");
- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- " - Forcing option \"Stretch\" \"ON\".\n");
- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- " - Forcing option \"LcdCenter\" \"OFF\".\n");
- if (cPtr->Flags & ChipsShadowFB) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- " - Disabling \"Shadow Framebuffer\".\n");
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- " Not support with option \"8Plus16\".\n");
- cPtr->Flags &= ~ChipsShadowFB;
- cPtr->Rotate = 0;
- }
- } else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
- }
- } else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Option \"Overlay\" is not supported in this configuration\n");
- }
- } else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "\"%s\" is not a valid value for Option \"Overlay\"\n", s);
- }
- }
-
- if (!(cPtr->Flags & ChipsOverlay8plus16)) {
- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
- &(cPtr->videoKey))) {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
+ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
+ &(cPtr->videoKey))) {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
cPtr->videoKey);
- } else {
- cPtr->videoKey = (1 << pScrn->offset.red) |
+ } else {
+ cPtr->videoKey = (1 << pScrn->offset.red) |
(1 << pScrn->offset.green) |
(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
<< pScrn->offset.blue);
- }
}
if (cPtr->Flags & ChipsShadowFB) {
@@ -1878,7 +1851,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
if (!ddc_done)
if (xf86LoadSubModule(pScrn, "i2c")) {
if (chips_i2cInit(pScrn)) {
- if ((pMon = xf86PrintEDID(xf86DoEDID_DDC2(pScrn->scrnIndex,
+ if ((pMon = xf86PrintEDID(xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),
cPtr->I2C))) != NULL)
ddc_done = TRUE;
xf86SetDDCproperties(pScrn,pMon);
@@ -2260,28 +2233,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
/* and 32bits on the others. Thus multiply by a suitable factor */
if (cPtr->Flags & Chips64BitMemory) {
if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
- if (cPtr->Flags & ChipsOverlay8plus16 )
- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
- else
cPtr->MaxClock = min(cPtr->MaxClock,
MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
else
- if (cPtr->Flags & ChipsOverlay8plus16)
- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
- else
cPtr->MaxClock = min(cPtr->MaxClock,
MemClk->Clk * 8 * 0.7 / bytesPerPixel);
} else {
if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
- if (cPtr->Flags & ChipsOverlay8plus16 )
- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
- else
cPtr->MaxClock = min(cPtr->MaxClock,
MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
else
- if (cPtr->Flags & ChipsOverlay8plus16)
- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
- else
cPtr->MaxClock = min(cPtr->MaxClock,
MemClk->Clk * 4 * 0.7 / bytesPerPixel);
}
@@ -3647,9 +3608,9 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int
/* Mandatory */
static Bool
-CHIPSEnterVT(int scrnIndex, int flags)
+CHIPSEnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
CHIPSEntPtr cPtrEnt;
@@ -3661,8 +3622,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
/* Should we re-save the text mode on each VT enter? */
if(!chipsModeInit(pScrn, pScrn->currentMode))
return FALSE;
- if ((!(cPtr->Flags & ChipsOverlay8plus16))
- && (cPtr->Flags & ChipsVideoSupport)
+ if ((cPtr->Flags & ChipsVideoSupport)
&& (cPtr->Flags & ChipsLinearSupport))
CHIPSResetVideo(pScrn);
@@ -3670,16 +3630,16 @@ CHIPSEnterVT(int scrnIndex, int flags)
chipsHWCursorOn(cPtr, pScrn);
/* cursor settle delay */
usleep(50000);
- CHIPSAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ CHIPSAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
usleep(50000);
return TRUE;
}
/* Mandatory */
static void
-CHIPSLeaveVT(int scrnIndex, int flags)
+CHIPSLeaveVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
CHIPSACLPtr cAcl = CHIPSACLPTR(pScrn);
CHIPSEntPtr cPtrEnt;
@@ -3713,8 +3673,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int
int i, index, shift ;
CHIPSEntPtr cPtrEnt;
- shift = ((pScrn->depth == 15) &&
- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
+ shift = (pScrn->depth == 15) ? 3 : 0;
if (cPtr->UseDualChannel) {
cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
@@ -3820,23 +3779,11 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, in
hwp->disablePalette(hwp);
}
-static Bool
-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
- int xsize, int ysize, int dpix, int dpiy,
- int width16, int width8)
-{
- return
- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
- dpix, dpiy, width16, width8, 16, 8) &&
- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
- dpix, dpiy, width16, width8, 16, 8, 16, 8));
-}
-
/* Mandatory */
static Bool
-CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
vgaHWPtr hwp;
CHIPSPtr cPtr;
CHIPSACLPtr cAcl;
@@ -3872,22 +3819,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
if (!chipsMapMem(pScrn))
return FALSE;
- /* Setup a pointer to the overlay if needed */
- if (cPtr->Flags & ChipsOverlay8plus16) {
- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY;
- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Too little memory for overlay. Disabling.\n");
- cPtr->Flags &= ~ChipsOverlay8plus16;
- }
- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Max overlay Width/Height 1024 pixels. Disabling.\n");
- cPtr->Flags &= ~ChipsOverlay8plus16;
- }
- }
-
/* Setup the MMIO register access functions if need */
if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
CHIPSSetMmioExtFuncs(cPtr);
@@ -3940,7 +3871,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
if (!chipsModeInit(pScrn,pScrn->currentMode))
return FALSE;
CHIPSSaveScreen(pScreen,SCREEN_SAVER_ON);
- CHIPSAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ CHIPSAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
/*
* The next step is to setup the screen's visuals, and initialise the
@@ -3960,18 +3891,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
miClearVisualTypes();
/* Setup the visuals we support. */
- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
- pScrn->rgbBits, PseudoColor))
- return FALSE;
- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
- return FALSE;
- } else {
- if (!miSetVisualTypes(pScrn->depth,
+ if (!miSetVisualTypes(pScrn->depth,
miGetDefaultVisualMask(pScrn->depth),
pScrn->rgbBits, pScrn->defaultVisual))
- return FALSE;
- }
+ return FALSE;
miSetPixmapDepths ();
/*
@@ -4015,13 +3938,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
break;
#endif
case 16:
- if (cPtr->Flags & ChipsOverlay8plus16) {
- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
- cPtr->FbOffset16, FBStart, width,
- height, pScrn->xDpi, pScrn->yDpi,
- displayWidth, displayWidth);
- break;
- }
default:
ret = fbScreenInit(pScreen, FBStart,
width,height,
@@ -4148,7 +4064,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
}
if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
pScrn->displayWidth, pBankInfo)) {
- xfree(pBankInfo);
+ free(pBankInfo);
pBankInfo = NULL;
return FALSE;
}
@@ -4169,9 +4085,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
if (pScrn->bitsPerPixel < 8)
freespace = allocatebase - pScrn->displayWidth *
pScrn->virtualY / 2;
- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
- freespace = allocatebase - pScrn->displayWidth *
- pScrn->virtualY - cPtr->FbSize16;
else
freespace = allocatebase - pScrn->displayWidth *
pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
@@ -4182,7 +4095,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
} else
currentaddr = allocatebase;
if (serverGeneration == 1)
- xf86DrvMsg(scrnIndex, X_PROBED,
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"%d bytes off-screen memory available\n", freespace);
/*
@@ -4207,7 +4120,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
cAcl->CursorAddress = currentaddr;
}
if (cAcl->CursorAddress == -1)
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Too little space for H/W cursor.\n");
}
@@ -4267,7 +4180,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
cAcl->CacheEnd = currentaddr;
if (cAcl->CacheStart >= cAcl->CacheEnd) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Too little space for pixmap cache.\n");
cAcl->CacheStart = 0;
cAcl->CacheEnd = 0;
@@ -4294,9 +4207,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
AvailFBArea.y2 = cAcl->CacheEnd /
(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- if (!(cPtr->Flags & ChipsOverlay8plus16)) {
- xf86InitFBManager(pScreen, &AvailFBArea);
- }
+ xf86InitFBManager(pScreen, &AvailFBArea);
}
if (cPtr->Flags & ChipsAccelSupport) {
if (IS_HiQV(cPtr)) {
@@ -4320,7 +4231,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
if ((cAcl->UseHWCursor) && (cAcl->CursorAddress != -1)) {
/* HW cursor functions */
if (!CHIPSCursorInit(pScreen)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Hardware cursor initialization failed\n");
return FALSE;
}
@@ -4350,16 +4261,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
if (!miCreateDefColormap(pScreen))
return FALSE;
- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
- NULL, CMAP_RELOAD_ON_MODE_SWITCH))
- return FALSE;
- } else {
- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
+ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
- return FALSE;
- }
+ return FALSE;
#ifndef XSERVER_LIBPCIACCESS
racflag = RAC_COLORMAP;
@@ -4373,8 +4278,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
xf86SetSilkenMouse(pScreen);
#endif
- if ((!(cPtr->Flags & ChipsOverlay8plus16))
- && (cPtr->Flags & ChipsVideoSupport)
+ if ((cPtr->Flags & ChipsVideoSupport)
&& (cPtr->Flags & ChipsLinearSupport)) {
CHIPSInitVideo(pScreen);
}
@@ -4400,9 +4304,9 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr
/* Mandatory */
Bool
-CHIPSSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+CHIPSSwitchMode(SWITCH_MODE_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
CHIPSEntPtr cPtrEnt;
@@ -4415,14 +4319,14 @@ CHIPSSwitchMode(int scrnIndex, DisplayMo
DUALREOPEN;
}
- return chipsModeInit(xf86Screens[scrnIndex], mode);
+ return chipsModeInit(pScrn, mode);
}
/* Mandatory */
void
-CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+CHIPSAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
CHIPSEntPtr cPtrEnt;
@@ -4447,10 +4351,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, i
Base >>= 3;
break;
case 16:
- if (!(cPtr->Flags & ChipsOverlay8plus16))
- Base >>= 1;
- else
- Base >>= 2;
+ Base >>= 1;
break;
case 24:
if (!IS_HiQV(cPtr))
@@ -4506,21 +4407,13 @@ CHIPSAdjustFrame(int scrnIndex, int x, i
cPtr->writeMSS(cPtr, hwp, MSS);
}
- if (cPtr->Flags & ChipsOverlay8plus16) {
- Base = (Base << 3) & ~(unsigned long)0xF;
-
- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
- }
-
}
/* Mandatory */
static Bool
-CHIPSCloseScreen(int scrnIndex, ScreenPtr pScreen)
+CHIPSCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
CHIPSEntPtr cPtrEnt;
@@ -4546,8 +4439,10 @@ CHIPSCloseScreen(int scrnIndex, ScreenPt
cPtrEnt = pPriv->ptr;
cPtrEnt->refCount--;
}
+#ifdef HAVE_XAA_H
if (cPtr->AccelInfoRec)
XAADestroyInfoRec(cPtr->AccelInfoRec);
+#endif
if (cPtr->CursorInfoRec)
xf86DestroyCursorInfoRec(cPtr->CursorInfoRec);
free(cPtr->ShadowPtr);
@@ -4558,32 +4453,26 @@ CHIPSCloseScreen(int scrnIndex, ScreenPt
pScreen->CloseScreen = cPtr->CloseScreen; /*§§§*/
xf86ClearPrimInitDone(pScrn->entityList[0]);
- return (*pScreen->CloseScreen)(scrnIndex, pScreen);/*§§§*/
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);/*§§§*/
}
/* Optional */
static void
-CHIPSFreeScreen(int scrnIndex, int flags)
+CHIPSFreeScreen(FREE_SCREEN_ARGS_DECL)
{
+ SCRN_INFO_PTR(arg);
if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
- vgaHWFreeHWRec(xf86Screens[scrnIndex]);
- CHIPSFreeRec(xf86Screens[scrnIndex]);
+ vgaHWFreeHWRec(pScrn);
+ CHIPSFreeRec(pScrn);
}
/* Optional */
static ModeStatus
-CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+CHIPSValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
- if (flags & MODECHECK_FINAL) {
- /* Don't subtract FrambufferSize here as it should be subtracted already */
- if ((cPtr->Flags & ChipsOverlay8plus16)
- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY
- < 0))
- return MODE_MEM;
- }
/* The tests here need to be expanded */
if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
return MODE_NO_INTERLACE;
@@ -4706,7 +4595,7 @@ CHIPSSaveScreen(ScreenPtr pScreen, int m
unblank = xf86IsUnblank(mode);
if (pScreen != NULL)
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
if (unblank)
SetTimeSinceLastInputEvent();
@@ -5469,12 +5358,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
} else {
ChipsStd->Attribute[0x10] = 0x01; /* mode */
}
- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
- /* Make sure that the overlay isn't visible in the overscan region */
- if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
- } else
- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */
+ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */
ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */
ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */
@@ -5483,8 +5367,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
/* set virtual screen width */
tmp = pScrn->displayWidth >> 3;
if (pScrn->bitsPerPixel == 16) {
- if (!(cPtr->Flags & ChipsOverlay8plus16))
- tmp <<= 1; /* double the width of the buffer */
+ tmp <<= 1; /* double the width of the buffer */
} else if (pScrn->bitsPerPixel == 24) {
tmp += tmp << 1;
} else if (pScrn->bitsPerPixel == 32) {
@@ -5613,8 +5496,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
/* centering/stretching */
if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
- (cPtr->Flags & ChipsOverlay8plus16)) {
+ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */
ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */
ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */
@@ -5634,8 +5516,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
}
}
- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
- || (cPtr->Flags & ChipsOverlay8plus16)) {
+ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */
ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */
} else {
@@ -5648,8 +5529,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
ChipsNew->XR[0x82] |=0x02;
/* software mode flag */
- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
+ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
mode->CrtcHDisplay, mode->CrtcVDisplay);
#ifdef DEBUG
@@ -5687,7 +5567,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
}
}
/* bpp depend */
- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
+ if (pScrn->bitsPerPixel == 16) {
ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
if (cPtr->Flags & ChipsGammaSupport)
ChipsNew->XR[0x82] |= 0x0C;
@@ -5840,60 +5720,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
/* Turn off multimedia by default as it degrades performance */
ChipsNew->XR[0xD0] &= 0x0f;
- /* Setup the video/overlay */
- if (cPtr->Flags & ChipsOverlay8plus16) {
- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */
-#ifdef SAR04
- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */
-#endif
- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */
- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */
- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */
- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */
- if (pScrn->weight.green == 5)
- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */
-
- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */
- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */
- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */
- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */
- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */
- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
-
- /* Left Edge of Overlay */
- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */
- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
- /* Right Edge of Overlay */
- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth -
- 1) & 0xFF;
- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */
- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
- 1) >> 8) & 0x07;
- /* Top Edge of Overlay */
- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
- ChipsNew->MR[0x2F] &= 0xF8;
- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
- /* Bottom Edge of Overlay*/
- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */
- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY -
- 1 ) >> 8) & 0x07;
-
- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */
- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */
- ChipsNew->MR[0x3D] = 0x00;
- ChipsNew->MR[0x3E] = 0x00;
- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
- ChipsNew->MR[0x40] = 0xFF;
- ChipsNew->MR[0x41] = 0xFF;
- ChipsNew->MR[0x42] = 0x00;
- } else if (cPtr->Flags & ChipsVideoSupport) {
+ if (cPtr->Flags & ChipsVideoSupport) {
#if 0 /* if we do this even though video isn't playing we kill performance */
ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */
#endif
@@ -6802,8 +6629,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pSc
}
/* Set SAR04 multimedia register correctly */
- if ((cPtr->Flags & ChipsOverlay8plus16)
- || (cPtr->Flags & ChipsVideoSupport)) {
+ if ((cPtr->Flags & ChipsVideoSupport)) {
#ifdef SAR04
cPtr->writeXR(cPtr, 0x4E, 0x04);
if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
@@ -7604,18 +7430,14 @@ chipsSetPanelType(CHIPSPtr cPtr)
}
static void
-chipsBlockHandler (
- int i,
- pointer blockData,
- pointer pTimeout,
- pointer pReadmask
-){
- ScreenPtr pScreen = screenInfo.screens[i];
- ScrnInfoPtr pScrn = xf86Screens[i];
+chipsBlockHandler (BLOCKHANDLER_ARGS_DECL)
+{
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
pScreen->BlockHandler = cPtr->BlockHandler;
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
pScreen->BlockHandler = chipsBlockHandler;
if(cPtr->VideoTimerCallback) {
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h:1.2 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h:1.3
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h:1.2 Thu Oct 15 22:53:26 2009
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h Sun Jun 2 07:44:10 2013
@@ -27,9 +27,11 @@
#define _CT_DRIVER_H_
#include "ct_pcirename.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
-#include "vbe.h"
#include "xaalocal.h" /* XAA internals as we replace some of XAA */
+#endif
+#include "vbe.h"
#include "xf86Cursor.h"
#include "xf86i2c.h"
#include "xf86DDC.h"
@@ -38,6 +40,8 @@
#include <string.h>
#include <unistd.h>
+#include "compat-api.h"
+
/* Supported chipsets */
typedef enum {
CHIPS_CT65520,
@@ -114,7 +118,6 @@ typedef struct {
/* Options flags for the C&T chipsets */
#define ChipsHWCursor 0x00001000
#define ChipsShadowFB 0x00002000
-#define ChipsOverlay8plus16 0x00004000
#define ChipsUseNewFB 0x00008000
/* Architecture type flags */
@@ -272,11 +275,13 @@ typedef struct {
typedef struct _CHIPSRec {
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
int Chipset;
EntityInfoPtr pEnt;
- IOADDRESS PIOBase;
- CARD32 IOAddress;
+ unsigned long PIOBase;
+ unsigned long IOAddress;
unsigned long FbAddress;
unsigned int IOBase;
unsigned char * FbBase;
@@ -288,7 +293,7 @@ typedef struct _CHIPSRec {
unsigned char * ShadowPtr;
int ShadowPitch;
int Rotate;
- void (*PointerMoved)(int index, int x, int y);
+ void (*PointerMoved)(SCRN_ARG_TYPE arg, int x, int y);
int FbOffset16;
int FbSize16;
OptionInfoPtr Options;
@@ -321,7 +326,9 @@ typedef struct _CHIPSRec {
unsigned int * Regs32;
unsigned int Flags;
CARD32 Bus;
+#ifdef HAVE_XAA_H
XAAInfoRecPtr AccelInfoRec;
+#endif
xf86CursorInfoPtr CursorInfoRec;
CHIPSACLRec Accel;
unsigned int HWCursorContents;
@@ -381,8 +388,8 @@ extern unsigned int ChipsReg32HiQV[];
/* Prototypes */
-void CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags);
-Bool CHIPSSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+void CHIPSAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+Bool CHIPSSwitchMode(SWITCH_MODE_ARGS_DECL);
/* video */
void CHIPSInitVideo(ScreenPtr pScreen);
@@ -431,7 +438,7 @@ void chipsRefreshArea8(ScrnInfoPtr p
void chipsRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
void chipsRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
void chipsRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
-void chipsPointerMoved(int index, int x, int y);
+void chipsPointerMoved(SCRN_ARG_TYPE arg, int x, int y);
#if X_BYTE_ORDER == X_BIG_ENDIAN
# define BE_SWAP_APRETURE(pScrn,cPtr) \