Merge "drm/msm/dp: protect mst add_connector process with mode_lock" into dev/msm-4.14-display (adb7b11b) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/dp/dp_mst_drm.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1005,6 +1005,9 @@ dp_mst_add_connector(struct drm_dp_mst_topology_mgr *mgr,
		dp_display = dp_mst->dp_display;
		dev = dp_display->drm_dev;

		/* make sure connector is not accessed before reset */
		drm_modeset_lock_all(dev);

		connector = sde_connector_init(dev,
		dp_mst->mst_bridge[0].encoder,
		NULL,
		@@ -1041,6 +1044,9 @@ dp_mst_add_connector(struct drm_dp_mst_topology_mgr *mgr,
		drm_object_attach_property(&connector->base,
		dev->mode_config.tile_property, 0);

		/* unlock connector and make it accessible */
		drm_modeset_unlock_all(dev);

		DP_MST_DEBUG("add mst connector:%d\n", connector->base.id);

		return connector;