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

Commit c7dc5275 authored by Hans de Goede's avatar Hans de Goede Committed by Jani Nikula
Browse files

drm/i915/dsi: Move MIPI_SEQ_POWER_ON/OFF calls together with pmic gpio calls 



Now that we are no longer bound to the drm_panel_ callbacks, call
MIPI_SEQ_POWER_ON/OFF at the proper place.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarBob Paauwe <bob.j.paauwe@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1488374106-4949-4-git-send-email-jani.nikula@intel.com
parent 19c17df3

drivers/gpu/drm/i915/intel_dsi.c

+4 −6
Original line number Diff line number Diff line
@@ -793,10 +793,10 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder, 


	intel_dsi_prepare(encoder, pipe_config);



	/* Panel Enable over CRC PMIC */

	/* Power on, try both CRC pmic gpio and VBT */

	if (intel_dsi->gpio_panel)

		gpiod_set_value_cansleep(intel_dsi->gpio_panel, 1);



	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_POWER_ON);

	msleep(intel_dsi->panel_on_delay);



	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
@@ -811,7 +811,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder, 
	/* put device in ready state */

	intel_dsi_device_ready(encoder);



	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_POWER_ON);

	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_DEASSERT_RESET);

	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_INIT_OTP);
@@ -940,11 +939,10 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder, 
	}



	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET);

	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_POWER_OFF);



	/* Power off, try both CRC pmic gpio and VBT */

	msleep(intel_dsi->panel_off_delay);



	/* Panel Disable over CRC PMIC */

	intel_dsi_exec_vbt_sequence(intel_dsi, MIPI_SEQ_POWER_OFF);

	if (intel_dsi->gpio_panel)

		gpiod_set_value_cansleep(intel_dsi->gpio_panel, 0);