summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2001-05-01 21:39:35 +0000
committerDavid Dawes <dawes@xfree86.org>2001-05-01 21:39:35 +0000
commit2ea12226a675cc8d4b95799129f143fa61d97296 (patch)
treef01596eb8d3b3c13ed7853e2f84008eb7b7560f7
parenta576d41498b742502d4f7dbfeed44737ff79db8f (diff)
Initial merge for XFree86 4.0.99.3 import
-rw-r--r--bsd/Imakefile4
-rw-r--r--libdrm/xf86drm.c12
2 files changed, 13 insertions, 3 deletions
diff --git a/bsd/Imakefile b/bsd/Imakefile
index 453ab01a..0e11ec50 100644
--- a/bsd/Imakefile
+++ b/bsd/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.4 2001/01/12 19:28:34 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.6 2001/04/18 14:52:43 dawes Exp $
#include <Server.tmpl>
@@ -37,7 +37,7 @@ install::
$(MAKE) -f Makefile.bsd install
#else
all::
- echo 'Use "make -f Makefile.bsd" to manually build drm.o'
+ @echo 'Use "make -f Makefile.bsd" to manually build drm.o'
#endif
clean::
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 8d663dae..ffc85d8c 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -27,7 +27,7 @@
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
* Kevin E. Martin <martin@valinux.com>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.18 2001/03/21 18:08:54 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.20 2001/04/18 18:44:39 dawes Exp $
*
*/
@@ -67,6 +67,11 @@ extern int xf86RemoveSIGIOHandler(int fd);
# endif
#endif
+#if defined(__alpha__) && defined(__linux__)
+extern unsigned long _bus_base(void);
+#define BUS_BASE _bus_base()
+#endif
+
/* Not all systems have MAP_FAILED defined */
#ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1)
@@ -489,6 +494,11 @@ int drmAddMap(int fd,
drm_map_t map;
map.offset = offset;
+#ifdef __alpha__
+ /* Make sure we add the bus_base to all but shm */
+ if (type != DRM_SHM)
+ map.offset += BUS_BASE;
+#endif
map.size = size;
map.handle = 0;
map.type = type;