mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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>
This commit is contained in:
parent
c85f6c91ec
commit
56c4897841
2 changed files with 4 additions and 15 deletions
|
@ -8102,9 +8102,7 @@ enum skl_disp_power_wells {
|
|||
#define RGB_FLIP_TO_BGR (1 << 2)
|
||||
|
||||
#define BXT_PIPE_SELECT_MASK (7 << 7)
|
||||
#define BXT_PIPE_SELECT_C (2 << 7)
|
||||
#define BXT_PIPE_SELECT_B (1 << 7)
|
||||
#define BXT_PIPE_SELECT_A (0 << 7)
|
||||
#define BXT_PIPE_SELECT(pipe) ((pipe) << 7)
|
||||
|
||||
#define _MIPIA_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb108)
|
||||
#define _MIPIC_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb908)
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue