summaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 3bd11aaa..b1b23b58 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -246,9 +246,10 @@
#define LOCK_TEST_WITH_RETURN( dev, filp ) \
do { \
if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) || \
- dev->lock.filp != filp ) { \
- DRM_ERROR( "%s called without lock held\n", \
- __FUNCTION__ ); \
+ dev->lock.filp != filp ) { \
+ DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\
+ __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\
+ dev->lock.filp, filp ); \
return -EINVAL; \
} \
} while (0)
@@ -907,8 +908,8 @@ extern void drm_vbl_send_signals( drm_device_t *dev );
/* AGP/GART support (drm_agpsupport.h) */
+extern const drm_agp_t *drm_agp;
extern drm_agp_head_t *drm_agp_init(void);
-extern void drm_agp_uninit(void);
extern int drm_agp_acquire(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern void drm_agp_do_release(void);