aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/drm/mga_drv.h
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-04-25 01:18:47 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-04-25 01:18:47 +0000
commit42da33c444e5a6ca8ffa15622a9783f550e69d4b (patch)
treeefa3d0f59b543fa0e752db53d7ddd71f5a18e325 /sys/dev/drm/mga_drv.h
parent8235d79a86b1db9f4e75fe78d2904e0ef04a906e (diff)
downloadsrc-42da33c444e5a6ca8ffa15622a9783f550e69d4b.tar.gz
src-42da33c444e5a6ca8ffa15622a9783f550e69d4b.zip
Update the DRM to the latest from DRI CVS. Includes some bugfixes and removal
of the infrastructure for the gamma driver which was removed a while back. The DRM_LINUX option is removed because the handler is now provided by the linux compat code itself.
Notes
Notes: svn path=/head/; revision=113995
Diffstat (limited to 'sys/dev/drm/mga_drv.h')
-rw-r--r--sys/dev/drm/mga_drv.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index 5772cd62486c..b3ebaf629fd4 100644
--- a/sys/dev/drm/mga_drv.h
+++ b/sys/dev/drm/mga_drv.h
@@ -186,16 +186,6 @@ do { \
} \
} while (0)
-#define LOCK_TEST_WITH_RETURN( dev ) \
-do { \
- if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) || \
- dev->lock.pid != DRM_CURRENTPID ) { \
- DRM_ERROR( "%s called without lock held\n", \
- __FUNCTION__ ); \
- return DRM_ERR(EINVAL); \
- } \
-} while (0)
-
#define WRAP_TEST_WITH_RETURN( dev_priv ) \
do { \
if ( test_bit( 0, &dev_priv->prim.wrapped ) ) { \