[xsrc/trunk]: xsrc/external/mit merge xf86-video-i128 1.4.0 and xf86-video-i7...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/eb7652dc79e9
branches:  trunk
changeset: 10021:eb7652dc79e9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Dec 29 06:46:43 2018 +0000

description:
merge xf86-video-i128 1.4.0 and xf86-video-i740 1.4.0.

diffstat:

 external/mit/xf86-video-i128/dist/src/i128_driver.c |  4 ----
 external/mit/xf86-video-i740/dist/src/i740_dga.c    |  1 -
 external/mit/xf86-video-i740/dist/src/i740_driver.c |  2 ++
 external/mit/xf86-video-i740/dist/src/i740_video.c  |  1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 5e66ac01ac8a -r eb7652dc79e9 external/mit/xf86-video-i128/dist/src/i128_driver.c
--- a/external/mit/xf86-video-i128/dist/src/i128_driver.c       Sat Dec 29 06:45:19 2018 +0000
+++ b/external/mit/xf86-video-i128/dist/src/i128_driver.c       Sat Dec 29 06:46:43 2018 +0000
@@ -38,9 +38,6 @@
 
 #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"
 
@@ -53,7 +50,6 @@
 #include "micmap.h"
 
 #include "xf86DDC.h"
-#include "vbe.h"
 
 #include "xf86cmap.h"
 #include "fb.h"
diff -r 5e66ac01ac8a -r eb7652dc79e9 external/mit/xf86-video-i740/dist/src/i740_dga.c
--- a/external/mit/xf86-video-i740/dist/src/i740_dga.c  Sat Dec 29 06:45:19 2018 +0000
+++ b/external/mit/xf86-video-i740/dist/src/i740_dga.c  Sat Dec 29 06:46:43 2018 +0000
@@ -29,7 +29,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 #include "vgaHW.h"
 #include "xf86xv.h"
 #include "i740.h"
diff -r 5e66ac01ac8a -r eb7652dc79e9 external/mit/xf86-video-i740/dist/src/i740_driver.c
--- a/external/mit/xf86-video-i740/dist/src/i740_driver.c       Sat Dec 29 06:45:19 2018 +0000
+++ b/external/mit/xf86-video-i740/dist/src/i740_driver.c       Sat Dec 29 06:46:43 2018 +0000
@@ -780,7 +780,9 @@
 
 static Bool I740MapMem(ScrnInfoPtr pScrn)
 {
+#ifndef XSERVER_LIBPCIACCESS
   int mmioFlags;
+#endif
   I740Ptr pI740;
 
   pI740 = I740PTR(pScrn);
diff -r 5e66ac01ac8a -r eb7652dc79e9 external/mit/xf86-video-i740/dist/src/i740_video.c
--- a/external/mit/xf86-video-i740/dist/src/i740_video.c        Sat Dec 29 06:45:19 2018 +0000
+++ b/external/mit/xf86-video-i740/dist/src/i740_video.c        Sat Dec 29 06:46:43 2018 +0000
@@ -60,7 +60,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86fbman.h"
 #include "regionstr.h"