Module Name: xsrc
Committed By: mrg
Date: Sat Aug 14 08:41:10 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
Removed Files:
xsrc/external/mit/xf86-video-chips/dist: README.sgml
Log Message:
merge xf86-video-chips-1.2.3
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-chips/dist/README.sgml
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
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.4 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.5
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.4 Thu Oct 15 22:53:26 2009
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sat Aug 14 08:41:09 2010
@@ -103,7 +103,9 @@
#include "mibstore.h"
/* All drivers using the mi banking wrapper need this */
+#ifdef HAVE_ISA
#include "mibank.h"
+#endif
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
@@ -761,10 +763,12 @@
{
int chip = chipid & 0x0000ffff;
+#ifdef HAVE_ISA
if (busid == BUS_ISA) {
if ((chip == CHIPS_CT64200) || (chip == CHIPS_CT64300))
return ChipsWingineOptions;
}
+#endif
if (busid == BUS_PCI) {
if ((chip >= CHIPS_CT65550) && (chip <= CHIPS_CT69030))
return ChipsHiQVOptions;
@@ -1463,6 +1467,13 @@
from = X_CONFIG;
}
+#ifndef HAVE_ISA
+ if (!(cPtr->Flags & ChipsLinearSupport)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Linear framebuffer required\n");
+ return FALSE;
+ }
+#endif
+
/* linear base */
if (cPtr->Flags & ChipsLinearSupport) {
if (cPtr->pEnt->location.type == BUS_PCI) {
@@ -2567,6 +2578,13 @@
from = X_CONFIG;
}
+#ifndef HAVE_ISA
+ if (!(cPtr->Flags & ChipsLinearSupport)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Linear framebuffer required\n");
+ return FALSE;
+ }
+#endif
+
/* linear base */
if (useLinear) {
unsigned char mask = 0xF8;
@@ -3030,6 +3048,13 @@
from = X_CONFIG;
}
+#ifndef HAVE_ISA
+ if (!(cPtr->Flags & ChipsLinearSupport)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Linear framebuffer required\n");
+ return FALSE;
+ }
+#endif
+
/* linear base */
if (useLinear) {
unsigned char mask;
@@ -3642,12 +3667,12 @@
&& (cPtr->Flags & ChipsLinearSupport))
CHIPSResetVideo(pScrn);
- /*xf86UDelay(50000);*/
+ /*usleep(50000);*/
chipsHWCursorOn(cPtr, pScrn);
/* cursor settle delay */
- xf86UDelay(50000);
+ usleep(50000);
CHIPSAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
- xf86UDelay(50000);
+ usleep(50000);
return TRUE;
}
@@ -4040,6 +4065,7 @@
cPtr->HWCursorShown = FALSE;
+#ifdef HAVE_ISA
if (!(cPtr->Flags & ChipsLinearSupport)) {
miBankInfoPtr pBankInfo;
@@ -4119,7 +4145,9 @@
/* Initialise cursor functions */
miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
- } else {
+ } else
+#endif /* HAVE_ISA */
+ {
/* !!! Only support linear addressing for now. This might change */
/* Setup pointers to free space in video ram */
#define CHIPSALIGN(size, align) (currentaddr - ((currentaddr - size) & ~align))
@@ -4581,7 +4609,9 @@
if (!pScrn->vtSema)
return;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8
xf86EnableAccess(pScrn);
+#endif
switch (PowerManagementMode) {
case DPMSModeOn:
/* Screen: On; HSync: On, VSync: On */
