diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-07-11 11:41:07 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-07-11 11:41:07 +0000 |
| commit | 8751b6774da527fdc3773d86da53ad5948b733dc (patch) | |
| tree | 064adbe5b6b4b5d8ab4a8791ddfb5fcfc97f189e /libdrm | |
| parent | 8bc39d01cae622db6097b967c132f9b0e04fb785 (diff) | |
Merge XFree86 4.0.1
Diffstat (limited to 'libdrm')
| -rw-r--r-- | libdrm/xf86drm.c | 15 | ||||
| -rw-r--r-- | libdrm/xf86drmHash.c | 2 | ||||
| -rw-r--r-- | libdrm/xf86drmRandom.c | 2 | ||||
| -rw-r--r-- | libdrm/xf86drmSL.c | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 1174a0fa..e4bc53bc 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.10 2000/02/23 04:47:23 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.14 2000/06/27 16:42:07 alanh Exp $ * */ @@ -68,6 +68,13 @@ extern int xf86RemoveSIGIOHandler(int fd); # endif #endif +#ifdef __alpha__ +extern unsigned long _bus_base(void); +#define BUS_BASE _bus_base() +#else +#define BUS_BASE (0) +#endif + /* Not all systems have MAP_FAILED defined */ #ifndef MAP_FAILED #define MAP_FAILED ((void *)-1) @@ -270,7 +277,7 @@ static int drmOpenByName(const char *name) #if defined(XFree86Server) mode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE; - group = xf86ConfigDRI.group ? xf86ConfigDRI.group : DRM_DEV_GID; + group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID; #endif #if defined(XFree86Server) @@ -496,6 +503,10 @@ int drmAddMap(int fd, drm_map_t map; map.offset = offset; +#ifdef __alpha__ + if (!(type & DRM_SHM)) + map.offset += BUS_BASE; +#endif map.size = size; map.handle = 0; map.type = type; diff --git a/libdrm/xf86drmHash.c b/libdrm/xf86drmHash.c index 17089e44..24b698cc 100644 --- a/libdrm/xf86drmHash.c +++ b/libdrm/xf86drmHash.c @@ -25,7 +25,7 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.2 2000/02/23 04:47:23 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.3 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * diff --git a/libdrm/xf86drmRandom.c b/libdrm/xf86drmRandom.c index 71ef1155..9e1e9ee2 100644 --- a/libdrm/xf86drmRandom.c +++ b/libdrm/xf86drmRandom.c @@ -25,7 +25,7 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.3 2000/02/23 04:47:23 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * diff --git a/libdrm/xf86drmSL.c b/libdrm/xf86drmSL.c index f67434be..dd634c30 100644 --- a/libdrm/xf86drmSL.c +++ b/libdrm/xf86drmSL.c @@ -25,7 +25,7 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.2 2000/02/23 04:47:24 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.3 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * |