From: Stephen Boyd <swboyd@chromium.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Douglas Anderson <dianders@chromium.org> Cc: Saravana Kannan <saravanak@google.com>, "Rafael J. Wysocki" <rafael@kernel.org>, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sandy Huang <hjc@rock-chips.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Russell King <rmk+kernel@arm.linux.org.uk>, freedreno@lists.freedesktop.org Subject: [PATCH v6 20/35] drm/rockchip: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:26 -0800 [thread overview] Message-ID: <20220127200141.1295328-21-swboyd@chromium.org> (raw) In-Reply-To: <20220127200141.1295328-1-swboyd@chromium.org> Use an aggregate driver instead of component ops so that we can get proper driver probe ordering of the aggregate device with respect to all the component devices that make up the aggregate device. Cc: Sandy Huang <hjc@rock-chips.com> Cc: "Heiko Stübner" <heiko@sntech.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Rob Clark <robdclark@gmail.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Saravana Kannan <saravanak@google.com> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index bec207de4544..6a6ed293d7a0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -108,8 +108,9 @@ static void rockchip_iommu_cleanup(struct drm_device *drm_dev) iommu_domain_free(private->domain); } -static int rockchip_drm_bind(struct device *dev) +static int rockchip_drm_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm_dev; struct rockchip_drm_private *private; int ret; @@ -179,8 +180,9 @@ static int rockchip_drm_bind(struct device *dev) return ret; } -static void rockchip_drm_unbind(struct device *dev) +static void rockchip_drm_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm_dev = dev_get_drvdata(dev); drm_dev_unregister(drm_dev); @@ -331,9 +333,13 @@ static struct component_match *rockchip_drm_match_add(struct device *dev) return match ?: ERR_PTR(-ENODEV); } -static const struct component_master_ops rockchip_drm_ops = { - .bind = rockchip_drm_bind, - .unbind = rockchip_drm_unbind, +static struct aggregate_driver rockchip_aggregate_driver = { + .probe = rockchip_drm_bind, + .remove = rockchip_drm_unbind, + .driver = { + .name = "rockchip_drm", + .owner = THIS_MODULE, + }, }; static int rockchip_drm_platform_of_probe(struct device *dev) @@ -404,7 +410,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) if (IS_ERR(match)) return PTR_ERR(match); - ret = component_master_add_with_match(dev, &rockchip_drm_ops, match); + ret = component_aggregate_register(dev, &rockchip_aggregate_driver, match); if (ret < 0) { rockchip_drm_match_remove(dev); return ret; @@ -415,7 +421,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) static int rockchip_drm_platform_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &rockchip_drm_ops); + component_aggregate_unregister(&pdev->dev, &rockchip_aggregate_driver); rockchip_drm_match_remove(&pdev->dev); -- https://chromeos.dev
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <swboyd@chromium.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Douglas Anderson <dianders@chromium.org> Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, "Sandy Huang" <hjc@rock-chips.com>, "Heiko Stübner" <heiko@sntech.de>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Rafael J. Wysocki" <rafael@kernel.org>, "Rob Clark" <robdclark@gmail.com>, "Russell King" <rmk+kernel@arm.linux.org.uk>, "Saravana Kannan" <saravanak@google.com> Subject: [PATCH v6 20/35] drm/rockchip: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:26 -0800 [thread overview] Message-ID: <20220127200141.1295328-21-swboyd@chromium.org> (raw) In-Reply-To: <20220127200141.1295328-1-swboyd@chromium.org> Use an aggregate driver instead of component ops so that we can get proper driver probe ordering of the aggregate device with respect to all the component devices that make up the aggregate device. Cc: Sandy Huang <hjc@rock-chips.com> Cc: "Heiko Stübner" <heiko@sntech.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Rob Clark <robdclark@gmail.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Saravana Kannan <saravanak@google.com> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index bec207de4544..6a6ed293d7a0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -108,8 +108,9 @@ static void rockchip_iommu_cleanup(struct drm_device *drm_dev) iommu_domain_free(private->domain); } -static int rockchip_drm_bind(struct device *dev) +static int rockchip_drm_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm_dev; struct rockchip_drm_private *private; int ret; @@ -179,8 +180,9 @@ static int rockchip_drm_bind(struct device *dev) return ret; } -static void rockchip_drm_unbind(struct device *dev) +static void rockchip_drm_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm_dev = dev_get_drvdata(dev); drm_dev_unregister(drm_dev); @@ -331,9 +333,13 @@ static struct component_match *rockchip_drm_match_add(struct device *dev) return match ?: ERR_PTR(-ENODEV); } -static const struct component_master_ops rockchip_drm_ops = { - .bind = rockchip_drm_bind, - .unbind = rockchip_drm_unbind, +static struct aggregate_driver rockchip_aggregate_driver = { + .probe = rockchip_drm_bind, + .remove = rockchip_drm_unbind, + .driver = { + .name = "rockchip_drm", + .owner = THIS_MODULE, + }, }; static int rockchip_drm_platform_of_probe(struct device *dev) @@ -404,7 +410,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) if (IS_ERR(match)) return PTR_ERR(match); - ret = component_master_add_with_match(dev, &rockchip_drm_ops, match); + ret = component_aggregate_register(dev, &rockchip_aggregate_driver, match); if (ret < 0) { rockchip_drm_match_remove(dev); return ret; @@ -415,7 +421,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) static int rockchip_drm_platform_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &rockchip_drm_ops); + component_aggregate_unregister(&pdev->dev, &rockchip_aggregate_driver); rockchip_drm_match_remove(&pdev->dev); -- https://chromeos.dev
next prev parent reply other threads:[~2022-01-27 20:02 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-27 20:01 [PATCH v6 00/35] component: Make into an aggregate bus Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 01/35] component: Replace most references to 'master' with 'aggregate device' Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-31 13:48 ` Greg Kroah-Hartman 2022-01-31 13:48 ` Greg Kroah-Hartman 2022-01-27 20:01 ` [PATCH v6 02/35] component: Introduce the aggregate bus_type Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-31 13:48 ` Greg Kroah-Hartman 2022-01-31 13:48 ` Greg Kroah-Hartman 2022-01-31 15:15 ` Daniel Vetter 2022-01-31 15:15 ` Daniel Vetter 2022-01-31 15:32 ` Laurent Pinchart 2022-01-31 15:32 ` Laurent Pinchart 2022-01-31 16:34 ` Greg Kroah-Hartman 2022-01-31 16:34 ` Greg Kroah-Hartman 2022-02-08 12:53 ` Daniel Vetter 2022-02-08 12:53 ` Daniel Vetter 2022-02-11 2:04 ` Stephen Boyd 2022-02-11 2:04 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 03/35] component: Add aggregate_device_parent() for driver use Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 04/35] component: Add {bind,unbind}_component() ops that take aggregate device Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 04/35] component: Add {bind, unbind}_component() " Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 05/35] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 06/35] drm/msm: Migrate to aggregate driver Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 07/35] drm/komeda: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 08/35] drm/arm/hdlcd: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 09/35] drm/malidp: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 10/35] drm/armada: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 11/35] drm/etnaviv: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 12/35] drm/kirin: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 13/35] drm/exynos: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 14/35] drm/imx: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 15/35] drm/ingenic: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 16/35] drm/mcde: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 17/35] drm/mediatek: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 18/35] drm/meson: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 19/35] drm/omap: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd [this message] 2022-01-27 20:01 ` [PATCH v6 20/35] drm/rockchip: " Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 21/35] drm/sti: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 22/35] drm/sun4i: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 23/35] drm/tilcdc: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 24/35] drm/vc4: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 25/35] iommu/mediatek: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-02-10 11:03 ` Yong Wu 2022-02-10 11:03 ` Yong Wu 2022-02-15 17:35 ` Krzysztof Kozlowski 2022-02-15 17:35 ` Krzysztof Kozlowski 2022-01-27 20:01 ` [PATCH v6 26/35] mei: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 27/35] power: supply: ab8500: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 28/35] fbdev: omap2: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 29/35] sound: hdac: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-31 8:18 ` Takashi Iwai 2022-01-31 8:18 ` Takashi Iwai 2022-01-27 20:01 ` [PATCH v6 30/35] ASoC: codecs: wcd938x: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 31/35] drm/sprd: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 32/35] usb: typec: port-mapper: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 33/35] ALSA: hda/realtek: " Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-28 15:31 ` Stefan Binding 2022-01-28 15:31 ` Stefan Binding 2022-01-27 20:01 ` [PATCH v6 34/35] component: Get rid of drm_of_component_probe() Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd 2022-01-27 20:01 ` [PATCH v6 35/35] component: Remove component_master_ops and friends Stephen Boyd 2022-01-27 20:01 ` Stephen Boyd
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220127200141.1295328-21-swboyd@chromium.org \ --to=swboyd@chromium.org \ --cc=daniel.vetter@ffwll.ch \ --cc=dianders@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=hjc@rock-chips.com \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rafael@kernel.org \ --cc=rmk+kernel@arm.linux.org.uk \ --cc=saravanak@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.