Merge tag 'topic/drm-misc-2015-05-06' of git://anongit.freedesktop.org/drm-intel into drm-next

misc drm core patches.

* tag 'topic/drm-misc-2015-05-06' of git://anongit.freedesktop.org/drm-intel:
  drm: simplify master cleanup
  drm: simplify authentication management
  drm: drop unused 'magicfree' list
  drm: fix a memleak on mutex failure path
  drm/atomic-helper: Really recover pre-atomic plane/cursor behavior
  drm/qxl: Fix qxl_noop_get_vblank_counter()
  drm: Zero out invalid vblank timestamp in drm_update_vblank_count. (v2)
  drm: Prevent invalid use of vblank_disable_immediate. (v2)
  drm/vblank: Fixup and document timestamp update/read barriers
  DRM: Don't re-poll connector for disconnect
  drm: Fix for DP CTS test 4.2.2.5 - I2C DEFER handling
  drm: Fix the 'native defer' message in drm_dp_i2c_do_msg()
  drm/atomic-helper: Don't call atomic_update_plane when it stays off

1 files changed, 8 insertions, 6 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 62c40777c009..df6d9970d9a4 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -355,8 +355,7 @@ struct drm_lock_data {
  * @minor: Link back to minor char device we are master for. Immutable.
  * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
  * @unique_len: Length of unique field. Protected by drm_global_mutex.
- * @magiclist: Hash of used authentication tokens. Protected by struct_mutex.
- * @magicfree: List of used authentication tokens. Protected by struct_mutex.
+ * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
  * @lock: DRI lock information.
  * @driver_priv: Pointer to driver-private information.
  */
@@ -365,8 +364,7 @@ struct drm_master {
         struct drm_minor *minor;
         char *unique;
         int unique_len;
-        struct drm_open_hash magiclist;
-        struct list_head magicfree;
+        struct idr magic_map;
         struct drm_lock_data lock;
         void *driver_priv;
 };
@@ -686,9 +684,13 @@ struct drm_pending_vblank_event {
 struct drm_vblank_crtc {
         struct drm_device *dev;         /* pointer to the drm_device */
         wait_queue_head_t queue;        /**< VBLANK wait queue */
-        struct timeval time[DRM_VBLANKTIME_RBSIZE];     /**< timestamp of current count */
         struct timer_list disable_timer;                /* delayed disable timer */
-        atomic_t count;                 /**< number of VBLANK interrupts */
+
+        /* vblank counter, protected by dev->vblank_time_lock for writes */
+        unsigned long count;
+        /* vblank timestamps, protected by dev->vblank_time_lock for writes */
+        struct timeval time[DRM_VBLANKTIME_RBSIZE];
+
         atomic_t refcount;              /* number of users of vblank interruptsper crtc */
         u32 last;                       /* protected by dev->vbl_lock, used */
                                         /* for wraparound handling */