fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-08 03:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change return's to DRM_OS_RETURN. mga driver now compiles.

Browse source
This commit is contained in:
Alan Hourihane 2001-05-04 09:36:36 +00:00
parent c24c441c28
commit 9c4211f93d
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
linux/mga_dma.c
View file

@ -70,7 +70,7 @@ int mga_do_wait_for_idle( drm_mga_private_t *dev_priv )
DRM_ERROR( "failed!\n" );
DRM_INFO( " status=0x%08x\n", status );
#endif
return -EBUSY;
DRM_OS_RETURN(EBUSY);
}
int mga_do_dma_idle( drm_mga_private_t *dev_priv )
@ -88,7 +88,7 @@ int mga_do_dma_idle( drm_mga_private_t *dev_priv )
#if MGA_DMA_DEBUG
DRM_ERROR( "failed! status=0x%08x\n", status );
#endif
return -EBUSY;
DRM_OS_RETURN(EBUSY);
}
int mga_do_dma_reset( drm_mga_private_t *dev_priv )
@ -308,7 +308,7 @@ static int mga_freelist_init( drm_device_t *dev )
dev_priv->head = DRM(alloc)( sizeof(drm_mga_freelist_t),
DRM_MEM_DRIVER );
if ( dev_priv->head == NULL )
return -ENOMEM;
DRM_OS_RETURN(ENOMEM);
memset( dev_priv->head, 0, sizeof(drm_mga_freelist_t) );
SET_AGE( &dev_priv->head->age, MGA_BUFFER_USED, 0 );
@ -320,7 +320,7 @@ static int mga_freelist_init( drm_device_t *dev )
entry = DRM(alloc)( sizeof(drm_mga_freelist_t),
DRM_MEM_DRIVER );
if ( entry == NULL )
return -ENOMEM;
DRM_OS_RETURN(ENOMEM);
memset( entry, 0, sizeof(drm_mga_freelist_t) );
@ -464,7 +464,7 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
dev_priv = DRM(alloc)( sizeof(drm_mga_private_t), DRM_MEM_DRIVER );
if ( !dev_priv )
return -ENOMEM;
DRM_OS_RETURN(ENOMEM);
dev->dev_private = (void *)dev_priv;
memset( dev_priv, 0, sizeof(drm_mga_private_t) );
@ -589,7 +589,7 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
if ( mga_freelist_init( dev ) < 0 ) {
DRM_ERROR( "could not initialize freelist\n" );
mga_do_cleanup_dma( dev );
return -ENOMEM;
DRM_OS_RETURN(ENOMEM);
}
return 0;

10
linux/mga_warp.c
View file

@ -105,7 +105,7 @@ static int mga_warp_install_g400_microcode( drm_mga_private_t *dev_priv )
if ( size > dev_priv->warp->size ) {
DRM_ERROR( "microcode too large! (%u > %lu)\n",
size, dev_priv->warp->size );
return -ENOMEM;
DRM_OS_RETURN(ENOMEM);
}
memset( dev_priv->warp_pipe_phys, 0,
@ -142,7 +142,7 @@ static int mga_warp_install_g200_microcode( drm_mga_private_t *dev_priv )
if ( size > dev_priv->warp->size ) {
DRM_ERROR( "microcode too large! (%u > %lu)\n",
size, dev_priv->warp->size );
return -ENOMEM;
DRM_OS_RETURN(ENOMEM);
}
memset( dev_priv->warp_pipe_phys, 0,
@ -171,7 +171,7 @@ int mga_warp_install_microcode( drm_device_t *dev )
case MGA_CARD_TYPE_G200:
return mga_warp_install_g200_microcode( dev_priv );
default:
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
}
@ -198,7 +198,7 @@ int mga_warp_init( drm_device_t *dev )
MGA_WRITE( MGA_WVRTXSZ, 7 );
break;
default:
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
MGA_WRITE( MGA_WMISC, (MGA_WUCODECACHE_ENABLE |
@ -208,7 +208,7 @@ int mga_warp_init( drm_device_t *dev )
if ( wmisc != WMISC_EXPECTED ) {
DRM_ERROR( "WARP engine config failed! 0x%x != 0x%x\n",
wmisc, WMISC_EXPECTED );
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
return 0;