916,6 → 916,7 |
/* no need to clean up vcpi |
* as if we have no connector we never setup a vcpi */ |
drm_dp_port_teardown_pdt(port, port->pdt); |
port->pdt = DP_PEER_DEVICE_NONE; |
} |
kfree(port); |
} |
1161,7 → 1162,9 |
drm_dp_put_port(port); |
goto out; |
} |
if (port->port_num >= DP_MST_LOGICAL_PORT_0) { |
if ((port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV || |
port->pdt == DP_PEER_DEVICE_SST_SINK) && |
port->port_num >= DP_MST_LOGICAL_PORT_0) { |
port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc); |
drm_mode_connector_set_tile_property(port->connector); |
} |
1816,7 → 1819,7 |
mgr->payloads[i].num_slots = req_payload.num_slots; |
} else if (mgr->payloads[i].num_slots) { |
mgr->payloads[i].num_slots = 0; |
drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]); |
drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); |
req_payload.payload_state = mgr->payloads[i].payload_state; |
mgr->payloads[i].start_slot = 0; |
} |