Module Name: xsrc
Committed By: martin
Date: Mon Jul 11 10:18:49 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-siliconmotion/dist/src [netbsd-7]:
smi_driver.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw [netbsd-7]: vgaHW.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1201):
external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c: revision
1.5
external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h: revision 1.2
Avoid legacy VGA I/O port access on MIPS. Xorg converts the I/O port
address to a pointer and dereferences it, and then seg faults.
This fixes Xorg on my Lemote YeeLoong netbook.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
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-siliconmotion/dist/src/smi_driver.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.3 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.3.4.1
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.3 Mon Jun 3 08:50:48 2013
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c Mon Jul 11 10:18:49 2016
@@ -2011,6 +2011,7 @@ SMI_EnableVideo(ScrnInfoPtr pScrn)
void
SMI_EnableMmio(ScrnInfoPtr pScrn)
{
+#if !defined(__mips__)
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -2039,11 +2040,13 @@ SMI_EnableMmio(ScrnInfoPtr pScrn)
}
LEAVE();
+#endif
}
void
SMI_DisableMmio(ScrnInfoPtr pScrn)
{
+#if !defined(__mips__)
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -2063,6 +2066,7 @@ SMI_DisableMmio(ScrnInfoPtr pScrn)
}
LEAVE();
+#endif
}
static void
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.1.1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.1.1.3.10.1
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.1.1.3 Tue Nov 23 05:21:46 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h Mon Jul 11 10:18:49 2016
@@ -174,7 +174,7 @@ typedef struct _vgaHWRec {
#define BITS_PER_GUN 6
#define COLORMAP_SIZE 256
-#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) || defined(__nds32__)
+#if defined(__powerpc__) || defined(__arm__) || defined(__mips__) || defined(__s390__) || defined(__nds32__)
#define DACDelay(hw) /* No legacy VGA support */
#else
#define DACDelay(hw) \
