diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-12 03:56:49 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-12 03:56:49 +0000 |
| commit | 05c724faee6dbff27a6a573adc77bd22015444b4 (patch) | |
| tree | 9bcf1311c3d663daf879df3845ba2a59e5b8498e /linux/gamma_dma.c | |
| parent | eaf62674bea31156c892643906a7822801385856 (diff) | |
remove DRM_IOREMAP* and DRM_FIND_MAP macros replace them with inline fnsdrmfntbl-0-0-1-170804-freeze
Diffstat (limited to 'linux/gamma_dma.c')
| -rw-r--r-- | linux/gamma_dma.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c index 0167e43a..9b58a44a 100644 --- a/linux/gamma_dma.c +++ b/linux/gamma_dma.c @@ -646,12 +646,12 @@ static int gamma_do_init_dma( drm_device_t *dev, drm_gamma_init_t *init ) break; } } - - DRM_FIND_MAP( dev_priv->mmio0, init->mmio0 ); - DRM_FIND_MAP( dev_priv->mmio1, init->mmio1 ); - DRM_FIND_MAP( dev_priv->mmio2, init->mmio2 ); - DRM_FIND_MAP( dev_priv->mmio3, init->mmio3 ); - + + dev_priv->mmio0 = drm_core_findmap(dev, init->mmio0); + dev_priv->mmio1 = drm_core_findmap(dev, init->mmio1); + dev_priv->mmio2 = drm_core_findmap(dev, init->mmio2); + dev_priv->mmio3 = drm_core_findmap(dev, init->mmio3); + dev_priv->sarea_priv = (drm_gamma_sarea_t *) ((u8 *)dev_priv->sarea->handle + init->sarea_priv_offset); @@ -668,9 +668,8 @@ static int gamma_do_init_dma( drm_device_t *dev, drm_gamma_init_t *init ) buf = dma->buflist[GLINT_DRI_BUF_COUNT]; } else { - DRM_FIND_MAP( dev->agp_buffer_map, init->buffers_offset ); - - DRM_IOREMAP( dev->agp_buffer_map, dev ); + dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset); + drm_core_ioremap( dev->agp_buffer_map, dev); buf = dma->buflist[GLINT_DRI_BUF_COUNT]; pgt = buf->address; @@ -708,7 +707,7 @@ int gamma_do_cleanup_dma( drm_device_t *dev ) if ( dev->dev_private ) { if ( dev->agp_buffer_map != NULL ) - DRM_IOREMAPFREE( dev->agp_buffer_map, dev ); + drm_core_ioremapfree( dev->agp_buffer_map, dev ); DRM(free)( dev->dev_private, sizeof(drm_gamma_private_t), DRM_MEM_DRIVER ); |