OSDN Git Service

drm/i915/bxt: Correct dual-link MIPI port control.
authorBob Paauwe <bob.j.paauwe@intel.com>
Mon, 21 Nov 2016 22:24:06 +0000 (14:24 -0800)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 23 Nov 2016 20:18:05 +0000 (22:18 +0200)
For BXT, there is only one bit that enables/disables dual-link mode
and not different bits depending on which pipe is being used.

Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479767046-3964-1-git-send-email-bob.j.paauwe@intel.com
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
drivers/gpu/drm/i915/intel_dsi.c

index 4e0d025..a35c141 100644 (file)
@@ -476,7 +476,10 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)
                if (intel_dsi->ports == (BIT(PORT_A) | BIT(PORT_C))) {
                        temp |= (intel_dsi->dual_link - 1)
                                                << DUAL_LINK_MODE_SHIFT;
-                       temp |= intel_crtc->pipe ?
+                       if (IS_BROXTON(dev_priv))
+                               temp |= LANE_CONFIGURATION_DUAL_LINK_A;
+                       else
+                               temp |= intel_crtc->pipe ?
                                        LANE_CONFIGURATION_DUAL_LINK_B :
                                        LANE_CONFIGURATION_DUAL_LINK_A;
                }