Module Name: xsrc
Committed By: mrg
Date: Sun Mar 3 09:31:52 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-apm/dist/src: apm_driver.c
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_accel.c s3v_driver.c
Log Message:
merge xf86-video-apm 1.3.0, xf86-video-chips 1.4.0, and
xf86-video-s3virge 1.11.0.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c
cvs rdiff -u -r1.28 -r1.29 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_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-apm/dist/src/apm_driver.c
diff -u xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c:1.2 xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c:1.3
--- xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c:1.2 Tue Aug 16 01:27:46 2016
+++ xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c Sun Mar 3 09:31:52 2019
@@ -355,7 +355,8 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
EntityInfoPtr pEnt;
vgaHWPtr hwp;
MessageType from;
- char *mod = NULL, *req = NULL, *s;
+ char *mod = NULL;
+ const char *s;
ClockRangePtr clockRanges;
int i;
xf86MonPtr MonInfo = NULL;
@@ -751,7 +752,11 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
LinMap[0xFFECDB] = db;
LinMap[0xFFECD9] = d9;
/*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)LinMap, pApm->LinMapSize);
+#else
+ pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize);
+#endif
from = X_PROBED;
}
else {
@@ -1134,11 +1139,19 @@ ApmUnmapMem(ScrnInfoPtr pScrn)
WRXB(0xDB, pApm->db);
}
WRXB(0xC9, pApm->c9);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, pApm->LinMapSize);
+#else
+ pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize);
+#endif
pApm->LinMap = NULL;
}
else if (pApm->FbBase)
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, 0x10000);
+#else
+ pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x10000);
+#endif
return TRUE;
}
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.28 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.29
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.28 Thu Jan 19 23:50:31 2017
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sun Mar 3 09:31:52 2019
@@ -2414,6 +2414,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, i
return FALSE;
hwp = VGAHWPTR(pScrn);
+ vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
/*
@@ -2880,6 +2881,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int
return FALSE;
hwp = VGAHWPTR(pScrn);
+ vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
/*
Index: xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
diff -u xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c:1.4 xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c:1.5
--- xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c:1.4 Mon Sep 28 20:48:46 2015
+++ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c Sun Mar 3 09:31:52 2019
@@ -465,7 +465,7 @@ S3VAccelSync(ScrnInfoPtr pScrn)
WAITIDLE();
}
-
+#ifdef HAVE_XAA_H
static void
S3VEngineReset(ScrnInfoPtr pScrn)
{
@@ -540,7 +540,6 @@ S3VWriteMask(
return;
}
-#ifdef HAVE_XAA_H
/************************\
| Solid Filled Rects |
Index: xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
diff -u xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.7 xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.8
--- xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.7 Mon Dec 31 22:17:21 2018
+++ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c Sun Mar 3 09:31:52 2019
@@ -478,8 +478,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
int i;
double real;
ClockRangePtr clockRanges;
- char *mod = NULL;
- const char *reqSym = NULL;
const char *s;
unsigned char config1, config2, m, n, n1, n2, cr66 = 0;
