[src/trunk]: src/x11/Xserver/hw/xfree86/drivers + add arch specific flags for...

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

details:   https://anonhg.NetBSD.org/src/rev/76e55684ed9c
branches:  trunk
changeset: 570032:76e55684ed9c
user:      rtr <rtr%NetBSD.org@localhost>
date:      Sat Sep 18 06:49:27 2004 +0000

description:
+ add arch specific flags for ati driver should resolve pr#25918

XXX
This pr remains in feedback because I never did get confirmation that
this change resolved the problem.  People are free to test it and if
desired request a pull up to 2.0 branch.  I will not be requesting the
pullup.

diffstat:

 x11/Xserver/hw/xfree86/drivers/ati/Makefile     |  25 +++++++++++++++++-
 x11/Xserver/hw/xfree86/drivers/atimisc/Makefile |  35 ++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 4 deletions(-)

diffs (95 lines):

diff -r 5c54be9a5866 -r 76e55684ed9c x11/Xserver/hw/xfree86/drivers/ati/Makefile
--- a/x11/Xserver/hw/xfree86/drivers/ati/Makefile       Sat Sep 18 03:32:30 2004 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/ati/Makefile       Sat Sep 18 06:49:27 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2004/04/15 14:55:26 drochner Exp $
+#      $NetBSD: Makefile,v 1.5 2004/09/18 06:49:27 rtr Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
 
@@ -42,6 +42,29 @@
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${XSERVERINCDIR}
 
+# XXX from the Imakefile
+# -DAVOID_CPIO must be defined for os/arch combinations that do not
+# provide or emulate a little-endian undirected PIO address space of
+# at least 64KB in size.  The 'first cut' configuration only explicitly
+# defines the following as providing.
+.if !(${MACHINE} == "i386" || \
+    ${MACHINE} == "x86_64" || \
+    ${MACHINE} == "amd64"  || \
+    ${MACHINE} == "alpha") 
+CPPFLAGS+=     -DAVOID_CPIO
+.endif
+
+# XXX from the Imakefile
+# -DAVOID_NON_PCI must be defined for those platforms that do not
+# tolerate PCI master aborts.
+.if ${MACHINE} == "macppc"
+CPPFLAGS+=     -DAVOID_NON_PCI
+.endif
+
+.if ${MACHINE} == "sparc"
+CPPFLAGS+=     -DAVOID_DGA
+.endif
+
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
 .include "../../Makefile.drivermod"
diff -r 5c54be9a5866 -r 76e55684ed9c x11/Xserver/hw/xfree86/drivers/atimisc/Makefile
--- a/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile   Sat Sep 18 03:32:30 2004 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile   Sat Sep 18 06:49:27 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/11 01:09:35 rtr Exp $
+#      $NetBSD: Makefile,v 1.4 2004/09/18 06:49:27 rtr Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
 
@@ -14,7 +14,13 @@
        atimach64xv.c atimode.c atipreinit.c atiprint.c \
        atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \
         atixv.c atibank.c ativga.c atiwonder.c atiwonderio.c \
-       atidga.c atiload.c atimisc.c
+       atiload.c atimisc.c
+
+# NOTICE: there is a corresponding CPPFLAG below that sets -DAVOID_DGA
+#         if sparc.
+.if ${MACHINE} != "sparc"
+SRCS+= atidga.c
+.endif
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
@@ -45,7 +51,30 @@
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${XSERVERINCDIR}
-               
+
+# XXX from the Imakefile
+# -DAVOID_CPIO must be defined for os/arch combinations that do not
+# provide or emulate a little-endian undirected PIO address space of
+# at least 64KB in size.  The 'first cut' configuration only explicitly
+# defines the following as providing.
+.if !(${MACHINE} == "i386" || \
+    ${MACHINE} == "x86_64" || \
+    ${MACHINE} == "amd64"  || \
+    ${MACHINE} == "alpha") 
+CPPFLAGS+=     -DAVOID_CPIO
+.endif
+
+# XXX from the Imakefile
+# -DAVOID_NON_PCI must be defined for those platforms that do not
+# tolerate PCI master aborts.
+.if ${MACHINE} == "macppc"
+CPPFLAGS+=     -DAVOID_NON_PCI
+.endif
+
+.if ${MACHINE} == "sparc"
+CPPFLAGS+=     -DAVOID_DGA
+.endif
+
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
 .include "../../Makefile.drivermod"