diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2001-03-05 17:32:54 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2001-03-05 17:32:54 +0000 |
| commit | 91767f33a8ab458e84ac178e2ff322ceed7b75a3 (patch) | |
| tree | ac4f1432f4b4b076425559b7234ddad70159f316 | |
| parent | 0033505c6d106be5c5a230cd2da5c8c260d1ba57 (diff) | |
Merge trunk into branch (again).tdfx-3-1-0-20010305-merge
| -rw-r--r-- | linux-core/drm_agpsupport.c | 2 | ||||
| -rw-r--r-- | linux-core/drm_bufs.c | 1 | ||||
| -rw-r--r-- | linux-core/drm_drv.c | 3 | ||||
| -rw-r--r-- | linux-core/drm_memory.h | 2 | ||||
| -rw-r--r-- | linux-core/radeon_drv.c | 2 | ||||
| -rw-r--r-- | linux/drm_agpsupport.h | 2 | ||||
| -rw-r--r-- | linux/drm_bufs.h | 1 | ||||
| -rw-r--r-- | linux/drm_drv.h | 3 | ||||
| -rw-r--r-- | linux/drm_memory.h | 2 | ||||
| -rw-r--r-- | linux/radeon_drv.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c index b070a59e..dfd0d8fc 100644 --- a/linux-core/drm_agpsupport.c +++ b/linux-core/drm_agpsupport.c @@ -77,7 +77,7 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp, drm_device_t *dev = priv->dev; int retcode; - if (dev->agp->acquired || !drm_agp->acquire) return -EINVAL; + if (!dev->agp|| dev->agp->acquired || !drm_agp->acquire) return -EINVAL; if ((retcode = drm_agp->acquire())) return retcode; dev->agp->acquired = 1; return 0; diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index 38ea1ff0..b7e27d17 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -128,6 +128,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp, #if __REALLY_HAVE_AGP case _DRM_AGP: map->offset = map->offset + dev->agp->base; + map->mtrr = dev->agp->agp_mtrr; /* for getmap */ break; #endif default: diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 71f52276..d8a7d992 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -482,7 +482,8 @@ static int __init drm_init( void ) } #endif #if __REALLY_HAVE_MTRR - dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base, + if (dev->agp) + dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base, dev->agp->agp_info.aper_size*1024*1024, MTRR_TYPE_WRCOMB, 1 ); diff --git a/linux-core/drm_memory.h b/linux-core/drm_memory.h index caf05394..e9d3a734 100644 --- a/linux-core/drm_memory.h +++ b/linux-core/drm_memory.h @@ -352,7 +352,6 @@ void DRM(ioremapfree)(void *pt, unsigned long size) } #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) -#if __MUST_HAVE_AGP agp_memory *DRM(alloc_agp)(int pages, u32 type) { @@ -456,5 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle) } return retcode; } -#endif #endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */ diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c index 7d23859d..1aa889ae 100644 --- a/linux-core/radeon_drv.c +++ b/linux-core/radeon_drv.c @@ -36,7 +36,7 @@ #define DRIVER_NAME "radeon" #define DRIVER_DESC "ATI Radeon" -#define DRIVER_DATE "20010301" +#define DRIVER_DATE "20010305" #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 diff --git a/linux/drm_agpsupport.h b/linux/drm_agpsupport.h index b070a59e..dfd0d8fc 100644 --- a/linux/drm_agpsupport.h +++ b/linux/drm_agpsupport.h @@ -77,7 +77,7 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp, drm_device_t *dev = priv->dev; int retcode; - if (dev->agp->acquired || !drm_agp->acquire) return -EINVAL; + if (!dev->agp|| dev->agp->acquired || !drm_agp->acquire) return -EINVAL; if ((retcode = drm_agp->acquire())) return retcode; dev->agp->acquired = 1; return 0; diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h index 38ea1ff0..b7e27d17 100644 --- a/linux/drm_bufs.h +++ b/linux/drm_bufs.h @@ -128,6 +128,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp, #if __REALLY_HAVE_AGP case _DRM_AGP: map->offset = map->offset + dev->agp->base; + map->mtrr = dev->agp->agp_mtrr; /* for getmap */ break; #endif default: diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 71f52276..d8a7d992 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -482,7 +482,8 @@ static int __init drm_init( void ) } #endif #if __REALLY_HAVE_MTRR - dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base, + if (dev->agp) + dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base, dev->agp->agp_info.aper_size*1024*1024, MTRR_TYPE_WRCOMB, 1 ); diff --git a/linux/drm_memory.h b/linux/drm_memory.h index caf05394..e9d3a734 100644 --- a/linux/drm_memory.h +++ b/linux/drm_memory.h @@ -352,7 +352,6 @@ void DRM(ioremapfree)(void *pt, unsigned long size) } #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) -#if __MUST_HAVE_AGP agp_memory *DRM(alloc_agp)(int pages, u32 type) { @@ -456,5 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle) } return retcode; } -#endif #endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */ diff --git a/linux/radeon_drv.c b/linux/radeon_drv.c index 7d23859d..1aa889ae 100644 --- a/linux/radeon_drv.c +++ b/linux/radeon_drv.c @@ -36,7 +36,7 @@ #define DRIVER_NAME "radeon" #define DRIVER_DESC "ATI Radeon" -#define DRIVER_DATE "20010301" +#define DRIVER_DATE "20010305" #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 |