From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yakir Yang Subject: Re: [PATCH v3 06/10] drm/rockchip: analogix_dp: make panel detect to an optional action Date: Wed, 29 Jun 2016 14:43:37 +0800 Message-ID: <57736E19.7090900@rock-chips.com> References: <1465904718-663-1-git-send-email-ykk@rock-chips.com> <1465904784-978-1-git-send-email-ykk@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul Cc: Krzysztof Kozlowski , linux-samsung-soc , Javier Martinez Canillas , Mark Yao , Jingoo Han , Emil Velikov , Douglas Anderson , dri-devel , Linux Kernel Mailing List , linux-rockchip@lists.infradead.org, Daniel Vetter , Tomasz Figa , =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Thierry Reding , Dan Carpenter List-Id: linux-rockchip.vger.kernel.org U2VhbiwKCk9uIDA2LzIzLzIwMTYgMTA6MTAgUE0sIFNlYW4gUGF1bCB3cm90ZToKPiBPbiBUdWUs IEp1biAxNCwgMjAxNiBhdCA3OjQ2IEFNLCBZYWtpciBZYW5nIDx5a2tAcm9jay1jaGlwcy5jb20+ IHdyb3RlOgo+PiBTb21lIGJvYXJkcyBkb24ndCBuZWVkIHRvIGRlY2xhcmUgYSBwYW5lbCBkZXZp Y2Ugbm9kZSwgbGlrZSB0aGUKPj4gZGlzcGxheSBpbnRlcmZhY2UgaXMgRFAgbW9uaXRvcnMsIHNv IGl0J3MgbmVjZXNzYXJ5IHRvIG1ha2UgdGhlCj4+IHBhbmVsIGRldGVjdCB0byBhbiBvcHRpb25h bCBhY3Rpb24uCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IFlha2lyIFlhbmcgPHlra0Byb2NrLWNoaXBz LmNvbT4KPj4gQWNrZWQtYnk6IE1hcmsgWWFvIDxtYXJrLnlhb0Byb2NrLWNoaXBzLmNvbT4KPj4g LS0tCj4+IENoYW5nZXMgaW4gdjM6Cj4+IC0gQWRkIHRoZSBhY2tlZCBmbGFnIGZyb20gTWFyay4K Pj4KPj4gQ2hhbmdlcyBpbiB2MjogTm9uZQo+Pgo+PiAgIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hp cC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jIHwgNDggKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQo+ PiAgIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKPj4K Pj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2Nr Y2hpcC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMK Pj4gaW5kZXggYmNkOWVjYy4uZGEyZTg0NCAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMKPj4gQEAgLTMzMiwzOCArMzMyLDM0IEBA IHN0YXRpYyBpbnQgcm9ja2NoaXBfZHBfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl dikKPj4gICB7Cj4+ICAgICAgICAgIHN0cnVjdCBkZXZpY2UgKmRldiA9ICZwZGV2LT5kZXY7Cj4+ ICAgICAgICAgIHN0cnVjdCBkZXZpY2Vfbm9kZSAqcGFuZWxfbm9kZSwgKnBvcnQsICplbmRwb2lu dDsKPj4gKyAgICAgICBzdHJ1Y3QgZHJtX3BhbmVsICpwYW5lbCA9IE5VTEw7Cj4+ICAgICAgICAg IHN0cnVjdCByb2NrY2hpcF9kcF9kZXZpY2UgKmRwOwo+PiAtICAgICAgIHN0cnVjdCBkcm1fcGFu ZWwgKnBhbmVsOwo+Pgo+PiAgICAgICAgICBwb3J0ID0gb2ZfZ3JhcGhfZ2V0X3BvcnRfYnlfaWQo ZGV2LT5vZl9ub2RlLCAxKTsKPj4gLSAgICAgICBpZiAoIXBvcnQpIHsKPj4gLSAgICAgICAgICAg ICAgIGRldl9lcnIoZGV2LCAiY2FuJ3QgZmluZCBvdXRwdXQgcG9ydFxuIik7Cj4+IC0gICAgICAg ICAgICAgICByZXR1cm4gLUVJTlZBTDsKPj4gLSAgICAgICB9Cj4+IC0KPj4gLSAgICAgICBlbmRw b2ludCA9IG9mX2dldF9jaGlsZF9ieV9uYW1lKHBvcnQsICJlbmRwb2ludCIpOwo+PiAtICAgICAg IG9mX25vZGVfcHV0KHBvcnQpOwo+PiAtICAgICAgIGlmICghZW5kcG9pbnQpIHsKPj4gLSAgICAg ICAgICAgICAgIGRldl9lcnIoZGV2LCAibm8gb3V0cHV0IGVuZHBvaW50IGZvdW5kXG4iKTsKPj4g LSAgICAgICAgICAgICAgIHJldHVybiAtRUlOVkFMOwo+PiAtICAgICAgIH0KPj4gLQo+PiAtICAg ICAgIHBhbmVsX25vZGUgPSBvZl9ncmFwaF9nZXRfcmVtb3RlX3BvcnRfcGFyZW50KGVuZHBvaW50 KTsKPj4gLSAgICAgICBvZl9ub2RlX3B1dChlbmRwb2ludCk7Cj4+IC0gICAgICAgaWYgKCFwYW5l bF9ub2RlKSB7Cj4+IC0gICAgICAgICAgICAgICBkZXZfZXJyKGRldiwgIm5vIG91dHB1dCBub2Rl IGZvdW5kXG4iKTsKPj4gLSAgICAgICAgICAgICAgIHJldHVybiAtRUlOVkFMOwo+PiAtICAgICAg IH0KPj4gLQo+PiAtICAgICAgIHBhbmVsID0gb2ZfZHJtX2ZpbmRfcGFuZWwocGFuZWxfbm9kZSk7 Cj4+IC0gICAgICAgaWYgKCFwYW5lbCkgewo+PiAtICAgICAgICAgICAgICAgRFJNX0VSUk9SKCJm YWlsZWQgdG8gZmluZCBwYW5lbFxuIik7Cj4+ICsgICAgICAgaWYgKHBvcnQpIHsKPj4gKyAgICAg ICAgICAgICAgIGVuZHBvaW50ID0gb2ZfZ2V0X2NoaWxkX2J5X25hbWUocG9ydCwgImVuZHBvaW50 Iik7Cj4+ICsgICAgICAgICAgICAgICBvZl9ub2RlX3B1dChwb3J0KTsKPj4gKyAgICAgICAgICAg ICAgIGlmICghZW5kcG9pbnQpIHsKPj4gKyAgICAgICAgICAgICAgICAgICAgICAgZGV2X2Vycihk ZXYsICJubyBvdXRwdXQgZW5kcG9pbnQgZm91bmRcbiIpOwo+PiArICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm4gLUVJTlZBTDsKPj4gKyAgICAgICAgICAgICAgIH0KPj4gKwo+PiArICAgICAg ICAgICAgICAgcGFuZWxfbm9kZSA9IG9mX2dyYXBoX2dldF9yZW1vdGVfcG9ydF9wYXJlbnQoZW5k cG9pbnQpOwo+PiArICAgICAgICAgICAgICAgb2Zfbm9kZV9wdXQoZW5kcG9pbnQpOwo+PiArICAg ICAgICAgICAgICAgaWYgKCFwYW5lbF9ub2RlKSB7Cj4+ICsgICAgICAgICAgICAgICAgICAgICAg IGRldl9lcnIoZGV2LCAibm8gb3V0cHV0IG5vZGUgZm91bmRcbiIpOwo+PiArICAgICAgICAgICAg ICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsKPj4gKyAgICAgICAgICAgICAgIH0KPj4gKwo+PiAr ICAgICAgICAgICAgICAgcGFuZWwgPSBvZl9kcm1fZmluZF9wYW5lbChwYW5lbF9ub2RlKTsKPj4g KyAgICAgICAgICAgICAgIGlmICghcGFuZWwpIHsKPj4gKyAgICAgICAgICAgICAgICAgICAgICAg RFJNX0VSUk9SKCJmYWlsZWQgdG8gZmluZCBwYW5lbFxuIik7Cj4+ICsgICAgICAgICAgICAgICAg ICAgICAgIG9mX25vZGVfcHV0KHBhbmVsX25vZGUpOwo+PiArICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm4gLUVQUk9CRV9ERUZFUjsKPj4gKyAgICAgICAgICAgICAgIH0KPj4gICAgICAgICAg ICAgICAgICBvZl9ub2RlX3B1dChwYW5lbF9ub2RlKTsKPiBNaW5vciBuaXQ6IE1vdmUgb2Zfbm9k ZV9wdXQocGFuZWxfbm9kZSkgZGlyZWN0bHkgYmVsb3cKPiBvZl9kcm1fZmluZF9wYW5lbCB0byBh dm9pZCBkdXBsaWNhdGluZyBpdCBpbiBib3RoIGVycm9yIGFuZCBub3JtYWwKPiBwYXRocyAobGlr ZSB5b3UndmUgZG9uZSBhYm92ZSkuCgpZZXAsIGRvbmUuCgpUaGFua3MsCi0gWWFraXIKCj4gU2Vh bgo+Cj4+IC0gICAgICAgICAgICAgICByZXR1cm4gLUVQUk9CRV9ERUZFUjsKPj4gICAgICAgICAg fQo+Pgo+PiAtICAgICAgIG9mX25vZGVfcHV0KHBhbmVsX25vZGUpOwo+PiAtCj4+ICAgICAgICAg IGRwID0gZGV2bV9remFsbG9jKGRldiwgc2l6ZW9mKCpkcCksIEdGUF9LRVJORUwpOwo+PiAgICAg ICAgICBpZiAoIWRwKQo+PiAgICAgICAgICAgICAgICAgIHJldHVybiAtRU5PTUVNOwo+PiAtLQo+ PiAxLjkuMQo+Pgo+Pgo+PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwo+PiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4+IGRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKPj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwKPgo+CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752663AbcF2GoM (ORCPT ); Wed, 29 Jun 2016 02:44:12 -0400 Received: from lucky1.263xmail.com ([211.157.147.130]:38464 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752622AbcF2GoI (ORCPT ); Wed, 29 Jun 2016 02:44:08 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: dan.carpenter@oracle.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 06/10] drm/rockchip: analogix_dp: make panel detect to an optional action To: Sean Paul References: <1465904718-663-1-git-send-email-ykk@rock-chips.com> <1465904784-978-1-git-send-email-ykk@rock-chips.com> Cc: Mark Yao , Inki Dae , Jingoo Han , Heiko Stuebner , Krzysztof Kozlowski , linux-samsung-soc , linux-rockchip@lists.infradead.org, Daniel Vetter , Emil Velikov , Douglas Anderson , dri-devel , Linux Kernel Mailing List , Javier Martinez Canillas , Tomasz Figa , =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Thierry Reding , Dan Carpenter From: Yakir Yang Message-ID: <57736E19.7090900@rock-chips.com> Date: Wed, 29 Jun 2016 14:43:37 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean, On 06/23/2016 10:10 PM, Sean Paul wrote: > On Tue, Jun 14, 2016 at 7:46 AM, Yakir Yang wrote: >> Some boards don't need to declare a panel device node, like the >> display interface is DP monitors, so it's necessary to make the >> panel detect to an optional action. >> >> Signed-off-by: Yakir Yang >> Acked-by: Mark Yao >> --- >> Changes in v3: >> - Add the acked flag from Mark. >> >> Changes in v2: None >> >> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 48 ++++++++++++------------- >> 1 file changed, 22 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> index bcd9ecc..da2e844 100644 >> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> @@ -332,38 +332,34 @@ static int rockchip_dp_probe(struct platform_device *pdev) >> { >> struct device *dev = &pdev->dev; >> struct device_node *panel_node, *port, *endpoint; >> + struct drm_panel *panel = NULL; >> struct rockchip_dp_device *dp; >> - struct drm_panel *panel; >> >> port = of_graph_get_port_by_id(dev->of_node, 1); >> - if (!port) { >> - dev_err(dev, "can't find output port\n"); >> - return -EINVAL; >> - } >> - >> - endpoint = of_get_child_by_name(port, "endpoint"); >> - of_node_put(port); >> - if (!endpoint) { >> - dev_err(dev, "no output endpoint found\n"); >> - return -EINVAL; >> - } >> - >> - panel_node = of_graph_get_remote_port_parent(endpoint); >> - of_node_put(endpoint); >> - if (!panel_node) { >> - dev_err(dev, "no output node found\n"); >> - return -EINVAL; >> - } >> - >> - panel = of_drm_find_panel(panel_node); >> - if (!panel) { >> - DRM_ERROR("failed to find panel\n"); >> + if (port) { >> + endpoint = of_get_child_by_name(port, "endpoint"); >> + of_node_put(port); >> + if (!endpoint) { >> + dev_err(dev, "no output endpoint found\n"); >> + return -EINVAL; >> + } >> + >> + panel_node = of_graph_get_remote_port_parent(endpoint); >> + of_node_put(endpoint); >> + if (!panel_node) { >> + dev_err(dev, "no output node found\n"); >> + return -EINVAL; >> + } >> + >> + panel = of_drm_find_panel(panel_node); >> + if (!panel) { >> + DRM_ERROR("failed to find panel\n"); >> + of_node_put(panel_node); >> + return -EPROBE_DEFER; >> + } >> of_node_put(panel_node); > Minor nit: Move of_node_put(panel_node) directly below > of_drm_find_panel to avoid duplicating it in both error and normal > paths (like you've done above). Yep, done. Thanks, - Yakir > Sean > >> - return -EPROBE_DEFER; >> } >> >> - of_node_put(panel_node); >> - >> dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); >> if (!dp) >> return -ENOMEM; >> -- >> 1.9.1 >> >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >