From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756307AbdKODHJ (ORCPT ); Tue, 14 Nov 2017 22:07:09 -0500 Received: from omzsmtpe01.verizonbusiness.com ([199.249.25.210]:24880 "EHLO omzsmtpe01.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755691AbdKOCqn (ORCPT ); Tue, 14 Nov 2017 21:46:43 -0500 From: alexander.levin@verizon.com Cc: Bob Paauwe , =?utf-8?B?VmlsbGUgU3lyasOkbMOk?= , alexander.levin@verizon.com X-Host: pioneer.tdc.vzwcorp.com To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 4.9 42/56] drm/i915/bxt: Correct dual-link MIPI port control. Thread-Topic: [PATCH AUTOSEL for 4.9 42/56] drm/i915/bxt: Correct dual-link MIPI port control. Thread-Index: AQHTXbvVNwOhSJJcvESM2NPlu9bfYQ== Date: Wed, 15 Nov 2017 02:45:45 +0000 Message-ID: <20171115024521.5884-42-alexander.levin@verizon.com> References: <20171115024521.5884-1-alexander.levin@verizon.com> In-Reply-To: <20171115024521.5884-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] Content-Type: text/plain; charset="utf-8" Content-ID: <1B8F48C0C6F23442B21B650045E29CA4@vzwcorp.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id vAF381ZK031869 From: Bob Paauwe [ Upstream commit 812b1d2fe527c3c68d04f379aef850dd02db5945 ] 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 Link: http://patchwork.freedesktop.org/patch/msgid/1479767046-3964-1-git-send-email-bob.j.paauwe@intel.com Signed-off-by: Ville Syrjälä Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/intel_dsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index b2e3d3a334f7..a37ce07ba5ad 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -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; } -- 2.11.0