diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-04-18 06:07:14 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-04-18 06:07:14 +0000 |
| commit | 254f5a406de00d8500f3d32fc58083edead6660d (patch) | |
| tree | c804ede0e8a9de99e5cada56c661f2f90469df09 | |
| parent | 5a605a79f4c28e5941a2d7ddae133f41be01943b (diff) | |
Revert "drm/dp_mst: Remove VCPI while disabling topology mgr"
From Sasha Levin
9a61fe235c0a653457c741d6140c6a8f8d8bfb48 in linux 4.19.y/4.19.116
a86675968e2300fb567994459da3dbc4cd1b322a in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/drm_dp_mst_topology.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/dev/pci/drm/drm_dp_mst_topology.c b/sys/dev/pci/drm/drm_dp_mst_topology.c index 9f17d865c50..c7b393fbd85 100644 --- a/sys/dev/pci/drm/drm_dp_mst_topology.c +++ b/sys/dev/pci/drm/drm_dp_mst_topology.c @@ -2117,7 +2117,6 @@ static bool drm_dp_get_vc_payload_bw(int dp_link_bw, int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool mst_state) { int ret = 0; - int i = 0; struct drm_dp_mst_branch *mstb = NULL; mutex_lock(&mgr->lock); @@ -2178,21 +2177,10 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms /* this can fail if the device is gone */ drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, 0); ret = 0; - mutex_lock(&mgr->payload_lock); memset(mgr->payloads, 0, mgr->max_payloads * sizeof(struct drm_dp_payload)); mgr->payload_mask = 0; set_bit(0, &mgr->payload_mask); - for (i = 0; i < mgr->max_payloads; i++) { - struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i]; - - if (vcpi) { - vcpi->vcpi = 0; - vcpi->num_slots = 0; - } - mgr->proposed_vcpis[i] = NULL; - } mgr->vcpi_mask = 0; - mutex_unlock(&mgr->payload_lock); } out_unlock: |