geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial merge for XFree86 4.0.99.3 import

main
David Dawes 2001-05-01 21:39:35 +00:00
parent a576d41498
commit 2ea12226a6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsd/Imakefile
View File

@ -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::

12
libdrm/xf86drm.c
View File

@ -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;