Merge "drm/msm/sde: add software te support for phy cmd mode panels" into dev/msm-4.14-display (f3ea76bf) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -1595,6 +1595,7 @@ static void dsi_display_parse_cmdline_topology(struct dsi_display *display,
		{
		char *boot_str = NULL;
		char *str = NULL;
		char *sw_te = NULL;
		unsigned long value;

		if (display_type >= MAX_DSI_ACTIVE_DISPLAY) {
		@@ -1607,6 +1608,10 @@ static void dsi_display_parse_cmdline_topology(struct dsi_display *display,
		else
		boot_str = dsi_display_secondary;

		sw_te = strnstr(boot_str, ":swte", strlen(boot_str));
		if (sw_te)
		display->sw_te_using_wd = true;

		str = strnstr(boot_str, ":config", strlen(boot_str));
		if (!str)
		return;
		@@ -4202,7 +4207,8 @@ int dsi_display_get_info(struct drm_connector *connector,
		case DSI_OP_CMD_MODE:
		info->capabilities \|= MSM_DISPLAY_CAP_CMD_MODE;
		info->is_te_using_watchdog_timer =
		display->panel->te_using_watchdog_timer;
		display->panel->te_using_watchdog_timer \|
		display->sw_te_using_wd;
		break;
		default:
		pr_err("unknwown dsi panel mode %d\n",

+2 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ struct dsi_display_clk_info {
		* @list: List pointer.
		* @is_active: Is display active.
		* @is_cont_splash_enabled: Is continuous splash enabled
		* @sw_te_using_wd: Is software te enabled
		* @display_lock: Mutex for dsi_display interface.
		* @ctrl_count: Number of DSI interfaces required by panel.
		* @ctrl: Controller information for DSI display.
		@@ -172,6 +173,7 @@ struct dsi_display {
		const char *display_type;
		struct list_head list;
		bool is_cont_splash_enabled;
		bool sw_te_using_wd;
		struct mutex display_lock;

		u32 ctrl_count;