summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/mga_warp.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/drm/mga_warp.c')
-rw-r--r--sys/dev/drm/mga_warp.c11
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;
OpenPOWER on IntegriCloud