mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-11 19:19:42 +00:00
drm/i915/dsi: Add intel_dsi_unprepare() helper
The enable path has an intel_dsi_prepare() helper which prepares various registers for the mode-set. Move the code undoing this to a new intel_dsi_unprepare() helper function for better symmetry between the enable and disable paths. No functional changes. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Bob Paauwe <bob.j.paauwe@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/cc0baaf04ea74a20031b4b5bb128591dcfa78406.1488273823.git.jani.nikula@intel.com
This commit is contained in:
parent
5a2e65e742
commit
c7991ecad6
1 changed files with 24 additions and 13 deletions
|
@ -507,6 +507,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)
|
|||
|
||||
static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
|
||||
struct intel_crtc_state *pipe_config);
|
||||
static void intel_dsi_unprepare(struct intel_encoder *encoder);
|
||||
|
||||
static void intel_dsi_pre_enable(struct intel_encoder *encoder,
|
||||
struct intel_crtc_state *pipe_config,
|
||||
|
@ -682,19 +683,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder,
|
|||
usleep_range(2000, 5000);
|
||||
}
|
||||
|
||||
for_each_dsi_port(port, intel_dsi->ports) {
|
||||
/* Panel commands can be sent when clock is in LP11 */
|
||||
I915_WRITE(MIPI_DEVICE_READY(port), 0x0);
|
||||
|
||||
intel_dsi_reset_clocks(encoder, port);
|
||||
I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP);
|
||||
|
||||
val = I915_READ(MIPI_DSI_FUNC_PRG(port));
|
||||
val &= ~VID_MODE_FORMAT_MASK;
|
||||
I915_WRITE(MIPI_DSI_FUNC_PRG(port), val);
|
||||
|
||||
I915_WRITE(MIPI_DEVICE_READY(port), 0x1);
|
||||
}
|
||||
intel_dsi_unprepare(encoder);
|
||||
|
||||
/*
|
||||
* if disable packets are sent before sending shutdown packet then in
|
||||
|
@ -1310,6 +1299,28 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
|
|||
}
|
||||
}
|
||||
|
||||
static void intel_dsi_unprepare(struct intel_encoder *encoder)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
|
||||
enum port port;
|
||||
u32 val;
|
||||
|
||||
for_each_dsi_port(port, intel_dsi->ports) {
|
||||
/* Panel commands can be sent when clock is in LP11 */
|
||||
I915_WRITE(MIPI_DEVICE_READY(port), 0x0);
|
||||
|
||||
intel_dsi_reset_clocks(encoder, port);
|
||||
I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP);
|
||||
|
||||
val = I915_READ(MIPI_DSI_FUNC_PRG(port));
|
||||
val &= ~VID_MODE_FORMAT_MASK;
|
||||
I915_WRITE(MIPI_DSI_FUNC_PRG(port), val);
|
||||
|
||||
I915_WRITE(MIPI_DEVICE_READY(port), 0x1);
|
||||
}
|
||||
}
|
||||
|
||||
static int intel_dsi_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_connector *intel_connector = to_intel_connector(connector);
|
||||
|
|
Loading…
Reference in a new issue