[xsrc/trunk]: xsrc/external/mit merge xf86-video-apm 1.3.0, xf86-video-chips ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/f6f755080785
branches:  trunk
changeset: 10150:f6f755080785
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 03 09:31:52 2019 +0000

description:
merge xf86-video-apm 1.3.0, xf86-video-chips 1.4.0, and
xf86-video-s3virge 1.11.0.

diffstat:

 external/mit/xf86-video-apm/dist/src/apm_driver.c     |  15 ++++++++++++++-
 external/mit/xf86-video-chips/dist/src/ct_driver.c    |   2 ++
 external/mit/xf86-video-s3virge/dist/src/s3v_accel.c  |   3 +--
 external/mit/xf86-video-s3virge/dist/src/s3v_driver.c |   2 --
 4 files changed, 17 insertions(+), 5 deletions(-)

diffs (96 lines):

diff -r ae660fb72c56 -r f6f755080785 external/mit/xf86-video-apm/dist/src/apm_driver.c
--- a/external/mit/xf86-video-apm/dist/src/apm_driver.c Sun Mar 03 09:29:07 2019 +0000
+++ b/external/mit/xf86-video-apm/dist/src/apm_driver.c Sun Mar 03 09:31:52 2019 +0000
@@ -355,7 +355,8 @@
     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 @@
        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 @@
            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;
 }
diff -r ae660fb72c56 -r f6f755080785 external/mit/xf86-video-chips/dist/src/ct_driver.c
--- a/external/mit/xf86-video-chips/dist/src/ct_driver.c        Sun Mar 03 09:29:07 2019 +0000
+++ b/external/mit/xf86-video-chips/dist/src/ct_driver.c        Sun Mar 03 09:31:52 2019 +0000
@@ -2414,6 +2414,7 @@
         return FALSE;
 
     hwp = VGAHWPTR(pScrn);
+    vgaHWSetStdFuncs(hwp);
     vgaHWGetIOBase(hwp);
 
     /*
@@ -2880,6 +2881,7 @@
         return FALSE;
 
     hwp = VGAHWPTR(pScrn);
+    vgaHWSetStdFuncs(hwp);
     vgaHWGetIOBase(hwp);
 
     /*
diff -r ae660fb72c56 -r f6f755080785 external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
--- a/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c      Sun Mar 03 09:29:07 2019 +0000
+++ b/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c      Sun Mar 03 09:31:52 2019 +0000
@@ -465,7 +465,7 @@
     WAITIDLE();
 }
 
-
+#ifdef HAVE_XAA_H
 static void
 S3VEngineReset(ScrnInfoPtr pScrn)
 {
@@ -540,7 +540,6 @@
    return;
 }
 
-#ifdef HAVE_XAA_H
 
        /************************\
        |  Solid Filled Rects    |
diff -r ae660fb72c56 -r f6f755080785 external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
--- a/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c     Sun Mar 03 09:29:07 2019 +0000
+++ b/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c     Sun Mar 03 09:31:52 2019 +0000
@@ -478,8 +478,6 @@
     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;