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

Commit 2a2d04c1 authored by Lyude Paul's avatar Lyude Paul Committed by Gerrit - the friendly Code Review server
Browse files

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.

Change-Id: I3ff30da5c17374b9473f9c269282d608fa646426
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarDaniel 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
Git-commit: a68f9917721bba02de43f728e31426f2384cb961
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarXiaowen Wu <wxiaowen@codeaurora.org>
parent 48d06e34

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;

	}