Module Name: xsrc
Committed By: mrg
Date: Fri Aug 19 19:15:28 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: ati.h atii2c.h
atipreinit.c ativalid.c
Log Message:
make this build with sparc64 and xorg-server 1.18. doesn't quite work.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-mach64/dist/src/ati.h \
xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.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-mach64/dist/src/ati.h
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/ati.h:1.1.1.2 xsrc/external/mit/xf86-video-mach64/dist/src/ati.h:1.2
--- xsrc/external/mit/xf86-video-mach64/dist/src/ati.h:1.1.1.2 Sun Jun 2 08:23:44 2013
+++ xsrc/external/mit/xf86-video-mach64/dist/src/ati.h Fri Aug 19 19:15:27 2016
@@ -24,6 +24,7 @@
#define ___ATI_H___ 1
#include <unistd.h>
+#include "xorg-server.h"
#include "xf86Pci.h"
#include "xf86.h"
Index: xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c:1.1.1.2 xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c:1.2
--- xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c:1.1.1.2 Sun Jun 2 08:23:44 2013
+++ xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c Fri Aug 19 19:15:27 2016
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "atichip.h"
#include "atistruct.h"
Index: xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h:1.1.1.1 xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h:1.2
--- xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h:1.1.1.1 Sun Sep 21 01:46:32 2008
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h Fri Aug 19 19:15:27 2016
@@ -25,6 +25,7 @@
#include "atipriv.h"
+#include "xorg-server.h"
#include "xf86str.h"
#include "xf86i2c.h"
Index: xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.6 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.7
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.6 Mon Jul 20 01:19:27 2015
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c Fri Aug 19 19:15:27 2016
@@ -64,6 +64,7 @@
#endif
#include "xf86Priv.h"
+#include "xf86Privstr.h"
/*
* FreeScreen handles the clean-up.
@@ -714,7 +715,7 @@ ATIPreInit
ei.edid_data = buffer;
ei.buffer_size = 1024;
- if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GET_EDID, &ei) != -1) {
+ if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, &ei) != -1) {
xf86Msg(X_INFO, "got %d bytes worth of EDID from wsdisplay\n", ei.data_size);
ConfiguredMonitor = xf86InterpretEDID(pScreenInfo->scrnIndex, buffer);
} else
