From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [RFC][PATCH 5/5 v2] drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID Date: Mon, 28 Nov 2016 21:04:44 -0800 Message-ID: <1480395884-5471-6-git-send-email-john.stultz@linaro.org> References: <1480395884-5471-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf0-x233.google.com (mail-pf0-x233.google.com [IPv6:2607:f8b0:400e:c00::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53B186E359 for ; Tue, 29 Nov 2016 05:04:57 +0000 (UTC) Received: by mail-pf0-x233.google.com with SMTP id c4so29441977pfb.1 for ; Mon, 28 Nov 2016 21:04:57 -0800 (PST) In-Reply-To: <1480395884-5471-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: dri-devel@lists.freedesktop.org, Wolfram Sang , Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org SSd2ZSBmb3VuZCB0aGF0IGJ5IGp1c3QgdHVybmluZyB0aGUgY2hpcCBvbiBhbmQgb2ZmIHZpYSB0 aGUKUE9XRVJfRE9XTiByZWdpc3RlciwgSSBlbmQgdXAgZ2V0dGluZyBpMmNfdHJhbnNmZXIgZXJy b3JzCm9uIEhpS2V5LgoKSW52ZXN0aWdhdGluZyBmdXJ0aGVyLCBpdCBzZWVtcyBzb21lIG9mIHRo ZSByZWdpc3RlciBzdGF0ZQppbiB0aGUgcmVnbWFwIGNhY2hlIGlzIHNvbWVob3cgZ2V0dGluZyBs b3N0LiBVc2luZyB0aGUgbG9naWMKaW4gX19hZHY3NTExX3Bvd2VyX29uL29mZigpIHdoaWNoIHN5 bmNzIGFuZCBkaXJ0eXMgdGhlIGNhY2hlCmF2b2lkcyB0aGlzIGlzc3VlLgoKVGh1cyB0aGlzIHBh dGNoIGNoYW5nZXMgdGhlIEVESUQgcHJvYmluZyBsb2dpYyBzbyB0aGF0IHdlCnJlLXVzZSB0aGUg X19hZHY3NTExX3Bvd2VyX29uL29mZigpIGNhbGxzLgoKQ2M6IERhdmlkIEFpcmxpZSA8YWlybGll ZEBsaW51eC5pZT4KQ2M6IEFyY2hpdCBUYW5lamEgPGFyY2hpdHRAY29kZWF1cm9yYS5vcmc+CkNj OiBXb2xmcmFtIFNhbmcgPHdzYStyZW5lc2FzQHNhbmctZW5naW5lZXJpbmcuY29tPgpDYzogTGFy cy1QZXRlciBDbGF1c2VuIDxsYXJzQG1ldGFmb28uZGU+CkNjOiBMYXVyZW50IFBpbmNoYXJ0IDxs YXVyZW50LnBpbmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5h cm8ub3JnPgotLS0KdjI6IFNwbGl0IGludG8gdHdvIHBhdGNoZXMgdG8gbWFrZSB0aGUgY2hhbmdl IG1vcmUgY2xlYXIuCiAgICBBbHNvIHByb3ZpZGVkIG1vcmUgcmF0aW9uYWwgYXMgdG8gd2h5IHRo ZSBjaGFuZ2UgaXMKICAgIGltcG9ydGFudC4KCiBkcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2Fkdjc1 MTEvYWR2NzUxMV9kcnYuYyB8IDE3ICsrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MyBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYnJpZGdlL2Fkdjc1MTEvYWR2NzUxMV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9icmlk Z2UvYWR2NzUxMS9hZHY3NTExX2Rydi5jCmluZGV4IDE5NDg5NjguLjQ4N2IzM2QgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYWR2NzUxMS9hZHY3NTExX2Rydi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9icmlkZ2UvYWR2NzUxMS9hZHY3NTExX2Rydi5jCkBAIC01NTksMjQgKzU1 OSwxMyBAQCBzdGF0aWMgaW50IGFkdjc1MTFfZ2V0X21vZGVzKHN0cnVjdCBhZHY3NTExICphZHY3 NTExLAogCXVuc2lnbmVkIGludCBjb3VudDsKIAogCS8qIFJlYWRpbmcgdGhlIEVESUQgb25seSB3 b3JrcyBpZiB0aGUgZGV2aWNlIGlzIHBvd2VyZWQgKi8KLQlpZiAoIWFkdjc1MTEtPnBvd2VyZWQp IHsKLQkJcmVnbWFwX3VwZGF0ZV9iaXRzKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfUE9X RVIsCi0JCQkJICAgQURWNzUxMV9QT1dFUl9QT1dFUl9ET1dOLCAwKTsKLQkJaWYgKGFkdjc1MTEt PmkyY19tYWluLT5pcnEpIHsKLQkJCXJlZ21hcF93cml0ZShhZHY3NTExLT5yZWdtYXAsIEFEVjc1 MTFfUkVHX0lOVF9FTkFCTEUoMCksCi0JCQkJICAgICBBRFY3NTExX0lOVDBfRURJRF9SRUFEWSk7 Ci0JCQlyZWdtYXBfd3JpdGUoYWR2NzUxMS0+cmVnbWFwLCBBRFY3NTExX1JFR19JTlRfRU5BQkxF KDEpLAotCQkJCSAgICAgQURWNzUxMV9JTlQxX0REQ19FUlJPUik7Ci0JCX0KLQkJYWR2NzUxMS0+ Y3VycmVudF9lZGlkX3NlZ21lbnQgPSAtMTsKLQl9CisJaWYgKCFhZHY3NTExLT5wb3dlcmVkKQor CQlfX2Fkdjc1MTFfcG93ZXJfb24oYWR2NzUxMSk7CiAKIAllZGlkID0gZHJtX2RvX2dldF9lZGlk KGNvbm5lY3RvciwgYWR2NzUxMV9nZXRfZWRpZF9ibG9jaywgYWR2NzUxMSk7CiAKIAlpZiAoIWFk djc1MTEtPnBvd2VyZWQpCi0JCXJlZ21hcF91cGRhdGVfYml0cyhhZHY3NTExLT5yZWdtYXAsIEFE Vjc1MTFfUkVHX1BPV0VSLAotCQkJCSAgIEFEVjc1MTFfUE9XRVJfUE9XRVJfRE9XTiwKLQkJCQkg ICBBRFY3NTExX1BPV0VSX1BPV0VSX0RPV04pOworCQlfX2Fkdjc1MTFfcG93ZXJfb2ZmKGFkdjc1 MTEpOwogCiAJa2ZyZWUoYWR2NzUxMS0+ZWRpZCk7CiAJYWR2NzUxMS0+ZWRpZCA9IGVkaWQ7Ci0t IAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933063AbcK2FFZ (ORCPT ); Tue, 29 Nov 2016 00:05:25 -0500 Received: from mail-pf0-f182.google.com ([209.85.192.182]:36353 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754638AbcK2FE6 (ORCPT ); Tue, 29 Nov 2016 00:04:58 -0500 From: John Stultz To: lkml Cc: John Stultz , David Airlie , Archit Taneja , Wolfram Sang , Lars-Peter Clausen , Laurent Pinchart , dri-devel@lists.freedesktop.org Subject: [RFC][PATCH 5/5 v2] drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID Date: Mon, 28 Nov 2016 21:04:44 -0800 Message-Id: <1480395884-5471-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480395884-5471-1-git-send-email-john.stultz@linaro.org> References: <1480395884-5471-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 seems some of the register state in the regmap cache is somehow getting lost. Using the logic in __adv7511_power_on/off() which syncs and dirtys the cache avoids this issue. Thus this patch changes the EDID probing logic so that we re-use the __adv7511_power_on/off() calls. Cc: David Airlie Cc: Archit Taneja Cc: Wolfram Sang Cc: Lars-Peter Clausen Cc: Laurent Pinchart Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- v2: Split into two patches to make the change more clear. Also provided more rational as to why the change is important. drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 1948968..487b33d 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -559,24 +559,13 @@ static int adv7511_get_modes(struct adv7511 *adv7511, unsigned int count; /* Reading the EDID only works if the device is powered */ - if (!adv7511->powered) { - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, - ADV7511_POWER_POWER_DOWN, 0); - if (adv7511->i2c_main->irq) { - regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(0), - ADV7511_INT0_EDID_READY); - regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(1), - ADV7511_INT1_DDC_ERROR); - } - adv7511->current_edid_segment = -1; - } + if (!adv7511->powered) + __adv7511_power_on(adv7511); edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); if (!adv7511->powered) - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, - ADV7511_POWER_POWER_DOWN, - ADV7511_POWER_POWER_DOWN); + __adv7511_power_off(adv7511); kfree(adv7511->edid); adv7511->edid = edid; -- 2.7.4