diff options
| author | Deepak M | 2015-12-09 15:44:04 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-12-11 17:28:24 +0100 |
| commit | 56c48978413ec5a22b960826948063cae5df5a5f (patch) | |
| tree | d3e8453c0bd23def03fb50cb5b70098c0e7daac6 /drivers/gpu/drm/i915/intel_dsi.c | |
| parent | drm/i915: add VBT address and size fields to ASLE mailbox struct (diff) | |
| download | kernel-qcow2-linux-56c48978413ec5a22b960826948063cae5df5a5f.tar.gz kernel-qcow2-linux-56c48978413ec5a22b960826948063cae5df5a5f.tar.xz kernel-qcow2-linux-56c48978413ec5a22b960826948063cae5df5a5f.zip | |
drm/i915: dual link pipe selection for bxt
Pipe is assigned based on the port, but it should be
based on current crtc. Correcting the same in this patch.
v2: Use macro BXT_PIPE_SELECT(pipe) (Daniel)
Signed-off-by: Deepak M <m.deepak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.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 | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 25bdf1cbb5f9..4ab168dd36bf 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -885,21 +885,12 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) I915_WRITE(MIPI_CTRL(port), tmp | READ_REQUEST_PRIORITY_HIGH); } else if (IS_BROXTON(dev)) { - /* - * FIXME: - * BXT can connect any PIPE to any MIPI port. - * Select the pipe based on the MIPI port read from - * VBT for now. Pick PIPE A for MIPI port A and C - * for port C. - */ + enum pipe pipe = intel_crtc->pipe; + tmp = I915_READ(MIPI_CTRL(port)); tmp &= ~BXT_PIPE_SELECT_MASK; - if (port == PORT_A) - tmp |= BXT_PIPE_SELECT_A; - else if (port == PORT_C) - tmp |= BXT_PIPE_SELECT_C; - + tmp |= BXT_PIPE_SELECT(pipe); I915_WRITE(MIPI_CTRL(port), tmp); } |