diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-10 22:46:02 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-10 22:46:02 +0000 |
| commit | 17d893f567787914add42c221996c631455cdb25 (patch) | |
| tree | 6ef887d4b8378907a16033ab0d6140dfb1a3d5a0 | |
| parent | d6af902ff74d4a384c2dd9acb9540d637f588bc6 (diff) | |
Only try to find the agp_buffer_map if dma_type is AGP. This is all that's
needed on the DRM side to support PCI Savages. Bumped patch level and
driver date.
| -rw-r--r-- | shared-core/savage_bci.c | 13 | ||||
| -rw-r--r-- | shared-core/savage_drv.h | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/shared-core/savage_bci.c b/shared-core/savage_bci.c index de15e2b0..0f91cf78 100644 --- a/shared-core/savage_bci.c +++ b/shared-core/savage_bci.c @@ -386,11 +386,14 @@ static int savage_do_init_bci(drm_device_t *dev, drm_savage_init_t *init) } else { dev_priv->status = NULL; } - dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset); - if (!dev->agp_buffer_map) { - DRM_ERROR("could not find dma buffer region!\n"); - savage_do_cleanup_bci(dev); - return DRM_ERR(EINVAL); + if (dev_priv->dma_type == SAVAGE_DMA_AGP) { + dev->agp_buffer_map = drm_core_findmap(dev, + init->buffers_offset); + if (!dev->agp_buffer_map) { + DRM_ERROR("could not find dma buffer region!\n"); + savage_do_cleanup_bci(dev); + return DRM_ERR(EINVAL); + } } if (init->agp_textures_offset) { dev_priv->agp_textures = diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h index 726c54fc..a3671dbe 100644 --- a/shared-core/savage_drv.h +++ b/shared-core/savage_drv.h @@ -30,11 +30,11 @@ #define DRIVER_NAME "savage" #define DRIVER_DESC "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]" -#define DRIVER_DATE "20050109" +#define DRIVER_DATE "20050110" #define DRIVER_MAJOR 2 #define DRIVER_MINOR 1 -#define DRIVER_PATCHLEVEL 1 +#define DRIVER_PATCHLEVEL 2 /* Interface history: * * 1.x The DRM driver from the VIA/S3 code drop, basically a dummy |