CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src

2016-08-19 Thread matthew green 
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 
+#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, ) != -1) {
+	if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, ) != -1) {
 	xf86Msg(X_INFO, "got %d bytes worth of EDID from wsdisplay\n", ei.data_size);
 	ConfiguredMonitor = xf86InterpretEDID(pScreenInfo->scrnIndex, buffer);
 	} else

CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src

2015-07-19 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 20 01:19:27 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c

Log Message:
fix a merge botch in the previous.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.5 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.6
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.5	Mon Jul 20 00:10:28 2015
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c	Mon Jul 20 01:19:27 2015
@@ -729,8 +729,6 @@ ATIPreInit
 xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor);
 }
 
-#endif /* AVOID_CPIO */
-
 if (flags  PROBE_DETECT)
 {
 return TRUE;

CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src

2013-11-12 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Tue Nov 12 23:09:32 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atimach64render.c

Log Message:
Deal with pPict-pDrawable == NULL for source-only pictures.
Falling back to software rendering for such source pictures (solid/gradient).
from Matthieu Herrb via x.org


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.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/atimach64render.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c:1.1.1.3 xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c:1.2
--- xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c:1.1.1.3	Sun Jun  2 08:23:46 2013
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c	Tue Nov 12 23:09:32 2013
@@ -339,10 +339,15 @@ Mach64GetOrder(int val, int *shift)
 static Bool
 Mach64CheckTexture(PicturePtr pPict)
 {
-int w = pPict-pDrawable-width;
-int h = pPict-pDrawable-height;
+int h, w;
 int l2w, l2h, level, i;
 
+if  (pPict-pDrawable == NULL)
+	return FALSE;
+
+w = pPict-pDrawable-width;
+h = pPict-pDrawable-height;
+
 for (i = 0; i  MACH64_NR_TEX_FORMATS; i++) {
 if (Mach64TexFormats[i].pictFormat == pPict-format)
 break;

CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src

2012-08-15 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed Aug 15 17:35:03 UTC 2012

Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c

Log Message:
set the default reference clock for Rage XL on sparc to 29.498MHz
now the PGX64 works out of the box with no config file


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
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/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.2 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.3
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.2	Thu Aug  4 01:17:34 2011
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c	Wed Aug 15 17:35:03 2012
@@ -1012,8 +1012,13 @@ ATIPreInit
 }
 }
 
-ati_bios_clock(pScreenInfo, pATI, BIOS, ClockTable, pGDev);
+#if defined(__sparc__)
+	/* make PGX64 work by default */
+	if (pATI-Chip == ATI_CHIP_264XL)
+		pATI-refclk = 29498000;
+#endif
 
+ati_bios_clock(pScreenInfo, pATI, BIOS, ClockTable, pGDev);
 ati_bios_mmedia(pScreenInfo, pATI, BIOS, VideoTable, HardwareTable);
 
 if (pATI-LCDPanelID = 0)

CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src

2011-08-03 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Thu Aug  4 01:17:34 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c

Log Message:
support ioctl(WSDISPLAYIO_GET_EDID)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
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/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.1.1.4 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.2
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.1.1.4	Sat Jul 23 08:11:59 2011
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c	Thu Aug  4 01:17:34 2011
@@ -27,6 +27,13 @@
 #include string.h
 #include stdio.h
 
+#ifdef __NetBSD__
+#include sys/time.h
+#include sys/ioctl.h
+#include errno.h
+#include dev/wscons/wsconsio.h
+#endif
+
 #include ati.h
 #include atiadjust.h
 #include atiaudio.h
@@ -56,6 +63,8 @@
 #include xf86RAC.h
 #endif
 
+#include xf86Priv.h
+
 /*
  * FreeScreen handles the clean-up.
  */
@@ -529,7 +538,7 @@
 
 #   define   pATIHW (pATI-OldHW)
 
-#ifndef AVOID_CPIO
+#ifndef AVOID_CPIO_
 
 xf86Int10InfoPtr pInt10Info = NULL;
 vbeInfoPtr   pVBE = NULL;
@@ -648,7 +657,6 @@
 ATIClaimBusSlot(pGDev-active, pATI);
 
 #ifndef AVOID_CPIO
-
 #ifdef TV_OUT
 
 pATI-pVBE = NULL;
@@ -725,6 +733,23 @@
 pVBE = NULL;
 pInt10Info = NULL;
 #endif /* TV_OUT */
+#endif /* AVOID_CPIO */
+#ifdef __NetBSD__
+if (ConfiguredMonitor == NULL) {
+	struct wsdisplayio_edid_info ei;
+	char buffer[1024];
+	int i, j;
+
+	ei.edid_data = buffer;
+	ei.buffer_size = 1024;
+	if (ioctl(xf86Info.screenFd, 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
+	xf86Msg(X_INFO, ioctl failed %d\n, errno);
+}
+#endif
+
 
 if (ConfiguredMonitor  !(flags  PROBE_DETECT))
 {
@@ -732,10 +757,10 @@
 xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor);
 }
 
+#ifndef AVOID_CPIO
 /* DDC module is no longer needed at this point */
 xf86UnloadSubModule(pDDCModule);
-
-#endif /* AVOID_CPIO */
+#endif
 
 if (flags  PROBE_DETECT)
 {