diff options
| author | anholt <anholt@FreeBSD.org> | 2002-04-29 18:18:42 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2002-04-29 18:18:42 +0000 |
| commit | f449944be8fd359010c95701a1a74b2685ea4467 (patch) | |
| tree | 82f1baf5974fa0ac643272b9373e05eb7b3d67ef /sys/dev/drm/radeon_cp.c | |
| parent | 38d2985e9b4d507e97a7aab9a2c08d5410b080b3 (diff) | |
| download | FreeBSD-src-f449944be8fd359010c95701a1a74b2685ea4467.zip FreeBSD-src-f449944be8fd359010c95701a1a74b2685ea4467.tar.gz | |
More diff reduction: Shuffle around some header code as was done in
drmcommand-0-0-1-branch of DRI CVS, more return code cleanup, and remove some
gratuitous ifdefs.
Approved by: des
Diffstat (limited to 'sys/dev/drm/radeon_cp.c')
| -rw-r--r-- | sys/dev/drm/radeon_cp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c index 821d8e4..f5b72ca 100644 --- a/sys/dev/drm/radeon_cp.c +++ b/sys/dev/drm/radeon_cp.c @@ -32,6 +32,7 @@ #include "dev/drm/radeon.h" #include "dev/drm/drmP.h" +#include "dev/drm/radeon_drm.h" #include "dev/drm/radeon_drv.h" #ifdef __linux__ @@ -398,12 +399,7 @@ static int radeon_do_wait_for_idle( drm_radeon_private_t *dev_priv ) int i, ret; ret = radeon_do_wait_for_fifo( dev_priv, 64 ); -#ifdef __linux__ - if ( ret < 0 ) return ret; -#endif /* __linux__ */ -#ifdef __FreeBSD__ if ( ret ) return ret; -#endif /* __FreeBSD__ */ for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) { if ( !(RADEON_READ( RADEON_RBBM_STATUS ) & RADEON_RBBM_ACTIVE) ) { @@ -1110,12 +1106,7 @@ int radeon_cp_stop( DRM_OS_IOCTL ) */ if ( stop.idle ) { ret = radeon_do_cp_idle( dev_priv ); -#ifdef __linux__ - if ( ret < 0 ) return ret; -#endif /* __linux__ */ -#ifdef __FreeBSD__ if ( ret ) return ret; -#endif /* __FreeBSD__ */ } /* Finally, we can turn off the CP. If the engine isn't idle, |
