Module Name: src
Committed By: macallan
Date: Wed Nov 27 02:04:48 UTC 2013
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.36
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35 Thu Feb 28 13:28:36 2013
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Wed Nov 27 02:04:48 2013
@@ -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 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT
.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
