Bring some drm module changes over from the XFree86 trunk:

- Reset 'bound' flag for an agp entry after undbind succeeded in
    drm_agpsupport.h (Egbert Eich).
- Ignore hw_lock for drm device if lock was set by a different instance (ie
    Xserver) to prevent second server from spinning in driver release
    function (currently only relevant for i8xx drm drivers) (David Dawes).
- Use the agpgart "key" for the unique handle for bindings rather than the
    memory address (the key is guaranteed to be unique) (David Dawes).

1 files changed, 1 insertions, 0 deletions

diff --git a/linux/drmP.h b/linux/drmP.h
index efbc30c0..7c7428ba 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -448,6 +448,7 @@ typedef struct drm_file {
 	struct drm_file	  *prev;
 	struct drm_device *dev;
 	int 		  remove_auth_on_close;
+	unsigned long     lock_count;
 } drm_file_t;