Merge v5.6 into drm-next

[linux-2.6-microblaze.git] / include / drm / drm_dp_mst_helper.h

diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 41725d8..3cde42b 100644 (file)
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -479,7 +479,6 @@ struct drm_dp_mst_topology_mgr;
 struct drm_dp_mst_topology_cbs {
        /* create a connector for a port */
        struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *path);
-       void (*register_connector)(struct drm_connector *connector);
        void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr,
                                  struct drm_connector *connector);
 };
@@ -590,6 +589,11 @@ struct drm_dp_mst_topology_mgr {
         */
        bool payload_id_table_cleared : 1;
 
+       /**
+        * @is_waiting_for_dwn_reply: whether we're waiting for a down reply.
+        */
+       bool is_waiting_for_dwn_reply : 1;
+
        /**
         * @mst_primary: Pointer to the primary/first branch device.
         */
@@ -619,11 +623,6 @@ struct drm_dp_mst_topology_mgr {
         */
        struct mutex qlock;
 
-       /**
-        * @is_waiting_for_dwn_reply: indicate whether is waiting for down reply
-        */
-       bool is_waiting_for_dwn_reply;
-
        /**
         * @tx_msg_downq: List of pending down replies.
         */
@@ -635,11 +634,13 @@ struct drm_dp_mst_topology_mgr {
        struct mutex payload_lock;
        /**
         * @proposed_vcpis: Array of pointers for the new VCPI allocation. The
-        * VCPI structure itself is &drm_dp_mst_port.vcpi.
+        * VCPI structure itself is &drm_dp_mst_port.vcpi, and the size of
+        * this array is determined by @max_payloads.
         */
        struct drm_dp_vcpi **proposed_vcpis;
        /**
-        * @payloads: Array of payloads.
+        * @payloads: Array of payloads. The size of this array is determined
+        * by @max_payloads.
         */
        struct drm_dp_payload *payloads;
        /**