From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05D9EC77B7A for ; Wed, 31 May 2023 09:20:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234921AbjEaJUD (ORCPT ); Wed, 31 May 2023 05:20:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235221AbjEaJTs (ORCPT ); Wed, 31 May 2023 05:19:48 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E579DBE for ; Wed, 31 May 2023 02:19:43 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-64fbfe0d037so547155b3a.0 for ; Wed, 31 May 2023 02:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=g2QKglMZH/mJ1PlHw0xaAb1Atu0wvBgVAqYnuu8mReQEONCqAC+kuvmXr1GOl2K8hi PELXRr9/ZHFzDZ1y3TGPnhTkxyRxzi2WWpiULuLFvRre0MOUR2wmfXd4PYcyHYisgga9 vIxf3UCExwjWT2hL5wZhyPw1/THRLmg9F35utlvE2h3bHMSJOdGF1FVhqXM8zvkuKeiA QDOmg7HzxXmpRYriQ+VggWvGgLlVCw55VPwJnR21xsMdQuKGIVaBL+9JKvxwHIb3unI0 dNbqyoJWOojJolHETOZRlnmey1S+0lkpPlrlK4bJKbtj2DG0b51oWPxTwnJeIwJ9apJ4 TZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=Nj7hrURl6FAmrCdr2nf/wFVhgGq19uMwa7Ttc+/oGHEcIz0JMd2jtkzOkkWgbWsRrM DCK8cAKaOU+A/MNxksii3br/GW+QqeSd4B+eeKmTgvuZeoJZLl7EVdwR44BRMwNlAMFo CFs8Sxznjnut8QJCBUe90ucQsOtJM2pqG8FMWi5Uq6MEKaX183IEZhGHl1WlGZXZXv/y Ne6yYArvXeD+HVueg3NjApm14i1qtArY+ettfhyYKOvYZdd7V2uwt262joAGgXsd30l4 Bl9tXmNjEA0Cj8iIEmvQIfPtllBVBCs1evpyYAI28WVIii5YApW7T3VP+xkPWvlEuEaD soNg== X-Gm-Message-State: AC+VfDxpc4lmOzEpXxNV9yFNznCkTwYGdcH8YMQkIrpUkNJackq7LyxY 3kbr0lpUxJFAbmvkMrWt0+i1XwgbW9uo8XwfXK52kw== X-Google-Smtp-Source: ACHHUZ6Ofzg7tjk5fXnBtT7CKLOKxvtwCuBdh95OKJ7ZvI9XlppTjSg852EOtBKSeeNZAfFL9zCpUaqHc9KwNzmaA5U= X-Received: by 2002:a17:902:e744:b0:1ac:86b5:70d9 with SMTP id p4-20020a170902e74400b001ac86b570d9mr14542055plf.32.1685524783362; Wed, 31 May 2023 02:19:43 -0700 (PDT) MIME-Version: 1.0 References: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org> <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> From: Nicolas Belin Date: Wed, 31 May 2023 11:19:32 +0200 Message-ID: Subject: Re: [PATCH v5 08/17] drm/meson: fix unbind path if HDMI fails to bind To: Neil Armstrong Cc: Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Airlie , Daniel Vetter , Philipp Zabel , Kishon Vijay Abraham I , Sam Ravnborg , "Lukas F. Hartmann" , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le mar. 30 mai 2023 =C3=A0 09:38, Neil Armstrong a =C3=A9crit : > > If the case the HDMI controller fails to bind, we try to unbind > all components before calling drm_dev_put() which makes drm_bridge_detach= () > crash because unbinding the HDMI controller frees the bridge memory. > > The solution is the unbind all components at the end like in the remove > path. > > Signed-off-by: Neil Armstrong > --- > drivers/gpu/drm/meson/meson_drv.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/me= son_drv.c > index ca6d1e59e5d9..e060279dc80a 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -316,32 +316,34 @@ static int meson_drv_bind_master(struct device *dev= , bool has_components) > goto exit_afbcd; > > if (has_components) { > - ret =3D component_bind_all(drm->dev, drm); > + ret =3D component_bind_all(dev, drm); > if (ret) { > dev_err(drm->dev, "Couldn't bind all components\n= "); > + /* Do not try to unbind */ > + has_components =3D false; > goto exit_afbcd; > } > } > > ret =3D meson_encoder_hdmi_init(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D meson_plane_create(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D meson_overlay_create(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D meson_crtc_create(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->n= ame, drm); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > drm_mode_config_reset(drm); > > @@ -359,15 +361,18 @@ static int meson_drv_bind_master(struct device *dev= , bool has_components) > > uninstall_irq: > free_irq(priv->vsync_irq, drm); > -unbind_all: > - if (has_components) > - component_unbind_all(drm->dev, drm); > exit_afbcd: > if (priv->afbcd.ops) > priv->afbcd.ops->exit(priv); > free_drm: > drm_dev_put(drm); > > + meson_encoder_hdmi_remove(priv); > + meson_encoder_cvbs_remove(priv); > + > + if (has_components) > + component_unbind_all(dev, drm); > + > return ret; > } > > > -- > 2.34.1 > Works fine on a Khadas VIM3 using a TS050 panel, Thanks Reviewed-by: Nicolas Belin Tested-by: Nicolas Belin From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5EA71C77B7A for ; Wed, 31 May 2023 09:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ia1Cn4yLydR3OX+ZYgOhtofXnsLIeVU2FDcK5zElHno=; b=2f56IXgPGfsEYi 2ExgptpheHXD+qHsLDTGLnG5XeH3vBogFxM/BmhCrJq0qkm/KkNlhLw8P6+Z5yt4zQCZCuV9dSuyP d44bwsGGDoxWnCes8wDKCOzElhWK/W7Cloneh1J2gFgHbF6zIYWyl1pBqDJNNRqf9ZVhiYMIfxqNR 4TZKWUaAnsrOEU4KQiAM3OHQmJihiEx0YbZeo+E8Oxoynic0Sl/sNR7qTZ4urZuBVdsczmuIW/4ZJ QE6192OchD77HCaER4yTvaC8aSIX8h+3O3A+CqPyD9GdvR/Sd4cR7Xm9AhIcnHVJIgOIOOfT1dMb1 vwtf0OuvIwbDWivR15sA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4Hzg-00GqSC-18; Wed, 31 May 2023 09:19:48 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4Hze-00GqQd-18 for linux-arm-kernel@lists.infradead.org; Wed, 31 May 2023 09:19:47 +0000 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1b0236ee816so5587645ad.1 for ; Wed, 31 May 2023 02:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=g2QKglMZH/mJ1PlHw0xaAb1Atu0wvBgVAqYnuu8mReQEONCqAC+kuvmXr1GOl2K8hi PELXRr9/ZHFzDZ1y3TGPnhTkxyRxzi2WWpiULuLFvRre0MOUR2wmfXd4PYcyHYisgga9 vIxf3UCExwjWT2hL5wZhyPw1/THRLmg9F35utlvE2h3bHMSJOdGF1FVhqXM8zvkuKeiA QDOmg7HzxXmpRYriQ+VggWvGgLlVCw55VPwJnR21xsMdQuKGIVaBL+9JKvxwHIb3unI0 dNbqyoJWOojJolHETOZRlnmey1S+0lkpPlrlK4bJKbtj2DG0b51oWPxTwnJeIwJ9apJ4 TZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=Pwkg+fQT9yGbNS0NktQaMgkErbKibEY/VeBLm8MtFp1YadtSvtjvxz9i9Wsy1S23tm 1I4YpctSJW1zrbIpyLButFRuzw1Rx1MYDMj051d3UwpZsLueRBGwiA15nRjGOPpEXjFY 6soBA3+l3mSlgdesVgtIeVWbNgql4LIYRAR+JhEZYLzzp2WUsbGGgxgtcFTPbW3zQDkA jogScMiQ1G/2C7a+FXZ5eb93pqTrumo7BZrEL9SAhSbqXRyusufhQC0VhOZPRQHawau9 aBCqfW8hl1t1jeqi0uFWCnwHsux8RLSrRZddWpy2M1cjJXSUGJL/UmfAvXQpv5BWGe9j 36Cw== X-Gm-Message-State: AC+VfDyVWnMJVMFUTfYxuf+r0fI3uHNKIq7CCcktdBZfG+kbwCAhwhid Aeo3y5gvbCUQiV2go1S88VbpPk6i2KrkBc8mHInx6g== X-Google-Smtp-Source: ACHHUZ6Ofzg7tjk5fXnBtT7CKLOKxvtwCuBdh95OKJ7ZvI9XlppTjSg852EOtBKSeeNZAfFL9zCpUaqHc9KwNzmaA5U= X-Received: by 2002:a17:902:e744:b0:1ac:86b5:70d9 with SMTP id p4-20020a170902e74400b001ac86b570d9mr14542055plf.32.1685524783362; Wed, 31 May 2023 02:19:43 -0700 (PDT) MIME-Version: 1.0 References: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org> <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> From: Nicolas Belin Date: Wed, 31 May 2023 11:19:32 +0200 Message-ID: Subject: Re: [PATCH v5 08/17] drm/meson: fix unbind path if HDMI fails to bind To: Neil Armstrong Cc: Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Airlie , Daniel Vetter , Philipp Zabel , Kishon Vijay Abraham I , Sam Ravnborg , "Lukas F. Hartmann" , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230531_021946_407989_5CCBF3A2 X-CRM114-Status: GOOD ( 19.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org TGUgbWFyLiAzMCBtYWkgMjAyMyDDoCAwOTozOCwgTmVpbCBBcm1zdHJvbmcKPG5laWwuYXJtc3Ry b25nQGxpbmFyby5vcmc+IGEgw6ljcml0IDoKPgo+IElmIHRoZSBjYXNlIHRoZSBIRE1JIGNvbnRy b2xsZXIgZmFpbHMgdG8gYmluZCwgd2UgdHJ5IHRvIHVuYmluZAo+IGFsbCBjb21wb25lbnRzIGJl Zm9yZSBjYWxsaW5nIGRybV9kZXZfcHV0KCkgd2hpY2ggbWFrZXMgZHJtX2JyaWRnZV9kZXRhY2go KQo+IGNyYXNoIGJlY2F1c2UgdW5iaW5kaW5nIHRoZSBIRE1JIGNvbnRyb2xsZXIgZnJlZXMgdGhl IGJyaWRnZSBtZW1vcnkuCj4KPiBUaGUgc29sdXRpb24gaXMgdGhlIHVuYmluZCBhbGwgY29tcG9u ZW50cyBhdCB0aGUgZW5kIGxpa2UgaW4gdGhlIHJlbW92ZQo+IHBhdGguCj4KPiBTaWduZWQtb2Zm LWJ5OiBOZWlsIEFybXN0cm9uZyA8bmVpbC5hcm1zdHJvbmdAbGluYXJvLm9yZz4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jIHwgMjMgKysrKysrKysrKysrKystLS0t LS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p Cj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCj4gaW5kZXggY2E2ZDFlNTllNWQ5Li5lMDYw Mjc5ZGM4MGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCj4gQEAgLTMxNiwzMiAr MzE2LDM0IEBAIHN0YXRpYyBpbnQgbWVzb25fZHJ2X2JpbmRfbWFzdGVyKHN0cnVjdCBkZXZpY2Ug KmRldiwgYm9vbCBoYXNfY29tcG9uZW50cykKPiAgICAgICAgICAgICAgICAgZ290byBleGl0X2Fm YmNkOwo+Cj4gICAgICAgICBpZiAoaGFzX2NvbXBvbmVudHMpIHsKPiAtICAgICAgICAgICAgICAg cmV0ID0gY29tcG9uZW50X2JpbmRfYWxsKGRybS0+ZGV2LCBkcm0pOwo+ICsgICAgICAgICAgICAg ICByZXQgPSBjb21wb25lbnRfYmluZF9hbGwoZGV2LCBkcm0pOwo+ICAgICAgICAgICAgICAgICBp ZiAocmV0KSB7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgZGV2X2Vycihkcm0tPmRldiwgIkNv dWxkbid0IGJpbmQgYWxsIGNvbXBvbmVudHNcbiIpOwo+ICsgICAgICAgICAgICAgICAgICAgICAg IC8qIERvIG5vdCB0cnkgdG8gdW5iaW5kICovCj4gKyAgICAgICAgICAgICAgICAgICAgICAgaGFz X2NvbXBvbmVudHMgPSBmYWxzZTsKPiAgICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGV4aXRf YWZiY2Q7Cj4gICAgICAgICAgICAgICAgIH0KPiAgICAgICAgIH0KPgo+ICAgICAgICAgcmV0ID0g bWVzb25fZW5jb2Rlcl9oZG1pX2luaXQocHJpdik7Cj4gICAgICAgICBpZiAocmV0KQo+IC0gICAg ICAgICAgICAgICBnb3RvIHVuYmluZF9hbGw7Cj4gKyAgICAgICAgICAgICAgIGdvdG8gZXhpdF9h ZmJjZDsKPgo+ICAgICAgICAgcmV0ID0gbWVzb25fcGxhbmVfY3JlYXRlKHByaXYpOwo+ICAgICAg ICAgaWYgKHJldCkKPiAtICAgICAgICAgICAgICAgZ290byB1bmJpbmRfYWxsOwo+ICsgICAgICAg ICAgICAgICBnb3RvIGV4aXRfYWZiY2Q7Cj4KPiAgICAgICAgIHJldCA9IG1lc29uX292ZXJsYXlf Y3JlYXRlKHByaXYpOwo+ICAgICAgICAgaWYgKHJldCkKPiAtICAgICAgICAgICAgICAgZ290byB1 bmJpbmRfYWxsOwo+ICsgICAgICAgICAgICAgICBnb3RvIGV4aXRfYWZiY2Q7Cj4KPiAgICAgICAg IHJldCA9IG1lc29uX2NydGNfY3JlYXRlKHByaXYpOwo+ICAgICAgICAgaWYgKHJldCkKPiAtICAg ICAgICAgICAgICAgZ290byB1bmJpbmRfYWxsOwo+ICsgICAgICAgICAgICAgICBnb3RvIGV4aXRf YWZiY2Q7Cj4KPiAgICAgICAgIHJldCA9IHJlcXVlc3RfaXJxKHByaXYtPnZzeW5jX2lycSwgbWVz b25faXJxLCAwLCBkcm0tPmRyaXZlci0+bmFtZSwgZHJtKTsKPiAgICAgICAgIGlmIChyZXQpCj4g LSAgICAgICAgICAgICAgIGdvdG8gdW5iaW5kX2FsbDsKPiArICAgICAgICAgICAgICAgZ290byBl eGl0X2FmYmNkOwo+Cj4gICAgICAgICBkcm1fbW9kZV9jb25maWdfcmVzZXQoZHJtKTsKPgo+IEBA IC0zNTksMTUgKzM2MSwxOCBAQCBzdGF0aWMgaW50IG1lc29uX2Rydl9iaW5kX21hc3RlcihzdHJ1 Y3QgZGV2aWNlICpkZXYsIGJvb2wgaGFzX2NvbXBvbmVudHMpCj4KPiAgdW5pbnN0YWxsX2lycToK PiAgICAgICAgIGZyZWVfaXJxKHByaXYtPnZzeW5jX2lycSwgZHJtKTsKPiAtdW5iaW5kX2FsbDoK PiAtICAgICAgIGlmIChoYXNfY29tcG9uZW50cykKPiAtICAgICAgICAgICAgICAgY29tcG9uZW50 X3VuYmluZF9hbGwoZHJtLT5kZXYsIGRybSk7Cj4gIGV4aXRfYWZiY2Q6Cj4gICAgICAgICBpZiAo cHJpdi0+YWZiY2Qub3BzKQo+ICAgICAgICAgICAgICAgICBwcml2LT5hZmJjZC5vcHMtPmV4aXQo cHJpdik7Cj4gIGZyZWVfZHJtOgo+ICAgICAgICAgZHJtX2Rldl9wdXQoZHJtKTsKPgo+ICsgICAg ICAgbWVzb25fZW5jb2Rlcl9oZG1pX3JlbW92ZShwcml2KTsKPiArICAgICAgIG1lc29uX2VuY29k ZXJfY3Zic19yZW1vdmUocHJpdik7Cj4gKwo+ICsgICAgICAgaWYgKGhhc19jb21wb25lbnRzKQo+ ICsgICAgICAgICAgICAgICBjb21wb25lbnRfdW5iaW5kX2FsbChkZXYsIGRybSk7Cj4gKwo+ICAg ICAgICAgcmV0dXJuIHJldDsKPiAgfQo+Cj4KPiAtLQo+IDIuMzQuMQo+CgpXb3JrcyBmaW5lIG9u IGEgS2hhZGFzIFZJTTMgdXNpbmcgYSBUUzA1MCBwYW5lbCwKVGhhbmtzCgpSZXZpZXdlZC1ieTog Tmljb2xhcyBCZWxpbiA8bmJlbGluQGJheWxpYnJlLmNvbT4KVGVzdGVkLWJ5OiBOaWNvbGFzIEJl bGluIDxuYmVsaW5AYmF5bGlicmUuY29tPgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 09058C77B73 for ; Wed, 31 May 2023 09:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BECGSmgiQ/2d5McHZmZf/H/k9IwkfnRxcXW4ejHP8ls=; b=I0rTH2BBAbZVFZ NvS95DfbMtbu0JCAuetZHTPG+eUzjhsF4hoFpABS1MLjG1+V3R66ak0iPR9lw1HomYPxpj5bYCEgk DjhUdWrWuRJzebAdAFt83YVHBhIfbNiJky1A62sXYJ/suiCCud9kPxjFAPhXQDjaiq3e/s3WUwSa7 pH9rGIEwT01/ScOJy+AgJESClb+OPrcRVby34P9WWxerZb8bt2hENBk0bWGLR+jr0auMuGZ5/E5Cn CNSHHPsLKtFWpr0oQ3/DCkyN4wA2QpAxAja3vdqfm6R176+itX6TSz/nVtsRHqhQGj+qrx4f8LJJ/ G5ZvHlinVXdG8l175n3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4Hzh-00GqSp-34; Wed, 31 May 2023 09:19:49 +0000 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4Hze-00GqQc-18 for linux-amlogic@lists.infradead.org; Wed, 31 May 2023 09:19:48 +0000 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1b038064d97so5694925ad.0 for ; Wed, 31 May 2023 02:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=g2QKglMZH/mJ1PlHw0xaAb1Atu0wvBgVAqYnuu8mReQEONCqAC+kuvmXr1GOl2K8hi PELXRr9/ZHFzDZ1y3TGPnhTkxyRxzi2WWpiULuLFvRre0MOUR2wmfXd4PYcyHYisgga9 vIxf3UCExwjWT2hL5wZhyPw1/THRLmg9F35utlvE2h3bHMSJOdGF1FVhqXM8zvkuKeiA QDOmg7HzxXmpRYriQ+VggWvGgLlVCw55VPwJnR21xsMdQuKGIVaBL+9JKvxwHIb3unI0 dNbqyoJWOojJolHETOZRlnmey1S+0lkpPlrlK4bJKbtj2DG0b51oWPxTwnJeIwJ9apJ4 TZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=WqW+9E6ogdCf+T4nBpPyKplpW19j1cNzhGJYSI5U6pI5SCNsLlZqYszdxfgJQ45Isl qKcf30cPO4N028L6G1xnG8kVzVXAsq/VzRnCskxFuwKy4VDPQz+adqWRXWxuxCKOhLI4 IpbSJvdH8Fu6l6Gmt4iOLWwRVWoZSo9kDLM3iRA5hXM1BzGQwmaQipmZTnBSduEsSWW0 A2inLhjERphvzGErQZQSB6o70GggeEY9jSHIxHtVQIEHSKSUKVH1LupQmi2coZgWqShU 23RuZRRCOIJc/VB1LZKgV3bzkTYHtf97qM9KS4DeZMGGyYamjMRSZtDF4Lx5e6/PlFSP BhJA== X-Gm-Message-State: AC+VfDyZHvWQIB2zqeefi19Bj93IsPpV6SUPjYgdecn2DiVSjXWHVE1A l5CiXnErqAjC5HKOUbCWLGlYOkabQViJRxWjZF6NpA== X-Google-Smtp-Source: ACHHUZ6Ofzg7tjk5fXnBtT7CKLOKxvtwCuBdh95OKJ7ZvI9XlppTjSg852EOtBKSeeNZAfFL9zCpUaqHc9KwNzmaA5U= X-Received: by 2002:a17:902:e744:b0:1ac:86b5:70d9 with SMTP id p4-20020a170902e74400b001ac86b570d9mr14542055plf.32.1685524783362; Wed, 31 May 2023 02:19:43 -0700 (PDT) MIME-Version: 1.0 References: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org> <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> From: Nicolas Belin Date: Wed, 31 May 2023 11:19:32 +0200 Message-ID: Subject: Re: [PATCH v5 08/17] drm/meson: fix unbind path if HDMI fails to bind To: Neil Armstrong Cc: Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Airlie , Daniel Vetter , Philipp Zabel , Kishon Vijay Abraham I , Sam Ravnborg , "Lukas F. Hartmann" , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230531_021946_406714_3C341128 X-CRM114-Status: GOOD ( 17.79 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org TGUgbWFyLiAzMCBtYWkgMjAyMyDDoCAwOTozOCwgTmVpbCBBcm1zdHJvbmcKPG5laWwuYXJtc3Ry b25nQGxpbmFyby5vcmc+IGEgw6ljcml0IDoKPgo+IElmIHRoZSBjYXNlIHRoZSBIRE1JIGNvbnRy b2xsZXIgZmFpbHMgdG8gYmluZCwgd2UgdHJ5IHRvIHVuYmluZAo+IGFsbCBjb21wb25lbnRzIGJl Zm9yZSBjYWxsaW5nIGRybV9kZXZfcHV0KCkgd2hpY2ggbWFrZXMgZHJtX2JyaWRnZV9kZXRhY2go KQo+IGNyYXNoIGJlY2F1c2UgdW5iaW5kaW5nIHRoZSBIRE1JIGNvbnRyb2xsZXIgZnJlZXMgdGhl IGJyaWRnZSBtZW1vcnkuCj4KPiBUaGUgc29sdXRpb24gaXMgdGhlIHVuYmluZCBhbGwgY29tcG9u ZW50cyBhdCB0aGUgZW5kIGxpa2UgaW4gdGhlIHJlbW92ZQo+IHBhdGguCj4KPiBTaWduZWQtb2Zm LWJ5OiBOZWlsIEFybXN0cm9uZyA8bmVpbC5hcm1zdHJvbmdAbGluYXJvLm9yZz4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jIHwgMjMgKysrKysrKysrKysrKystLS0t LS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p Cj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCj4gaW5kZXggY2E2ZDFlNTllNWQ5Li5lMDYw Mjc5ZGM4MGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCj4gQEAgLTMxNiwzMiAr MzE2LDM0IEBAIHN0YXRpYyBpbnQgbWVzb25fZHJ2X2JpbmRfbWFzdGVyKHN0cnVjdCBkZXZpY2Ug KmRldiwgYm9vbCBoYXNfY29tcG9uZW50cykKPiAgICAgICAgICAgICAgICAgZ290byBleGl0X2Fm YmNkOwo+Cj4gICAgICAgICBpZiAoaGFzX2NvbXBvbmVudHMpIHsKPiAtICAgICAgICAgICAgICAg cmV0ID0gY29tcG9uZW50X2JpbmRfYWxsKGRybS0+ZGV2LCBkcm0pOwo+ICsgICAgICAgICAgICAg ICByZXQgPSBjb21wb25lbnRfYmluZF9hbGwoZGV2LCBkcm0pOwo+ICAgICAgICAgICAgICAgICBp ZiAocmV0KSB7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgZGV2X2Vycihkcm0tPmRldiwgIkNv dWxkbid0IGJpbmQgYWxsIGNvbXBvbmVudHNcbiIpOwo+ICsgICAgICAgICAgICAgICAgICAgICAg IC8qIERvIG5vdCB0cnkgdG8gdW5iaW5kICovCj4gKyAgICAgICAgICAgICAgICAgICAgICAgaGFz X2NvbXBvbmVudHMgPSBmYWxzZTsKPiAgICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGV4aXRf YWZiY2Q7Cj4gICAgICAgICAgICAgICAgIH0KPiAgICAgICAgIH0KPgo+ICAgICAgICAgcmV0ID0g bWVzb25fZW5jb2Rlcl9oZG1pX2luaXQocHJpdik7Cj4gICAgICAgICBpZiAocmV0KQo+IC0gICAg ICAgICAgICAgICBnb3RvIHVuYmluZF9hbGw7Cj4gKyAgICAgICAgICAgICAgIGdvdG8gZXhpdF9h ZmJjZDsKPgo+ICAgICAgICAgcmV0ID0gbWVzb25fcGxhbmVfY3JlYXRlKHByaXYpOwo+ICAgICAg ICAgaWYgKHJldCkKPiAtICAgICAgICAgICAgICAgZ290byB1bmJpbmRfYWxsOwo+ICsgICAgICAg ICAgICAgICBnb3RvIGV4aXRfYWZiY2Q7Cj4KPiAgICAgICAgIHJldCA9IG1lc29uX292ZXJsYXlf Y3JlYXRlKHByaXYpOwo+ICAgICAgICAgaWYgKHJldCkKPiAtICAgICAgICAgICAgICAgZ290byB1 bmJpbmRfYWxsOwo+ICsgICAgICAgICAgICAgICBnb3RvIGV4aXRfYWZiY2Q7Cj4KPiAgICAgICAg IHJldCA9IG1lc29uX2NydGNfY3JlYXRlKHByaXYpOwo+ICAgICAgICAgaWYgKHJldCkKPiAtICAg ICAgICAgICAgICAgZ290byB1bmJpbmRfYWxsOwo+ICsgICAgICAgICAgICAgICBnb3RvIGV4aXRf YWZiY2Q7Cj4KPiAgICAgICAgIHJldCA9IHJlcXVlc3RfaXJxKHByaXYtPnZzeW5jX2lycSwgbWVz b25faXJxLCAwLCBkcm0tPmRyaXZlci0+bmFtZSwgZHJtKTsKPiAgICAgICAgIGlmIChyZXQpCj4g LSAgICAgICAgICAgICAgIGdvdG8gdW5iaW5kX2FsbDsKPiArICAgICAgICAgICAgICAgZ290byBl eGl0X2FmYmNkOwo+Cj4gICAgICAgICBkcm1fbW9kZV9jb25maWdfcmVzZXQoZHJtKTsKPgo+IEBA IC0zNTksMTUgKzM2MSwxOCBAQCBzdGF0aWMgaW50IG1lc29uX2Rydl9iaW5kX21hc3RlcihzdHJ1 Y3QgZGV2aWNlICpkZXYsIGJvb2wgaGFzX2NvbXBvbmVudHMpCj4KPiAgdW5pbnN0YWxsX2lycToK PiAgICAgICAgIGZyZWVfaXJxKHByaXYtPnZzeW5jX2lycSwgZHJtKTsKPiAtdW5iaW5kX2FsbDoK PiAtICAgICAgIGlmIChoYXNfY29tcG9uZW50cykKPiAtICAgICAgICAgICAgICAgY29tcG9uZW50 X3VuYmluZF9hbGwoZHJtLT5kZXYsIGRybSk7Cj4gIGV4aXRfYWZiY2Q6Cj4gICAgICAgICBpZiAo cHJpdi0+YWZiY2Qub3BzKQo+ICAgICAgICAgICAgICAgICBwcml2LT5hZmJjZC5vcHMtPmV4aXQo cHJpdik7Cj4gIGZyZWVfZHJtOgo+ICAgICAgICAgZHJtX2Rldl9wdXQoZHJtKTsKPgo+ICsgICAg ICAgbWVzb25fZW5jb2Rlcl9oZG1pX3JlbW92ZShwcml2KTsKPiArICAgICAgIG1lc29uX2VuY29k ZXJfY3Zic19yZW1vdmUocHJpdik7Cj4gKwo+ICsgICAgICAgaWYgKGhhc19jb21wb25lbnRzKQo+ ICsgICAgICAgICAgICAgICBjb21wb25lbnRfdW5iaW5kX2FsbChkZXYsIGRybSk7Cj4gKwo+ICAg ICAgICAgcmV0dXJuIHJldDsKPiAgfQo+Cj4KPiAtLQo+IDIuMzQuMQo+CgpXb3JrcyBmaW5lIG9u IGEgS2hhZGFzIFZJTTMgdXNpbmcgYSBUUzA1MCBwYW5lbCwKVGhhbmtzCgpSZXZpZXdlZC1ieTog Tmljb2xhcyBCZWxpbiA8bmJlbGluQGJheWxpYnJlLmNvbT4KVGVzdGVkLWJ5OiBOaWNvbGFzIEJl bGluIDxuYmVsaW5AYmF5bGlicmUuY29tPgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KbGludXgtYW1sb2dpYyBtYWlsaW5nIGxpc3QKbGludXgtYW1sb2dp Y0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vbGludXgtYW1sb2dpYwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A105C77B7A for ; Wed, 31 May 2023 09:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qBmPQ+Md9JtP6Pyy/vp2UydM437mYqqK0Ar8EmB7ckw=; b=VkeFqMNgFRZPmm ZB7Pda56Tx4bCnfegsoAN70nrZIKOJTUdmNNdeqhusKUBiZKh+d/4RxJisMQpxS0qKj6fzmNuD+KZ U+kfrSC3kNKHTvRjago8oXGMO2ayUpHz4J0+u+T2OhL7WUZRQ2hLDbCp9sHITKoMxa6HQQUkCGdJ1 a2RdKycW/pwhGEmFih+aciXc955X5Qhob01g2HOX4km4gl56iciEGK7C6hjY2mozsPTtgX1T4mVCE nt9NjqNY0XryY5u1kyapdGBHcl6FS3P4wygfziyTO1QLwqfh3wfP0fWrTsRCfAG52hkjwjNPFhPSX dmqy7H9l6g5g+Rv136wQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4Hzg-00GqS0-07; Wed, 31 May 2023 09:19:48 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4Hzd-00GqQe-36 for linux-phy@lists.infradead.org; Wed, 31 May 2023 09:19:47 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1b0201d9a9eso5689295ad.0 for ; Wed, 31 May 2023 02:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=g2QKglMZH/mJ1PlHw0xaAb1Atu0wvBgVAqYnuu8mReQEONCqAC+kuvmXr1GOl2K8hi PELXRr9/ZHFzDZ1y3TGPnhTkxyRxzi2WWpiULuLFvRre0MOUR2wmfXd4PYcyHYisgga9 vIxf3UCExwjWT2hL5wZhyPw1/THRLmg9F35utlvE2h3bHMSJOdGF1FVhqXM8zvkuKeiA QDOmg7HzxXmpRYriQ+VggWvGgLlVCw55VPwJnR21xsMdQuKGIVaBL+9JKvxwHIb3unI0 dNbqyoJWOojJolHETOZRlnmey1S+0lkpPlrlK4bJKbtj2DG0b51oWPxTwnJeIwJ9apJ4 TZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=gHBivHZPkAhdqAx/ZfXs+vV8lsIhxDMWMyRjY7o0KmaOWZZ+k69aGdRvDVTsYHwB70 nDFy8VT6We7r8x3QOs7QcXSc1GtDdpL9bLCw2NHnATWCLgyITaUz5GUGJRzDmfEj+5ds DswZHuOqq4EC+WBIqTeCHwrGXnDdPMvETHoRrqyyNXKEacTK9GEM1HdDUyznw2PNZ+2h BFpJE6LebTNWu3sN0+mGLI62iwwd5vkoWfbAikP4a5waeG44tXso4eIKIqnEJMkqoYp3 ySqaV0ngXDeqfaSxicflOTlQs05XavJ8W1bk3sMXXyKzVXQuUiEUYwPk7mXzBfv5fYXK RKUw== X-Gm-Message-State: AC+VfDziEphgbtyusBP1zi++ZhOdNIcujDuFPe1AbEAgZ7CwjVEtYZf+ JXcFcALwxWVUF8MFmi5Dtn+MIFPayZF4SWJ5KTDmFg== X-Google-Smtp-Source: ACHHUZ6Ofzg7tjk5fXnBtT7CKLOKxvtwCuBdh95OKJ7ZvI9XlppTjSg852EOtBKSeeNZAfFL9zCpUaqHc9KwNzmaA5U= X-Received: by 2002:a17:902:e744:b0:1ac:86b5:70d9 with SMTP id p4-20020a170902e74400b001ac86b570d9mr14542055plf.32.1685524783362; Wed, 31 May 2023 02:19:43 -0700 (PDT) MIME-Version: 1.0 References: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org> <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> From: Nicolas Belin Date: Wed, 31 May 2023 11:19:32 +0200 Message-ID: Subject: Re: [PATCH v5 08/17] drm/meson: fix unbind path if HDMI fails to bind To: Neil Armstrong Cc: Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Airlie , Daniel Vetter , Philipp Zabel , Kishon Vijay Abraham I , Sam Ravnborg , "Lukas F. Hartmann" , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230531_021946_022868_CC313D69 X-CRM114-Status: GOOD ( 17.78 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org TGUgbWFyLiAzMCBtYWkgMjAyMyDDoCAwOTozOCwgTmVpbCBBcm1zdHJvbmcKPG5laWwuYXJtc3Ry b25nQGxpbmFyby5vcmc+IGEgw6ljcml0IDoKPgo+IElmIHRoZSBjYXNlIHRoZSBIRE1JIGNvbnRy b2xsZXIgZmFpbHMgdG8gYmluZCwgd2UgdHJ5IHRvIHVuYmluZAo+IGFsbCBjb21wb25lbnRzIGJl Zm9yZSBjYWxsaW5nIGRybV9kZXZfcHV0KCkgd2hpY2ggbWFrZXMgZHJtX2JyaWRnZV9kZXRhY2go KQo+IGNyYXNoIGJlY2F1c2UgdW5iaW5kaW5nIHRoZSBIRE1JIGNvbnRyb2xsZXIgZnJlZXMgdGhl IGJyaWRnZSBtZW1vcnkuCj4KPiBUaGUgc29sdXRpb24gaXMgdGhlIHVuYmluZCBhbGwgY29tcG9u ZW50cyBhdCB0aGUgZW5kIGxpa2UgaW4gdGhlIHJlbW92ZQo+IHBhdGguCj4KPiBTaWduZWQtb2Zm LWJ5OiBOZWlsIEFybXN0cm9uZyA8bmVpbC5hcm1zdHJvbmdAbGluYXJvLm9yZz4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jIHwgMjMgKysrKysrKysrKysrKystLS0t LS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p Cj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCj4gaW5kZXggY2E2ZDFlNTllNWQ5Li5lMDYw Mjc5ZGM4MGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCj4gQEAgLTMxNiwzMiAr MzE2LDM0IEBAIHN0YXRpYyBpbnQgbWVzb25fZHJ2X2JpbmRfbWFzdGVyKHN0cnVjdCBkZXZpY2Ug KmRldiwgYm9vbCBoYXNfY29tcG9uZW50cykKPiAgICAgICAgICAgICAgICAgZ290byBleGl0X2Fm YmNkOwo+Cj4gICAgICAgICBpZiAoaGFzX2NvbXBvbmVudHMpIHsKPiAtICAgICAgICAgICAgICAg cmV0ID0gY29tcG9uZW50X2JpbmRfYWxsKGRybS0+ZGV2LCBkcm0pOwo+ICsgICAgICAgICAgICAg ICByZXQgPSBjb21wb25lbnRfYmluZF9hbGwoZGV2LCBkcm0pOwo+ICAgICAgICAgICAgICAgICBp ZiAocmV0KSB7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgZGV2X2Vycihkcm0tPmRldiwgIkNv dWxkbid0IGJpbmQgYWxsIGNvbXBvbmVudHNcbiIpOwo+ICsgICAgICAgICAgICAgICAgICAgICAg IC8qIERvIG5vdCB0cnkgdG8gdW5iaW5kICovCj4gKyAgICAgICAgICAgICAgICAgICAgICAgaGFz X2NvbXBvbmVudHMgPSBmYWxzZTsKPiAgICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGV4aXRf YWZiY2Q7Cj4gICAgICAgICAgICAgICAgIH0KPiAgICAgICAgIH0KPgo+ICAgICAgICAgcmV0ID0g bWVzb25fZW5jb2Rlcl9oZG1pX2luaXQocHJpdik7Cj4gICAgICAgICBpZiAocmV0KQo+IC0gICAg ICAgICAgICAgICBnb3RvIHVuYmluZF9hbGw7Cj4gKyAgICAgICAgICAgICAgIGdvdG8gZXhpdF9h ZmJjZDsKPgo+ICAgICAgICAgcmV0ID0gbWVzb25fcGxhbmVfY3JlYXRlKHByaXYpOwo+ICAgICAg ICAgaWYgKHJldCkKPiAtICAgICAgICAgICAgICAgZ290byB1bmJpbmRfYWxsOwo+ICsgICAgICAg ICAgICAgICBnb3RvIGV4aXRfYWZiY2Q7Cj4KPiAgICAgICAgIHJldCA9IG1lc29uX292ZXJsYXlf Y3JlYXRlKHByaXYpOwo+ICAgICAgICAgaWYgKHJldCkKPiAtICAgICAgICAgICAgICAgZ290byB1 bmJpbmRfYWxsOwo+ICsgICAgICAgICAgICAgICBnb3RvIGV4aXRfYWZiY2Q7Cj4KPiAgICAgICAg IHJldCA9IG1lc29uX2NydGNfY3JlYXRlKHByaXYpOwo+ICAgICAgICAgaWYgKHJldCkKPiAtICAg ICAgICAgICAgICAgZ290byB1bmJpbmRfYWxsOwo+ICsgICAgICAgICAgICAgICBnb3RvIGV4aXRf YWZiY2Q7Cj4KPiAgICAgICAgIHJldCA9IHJlcXVlc3RfaXJxKHByaXYtPnZzeW5jX2lycSwgbWVz b25faXJxLCAwLCBkcm0tPmRyaXZlci0+bmFtZSwgZHJtKTsKPiAgICAgICAgIGlmIChyZXQpCj4g LSAgICAgICAgICAgICAgIGdvdG8gdW5iaW5kX2FsbDsKPiArICAgICAgICAgICAgICAgZ290byBl eGl0X2FmYmNkOwo+Cj4gICAgICAgICBkcm1fbW9kZV9jb25maWdfcmVzZXQoZHJtKTsKPgo+IEBA IC0zNTksMTUgKzM2MSwxOCBAQCBzdGF0aWMgaW50IG1lc29uX2Rydl9iaW5kX21hc3RlcihzdHJ1 Y3QgZGV2aWNlICpkZXYsIGJvb2wgaGFzX2NvbXBvbmVudHMpCj4KPiAgdW5pbnN0YWxsX2lycToK PiAgICAgICAgIGZyZWVfaXJxKHByaXYtPnZzeW5jX2lycSwgZHJtKTsKPiAtdW5iaW5kX2FsbDoK PiAtICAgICAgIGlmIChoYXNfY29tcG9uZW50cykKPiAtICAgICAgICAgICAgICAgY29tcG9uZW50 X3VuYmluZF9hbGwoZHJtLT5kZXYsIGRybSk7Cj4gIGV4aXRfYWZiY2Q6Cj4gICAgICAgICBpZiAo cHJpdi0+YWZiY2Qub3BzKQo+ICAgICAgICAgICAgICAgICBwcml2LT5hZmJjZC5vcHMtPmV4aXQo cHJpdik7Cj4gIGZyZWVfZHJtOgo+ICAgICAgICAgZHJtX2Rldl9wdXQoZHJtKTsKPgo+ICsgICAg ICAgbWVzb25fZW5jb2Rlcl9oZG1pX3JlbW92ZShwcml2KTsKPiArICAgICAgIG1lc29uX2VuY29k ZXJfY3Zic19yZW1vdmUocHJpdik7Cj4gKwo+ICsgICAgICAgaWYgKGhhc19jb21wb25lbnRzKQo+ ICsgICAgICAgICAgICAgICBjb21wb25lbnRfdW5iaW5kX2FsbChkZXYsIGRybSk7Cj4gKwo+ICAg ICAgICAgcmV0dXJuIHJldDsKPiAgfQo+Cj4KPiAtLQo+IDIuMzQuMQo+CgpXb3JrcyBmaW5lIG9u IGEgS2hhZGFzIFZJTTMgdXNpbmcgYSBUUzA1MCBwYW5lbCwKVGhhbmtzCgpSZXZpZXdlZC1ieTog Tmljb2xhcyBCZWxpbiA8bmJlbGluQGJheWxpYnJlLmNvbT4KVGVzdGVkLWJ5OiBOaWNvbGFzIEJl bGluIDxuYmVsaW5AYmF5bGlicmUuY29tPgoKLS0gCmxpbnV4LXBoeSBtYWlsaW5nIGxpc3QKbGlu dXgtcGh5QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cHM6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtcGh5Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 446B8C77B7E for ; Thu, 1 Jun 2023 07:37:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 40C4C10E520; Thu, 1 Jun 2023 07:37:15 +0000 (UTC) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by gabe.freedesktop.org (Postfix) with ESMTPS id D83B810E1C7 for ; Wed, 31 May 2023 09:19:44 +0000 (UTC) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1b0201d9a9eso5689305ad.0 for ; Wed, 31 May 2023 02:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=g2QKglMZH/mJ1PlHw0xaAb1Atu0wvBgVAqYnuu8mReQEONCqAC+kuvmXr1GOl2K8hi PELXRr9/ZHFzDZ1y3TGPnhTkxyRxzi2WWpiULuLFvRre0MOUR2wmfXd4PYcyHYisgga9 vIxf3UCExwjWT2hL5wZhyPw1/THRLmg9F35utlvE2h3bHMSJOdGF1FVhqXM8zvkuKeiA QDOmg7HzxXmpRYriQ+VggWvGgLlVCw55VPwJnR21xsMdQuKGIVaBL+9JKvxwHIb3unI0 dNbqyoJWOojJolHETOZRlnmey1S+0lkpPlrlK4bJKbtj2DG0b51oWPxTwnJeIwJ9apJ4 TZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685524783; x=1688116783; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/F8jIF8NqATxdAvMuHV954nGjADHoS+vIBQmhEkWOs=; b=GIPXRSeijhqUj8nKsQ/VREqCEKSEDP00PUHgNFO9xLhMwfFwMNSHQnhZiQMvUwjaF0 BXvr2ja55f/h6a+wOHvJu4aiCf+XH2WG/Td9fBM3DQyWMv2NXVLSLeVvLj4z4xR+HVrd OOdPIWo1nShSXsy3R9TwL46UHSVUVWzLEPXY5jTCDiY8E2kdDGA3BPSeB7jhp/Jn5Yw7 bVSz9K3V12vIL4d1iTzumBxPqmgq/2tfR5QIPoiiXmsrJKN/x0rhwED9+mgoM+Tkatfh gRxT7V6SWxEPdyKPxd1wW+VAwmLV4GxjKhFSlZOKkDgwXI3XNryIU4Z/NltGoFF6i5LV gTNg== X-Gm-Message-State: AC+VfDx9pLWwNRo5/zQMRSWQ5RTHDNQ9zJLQzv3A4s3szvgwr3fYPUrq PaRVMp2OlQw+BWtK2745dTGWp+/+7WZ0TBMww5aU8w== X-Google-Smtp-Source: ACHHUZ6Ofzg7tjk5fXnBtT7CKLOKxvtwCuBdh95OKJ7ZvI9XlppTjSg852EOtBKSeeNZAfFL9zCpUaqHc9KwNzmaA5U= X-Received: by 2002:a17:902:e744:b0:1ac:86b5:70d9 with SMTP id p4-20020a170902e74400b001ac86b570d9mr14542055plf.32.1685524783362; Wed, 31 May 2023 02:19:43 -0700 (PDT) MIME-Version: 1.0 References: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org> <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-8-56eb7a4d5b8e@linaro.org> From: Nicolas Belin Date: Wed, 31 May 2023 11:19:32 +0200 Message-ID: Subject: Re: [PATCH v5 08/17] drm/meson: fix unbind path if HDMI fails to bind To: Neil Armstrong Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Thu, 01 Jun 2023 07:37:12 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kishon Vijay Abraham I , devicetree@vger.kernel.org, Conor Dooley , Sam Ravnborg , Stephen Boyd , Kevin Hilman , Michael Turquette , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Martin Blumenstingl , Rob Herring , linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski , linux-amlogic@lists.infradead.org, linux-phy@lists.infradead.org, linux-clk@vger.kernel.org, "Lukas F. Hartmann" , Jerome Brunet Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Le mar. 30 mai 2023 =C3=A0 09:38, Neil Armstrong a =C3=A9crit : > > If the case the HDMI controller fails to bind, we try to unbind > all components before calling drm_dev_put() which makes drm_bridge_detach= () > crash because unbinding the HDMI controller frees the bridge memory. > > The solution is the unbind all components at the end like in the remove > path. > > Signed-off-by: Neil Armstrong > --- > drivers/gpu/drm/meson/meson_drv.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/me= son_drv.c > index ca6d1e59e5d9..e060279dc80a 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -316,32 +316,34 @@ static int meson_drv_bind_master(struct device *dev= , bool has_components) > goto exit_afbcd; > > if (has_components) { > - ret =3D component_bind_all(drm->dev, drm); > + ret =3D component_bind_all(dev, drm); > if (ret) { > dev_err(drm->dev, "Couldn't bind all components\n= "); > + /* Do not try to unbind */ > + has_components =3D false; > goto exit_afbcd; > } > } > > ret =3D meson_encoder_hdmi_init(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D meson_plane_create(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D meson_overlay_create(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D meson_crtc_create(priv); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > ret =3D request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->n= ame, drm); > if (ret) > - goto unbind_all; > + goto exit_afbcd; > > drm_mode_config_reset(drm); > > @@ -359,15 +361,18 @@ static int meson_drv_bind_master(struct device *dev= , bool has_components) > > uninstall_irq: > free_irq(priv->vsync_irq, drm); > -unbind_all: > - if (has_components) > - component_unbind_all(drm->dev, drm); > exit_afbcd: > if (priv->afbcd.ops) > priv->afbcd.ops->exit(priv); > free_drm: > drm_dev_put(drm); > > + meson_encoder_hdmi_remove(priv); > + meson_encoder_cvbs_remove(priv); > + > + if (has_components) > + component_unbind_all(dev, drm); > + > return ret; > } > > > -- > 2.34.1 > Works fine on a Khadas VIM3 using a TS050 panel, Thanks Reviewed-by: Nicolas Belin Tested-by: Nicolas Belin