UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Pandiyan, Dhinakaran 2017-03-16 00:10:24 -07:00 committed by Daniel Vetter
parent eadf71cd8c
commit a538d6137d
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/drm_dp_mst_topology.c
View File

@ -2042,9 +2042,8 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
goto out_unlock; goto out_unlock;
} }
mgr->total_pbn = 2560; /* max. time slots - one slot for MTP header */
mgr->total_slots = DIV_ROUND_UP(mgr->total_pbn, mgr->pbn_div); mgr->avail_slots = 63;
mgr->avail_slots = mgr->total_slots;
/* add initial branch device at LCT 1 */ /* add initial branch device at LCT 1 */
mstb = drm_dp_add_mst_branch_device(1, NULL); mstb = drm_dp_add_mst_branch_device(1, NULL);

9
include/drm/drm_dp_mst_helper.h
View File

@ -479,18 +479,11 @@ struct drm_dp_mst_topology_mgr {
* @pbn_div: PBN to slots divisor. * @pbn_div: PBN to slots divisor.
*/ */
int pbn_div; int pbn_div;
/**
* @total_slots: Total slots that can be allocated.
*/
int total_slots;
/** /**
* @avail_slots: Still available slots that can be allocated. * @avail_slots: Still available slots that can be allocated.
*/ */
int avail_slots; int avail_slots;
/**
* @total_pbn: Total PBN count.
*/
int total_pbn;
/** /**
* @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and * @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and