From patchwork Fri Nov 3 03:12:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nhan Ngoc. Nguyen" X-Patchwork-Id: 117850 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2955909qgn; Thu, 2 Nov 2017 20:45:18 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SXJApsByEYXnVznOejxN2Kd5yypx55Kc+ipw3bsXBf5S6VMIODmTI0ec54Pl4vMVNcdOcP X-Received: by 10.101.78.138 with SMTP id b10mr5737767pgs.160.1509680718184; Thu, 02 Nov 2017 20:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509680718; cv=none; d=google.com; s=arc-20160816; b=eSHhYG59sKl8nn1+jNDnrzrvXE/GWW/lMRLE+xPnFmmyi2IZ7eUdLfsLCJ+o8vIdHD BINVFMNXANGhPJ2IjQvMFlWgA2PrmZoaMMkb6eojFIFBB4zAVYzMwTydL9LbBTfQT8g5 fMJXUUbwdY2A/zULzx0VCiXwv8Wg18t06IHuJ1sz2YTWZARN77Gj8Y+f1DU9CdohlqiU XmaoFELvljrTjOxbrqOxAHpqCYD6hf+i00r5d3efTSc3Uda2CFvTQWcUMrLun0cVCmnO beF9XInz+9ycnrS3jAYvODzjRNyEKcoM/XNNPyX8GlqXeWf/4aPwzK/hkprybh/2QbY4 GFwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:message-id:date:subject:cc:to :from:dkim-signature:arc-authentication-results; bh=AenLPEV3hWPG177FGHRqEc5hpHPuj1qPi/l6QlbwxqM=; b=FH0QBWWnJobOE4/VZLVYh7zA9dlHpy4AXTj280T4QMbfcgx6dqjG7X9nXnObgU8bt8 Ar0g93wtHPC9olAjCOc87DsLEFqW4Bydk6CYQ1VSGRT9WG5OkLlDlTdxzOnMCAo32md7 cgVlpe7cLEqRNEgJyQqELiDV77ua9tVnNO5jiKxtlfRtp3pW3NSSsVv4QJDG3xgerxjO atwQkWU3wjRte9dcwqzHeWFv51kYgzSWkyK06w+BAOrBZFOcwjeZvTYeyEK9GTzq0F4Y 9JaseL/bzC9c9Q0LKajgxHlLcH5wLKvE8hRf2O00fJiWPNOce7cy37JD8t2s7Ih0Nytb VcNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@renesasgroup.onmicrosoft.com header.s=selector1-renesas-com header.b=IN3YkcFk; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h185si4798224pgc.164.2017.11.02.20.45.17; Thu, 02 Nov 2017 20:45:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@renesasgroup.onmicrosoft.com header.s=selector1-renesas-com header.b=IN3YkcFk; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751737AbdKCDpR (ORCPT + 9 others); Thu, 2 Nov 2017 23:45:17 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:25179 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751297AbdKCDpQ (ORCPT ); Thu, 2 Nov 2017 23:45:16 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 03 Nov 2017 12:45:14 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 7889F5DFC7; Fri, 3 Nov 2017 12:45:14 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.44,336,1505746800"; d="scan'208";a="261199385" Received: from mail-hk2apc01lp0208.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.208]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 03 Nov 2017 12:45:13 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=AenLPEV3hWPG177FGHRqEc5hpHPuj1qPi/l6QlbwxqM=; b=IN3YkcFkULEXrlc7/P+CiIf9Y1JFxfyGzhNb+J0n9h97B2PfldNfVLgiSi5YPiV53Ot3RpTdL1fNLHQkfdIxbKllMFR7l07iLfMs419Xp9xAwUDeMFaM6NlGNAS4oLsT3oSsNSKHRvtRTwEMWyi9CiICLOdrB0KFhuMSbax3f+8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=nhan.nguyen.yb@renesas.com; Received: from RVC-LT-408230.rvc.renesas.com (210.245.28.11) by SG2PR0601MB1342.apcprd06.prod.outlook.com (2a01:111:e400:79fe::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Fri, 3 Nov 2017 03:45:11 +0000 From: Nhan Nguyen To: gregkh@linuxfoundation.org Cc: toru.oishi.zj@renesas.com, John Stultz , David Airlie , Archit Taneja , Wolfram Sang , Lars-Peter Clausen , Laurent Pinchart , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Thong Ho , Nhan Nguyen Subject: [PATCH 4.9.y 3/3] drm/bridge: adv7511: Re-write the i2c address before EDID probing Date: Fri, 3 Nov 2017 10:12:04 +0700 Message-Id: <20171103031204.8324-1-nhan.nguyen.yb@renesas.com> X-Mailer: git-send-email 2.9.3.windows.1 MIME-Version: 1.0 X-Originating-IP: [210.245.28.11] X-ClientProxiedBy: SG2PR06CA0113.apcprd06.prod.outlook.com (2603:1096:1:1d::15) To SG2PR0601MB1342.apcprd06.prod.outlook.com (2a01:111:e400:79fe::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8bc805de-4bd2-49a7-82c4-08d5226d498e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603199); SRVR:SG2PR0601MB1342; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1342; 3:/xhadDIu9yjT8rY0pA8ndLHMuYbmlZ1Cy8oJEwXk9mHHO6bSJ8HOqWeDl3qW/4Ml9nXhFfSIYFRBov19fSt0EMwgt+J37lI6G8qgzsiaVSL7H99JE6B9yTflrBbr3PKj4HkzqTbgK/sBo5MFan1nBxxMFCu+CeaElGYIUaqH/emd9xJwr6ekUgvZSlV3++8dDW6UqxChRskxSZUqN2t70Q4gJCOlrPmOymtlnYeV46+e4A20348ZAwc5K8f1Zt0t; 25:B+14L9laBBLQzBmXe5JVnYneBM1ErR5UW3nmw4jaHgD2knaDEp8QU4/oJuKYU2yEIHeX4bXSgZBvtI944/XNu98hRrE4QtXwxz9u++zJOFq7OjqfDA8b3xsICwjNLxG8oFex1PwpBZoT0rnwm7CrSg/pbpeWblUT/NN+fZY1TzqCZ2YC76ICrpzdY2v2CU4fz5yhujXt2H0a8gPjfl1nmYq2uZYYMMC2+j/INYPNnD+0Kx+5SC8EBv0Ko3YuS6z6Lykx44+FDvAefcjrgw/ZUTCOQkYhnn/+qfQ321+jIRkMydCs+qtyAnVBKywlL1UqR2BQ4uTK4etRZ3a2b8wF3Q==; 31:kbUuLnkRgXDxHZt+4iRwQ3Q5Kec8nrvO/PkV4etnwIg2iCj9NlpTskc046y9HFCQhLoo0Ar0fKLw0N3Ef6PHiaDtK4YuMvt9rLhHN9Gp9ZIrnYFlpV6EO518YYL0sVaPeY/VyHckCcSNEDIYlVo0JcuGJuz88a0EhmXWPw+G+Lz+FMvX6I6v15a3+pOHj5bkMFuJOPfnznDKltCaN5Ennj8bjTQ/rU5U6sAdrnoQnlQ= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1342: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1342; 20:sXzfx8VWhv3UuyrAb+itd7QC/Vwa+Wspt7GMAoFXxe+WIIq9d9ugLtdhxfMxs52mmDG6IGzzG6Pkx3kp33ktuaFx4S/SIDb4RLDuIinoiP+mc9naMwWnN5Gu77G+lmqgb9jV8MUgUYR4mVJesE+RUA4I8stPW1ZoCxfrX1iUbYCql76RHcKF0sF/CXGP/jvXi4Asz51IX6InWtAvoHbZ6XDXDPel1ruQibVyDHmUYniP4jeBc4gJkJRN98eLz6C7JJosU5fFzXPbUZFZQjkBZSu0ws5Ourgi4wzfUuPWOjBWZR+PJIMrzwYC7IJ9hZRZZzQhnk1n5Z7t31tl2U+UTDKJyCKX1RYb/YgRz5OsNXUgvUtk9CjiEdfNqlB1g8tX8HAA86zWPm3H8jfZ00mz8gicEvtYsdX95rJTVYttW0M50itm1cAm+gsQMn8vFDxB1Ce7qJ4fmfbURc9fe4hqfN23K+xu3nyVF9O0Q4R8S3QeiA26WBUfvaVhBKGC/kYX; 4:eywdOu5A9y1XkRPgooc05HZmq2xkec8FfZIFDczeRvSA5yyDEWLR2oLK/NJ/XH7VjShZ2vLbsjtfE3XMvdK842SkzOYsTHOYlAQucowBGp3KgcrIcLqdFA+u0KbiJB4SmliSG7+jgiQpKKF1Ey8Vd7QCPLL+Df9djV+DUl25tbxil13BD3yEnnSTo2eowYA3SAd5AqyLCb8pHd/Bz0CItiP0dMK8VLGohP7jqHw6Sql/nXfdfC3aR4D5mkGElVBI7t+qQ3GQHsXNBjlAmnJmrTTq6lnn6xsf+RKKgZkVgOvGKYjnCkq8V98WaTqoiUQ9kfejbwU4RNIUMMNingzFpn+McZI+VgNHHRvG32cYdSU= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(217544274631240); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3231021)(6055026)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SG2PR0601MB1342; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SG2PR0601MB1342; X-Forefront-PRVS: 0480A51D4A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(39860400002)(346002)(376002)(189002)(199003)(66066001)(50466002)(48376002)(478600001)(2361001)(966005)(86362001)(5660300001)(4326008)(7736002)(36756003)(305945005)(50226002)(189998001)(6666003)(68736007)(97736004)(6916009)(47776003)(6306002)(6116002)(101416001)(5003940100001)(3846002)(1076002)(81166006)(81156014)(50986999)(54906003)(106356001)(103116003)(33646002)(105586002)(6486002)(2906002)(8676002)(53936002)(107886003)(2351001)(16526018)(25786009)(16586007)(316002)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1342; H:RVC-LT-408230.rvc.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1342; 23:dPIi1U2llOGZ7PpdKjlrZ26/O84tdo4sl+EmQ09byR2gfwKE0r4LWXPmxEY5M0F1uKBe1wIrSBLq0efbRT8q9wwwyiWXTYxje66wAa/5TRCaJjk4jPtSWTl1i+cDYd0NoImTeKw4XmRB1RcK0heeViMUByBEB9zV951NnCcpP49Pf5YT8TBmszod//RsG5PlXDpjLpZ4qMt3+A15aIsHfBSUsxvdluD6SvgvIY+xXiofHqnHXopat7QvqIitFbLM+XgCsqpojnT/EXiL2wKdJWHASkGJ4goAH74eomlq1jy9IzToqjim83WfUQDZXuDlf6siCFbc77M8iyLOix5puKUZdtiYGbXFwAqC6RUErDz+7OqKfsKAl4QJh6nLp5i4f5rsOL+RNuMB3SwFQEEoTtnq4yXYP/PW0gBxpZ7GZ97Bz97NRqQ/U0yNDTzQtmfljVLobXCYJE9P3DoltC66w3ddPgHXyEjAmGKf7zQKnJz6SEFOZTJnaJ1hq0ROZentIXRYVXQwtNdvftM1sp0+vNJsiY1QXD52ppQrWR9oMA7Tv+QPtBr04dNfsie56HUkaHDF741RQnmCI3Wbcoep/ehKpVwrAax4cOyImeiNzKvea4VJ2bfwZgTd5Km8SVxwz8tCmI8MiIF2/bTPnp9diDeJk1quVJIdTbgPPnYFaBqih3XHmMb0vsZwraYHzB5kIj4lcXJgguSfcpsZK/PXGqnU6uFuwav2KDJXWJD58Q0E55QaV35QdOcLgDMnMGReKLwCYHq2aozFvazEDhP+Kr5YAQfe54TUY3V+V2/Cqr2wY+XqHattMIy7MgjEX2iH3V51I3XLQQmF1Xs/6Jjckz+VCNss5MmJyj0geS5hrBj20qhAW0ErqEI+0h3DUQklXNmt19PqdH9pZSg8+zI+gQ4TjGZbN4f0O/2Ibhhr2UFB6Yor7bjvkBkamk7Ga/NuFovw9HdmbInLsSytomuoQJ5dEmNBIzt4uIKxKowcWQFBP41NS5+gtYq146Xoh/W5sulebo/XSkFgpxmmSOCa6yppPcpBmr6zbhBHfAF0CB3TES/8V5FrkpIQW4NzwRZMmAnr34wj/FPQwS812cPF6t7CPvImyPslTXGWBc18gUgIcUOYapmuSRS19pvLWLwYHl9x1jrsU91WEPifgDOing== X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1342; 6:872upwowmCGG7RKpr6NBmR3PfAYaFPjNTCsQttTookqveJH2BJwvLjHz36a9vIw8x5KPgpR4aTzJq8387Isz9zya9I1+AdIYrhtOQcjqcrvCvx65Eguwwq3RXBAhYcEfqBg2a+dm8iNJQ+XTUyOyJYGyJSpePCLx7K7OWdb0UAFRSPuXgSOkoNe39MPfxfhU/ByJ9+jzniMtOFUzB5EGbsNouYFNpp/RwNU0L3lGZjvrz+gr0LNz+LupIxM1aEmwMCwyE66pw7xfqq5slzi8c3A5PtnfySx3kkYjdcKGXM5cNjSFn+8FtTZTTbNLm0EGFHNn0gKx8VTD3lX30u60tzurIbcOnpOIvJ1dVDVR11U=; 5:TnnST6X/ElAHsFh7iVSyn4pFkGpiYJp1whoIXku9px3jHpX0ysmXSMXk0RDNAlGSuKYZDNun327uUgwaweT72Sr39yeDSrFBtjSOJzJ/hI9+yV2UCP/k9YtfAXw3sDBhcaMAePHUMJ9LyZZmPdwVi/N07SCsAk/1Fsm9vosODEY=; 24:UI3m2uXWzRqrkZXcIx77gcSUPAE1/+KX+0T781P+xCXbVXLrp5iOm9J9k40RX3Y29SOxW5YKNV06YU64/Z2uDoOwcTcjywaIN/5y+XyC+Qs=; 7:QEbHzzPd9pBId1fMUaS5nwC1aXYCYasstL2UXpt/JZzzFds/+qA5XpPjJDeYbO9sYDGkjnW0yLaYD1ad/wBNyZxyXrYDbyVqfIlM0F5dFvKGOjM8Prrzcc8msXlTJI/oII8lJuh74eR8hmBP9QksrEO6fptpR6t4AJnhTl7defr80+mUdaOn82rg0RjQyNWX9ZudoW3vAZqIP49VotufAfmQ9dEtZqL19DMox22XEJa0zSfarE8A85pepekNxCWC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1342; 20:3ve7mM3SkqhvEgKA+f4unL3vqWupwnvg+rYCUQDCPz+dgAri2cc3hf7Kq9sUd5JEmFz3VCTUEMfw/+r1BQoC/SJGhosD4oy6AJBRFZZiPjJKyHkg6L+4GT2tZ6TIuSzwOPWS6W+ORFFmXcWTBvJ17UGOTUMh5TJa2mnCDjps+BQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2017 03:45:11.5055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8bc805de-4bd2-49a7-82c4-08d5226d498e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1342 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Stultz commit 3587c856675c45809010c2cee5b21096f6e8e938 upstream. I've found that by just turning the chip on and off via the POWER_DOWN register, I end up getting i2c_transfer errors on HiKey. Investigating further, it turns out that some of the register state in hardware is getting lost, as the device registers are reset when the chip is powered down. Thus this patch simply re-writes the i2c address to the ADV7511_REG_EDID_I2C_ADDR register to ensure its properly set before we try to read the EDID data. Cc: David Airlie Cc: Archit Taneja Cc: Wolfram Sang Cc: Lars-Peter Clausen Cc: Laurent Pinchart Cc: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Reviewed-by: Laurent Pinchart Tested-by: Laurent Pinchart Signed-off-by: John Stultz Signed-off-by: Archit Taneja Signed-off-by: Thong Ho Signed-off-by: Nhan Nguyen Link: http://patchwork.freedesktop.org/patch/msgid/1484614372-15342-7-git-send-email-john.stultz@linaro.org --- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 17b9e98..f75ab62 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -573,9 +573,17 @@ static int adv7511_get_modes(struct adv7511 *adv7511, unsigned int count; /* Reading the EDID only works if the device is powered */ - if (!adv7511->powered) + if (!adv7511->powered) { + unsigned int edid_i2c_addr = + (adv7511->i2c_main->addr << 1) + 4; + __adv7511_power_on(adv7511); + /* Reset the EDID_I2C_ADDR register as it might be cleared */ + regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, + edid_i2c_addr); + } + edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); if (!adv7511->powered)