diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2015-01-16 14:27:26 +0200 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-29 16:56:47 +0100 |
| commit | a2581a9e7cdc6167da779cf149296329371a32be (patch) | |
| tree | 2256897423c8fcd69d17ded9a8a86c5a502459ba /drivers/gpu/drm/i915/intel_dsi.c | |
| parent | drm/i915/dsi: remove old read/write functions in favor of new stuff (diff) | |
| download | linux-dev-a2581a9e7cdc6167da779cf149296329371a32be.tar.xz linux-dev-a2581a9e7cdc6167da779cf149296329371a32be.zip | |
drm/i915/dsi: move dpi_send_cmd() to intel_dsi.c and make it static
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-By: Shobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dsi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dsi.c | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 803e87a5a22f..7a75aaf200e3 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -203,6 +203,41 @@ static struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi, return host; } +/* + * send a video mode command + * + * XXX: commands with data in MIPI_DPI_DATA? + */ +static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs, + enum port port) +{ + struct drm_encoder *encoder = &intel_dsi->base.base; + struct drm_device *dev = encoder->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + u32 mask; + + /* XXX: pipe, hs */ + if (hs) + cmd &= ~DPI_LP_MODE; + else + cmd |= DPI_LP_MODE; + + /* clear bit */ + I915_WRITE(MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT); + + /* XXX: old code skips write if control unchanged */ + if (cmd == I915_READ(MIPI_DPI_CONTROL(port))) + DRM_ERROR("Same special packet %02x twice in a row.\n", cmd); + + I915_WRITE(MIPI_DPI_CONTROL(port), cmd); + + mask = SPL_PKT_SENT_INTERRUPT; + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 100)) + DRM_ERROR("Video mode command 0x%08x send failed.\n", cmd); + + return 0; +} + static void band_gap_reset(struct drm_i915_private *dev_priv) { mutex_lock(&dev_priv->dpio_lock); @@ -358,7 +393,7 @@ static void intel_dsi_enable(struct intel_encoder *encoder) } else { msleep(20); /* XXX */ for_each_dsi_port(port, intel_dsi->ports) - dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN, port); + dpi_send_cmd(intel_dsi, TURN_ON, false, port); msleep(100); drm_panel_enable(intel_dsi->panel); @@ -431,7 +466,7 @@ static void intel_dsi_pre_disable(struct intel_encoder *encoder) if (is_vid_mode(intel_dsi)) { /* Send Shutdown command to the panel in LP mode */ for_each_dsi_port(port, intel_dsi->ports) - dpi_send_cmd(intel_dsi, SHUTDOWN, DPI_LP_MODE_EN, port); + dpi_send_cmd(intel_dsi, SHUTDOWN, false, port); msleep(10); } } |