From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516768589-2-7217261814007805609 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES endasv, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516768588; b=wkC4f+YfNZHW+3/7gOrt7K1e2d84nl7XSOaPmgFT0Jc2jWf mBtLHSotg1gXaE5bHk6LD3q4nDR0AYp1WAfCzPbwdCYlz6poQk1BcaZRJACoyPwS vBYwomaeDVee1RUqhUJh4z4Q9mrFxVWw3tU4DQvni6ZFfDVc1xwEbw2FeZ8j1dLB DUbGX/4bW+S6tv6Xl03FSGYI4rqD7GE/BkbxF/JFSJL9wsqwpcj5baOM8DTyasXr UQJTFFC1TTAt4vQetunA51nSf3ifz8UKeBOwdLKDQVpqN+8yEOs4F+1OAaPk7+p+ 1qlaa8o/bvJEVnWze3iDXNuQ5qRATfGfKZ1XzQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516768588; bh=4DeonY 5sKikpdWT3Lm5Ld2J3q9vzwb6WQ6hidwhBFPo=; b=EoT7xwF56IW65uSnZ7QPvs FdzxcvNg5dY8MYCaWUl4w0RPk85084BUx9gbSzOhxOmU4R9Vtppxk7JxcunphtFB VgckQzFmzqOm78FhohIgYGAI3gU91CUYLG9SgXjmAOV1Sm+8kvw1SCWJA7I+n4N5 4XmXR9dk+MjMG46CeNP9EhMDrd+7yp/jv/PLRzSxx4bZEWL3dZtbdHuF0PPqPbNU jaa35h3/H4DUxQAalEBGVxHESzpdpvr1piUcfktU61tuLXZBgKt5WLjdnx7IX5/t t3JOkcEpT6/PBkhMISKP/ygun6/kcNkkwuGQFtaDHEmlYaHYRym+rcGFTs8im3KA == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=oDCmJpNx x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=oDCmJpNx x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933073AbeAXEgJ (ORCPT ); Tue, 23 Jan 2018 23:36:09 -0500 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127]:16377 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933039AbeAXESm (ORCPT ); Tue, 23 Jan 2018 23:18:42 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Andrey Gusakov , Andrzej Hajda , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 45/55] drm/bridge: tc358767: fix 1-lane behavior Thread-Topic: [PATCH AUTOSEL for 4.9 45/55] drm/bridge: tc358767: fix 1-lane behavior Thread-Index: AQHTlMoG6B+RRpMfjEmJnGO1JM1bGw== Date: Wed, 24 Jan 2018 04:15:53 +0000 Message-ID: <20180124041521.32223-45-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1032;7:mvA2TXH8bMTLbMI+RqSSL6kIqN0Zyh3Ua9MJxsbdw3eTK10GTZPT+NQPQ3sNx4zl7vfDxW6bEyNyOsYeHSXfglF+yHinpUx4jD9HhvKFKLClLvyjiilg54OUb+aKWN4AP0eaThc8o9AnyBkDGdJ6DZkMEQCmtrCaAiBvTDXhjPseXBAML6XueuEooPx8C5dXyvlVM1QPXPq97OKsEWqMDKv6AUQpcuLu8RyyVQ2pOxxwsh9fTv6k3KIEl6b6IOtL x-ms-office365-filtering-correlation-id: bbb828a4-6ccc-47ca-4da2-08d562e18b8d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(7411616537696); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1032;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1032; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(376002)(346002)(39380400002)(189003)(199004)(36756003)(478600001)(6506007)(8676002)(14454004)(6512007)(53936002)(5660300001)(26005)(72206003)(4326008)(25786009)(81156014)(81166006)(8936002)(86362001)(59450400001)(10290500003)(68736007)(2906002)(6346003)(99286004)(6666003)(86612001)(76176011)(6436002)(102836004)(7736002)(2950100002)(966005)(66066001)(1076002)(10090500001)(54906003)(22452003)(316002)(105586002)(6306002)(106356001)(5250100002)(305945005)(2501003)(3846002)(3280700002)(97736004)(2900100001)(6486002)(6116002)(110136005)(3660700001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1032;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 2Jbdy3qJxeek6QPsyA3KjOAbLdN/A/wdV4Tdqgq1UFrbSyA+/Y/fHUnxxwuwlT7rHIHqmPjaHy9nn6SIn9EG1Q== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbb828a4-6ccc-47ca-4da2-08d562e18b8d X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:53.1287 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Andrey Gusakov [ Upstream commit 4dbd6c03fbf88299c573d676838896c6e06aade2 ] Use drm_dp_channel_eq_ok helper Acked-by: Philipp Zabel Signed-off-by: Andrey Gusakov Signed-off-by: Andrzej Hajda Link: https://patchwork.freedesktop.org/patch/msgid/1510073785-16108-7-git-= send-email-andrey.gusakov@cogentembedded.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/tc358767.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc3= 58767.c index 6d0772864935..f64f35cdc2ff 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -819,8 +819,6 @@ static int tc_main_link_setup(struct tc_data *tc) unsigned int rate; u32 dp_phy_ctrl; int timeout; - bool aligned; - bool ready; u32 value; int ret; u8 tmp[8]; @@ -965,16 +963,15 @@ static int tc_main_link_setup(struct tc_data *tc) ret =3D drm_dp_dpcd_read_link_status(aux, tmp + 2); if (ret < 0) goto err_dpcd_read; - ready =3D (tmp[2] =3D=3D ((DP_CHANNEL_EQ_BITS << 4) | /* Lane1 */ - DP_CHANNEL_EQ_BITS)); /* Lane0 */ - aligned =3D tmp[4] & DP_INTERLANE_ALIGN_DONE; - } while ((--timeout) && !(ready && aligned)); + } while ((--timeout) && + !(drm_dp_channel_eq_ok(tmp + 2, tc->link.base.num_lanes))); =20 if (timeout =3D=3D 0) { /* Read DPCD 0x200-0x201 */ ret =3D drm_dp_dpcd_read(aux, DP_SINK_COUNT, tmp, 2); if (ret < 0) goto err_dpcd_read; + dev_err(dev, "channel(s) EQ not ok\n"); dev_info(dev, "0x0200 SINK_COUNT: 0x%02x\n", tmp[0]); dev_info(dev, "0x0201 DEVICE_SERVICE_IRQ_VECTOR: 0x%02x\n", tmp[1]); @@ -985,10 +982,6 @@ static int tc_main_link_setup(struct tc_data *tc) dev_info(dev, "0x0206 ADJUST_REQUEST_LANE0_1: 0x%02x\n", tmp[6]); =20 - if (!ready) - dev_err(dev, "Lane0/1 not ready\n"); - if (!aligned) - dev_err(dev, "Lane0/1 not aligned\n"); return -EAGAIN; } =20 --=20 2.11.0