Merge "drm/msm/dsi-staging: Do not bind ext bridge when dsi panel was set" (8614066e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -4914,13 +4914,16 @@ static int dsi_display_bind(struct device *dev,
		return 0;

		/* defer bind if ext bridge driver is not loaded */
		if (display->panel && display->panel->host_config.ext_bridge_mode) {
		for (i = 0; i < display->ext_bridge_cnt; i++) {
		if (!of_drm_find_bridge(display->ext_bridge[i].node_of)) {
		pr_err("defer for bridge[%d] %s\n", i,
		if (!of_drm_find_bridge(
		display->ext_bridge[i].node_of)) {
		pr_debug("defer for bridge[%d] %s\n", i,
		display->ext_bridge[i].node_of->full_name);
		return -EPROBE_DEFER;
		}
		}
		}

		mutex_lock(&display->display_lock);

		@@ -5763,6 +5766,9 @@ int dsi_display_drm_ext_bridge_init(struct dsi_display *display,
		struct drm_bridge *prev_bridge = bridge;
		int rc = 0, i;

		if (display->panel && !display->panel->host_config.ext_bridge_mode)
		return 0;

		for (i = 0; i < display->ext_bridge_cnt; i++) {
		struct dsi_display_ext_bridge *ext_bridge_info =
		&display->ext_bridge[i];