patch rejection #4

radeon_cp.c.rej (text/plain), 1.91 KB, created by David Baehrens on 2004-04-14 10:27:57 UTC

***************
*** 1176,1184 ****
  
  #if __REALLY_HAVE_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 );
  		if(!dev_priv->cp_ring->handle ||
  		   !dev_priv->ring_rptr->handle ||
  		   !dev_priv->buffers->handle) {
--- 1176,1190 ----
  
  #if __REALLY_HAVE_AGP
  	if ( !dev_priv->is_pci ) {
+ #if defined( CONFIG_ALL_PPC ) && !defined( VMAP_4_ARGS )
+ 		DRM_IOREMAPAGP( dev_priv->cp_ring, dev );
+ 		DRM_IOREMAPAGP( dev_priv->ring_rptr, dev );
+ 		DRM_IOREMAPAGP( dev_priv->buffers, dev );
+ #else
  		DRM_IOREMAP( dev_priv->cp_ring, dev );
  		DRM_IOREMAP( dev_priv->ring_rptr, dev );
  		DRM_IOREMAP( dev_priv->buffers, dev );
+ #endif
  		if(!dev_priv->cp_ring->handle ||
  		   !dev_priv->ring_rptr->handle ||
  		   !dev_priv->buffers->handle) {
***************
*** 1284,1295 ****
  
  #if __REALLY_HAVE_AGP
  		if ( !dev_priv->is_pci ) {
  			if ( dev_priv->cp_ring != NULL )
  				DRM_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 );
  		} else
  #endif
  		{
--- 1290,1310 ----
  
  #if __REALLY_HAVE_AGP
  		if ( !dev_priv->is_pci ) {
+ #if defined( CONFIG_ALL_PPC ) && !defined( VMAP_4_ARGS )
+ 			if ( dev_priv->cp_ring != NULL )
+ 				DRM_IOREMAPAGPFREE( dev_priv->cp_ring );
+ 			if ( dev_priv->ring_rptr != NULL )
+ 				DRM_IOREMAPAGPFREE( dev_priv->ring_rptr );
+ 			if ( dev_priv->buffers != NULL )
+ 				DRM_IOREMAPAGPFREE( dev_priv->buffers );
+ #else
  			if ( dev_priv->cp_ring != NULL )
  				DRM_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 );
+ #endif
  		} else
  #endif
  		{