Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56c48978 authored by Deepak M's avatar Deepak M Committed by Daniel Vetter
Browse files

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: default avatarDeepak M <m.deepak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c85f6c91

drivers/gpu/drm/i915/i915_reg.h

+1 −3
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/intel_dsi.c

+3 −12
Original line number Diff line number Diff line
@@ -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);

		}