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

Commit 1cbde8fd authored by Yuan Zhao's avatar Yuan Zhao Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm/dsi-staging: Do not bind ext bridge when dsi panel was set 



HDK device support both ext bridge and DSI panel,
we need not bind ext bridge when DSI panel was set.

Change-Id: I3bcdce6e4110c5ebe063cbcf767368d43b8b11ba
Signed-off-by: default avatarYuan Zhao <yzhao@codeaurora.org>
parent 8cca25c2

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];