Commit a174c062 authored by Dave Airlie's avatar Dave Airlie

drm: fix minor bug on X recycling with freeing io buffer

The previous checkin missed an issue on X recycling.
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent fc213d03
...@@ -1556,7 +1556,10 @@ int radeon_do_cleanup_cp( drm_device_t *dev ) ...@@ -1556,7 +1556,10 @@ int radeon_do_cleanup_cp( drm_device_t *dev )
if ( dev_priv->ring_rptr != NULL ) if ( dev_priv->ring_rptr != NULL )
drm_core_ioremapfree( dev_priv->ring_rptr, dev ); drm_core_ioremapfree( dev_priv->ring_rptr, dev );
if ( dev->agp_buffer_map != NULL ) if ( dev->agp_buffer_map != NULL )
{
drm_core_ioremapfree( dev->agp_buffer_map, dev ); drm_core_ioremapfree( dev->agp_buffer_map, dev );
dev->agp_buffer_map = NULL;
}
} else } else
#endif #endif
{ {
...@@ -1723,6 +1726,7 @@ void radeon_do_release( drm_device_t *dev ) ...@@ -1723,6 +1726,7 @@ void radeon_do_release( drm_device_t *dev )
} }
/* Disable *all* interrupts */ /* Disable *all* interrupts */
if (dev_priv->mmio) /* remove this after permanent addmaps */
RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 ); RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 );
/* Free memory heap structures */ /* Free memory heap structures */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment