Merge "drm/msm/dsi-staging: avoid ctl soft reset when cont-splash is enabled" into msm-4.14 (7162a8df) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -5033,18 +5033,19 @@ int dsi_display_prepare(struct dsi_display *display)
		goto error_host_engine_off;
		}

		if (!display->is_cont_splash_enabled) {
		/*
		* For continuous splash usecase, skip panel prepare and
		* ctl reset since the pnael and ctrl is already in active
		* state and panel on commands are not needed
		*/
		rc = dsi_display_soft_reset(display);
		if (rc) {
		pr_err("[%s] failed soft reset, rc=%d\n", display->name, rc);
		pr_err("[%s] failed soft reset, rc=%d\n",
		display->name, rc);
		goto error_ctrl_link_off;
		}

		if (!display->is_cont_splash_enabled) {
		/*
		* For continuous splash usecase we skip panel
		* prepare since the pnael is already in
		* active state and panel on commands are not needed
		*/
		rc = dsi_panel_prepare(display->panel);
		if (rc) {
		pr_err("[%s] panel prepare failed, rc=%d\n",