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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7D82C433F5 for ; Thu, 7 Oct 2021 21:29:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 88B2961073 for ; Thu, 7 Oct 2021 21:29:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 88B2961073 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F4CC6E03C; Thu, 7 Oct 2021 21:29:57 +0000 (UTC) Received: from aposti.net (aposti.net [89.234.176.197]) by gabe.freedesktop.org (Postfix) with ESMTPS id EBA836E03C for ; Thu, 7 Oct 2021 21:29:55 +0000 (UTC) Date: Thu, 07 Oct 2021 22:29:42 +0100 From: Paul Cercueil Subject: Re: [PATCH v2 15/34] drm/ingenic: Migrate to aggregate driver To: Stephen Boyd Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Message-Id: In-Reply-To: <20211006193819.2654854-16-swboyd@chromium.org> References: <20211006193819.2654854-1-swboyd@chromium.org> <20211006193819.2654854-16-swboyd@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable 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" Hi Stephen, Le mer., oct. 6 2021 at 12:38:00 -0700, Stephen Boyd=20 a =E9crit : > Use an aggregate driver instead of component ops so that we can get > proper driver probe ordering of the aggregate device with respect to=20 > all > the component devices that make up the aggregate device. >=20 > TODO: Move the helpers to PM in aggregate driver hooks. >=20 > Cc: Paul Cercueil > Cc: Daniel Vetter > Cc: "Rafael J. Wysocki" > Cc: Rob Clark > Cc: Russell King > Cc: Saravana Kannan > Signed-off-by: Stephen Boyd > --- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 24=20 > +++++++++++++++++------ > 1 file changed, 18 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c=20 > b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index a5df1c8d34cd..058b7bfe5610 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -1150,8 +1150,10 @@ static int ingenic_drm_bind(struct device=20 > *dev, bool has_components) > return ret; > } >=20 > -static int ingenic_drm_bind_with_components(struct device *dev) > +static int ingenic_drm_bind_with_components(struct aggregate_device=20 > *adev) > { > + struct device *dev =3D adev->parent; > + > return ingenic_drm_bind(dev, true); > } >=20 > @@ -1174,9 +1176,19 @@ static void ingenic_drm_unbind(struct device=20 > *dev) > drm_atomic_helper_shutdown(&priv->drm); > } >=20 > -static const struct component_master_ops ingenic_master_ops =3D { > - .bind =3D ingenic_drm_bind_with_components, > - .unbind =3D ingenic_drm_unbind, > +static void ingenic_aggregate_remove(struct aggregate_device *adev) > +{ > + struct device *dev =3D adev->parent; Space here. With that: Acked-by: Paul Cercueil Cheers, -Paul > + ingenic_drm_unbind(dev); > +} > + > +static struct aggregate_driver ingenic_aggregate_driver =3D { > + .probe =3D ingenic_drm_bind_with_components, > + .remove =3D ingenic_aggregate_remove, > + .driver =3D { > + .name =3D "ingenic_drm", > + .owner =3D THIS_MODULE, > + }, > }; >=20 > static int ingenic_drm_probe(struct platform_device *pdev) > @@ -1196,7 +1208,7 @@ static int ingenic_drm_probe(struct=20 > platform_device *pdev) > drm_of_component_match_add(dev, &match, compare_of, np); > of_node_put(np); >=20 > - return component_master_add_with_match(dev, &ingenic_master_ops,=20 > match); > + return component_aggregate_register(dev, &ingenic_aggregate_driver,=20 > match); > } >=20 > static int ingenic_drm_remove(struct platform_device *pdev) > @@ -1206,7 +1218,7 @@ static int ingenic_drm_remove(struct=20 > platform_device *pdev) > if (!IS_ENABLED(CONFIG_DRM_INGENIC_IPU)) > ingenic_drm_unbind(dev); > else > - component_master_del(dev, &ingenic_master_ops); > + component_aggregate_unregister(dev, &ingenic_aggregate_driver); >=20 > return 0; > } > -- > https://chromeos.dev >=20