drm/dp: Kill total_pbn and total_slots in struct drm_dp_mst_topology_mgr

The total vcpi time slots is always 63 and does not depend on the link BW,
remove total_slots from MST topology manager struct. The next change is to
remove total_pbn which is hardcoded to 2560. The total PBN that the
topology manager allocates from depends on the link rate and is not a
constant. So, fix this by removing the total_pbn member itself.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Harry Wentland <Harry.wentland@amd.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1489648231-30700-2-git-send-email-dhinakaran.pandiyan@intel.com

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index f2cc375907d0caddd50e1de18a104ac0cf8c07f2..66a611afa82a7be9c22a38cb9da6630e0d5f2f4e 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2042,9 +2042,8 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
                        goto out_unlock;
                }
 
-               mgr->total_pbn = 2560;
-               mgr->total_slots = DIV_ROUND_UP(mgr->total_pbn, mgr->pbn_div);
-               mgr->avail_slots = mgr->total_slots;
+               /* max. time slots - one slot for MTP header */
+               mgr->avail_slots = 63;
 
                /* add initial branch device at LCT 1 */
                mstb = drm_dp_add_mst_branch_device(1, NULL);

diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index f4b4d154b98e723ca1fba78f7f4908512d4cd75f..1a7e0f41d6feb2bdf487b78759762a4503b3250a 100644 (file)
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -479,18 +479,11 @@ struct drm_dp_mst_topology_mgr {
         * @pbn_div: PBN to slots divisor.
         */
        int pbn_div;
-       /**
-        * @total_slots: Total slots that can be allocated.
-        */
-       int total_slots;
+
        /**
         * @avail_slots: Still available slots that can be allocated.
         */
        int avail_slots;
-       /**
-        * @total_pbn: Total PBN count.
-        */
-       int total_pbn;
 
        /**
         * @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and