Merge tag 'v4.10-rc8' into drm-next

[karo-tx-linux.git] / include / drm / drm_mode_config.h

diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 137432386310aa8a9449d28f655a60b78bdd654a..26ff46ab26fb829d57ebc2cc4de8d25059ea5a99 100644 (file)
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -47,7 +47,7 @@ struct drm_mode_config_funcs {
         *
         * Create a new framebuffer object. The core does basic checks on the
         * requested metadata, but most of that is left to the driver. See
-        * struct &drm_mode_fb_cmd2 for details.
+        * &struct drm_mode_fb_cmd2 for details.
         *
         * If the parameters are deemed valid and the backing storage objects in
         * the underlying memory manager all exist, then the driver allocates
@@ -132,10 +132,10 @@ struct drm_mode_config_funcs {
         *    that before calling this hook.
         *
         * See the documentation of @atomic_commit for an exhaustive list of
-        * error conditions which don't have to be checked at the
-        * ->atomic_check() stage?
+        * error conditions which don't have to be checked at the in this
+        * callback.
         *
-        * See the documentation for struct &drm_atomic_state for how exactly
+        * See the documentation for &struct drm_atomic_state for how exactly
         * an atomic modeset update is described.
         *
         * Drivers using the atomic helpers can implement this hook using
@@ -171,7 +171,7 @@ struct drm_mode_config_funcs {
         * calling this function, and that nothing has been changed in the
         * interim.
         *
-        * See the documentation for struct &drm_atomic_state for how exactly
+        * See the documentation for &struct drm_atomic_state for how exactly
         * an atomic modeset update is described.
         *
         * Drivers using the atomic helpers can implement this hook using
@@ -198,10 +198,10 @@ struct drm_mode_config_funcs {
         * completed. These events are per-CRTC and can be distinguished by the
         * CRTC index supplied in &drm_event to userspace.
         *
-        * The drm core will supply a struct &drm_event in the event
-        * member of each CRTC's &drm_crtc_state structure. See the
-        * documentation for &drm_crtc_state for more details about the precise
-        * semantics of this event.
+        * The drm core will supply a &struct drm_event in each CRTC's
+        * &drm_crtc_state.event. See the documentation for
+        * &drm_crtc_state.event for more details about the precise semantics of
+        * this event.
         *
         * NOTE:
         *
@@ -365,7 +365,13 @@ struct drm_mode_config {
        struct list_head fb_list;
 
        /**
-        * @num_connector: Number of connectors on this device.
+        * @connector_list_lock: Protects @num_connector and
+        * @connector_list.
+        */
+       spinlock_t connector_list_lock;
+       /**
+        * @num_connector: Number of connectors on this device. Protected by
+        * @connector_list_lock.
         */
        int num_connector;
        /**
@@ -373,7 +379,9 @@ struct drm_mode_config {
         */
        struct ida connector_ida;
        /**
-        * @connector_list: List of connector objects.
+        * @connector_list: List of connector objects. Protected by
+        * @connector_list_lock. Only use drm_for_each_connector_iter() and
+        * &struct drm_connector_list_iter to walk this list.
         */
        struct list_head connector_list;
        int num_encoder;