diff options
| author | anholt <anholt@FreeBSD.org> | 2003-04-25 01:18:47 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-04-25 01:18:47 +0000 |
| commit | 6afbdfe8ea6944a3f1856cc687cc6ea5e1d09657 (patch) | |
| tree | efa3d0f59b543fa0e752db53d7ddd71f5a18e325 /sys/dev/drm/r128_drv.h | |
| parent | a521aa5aa4b354de2cb042c0909b4830a4884051 (diff) | |
| download | FreeBSD-src-6afbdfe8ea6944a3f1856cc687cc6ea5e1d09657.zip FreeBSD-src-6afbdfe8ea6944a3f1856cc687cc6ea5e1d09657.tar.gz | |
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.
Diffstat (limited to 'sys/dev/drm/r128_drv.h')
| -rw-r--r-- | sys/dev/drm/r128_drv.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h index 325c453..6252838 100644 --- a/sys/dev/drm/r128_drv.h +++ b/sys/dev/drm/r128_drv.h @@ -401,15 +401,6 @@ extern int R128_READ_PLL(drm_device_t *dev, int addr); * Misc helper macros */ -#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 RING_SPACE_TEST_WITH_RETURN( dev_priv ) \ do { \ drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i; \ |
