diff options
| author | anholt <anholt@FreeBSD.org> | 2003-03-09 02:08:30 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-03-09 02:08:30 +0000 |
| commit | ccdf4ef2d9288d035e56820efb0e79db6acf5ba8 (patch) | |
| tree | ef9d3b03548e9f28bd5c265be746871660c0c16a /sys/dev/drm/mga_warp.c | |
| parent | 0b60094f80a8137660b368df0b80fb0179b92d04 (diff) | |
| download | FreeBSD-src-ccdf4ef2d9288d035e56820efb0e79db6acf5ba8.zip FreeBSD-src-ccdf4ef2d9288d035e56820efb0e79db6acf5ba8.tar.gz | |
Update the DRM to latest from DRI CVS. This is approximately the version
included in XFree86 4.3, but includes some fixes. Notable changes include
Radeon 8500-9100 support, PCI Radeon/Rage 128 support, transform & lighting
support for Radeons, and vblank syncing support for r128, radeon, and mga.
The gamma driver was removed due to lack of any users.
Diffstat (limited to 'sys/dev/drm/mga_warp.c')
| -rw-r--r-- | sys/dev/drm/mga_warp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga_warp.c index 7e94b6a..06aa833 100644 --- a/sys/dev/drm/mga_warp.c +++ b/sys/dev/drm/mga_warp.c @@ -32,6 +32,7 @@ #define __NO_VERSION__ #include "dev/drm/mga.h" #include "dev/drm/drmP.h" +#include "dev/drm/drm.h" #include "dev/drm/mga_drm.h" #include "dev/drm/mga_drv.h" #include "dev/drm/mga_ucode.h" @@ -108,7 +109,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 DRM_OS_ERR(ENOMEM); + return DRM_ERR(ENOMEM); } memset( dev_priv->warp_pipe_phys, 0, @@ -145,7 +146,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 DRM_OS_ERR(ENOMEM); + return DRM_ERR(ENOMEM); } memset( dev_priv->warp_pipe_phys, 0, @@ -171,7 +172,7 @@ int mga_warp_install_microcode( drm_mga_private_t *dev_priv ) case MGA_CARD_TYPE_G200: return mga_warp_install_g200_microcode( dev_priv ); default: - return DRM_OS_ERR(EINVAL); + return DRM_ERR(EINVAL); } } @@ -196,7 +197,7 @@ int mga_warp_init( drm_mga_private_t *dev_priv ) MGA_WRITE( MGA_WVRTXSZ, 7 ); break; default: - return DRM_OS_ERR(EINVAL); + return DRM_ERR(EINVAL); } MGA_WRITE( MGA_WMISC, (MGA_WUCODECACHE_ENABLE | @@ -206,7 +207,7 @@ int mga_warp_init( drm_mga_private_t *dev_priv ) if ( wmisc != WMISC_EXPECTED ) { DRM_ERROR( "WARP engine config failed! 0x%x != 0x%x\n", wmisc, WMISC_EXPECTED ); - return DRM_OS_ERR(EINVAL); + return DRM_ERR(EINVAL); } return 0; |
