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 8858A10F9951 for ; Wed, 8 Apr 2026 15:44:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8B7C10E692; Wed, 8 Apr 2026 15:44:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="CbqlRATR"; dkim-atps=neutral Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9567810E692 for ; Wed, 8 Apr 2026 15:44:01 +0000 (UTC) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 5B2051A320D; Wed, 8 Apr 2026 15:44:00 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 24CD9603CB; Wed, 8 Apr 2026 15:44:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BC7FA1045012A; Wed, 8 Apr 2026 17:43:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1775663039; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:content-language:in-reply-to:references; bh=8Rrz89gPzPp297ULZaYId6KNoBOvWz14fm4uY98Dttk=; b=CbqlRATRSuaGDiwycm+nperBpEQoMjeerVUCl3vIKiewReKWRln3Ngk/rake7EyeLkKI9f htntddeXNoKjyPvH2gUznC/6SEMwQecut0zU88eKVslBAVJFbRTkF7bLqSZHwU8T5ENYbn Cb4ytN7lQt8X49NttrYDXgsWsr+dvhX+T3LhbpWLW9gLFTwW8ibHoKZQ5lebwCp1S7Y/s8 DJC0JNR7jGzyOn5Yuvb/jdHUhha28BrouL8zL91e/SoXh6XV/F1ZVmQzhm8mJkh9d2ECM5 sqIoEuwYJCERlhVXFmpgEPORj1EsppBZKYayPnEGuGnE5rT+a8VXSGKOsStVkg== Message-ID: Date: Wed, 8 Apr 2026 17:44:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 1/4] drm: renesas: rz-du: rzg2l_du_encoder: convert to of_drm_find_and_get_bridge() To: Luca Ceresoli , Biju Das , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Anitha Chrisanthus , Linus Walleij , Laurent Pinchart , Tomi Valkeinen , Kieran Bingham , Geert Uytterhoeven , Magnus Damm , Tomi Valkeinen Cc: Hui Pu , Ian Ray , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260402-drm-bridge-alloc-getput-drm_of_find_bridge-4-v4-0-421781c8c061@bootlin.com> <20260402-drm-bridge-alloc-getput-drm_of_find_bridge-4-v4-1-421781c8c061@bootlin.com> From: Louis Chauvet Content-Language: en-US In-Reply-To: <20260402-drm-bridge-alloc-getput-drm_of_find_bridge-4-v4-1-421781c8c061@bootlin.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Last-TLS-Session-Version: TLSv1.3 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 4/2/26 18:27, Luca Ceresoli wrote: > of_drm_find_bridge() is deprecated. Move to its replacement > of_drm_find_and_get_bridge() which gets a bridge reference, and ensure it > is put when done. > > This is made somewhat simpler by the fact that 'bridge' is a local > variable. > > However we need to handle both branches of the main if(). > > In the 'else' case, just switch to of_drm_find_and_get_bridge() to ensure > the bridge is not freed while in use in the function tail > (drm_bridge_attach() mainly). > > In the 'then' case, devm_drm_panel_bridge_add_typed() already increments > the refcount using devres which ties the bridge allocation lifetime to the > device lifetime, so we would not need to do anything. However to have the > same behaviour in both branches take an additional reference here, so that > the bridge needs to be put whichever branch is taken without more > complicated logic. Ensure to clear the bridge pointer however, to avoid > calling drm_bridge_put() on an ERR_PTR. > > Reviewed-by: Biju Das > Tested-by: Biju Das > Signed-off-by: Luca Ceresoli > > --- > > Changes in v4: > - Added comment to clarify the additional drm_bridge_get() in the > panel_bridge case (keeping the R-by and T-by tags as it's just a comment) > --- > drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c > index 5e6dd16705e6..9edb90059830 100644 > --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c > +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c > @@ -67,7 +67,7 @@ int rzg2l_du_encoder_init(struct rzg2l_du_device *rcdu, > { > struct rzg2l_du_encoder *renc; > struct drm_connector *connector; > - struct drm_bridge *bridge; > + struct drm_bridge *bridge __free(drm_bridge_put) = NULL; > int ret; > > /* > @@ -83,10 +83,21 @@ int rzg2l_du_encoder_init(struct rzg2l_du_device *rcdu, > > bridge = devm_drm_panel_bridge_add_typed(rcdu->dev, panel, > DRM_MODE_CONNECTOR_DPI); > - if (IS_ERR(bridge)) > - return PTR_ERR(bridge); > + if (IS_ERR(bridge)) { > + // Inhibit the cleanup action on an ERR_PTR > + ret = PTR_ERR(bridge); > + bridge = NULL; > + return ret; > + } Can't you use https://elixir.bootlin.com/linux/v6.19.11/source/include/linux/cleanup.h#L230? return PTR_ERR(no_free_ptr(bridge)); With or without this modification: Reviewed-by: Louis Chauvet > + > + /* > + * The reference taken by devm_drm_panel_bridge_add_typed() is > + * released automatically. Take a second one for the __free() > + * when this function will return. > + */ > + drm_bridge_get(bridge); > } else { > - bridge = of_drm_find_bridge(enc_node); > + bridge = of_drm_find_and_get_bridge(enc_node); > if (!bridge) > return -EPROBE_DEFER; > } >