drm: Move drm_lock_data out of drmP.h

And remove the semi-kernel-doc stuff, to make sure no one uses this.

Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170308141257.12119-4-daniel.vetter@ffwll.ch

2 files changed, 17 insertions, 15 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5f829d2372da..22b6f6f45b07 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -428,21 +428,6 @@ struct drm_file {
         struct drm_prime_file_private prime;
 };
 
-/**
- * Lock data.
- */
-struct drm_lock_data {
-        struct drm_hw_lock *hw_lock;    /**< Hardware lock */
-        /** Private of lock holder's file (NULL=kernel) */
-        struct drm_file *file_priv;
-        wait_queue_head_t lock_queue;   /**< Queue of blocked processes */
-        unsigned long lock_time;        /**< Time of last lock in jiffies */
-        spinlock_t spinlock;
-        uint32_t kernel_waiters;
-        uint32_t user_waiters;
-        int idle_has_lock;
-};
-
 /* Flags and return codes for get_vblank_timestamp() driver function. */
 #define DRM_CALLED_FROM_VBLIRQ 1
 #define DRM_VBLANKTIME_SCANOUTPOS_METHOD (1 << 0)
diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h
index 1eb4a52cad8d..81a40c2a9a3e 100644
--- a/include/drm/drm_auth.h
+++ b/include/drm/drm_auth.h
@@ -28,6 +28,23 @@
 #ifndef _DRM_AUTH_H_
 #define _DRM_AUTH_H_
 
+/*
+ * Legacy DRI1 locking data structure. Only here instead of in drm_legacy.h for
+ * include ordering reasons.
+ *
+ * DO NOT USE.
+ */
+struct drm_lock_data {
+        struct drm_hw_lock *hw_lock;
+        struct drm_file *file_priv;
+        wait_queue_head_t lock_queue;
+        unsigned long lock_time;
+        spinlock_t spinlock;
+        uint32_t kernel_waiters;
+        uint32_t user_waiters;
+        int idle_has_lock;
+};
+
 /**
  * struct drm_master - drm master structure
  *