This has never actually worked, and isn't needed anyway: the driver's
always going to try to deallocate VCPI when it tears down the display
that the VCPI belongs to.

Signed-off-by: Lyude Paul <ly...@redhat.com>
Cc: Daniel Vetter <dan...@ffwll.ch>
Cc: David Airlie <airl...@redhat.com>
Cc: Jerry Zuo <jerry....@amd.com>
Cc: Harry Wentland <harry.wentl...@amd.com>
Cc: Juston Li <juston...@intel.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c 
b/drivers/gpu/drm/drm_dp_mst_topology.c
index b8a47c795fa9..f10a7edb401e 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1176,8 +1176,6 @@ static void drm_dp_destroy_port(struct kref *kref)
        struct drm_dp_mst_topology_mgr *mgr = port->mgr;
 
        if (!port->input) {
-               port->vcpi.num_slots = 0;
-
                kfree(port->cached_edid);
 
                /*
@@ -3493,12 +3491,6 @@ static void drm_dp_destroy_connector_work(struct 
work_struct *work)
                drm_dp_port_teardown_pdt(port, port->pdt);
                port->pdt = DP_PEER_DEVICE_NONE;
 
-               if (!port->input && port->vcpi.vcpi > 0) {
-                       drm_dp_mst_reset_vcpi_slots(mgr, port);
-                       drm_dp_update_payload_part1(mgr);
-                       drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
-               }
-
                drm_dp_mst_put_port_malloc(port);
                send_hotplug = true;
        }
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to