From a2815c78da58680712312f4670e1f5e55da3c303 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Fri, 11 May 2001 13:29:38 +0000 Subject: [PATCH] fix a silly typo. Hurray ! Now tdfx driver works. Using Eric's libglide3.so.13. mga driver works, but second start of Xserver results in reboot. Seems as though there's some problem unbinding agp memory. --- linux-core/drm_bufs.c | 4 ++-- linux-core/drm_drv.c | 2 +- linux/drm_bufs.h | 4 ++-- linux/drm_drv.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index 0406fe09..7e68e0be 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -198,7 +198,7 @@ int DRM(addmap)( DRM_OS_IOCTL ) #ifdef __alpha__ map->offset += dev->hose->mem_space->start; #endif - map->offset = map->offset + dev->agp->base; + map->offset += dev->agp->base; map->mtrr = dev->agp->agp_mtrr; /* for getmap */ break; #endif @@ -248,7 +248,7 @@ int DRM(addmap)( DRM_OS_IOCTL ) DRM_OS_RETURN(EFAULT); #endif #ifdef __FreeBSD__ - ((drm_map_t *)data)->handle = (void *)map; + ((drm_map_t *)data)->handle = (void *)map->offset; #endif } return 0; diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 462a6504..bd3cbc57 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -1170,7 +1170,7 @@ int DRM(lock)( DRM_OS_IOCTL ) } DRM_DEBUG( "%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n", - lock.context, current->pid, + lock.context, DRM_OS_CURRENTPID, dev->lock.hw_lock->lock, lock.flags ); #if __HAVE_DMA_QUEUE diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h index 0406fe09..7e68e0be 100644 --- a/linux/drm_bufs.h +++ b/linux/drm_bufs.h @@ -198,7 +198,7 @@ int DRM(addmap)( DRM_OS_IOCTL ) #ifdef __alpha__ map->offset += dev->hose->mem_space->start; #endif - map->offset = map->offset + dev->agp->base; + map->offset += dev->agp->base; map->mtrr = dev->agp->agp_mtrr; /* for getmap */ break; #endif @@ -248,7 +248,7 @@ int DRM(addmap)( DRM_OS_IOCTL ) DRM_OS_RETURN(EFAULT); #endif #ifdef __FreeBSD__ - ((drm_map_t *)data)->handle = (void *)map; + ((drm_map_t *)data)->handle = (void *)map->offset; #endif } return 0; diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 462a6504..bd3cbc57 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -1170,7 +1170,7 @@ int DRM(lock)( DRM_OS_IOCTL ) } DRM_DEBUG( "%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n", - lock.context, current->pid, + lock.context, DRM_OS_CURRENTPID, dev->lock.hw_lock->lock, lock.flags ); #if __HAVE_DMA_QUEUE