diff options
| author | David Dawes <dawes@xfree86.org> | 2001-04-09 21:56:31 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2001-04-09 21:56:31 +0000 |
| commit | 18fc5ee92394b31c00df8e72b1f29bada79292f5 (patch) | |
| tree | 6c3bebbd78b4e493fc5fcb02aefdb88ea695922d /libdrm | |
| parent | 1759c16ab9b64598968a0058039e8a66bf5f9773 (diff) | |
First pass of XFree86 4.0.99.2 merge.X_4_0_99_2-20010410-merge
Diffstat (limited to 'libdrm')
| -rw-r--r-- | libdrm/xf86drm.c | 13 | ||||
| -rw-r--r-- | libdrm/xf86drmHash.c | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index bb719edb..33d387e9 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.17 2000/09/24 13:51:32 alanh Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.18 2001/03/21 18:08:54 dawes Exp $ * */ @@ -164,7 +164,11 @@ static drmHashEntry *drmGetEntry(int fd) static int drmOpenDevice(long dev, int minor) { - stat_t st; +#ifdef XFree86LOADER + struct xf86stat st; +#else + struct stat st; +#endif char buf[64]; int fd; mode_t dirmode = DRM_DEV_DIRMODE; @@ -485,6 +489,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; diff --git a/libdrm/xf86drmHash.c b/libdrm/xf86drmHash.c index 70240b95..1f1a05b3 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.3 2000/06/17 00:03:34 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.4 2001/03/21 18:08:54 dawes Exp $ * * DESCRIPTION * |