|
@@ -791,14 +791,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,
|
|
|
I915_WRITE(BXT_P_DSI_REGULATOR_TX_CTRL, 0);
|
|
I915_WRITE(BXT_P_DSI_REGULATOR_TX_CTRL, 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- intel_dsi_prepare(encoder, pipe_config);
|
|
|
|
|
-
|
|
|
|
|
- /* 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)) {
|
|
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
|
|
u32 val;
|
|
u32 val;
|
|
|
|
|
|
|
@@ -808,6 +800,14 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,
|
|
|
I915_WRITE(DSPCLK_GATE_D, val);
|
|
I915_WRITE(DSPCLK_GATE_D, val);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ intel_dsi_prepare(encoder, pipe_config);
|
|
|
|
|
+
|
|
|
|
|
+ /* 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);
|
|
|
|
|
+
|
|
|
/* put device in ready state */
|
|
/* put device in ready state */
|
|
|
intel_dsi_device_ready(encoder);
|
|
intel_dsi_device_ready(encoder);
|
|
|
|
|
|