diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-10 12:43:58 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-12 15:28:13 +0200 |
| commit | 8f1a2c8dc0dc5c2842e08f304ebdd34b5ddb982c (patch) | |
| tree | f88c8f80b2096a4232a16259f69d67604d86bf03 /include/drm/drmP.h | |
| parent | ba8286fab52652e431784d066b075c1bb4933ea1 (diff) | |
| download | linux-stable-8f1a2c8dc0dc5c2842e08f304ebdd34b5ddb982c.tar.gz linux-stable-8f1a2c8dc0dc5c2842e08f304ebdd34b5ddb982c.tar.bz2 linux-stable-8f1a2c8dc0dc5c2842e08f304ebdd34b5ddb982c.zip | |
drm: Move LOCK_TEST_WITH_RETURN to <drm/drm_legacy.h>
Unfortunately we can't move struct drm_lock_data easily since
it's embedded into struct drm_master. And figuring out where exactly
this struct should be allocated isn't that simple ...
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0d68ecdb447a..0308214a6f83 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -222,23 +222,6 @@ int drm_err(const char *func, const char *format, ...); #define DRM_IF_VERSION(maj, min) (maj << 16 | min) /** - * Test that the hardware lock is held by the caller, returning otherwise. - * - * \param dev DRM device. - * \param filp file pointer of the caller. - */ -#define LOCK_TEST_WITH_RETURN( dev, _file_priv ) \ -do { \ - if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) || \ - _file_priv->master->lock.file_priv != _file_priv) { \ - DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ - __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\ - _file_priv->master->lock.file_priv, _file_priv); \ - return -EINVAL; \ - } \ -} while (0) - -/** * Ioctl function type. * * \param inode device inode. |