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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78B71C433E0 for ; Sun, 21 Feb 2021 18:13:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4117964E57 for ; Sun, 21 Feb 2021 18:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230182AbhBUSNG (ORCPT ); Sun, 21 Feb 2021 13:13:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbhBUSND (ORCPT ); Sun, 21 Feb 2021 13:13:03 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B64C061574 for ; Sun, 21 Feb 2021 10:12:23 -0800 (PST) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 30AE7EF; Sun, 21 Feb 2021 19:12:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1613931138; bh=xdfpZVs5pD00qCgiYjQiBk3+yzMOzjLRl/tciOa0xRQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dTBeVr1+HpMUqB10851acTLvDXgWnvg35PoUyXXimlsR+ONaWYnKSLLayt0vIArsm OMbmMeU70R2HpI1VzO23H0aXXbXOi8/nhoFQVfHnVtISrITADRv5Qq7LiHqpQhNVp0 KzbpxsFJiiX05pQYTfrYgWyO186dgpxVREIUYacc= Date: Sun, 21 Feb 2021 20:11:51 +0200 From: Laurent Pinchart To: Lyude Paul Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, Ville =?utf-8?B?U3lyasOkbMOk?= , Jani Nikula , Rodrigo Vivi , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , open list Subject: Re: [PATCH 06/30] drm/bridge/ti-sn65dsi86: (Un)register aux device on bridge attach/detach Message-ID: References: <20210219215326.2227596-1-lyude@redhat.com> <20210219215326.2227596-7-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210219215326.2227596-7-lyude@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Lyude, Thank you for the patch. On Fri, Feb 19, 2021 at 04:53:02PM -0500, Lyude Paul wrote: > Since we're about to add a back-pointer to drm_dev in drm_dp_aux, let's > move the AUX adapter registration to the first point where we know which > DRM device we'll be working with - when the drm_bridge is attached. > Likewise, we unregister the AUX adapter on bridge detachment by adding a > ti_sn_bridge_detach() callback. > > Signed-off-by: Lyude Paul Reviewed-by: Laurent Pinchart > --- > drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > index f27306c51e4d..88df4dd0f39d 100644 > --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c > +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > @@ -362,12 +362,18 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, > return -EINVAL; > } > > + ret = drm_dp_aux_register(&pdata->aux); > + if (ret < 0) { > + drm_err(bridge->dev, "Failed to register DP AUX channel: %d\n", ret); > + return ret; > + } > + > ret = drm_connector_init(bridge->dev, &pdata->connector, > &ti_sn_bridge_connector_funcs, > DRM_MODE_CONNECTOR_eDP); > if (ret) { > DRM_ERROR("Failed to initialize connector with drm\n"); > - return ret; > + goto err_conn_init; > } > > drm_connector_helper_add(&pdata->connector, > @@ -424,9 +430,16 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, > mipi_dsi_device_unregister(dsi); > err_dsi_host: > drm_connector_cleanup(&pdata->connector); > +err_conn_init: > + drm_dp_aux_unregister(&pdata->aux); > return ret; > } > > +static void ti_sn_bridge_detach(struct drm_bridge *bridge) > +{ > + drm_dp_aux_unregister(&bridge_to_ti_sn_bridge(bridge)->aux); > +} > + > static void ti_sn_bridge_disable(struct drm_bridge *bridge) > { > struct ti_sn_bridge *pdata = bridge_to_ti_sn_bridge(bridge); > @@ -863,6 +876,7 @@ static void ti_sn_bridge_post_disable(struct drm_bridge *bridge) > > static const struct drm_bridge_funcs ti_sn_bridge_funcs = { > .attach = ti_sn_bridge_attach, > + .detach = ti_sn_bridge_detach, > .pre_enable = ti_sn_bridge_pre_enable, > .enable = ti_sn_bridge_enable, > .disable = ti_sn_bridge_disable, > @@ -1287,7 +1301,7 @@ static int ti_sn_bridge_probe(struct i2c_client *client, > pdata->aux.name = "ti-sn65dsi86-aux"; > pdata->aux.dev = pdata->dev; > pdata->aux.transfer = ti_sn_aux_transfer; > - drm_dp_aux_register(&pdata->aux); > + drm_dp_aux_init(&pdata->aux); > > pdata->bridge.funcs = &ti_sn_bridge_funcs; > pdata->bridge.of_node = client->dev.of_node; -- Regards, Laurent Pinchart