drm/dp_mst: Stop releasing VCPI when removing ports from topology

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 <lyude@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@amd.com>
Cc: Juston Li <juston.li@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190111005343.17443-9-lyude@redhat.com

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 7a251905b3c490991882ca92367d5faad11627dc..bb9107852fed46637fbb3a339bb97c0a035f97fb 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1177,8 +1177,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);
 
                /*
@@ -3487,12 +3485,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;
        }