Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2357e8c5 authored by ckosuru's avatar ckosuru
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14.c12-display' into msm-4.14.c12 



* quic/dev/msm-4.14.c12-display:
  drm/dp_mst: Stop releasing VCPI when removing ports from topology

Change-Id: I589f5a09e747012df86b017f995f41e24451f3eb
Signed-off-by: default avatarckosuru <kosuru@codeaurora.org>
parents 51a767ab 2a2d04c1

drivers/gpu/drm/drm_dp_mst_topology.c

+0 −8
Original line number Diff line number Diff line
@@ -937,8 +937,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);



		/*
@@ -3167,12 +3165,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);

		}



		kref_put(&port->kref, drm_dp_free_mst_port);

		send_hotplug = true;

	}