[src/trunk]: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos Add (...

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

details:   https://anonhg.NetBSD.org/src/rev/101708165c1d
branches:  trunk
changeset: 791636:101708165c1d
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Nov 27 02:04:48 2013 +0000

description:
Add (hopefully temporary) kludge to define PCI_MAGIC_IO_RANGE on shark and
make accelerated X work again.
This used to be defined in machine/param.h but lately the param.h from
arch/arm is installed in machine/ instead of the one from arch/shark, so the
Xserver didn't see PCI_MAGIC_IO_RANGE and couldn't figure out how to map its
IO space.

diffstat:

 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 745cc4f55d29 -r 101708165c1d external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Nov 27 01:47:53 2013 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Nov 27 02:04:48 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2013/02/28 13:28:36 macallan Exp $
+#      $NetBSD: Makefile,v 1.36 2013/11/27 02:04:48 macallan Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -77,6 +77,10 @@
 .endfor
 .endif
 
+.if ${MACHINE} == "shark"
+CPPFLAGS.ppc_video.c += -DPCI_MAGIC_IO_RANGE=0xf0000000
+.endif
+
 .if ${MACHINE} == "dreamcast" || \
     ${MACHINE} == "hpcsh"
 SRCS.bsd+=     ppc_video.c pm_noop.c agp_noop.c