From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [RFC][PATCH] drm: adv7511/33: Fix adv7511_cec_init() failure handling Date: Wed, 29 Nov 2017 10:35:54 +0530 Message-ID: References: <1510873179-20786-1-git-send-email-john.stultz@linaro.org> <6faf6790-c5a3-8ca7-eb51-115842a66ceb@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id F16C46E809 for ; Wed, 29 Nov 2017 05:06:02 +0000 (UTC) In-Reply-To: Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Stultz Cc: Guodong Xu , Arnd Bergmann , David Airlie , lkml , dri-devel@lists.freedesktop.org, Laurent Pinchart , Hans Verkuil , Dan Carpenter , Bhumika Goyal List-Id: dri-devel@lists.freedesktop.org CgpPbiAxMS8yOS8yMDE3IDAzOjAyIEFNLCBKb2huIFN0dWx0eiB3cm90ZToKPiBPbiBTdW4sIE5v diAyNiwgMjAxNyBhdCA0OjU2IEFNLCBBcmNoaXQgVGFuZWphIDxhcmNoaXR0QGNvZGVhdXJvcmEu b3JnPiB3cm90ZToKPj4KPj4gT24gMTEvMTcvMjAxNyAwNDoyOSBBTSwgSm9obiBTdHVsdHogd3Jv dGU6Cj4+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hZHY3NTExL2Fkdjc1 MTFfZHJ2LmMKPj4+IGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hZHY3NTExL2Fkdjc1MTFfZHJ2 LmMKPj4+IGluZGV4IDBlMTRmMTUuLjkzOWMzYjkgMTAwNjQ0Cj4+PiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vYnJpZGdlL2Fkdjc1MTEvYWR2NzUxMV9kcnYuYwo+Pj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2JyaWRnZS9hZHY3NTExL2Fkdjc1MTFfZHJ2LmMKPj4+IEBAIC0xMjAzLDEyICsxMjAzLDEy IEBAIHN0YXRpYyBpbnQgYWR2NzUxMV9wcm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqaTJjLAo+Pj4g Y29uc3Qgc3RydWN0IGkyY19kZXZpY2VfaWQgKmlkKQo+Pj4gICAgICAjaWZkZWYgQ09ORklHX0RS TV9JMkNfQURWNzUxMV9DRUMKPj4+ICAgICAgICAgIHJldCA9IGFkdjc1MTFfY2VjX2luaXQoZGV2 LCBhZHY3NTExLCBvZmZzZXQpOwo+Pj4gLSAgICAgICBpZiAocmV0KQo+Pj4gLSAgICAgICAgICAg ICAgIGdvdG8gZXJyX3VucmVnaXN0ZXJfY2VjOwo+Pj4gICAgI2Vsc2UKPj4+IC0gICAgICAgcmVn bWFwX3dyaXRlKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9SRUdfQ0VDX0NUUkwgKyBvZmZzZXQs Cj4+PiAtICAgICAgICAgICAgICAgICAgICBBRFY3NTExX0NFQ19DVFJMX1BPV0VSX0RPV04pOwo+ Pj4gKyAgICAgICByZXQgPSAxOwo+Pj4gICAgI2VuZGlmCj4+PiArICAgICAgIGlmIChyZXQpCj4+ PiArICAgICAgICAgICAgICAgcmVnbWFwX3dyaXRlKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUxMV9S RUdfQ0VDX0NUUkwgKwo+Pj4gb2Zmc2V0LAo+Pj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBBRFY3NTExX0NFQ19DVFJMX1BPV0VSX0RPV04pOwo+Pgo+Pgo+PiBUaGlzIHdvdWxkIGZvcmNl IENFQyB0byBiZSBwb3dlcmVkIG9mZiBldmVuIGlmIGFkdjc1MTFfY2VjX2luaXQoKSByZXR1cm5l ZAo+PiAwLCByaWdodD8KPiAKPiBJIGRvbid0IHRoaW5rIHNvLiBUaGUgaW5pdGVudCB3YXMgaXRz IG9ubHkgcG93ZXJlZCBvZmYgaWYKPiBhZHY3NTExX2NlY19pbml0IHJldHVybnMgYW4gZXJyb3Ig b3IgaWYgIENPTkZJR19EUk1fSTJDX0FEVjc1MTFfQ0VDIGlzCj4gbm90IHNldC4KPiAKPj4gRG8g d2Uga25vdyB3aHkgdGhlIGNhbGwgdG8gYWR2NzUxMV9jZWNfaW5pdCgpIGlzIGZhaWxpbmcgb24g dGhlIEhpa2V5IGJvYXJkPwo+PiBJZiBpdCdzCj4+IGJlY2F1c2UgdGhlcmUgaXNuJ3QgYSAiY2Vj IiBjbG9jayBzcGVjaWZpZWQgaW4gRFQsIGl0J3Mgbm90IHJlYWxseSBhIGZhdGFsCj4+IGVycm9y LCBpdAo+PiBqdXN0IG1lYW5zIHRoYXQgdGhlIHBsYXRmb3JtIGhhc24ndCBiZWVuIHNldCB1cCB0 byBzdXBwb3J0IENFQy4gSW4gdGhhdAo+IAo+IFllYS4gSSBiZWxpZXZlIHRoaXMgaXMgdGhlIGNh c2Ugdy8gSGlLZXkuICBJIGRvbid0IGhhdmUgZGVlcGx5Cj4gZGV0YWlsZWQgZG9jcyBvbiB0aGUg Ym9hcmQgc28gSSdtIG5vdCBzdXJlIGlmIHdlIHdpbGwgYmUgYWJsZSB0bwo+IGVuYWJsZSB0aGF0 IG9yIG5vdCAoWGlubGlhbmcvR3VvZG9uZzogRG8geW91IGtub3cgaWYgaXRzIHBvc3NpYmxlPyku Cj4gSW4gdGhlIG1lYW50aW1lIHRob3VnaCwgd2Ugc2hvdWxkbid0IHJlZ3Jlc3MuCj4gCj4+IGNh c2UsIHdlCj4+IHNob3VsZCBqdXN0IHBvd2VyIGRvd24gdGhlIENFQyBibG9jay4gU28sIGlmIGFk djc1MTFfY2VjX2luaXQoKSB3b3VsZCByZXR1cm4KPj4gYQo+PiAtRU5PRU5ULCB3aGljaCB3ZSBj b3VsZCB1c2UgYXMgYSBoaW50IHRvIHBvd2VyIGRvd24gQ0VDLiBTbywgbWF5YmUgc29tZXRoaW5n Cj4+IGxpa2UgdGhpcz86Cj4+Cj4+ICNpZmRlZiBDT05GSUdfRFJNX0kyQ19BRFY3NTExX0NFQwo+ PiAgICAgICAgICByZXQgPSBhZHY3NTExX2NlY19pbml0KGRldiwgYWR2NzUxMSwgb2Zmc2V0KTsK Pj4gICAgICAgICAgaWYgKHJldCAmJiByZXQgIT0gLUVOT0VOVCkKPj4gICAgICAgICAgICAgICAg ICBnb3RvIGVycl91bnJlZ2lzdGVyX2NlYzsKPj4gI2VuZGlmCj4+ICAgICAgICAgIGlmIChyZXQp Cj4+ICAgICAgICAgICAgICByZWdtYXBfd3JpdGUoYWR2NzUxMS0+cmVnbWFwLCBBRFY3NTExX1JF R19DRUNfQ1RSTCArIG9mZnNldCwKPj4gICAgICAgICAgICAgICAgICAgICAgICAgIEFEVjc1MTFf Q0VDX0NUUkxfUE9XRVJfRE9XTik7Cj4+Cj4+IEFwYXJ0IGZyb20gdGhpcywgd2Ugc2hvdWxkIGFs c28gbW92ZSBhZHY3NTExX2NlY19pbml0KCkgdXAgaW4gdGhlIHByb2JlIHNvCj4+IHRoYXQKPj4g aXQncyBjYWxsZWQgYmVmb3JlIHRoZSBkcm1fYnJpZGdlIGlzIHJlZ2lzdGVyZWQuCj4gCj4gSGFu cyBoYXMgc2luY2UgcmV3b3JrZWQgdGhlIHBhdGNoIHcvIGEgbmV3IHZlcnNpb24uIFlvdSBtaWdo dCB3YW50IHRvCj4gY2hlY2sgaGlzIHBhdGNoZXMgYW5kIHNlZSBpZiB0aGV5IGZpdCB3aGF0IHlv dXIgaW1hZ2luaW5nLgoKWWVzLCBJIHNhdyBIYW5zJ3MgcGF0Y2ggYWZ0ZXIgSSB3cm90ZSB0byB5 b3UuIFRoYXQgcGF0Y2ggbG9va3MgcGVyZmVjdC4gSSdsbApxdWV1ZSB0aGF0IHRvIHRoZSBkcm0t bWlzYyByZXBvIG9uY2UgaXQncyByZWJhc2VkIG9uIDQuMTUtcmMxLgoKVGhhbmtzLApBcmNoaXQK Cj4gCj4gdGhhbmtzCj4gLWpvaG4KPiAKCi0tIApRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwg SW5jLiBpcyBhIG1lbWJlciBvZiBDb2RlIEF1cm9yYSBGb3J1bSwKYSBMaW51eCBGb3VuZGF0aW9u IENvbGxhYm9yYXRpdmUgUHJvamVjdApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750989AbdK2FGD (ORCPT ); Wed, 29 Nov 2017 00:06:03 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:50762 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750791AbdK2FGB (ORCPT ); Wed, 29 Nov 2017 00:06:01 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1844E6024C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=architt@codeaurora.org Subject: Re: [RFC][PATCH] drm: adv7511/33: Fix adv7511_cec_init() failure handling To: John Stultz Cc: Arnd Bergmann , Laurent Pinchart , David Airlie , Lars-Peter Clausen , Bhumika Goyal , Inki Dae , dri-devel@lists.freedesktop.org, lkml , Xinliang Liu , Dan Carpenter , Sean Paul , Hans Verkuil , Guodong Xu References: <1510873179-20786-1-git-send-email-john.stultz@linaro.org> <6faf6790-c5a3-8ca7-eb51-115842a66ceb@codeaurora.org> From: Archit Taneja Message-ID: Date: Wed, 29 Nov 2017 10:35:54 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/29/2017 03:02 AM, John Stultz wrote: > On Sun, Nov 26, 2017 at 4:56 AM, Archit Taneja wrote: >> >> On 11/17/2017 04:29 AM, John Stultz wrote: >>> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >>> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >>> index 0e14f15..939c3b9 100644 >>> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >>> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >>> @@ -1203,12 +1203,12 @@ static int adv7511_probe(struct i2c_client *i2c, >>> const struct i2c_device_id *id) >>> #ifdef CONFIG_DRM_I2C_ADV7511_CEC >>> ret = adv7511_cec_init(dev, adv7511, offset); >>> - if (ret) >>> - goto err_unregister_cec; >>> #else >>> - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, >>> - ADV7511_CEC_CTRL_POWER_DOWN); >>> + ret = 1; >>> #endif >>> + if (ret) >>> + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + >>> offset, >>> + ADV7511_CEC_CTRL_POWER_DOWN); >> >> >> This would force CEC to be powered off even if adv7511_cec_init() returned >> 0, right? > > I don't think so. The initent was its only powered off if > adv7511_cec_init returns an error or if CONFIG_DRM_I2C_ADV7511_CEC is > not set. > >> Do we know why the call to adv7511_cec_init() is failing on the Hikey board? >> If it's >> because there isn't a "cec" clock specified in DT, it's not really a fatal >> error, it >> just means that the platform hasn't been set up to support CEC. In that > > Yea. I believe this is the case w/ HiKey. I don't have deeply > detailed docs on the board so I'm not sure if we will be able to > enable that or not (Xinliang/Guodong: Do you know if its possible?). > In the meantime though, we shouldn't regress. > >> case, we >> should just power down the CEC block. So, if adv7511_cec_init() would return >> a >> -ENOENT, which we could use as a hint to power down CEC. So, maybe something >> like this?: >> >> #ifdef CONFIG_DRM_I2C_ADV7511_CEC >> ret = adv7511_cec_init(dev, adv7511, offset); >> if (ret && ret != -ENOENT) >> goto err_unregister_cec; >> #endif >> if (ret) >> regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, >> ADV7511_CEC_CTRL_POWER_DOWN); >> >> Apart from this, we should also move adv7511_cec_init() up in the probe so >> that >> it's called before the drm_bridge is registered. > > Hans has since reworked the patch w/ a new version. You might want to > check his patches and see if they fit what your imagining. Yes, I saw Hans's patch after I wrote to you. That patch looks perfect. I'll queue that to the drm-misc repo once it's rebased on 4.15-rc1. Thanks, Archit > > thanks > -john > -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project