vserver 1.9.3

[linux-2.6.git] / drivers / char / drm / radeon_cp.c

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index f696490..43834b9 100644 (file)
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -858,7 +858,7 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev,
                      ( ( dev_priv->gart_vm_start - 1 ) & 0xffff0000 )
                    | ( dev_priv->fb_location >> 16 ) );
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
        if ( !dev_priv->is_pci ) {
                RADEON_WRITE( RADEON_MC_AGP_LOCATION,
                              (((dev_priv->gart_vm_start - 1 +
@@ -885,7 +885,7 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev,
        SET_RING_HEAD( dev_priv, cur_read_ptr );
        dev_priv->ring.tail = cur_read_ptr;
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
        if ( !dev_priv->is_pci ) {
                RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
                              dev_priv->ring_rptr->offset
@@ -1118,29 +1118,29 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
                return DRM_ERR(EINVAL);
        }
 
-       DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset );
+       dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
        if(!dev_priv->mmio) {
                DRM_ERROR("could not find mmio region!\n");
                dev->dev_private = (void *)dev_priv;
                radeon_do_cleanup_cp(dev);
                return DRM_ERR(EINVAL);
        }
-       DRM_FIND_MAP( dev_priv->cp_ring, init->ring_offset );
+       dev_priv->cp_ring = drm_core_findmap(dev, init->ring_offset);
        if(!dev_priv->cp_ring) {
                DRM_ERROR("could not find cp ring region!\n");
                dev->dev_private = (void *)dev_priv;
                radeon_do_cleanup_cp(dev);
                return DRM_ERR(EINVAL);
        }
-       DRM_FIND_MAP( dev_priv->ring_rptr, init->ring_rptr_offset );
+       dev_priv->ring_rptr = drm_core_findmap(dev, init->ring_rptr_offset);
        if(!dev_priv->ring_rptr) {
                DRM_ERROR("could not find ring read pointer!\n");
                dev->dev_private = (void *)dev_priv;
                radeon_do_cleanup_cp(dev);
                return DRM_ERR(EINVAL);
        }
-       DRM_FIND_MAP( dev_priv->buffers, init->buffers_offset );
-       if(!dev_priv->buffers) {
+       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");
                dev->dev_private = (void *)dev_priv;
                radeon_do_cleanup_cp(dev);
@@ -1148,7 +1148,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
        }
 
        if ( init->gart_textures_offset ) {
-               DRM_FIND_MAP( dev_priv->gart_textures, init->gart_textures_offset );
+               dev_priv->gart_textures = drm_core_findmap(dev, init->gart_textures_offset);
                if ( !dev_priv->gart_textures ) {
                        DRM_ERROR("could not find GART texture region!\n");
                        dev->dev_private = (void *)dev_priv;
@@ -1161,14 +1161,14 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
                (drm_radeon_sarea_t *)((u8 *)dev_priv->sarea->handle +
                                       init->sarea_priv_offset);
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
        if ( !dev_priv->is_pci ) {
-               DRM_IOREMAP( dev_priv->cp_ring, dev );
-               DRM_IOREMAP( dev_priv->ring_rptr, dev );
-               DRM_IOREMAP( dev_priv->buffers, dev );
+               drm_core_ioremap( dev_priv->cp_ring, dev );
+               drm_core_ioremap( dev_priv->ring_rptr, dev );
+               drm_core_ioremap( dev->agp_buffer_map, dev );
                if(!dev_priv->cp_ring->handle ||
                   !dev_priv->ring_rptr->handle ||
-                  !dev_priv->buffers->handle) {
+                  !dev->agp_buffer_map->handle) {
                        DRM_ERROR("could not find ioremap agp regions!\n");
                        dev->dev_private = (void *)dev_priv;
                        radeon_do_cleanup_cp(dev);
@@ -1181,14 +1181,14 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
                        (void *)dev_priv->cp_ring->offset;
                dev_priv->ring_rptr->handle =
                        (void *)dev_priv->ring_rptr->offset;
-               dev_priv->buffers->handle = (void *)dev_priv->buffers->offset;
+               dev->agp_buffer_map->handle = (void *)dev->agp_buffer_map->offset;
 
                DRM_DEBUG( "dev_priv->cp_ring->handle %p\n",
                           dev_priv->cp_ring->handle );
                DRM_DEBUG( "dev_priv->ring_rptr->handle %p\n",
                           dev_priv->ring_rptr->handle );
-               DRM_DEBUG( "dev_priv->buffers->handle %p\n",
-                          dev_priv->buffers->handle );
+               DRM_DEBUG( "dev->agp_buffer_map->handle %p\n",
+                          dev->agp_buffer_map->handle );
        }
 
        dev_priv->fb_location = ( RADEON_READ( RADEON_MC_FB_LOCATION )
@@ -1211,14 +1211,14 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
        dev_priv->gart_vm_start = dev_priv->fb_location
                                + RADEON_READ( RADEON_CONFIG_APER_SIZE );
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
        if ( !dev_priv->is_pci )
-               dev_priv->gart_buffers_offset = (dev_priv->buffers->offset
+               dev_priv->gart_buffers_offset = (dev->agp_buffer_map->offset
                                                - dev->agp->base
                                                + dev_priv->gart_vm_start);
        else
 #endif
-               dev_priv->gart_buffers_offset = (dev_priv->buffers->offset
+               dev_priv->gart_buffers_offset = (dev->agp_buffer_map->offset
                                                - dev->sg->handle
                                                + dev_priv->gart_vm_start);
 
@@ -1240,7 +1240,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
 
        dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
        if ( !dev_priv->is_pci ) {
                /* Turn off PCI GART */
                radeon_set_pcigart( dev_priv, 0 );
@@ -1275,25 +1275,23 @@ int radeon_do_cleanup_cp( drm_device_t *dev )
 {
        DRM_DEBUG( "\n" );
 
-#if __HAVE_IRQ
        /* Make sure interrupts are disabled here because the uninstall ioctl
         * may not have been called from userspace and after dev_private
         * is freed, it's too late.
         */
        if ( dev->irq_enabled ) DRM(irq_uninstall)(dev);
-#endif
 
        if ( dev->dev_private ) {
                drm_radeon_private_t *dev_priv = dev->dev_private;
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
                if ( !dev_priv->is_pci ) {
                        if ( dev_priv->cp_ring != NULL )
-                               DRM_IOREMAPFREE( dev_priv->cp_ring, dev );
+                               drm_core_ioremapfree( dev_priv->cp_ring, dev );
                        if ( dev_priv->ring_rptr != NULL )
-                               DRM_IOREMAPFREE( dev_priv->ring_rptr, dev );
-                       if ( dev_priv->buffers != NULL )
-                               DRM_IOREMAPFREE( dev_priv->buffers, dev );
+                               drm_core_ioremapfree( dev_priv->ring_rptr, dev );
+                       if ( dev->agp_buffer_map != NULL )
+                               drm_core_ioremapfree( dev->agp_buffer_map, dev );
                } else
 #endif
                {
@@ -1329,7 +1327,7 @@ static int radeon_do_resume_cp( drm_device_t *dev )
 
        DRM_DEBUG("Starting radeon_do_resume_cp()\n");
 
-#if __REALLY_HAVE_AGP
+#if __OS_HAS_AGP
        if ( !dev_priv->is_pci ) {
                /* Turn off PCI GART */
                radeon_set_pcigart( dev_priv, 0 );