Module Name: xsrc
Committed By: mrg
Date: Sat Dec 29 06:46:43 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-i128/dist/src: i128_driver.c
xsrc/external/mit/xf86-video-i740/dist/src: i740_dga.c i740_driver.c
i740_video.c
Log Message:
merge xf86-video-i128 1.4.0 and xf86-video-i740 1.4.0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c \
xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-i740/dist/src/i740_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-i128/dist/src/i128_driver.c
diff -u xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c:1.3 xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c:1.4
--- xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c:1.3 Sat Aug 20 05:00:58 2016
+++ xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c Sat Dec 29 06:46:43 2018
@@ -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"
Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c:1.3 xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c:1.4
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c:1.3 Thu Jul 11 10:28:27 2013
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c Sat Dec 29 06:46:43 2018
@@ -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"
Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c:1.3 xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c:1.4
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c:1.3 Sun Jun 2 07:36:43 2013
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c Sat Dec 29 06:46:43 2018
@@ -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"
Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.5 xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.6
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.5 Thu Jul 23 01:19:16 2015
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c Sat Dec 29 06:46:43 2018
@@ -780,7 +780,9 @@ I740PreInit(ScrnInfoPtr pScrn, int flags
static Bool I740MapMem(ScrnInfoPtr pScrn)
{
+#ifndef XSERVER_LIBPCIACCESS
int mmioFlags;
+#endif
I740Ptr pI740;
pI740 = I740PTR(pScrn);
