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

Commit c175cd16 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Dave Airlie
Browse files

drm/dp/mst: Reverse order of MST enable and clearing VC payload table. 



On DELL U3014 if you clear the table before enabling MST it sometimes
hangs the receiver.

Signed-off-by: default avatarAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5e93b820

drivers/gpu/drm/drm_dp_mst_topology.c

+6 −6
Original line number Diff line number Diff line
@@ -1998,6 +1998,12 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms 
		mgr->mst_primary = mstb;

		kref_get(&mgr->mst_primary->kref);



		ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,

							 DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);

		if (ret < 0) {

			goto out_unlock;

		}



		{

			struct drm_dp_payload reset_pay;

			reset_pay.start_slot = 0;
@@ -2005,12 +2011,6 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms 
			drm_dp_dpcd_write_payload(mgr, 0, &reset_pay);

		}



		ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,

					 DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);

		if (ret < 0) {

			goto out_unlock;

		}



		queue_work(system_long_wq, &mgr->work);



		ret = 0;