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, Liviu Dudau <liviu.dudau@arm.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Russell King <rmk+kernel@arm.linux.org.uk>, freedreno@lists.freedesktop.org Subject: [PATCH v5 09/32] drm/malidp: Migrate to aggregate driver Date: Thu, 6 Jan 2022 13:45:32 -0800 [thread overview] Message-ID: <20220106214556.2461363-10-swboyd@chromium.org> (raw) In-Reply-To: <20220106214556.2461363-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. TODO: This can be updated to move the drm helper logic into the aggregate driver shutdown op. Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Liviu Dudau <liviu.dudau@arm.com> 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/arm/malidp_drv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 78d15b04b105..e6ee4d1e3bb8 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -702,8 +702,9 @@ static int malidp_runtime_pm_resume(struct device *dev) return 0; } -static int malidp_bind(struct device *dev) +static int malidp_bind(struct aggregate_device *adev) { + struct device *dev = adev->parent; struct resource *res; struct drm_device *drm; struct malidp_drm *malidp; @@ -894,8 +895,9 @@ static int malidp_bind(struct device *dev) return ret; } -static void malidp_unbind(struct device *dev) +static void malidp_unbind(struct aggregate_device *adev) { + struct device *dev = adev->parent; struct drm_device *drm = dev_get_drvdata(dev); struct malidp_drm *malidp = drm->dev_private; struct malidp_hw_device *hwdev = malidp->dev; @@ -921,9 +923,13 @@ static void malidp_unbind(struct device *dev) of_reserved_mem_device_release(dev); } -static const struct component_master_ops malidp_master_ops = { - .bind = malidp_bind, - .unbind = malidp_unbind, +static struct aggregate_driver malidp_aggregate_driver = { + .probe = malidp_bind, + .remove = malidp_unbind, + .driver = { + .name = "malidp_drm", + .owner = THIS_MODULE, + }, }; static int malidp_compare_dev(struct device *dev, void *data) @@ -949,13 +955,12 @@ static int malidp_platform_probe(struct platform_device *pdev) drm_of_component_match_add(&pdev->dev, &match, malidp_compare_dev, port); of_node_put(port); - return component_master_add_with_match(&pdev->dev, &malidp_master_ops, - match); + return component_aggregate_register(&pdev->dev, &malidp_aggregate_driver, match); } static int malidp_platform_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &malidp_master_ops); + component_aggregate_unregister(&pdev->dev, &malidp_aggregate_driver); return 0; } -- 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, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Liviu Dudau <liviu.dudau@arm.com>, 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 v5 09/32] drm/malidp: Migrate to aggregate driver Date: Thu, 6 Jan 2022 13:45:32 -0800 [thread overview] Message-ID: <20220106214556.2461363-10-swboyd@chromium.org> (raw) In-Reply-To: <20220106214556.2461363-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. TODO: This can be updated to move the drm helper logic into the aggregate driver shutdown op. Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Liviu Dudau <liviu.dudau@arm.com> 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/arm/malidp_drv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 78d15b04b105..e6ee4d1e3bb8 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -702,8 +702,9 @@ static int malidp_runtime_pm_resume(struct device *dev) return 0; } -static int malidp_bind(struct device *dev) +static int malidp_bind(struct aggregate_device *adev) { + struct device *dev = adev->parent; struct resource *res; struct drm_device *drm; struct malidp_drm *malidp; @@ -894,8 +895,9 @@ static int malidp_bind(struct device *dev) return ret; } -static void malidp_unbind(struct device *dev) +static void malidp_unbind(struct aggregate_device *adev) { + struct device *dev = adev->parent; struct drm_device *drm = dev_get_drvdata(dev); struct malidp_drm *malidp = drm->dev_private; struct malidp_hw_device *hwdev = malidp->dev; @@ -921,9 +923,13 @@ static void malidp_unbind(struct device *dev) of_reserved_mem_device_release(dev); } -static const struct component_master_ops malidp_master_ops = { - .bind = malidp_bind, - .unbind = malidp_unbind, +static struct aggregate_driver malidp_aggregate_driver = { + .probe = malidp_bind, + .remove = malidp_unbind, + .driver = { + .name = "malidp_drm", + .owner = THIS_MODULE, + }, }; static int malidp_compare_dev(struct device *dev, void *data) @@ -949,13 +955,12 @@ static int malidp_platform_probe(struct platform_device *pdev) drm_of_component_match_add(&pdev->dev, &match, malidp_compare_dev, port); of_node_put(port); - return component_master_add_with_match(&pdev->dev, &malidp_master_ops, - match); + return component_aggregate_register(&pdev->dev, &malidp_aggregate_driver, match); } static int malidp_platform_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &malidp_master_ops); + component_aggregate_unregister(&pdev->dev, &malidp_aggregate_driver); return 0; } -- https://chromeos.dev
next prev parent reply other threads:[~2022-01-06 21:46 UTC|newest] Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-06 21:45 [PATCH v5 00/32] component: Make into an aggregate bus Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 01/32] component: Replace most references to 'master' with 'aggregate device' Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 02/32] component: Introduce the aggregate bus_type Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 03/32] component: Move struct aggregate_device out to header file Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-07 13:07 ` Jani Nikula 2022-01-07 20:12 ` Stephen Boyd 2022-01-10 11:23 ` Jani Nikula 2022-01-06 21:45 ` [PATCH v5 04/32] component: Add {bind, unbind}_component() ops that take aggregate device Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 04/32] component: Add {bind,unbind}_component() " Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 05/32] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 06/32] drm/msm: Migrate to aggregate driver Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 07/32] drm/komeda: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 08/32] drm/arm/hdlcd: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd [this message] 2022-01-06 21:45 ` [PATCH v5 09/32] drm/malidp: " Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 10/32] drm/armada: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 11/32] drm/etnaviv: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 12/32] drm/kirin: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 13/32] drm/exynos: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 14/32] drm/imx: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 15/32] drm/ingenic: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 16/32] drm/mcde: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 17/32] drm/mediatek: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 18/32] drm/meson: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 19/32] drm/omap: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 20/32] drm/rockchip: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 21/32] drm/sti: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 22/32] drm/sun4i: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 23/32] drm/tilcdc: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 24/32] drm/vc4: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 25/32] iommu/mtk: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-11 12:22 ` Yong Wu 2022-01-11 12:22 ` Yong Wu 2022-01-11 12:22 ` Yong Wu 2022-01-12 0:27 ` Stephen Boyd 2022-01-12 0:27 ` Stephen Boyd 2022-01-12 0:27 ` Stephen Boyd 2022-01-12 9:09 ` Yong Wu 2022-01-12 9:09 ` Yong Wu 2022-01-12 9:09 ` Yong Wu 2022-01-12 9:09 ` Yong Wu 2022-01-13 4:25 ` Stephen Boyd 2022-01-13 4:25 ` Stephen Boyd 2022-01-13 4:25 ` Stephen Boyd 2022-01-13 4:25 ` Stephen Boyd 2022-01-14 9:06 ` Yong Wu 2022-01-14 9:06 ` Yong Wu 2022-01-14 9:06 ` Yong Wu 2022-01-14 9:06 ` Yong Wu 2022-01-14 21:30 ` Stephen Boyd 2022-01-14 21:30 ` Stephen Boyd 2022-01-14 21:30 ` Stephen Boyd 2022-01-14 21:30 ` Stephen Boyd 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:50 ` Stephen Boyd 2022-01-15 7:50 ` Stephen Boyd 2022-01-15 7:50 ` Stephen Boyd 2022-01-15 7:50 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 26/32] mei: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 27/32] power: supply: ab8500: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 28/32] fbdev: omap2: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 29/32] sound: hdac: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 30/32] ASoC: codecs: wcd938x: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 31/32] component: Get rid of drm_of_component_probe() Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 32/32] component: Remove component_master_ops and friends Stephen Boyd 2022-01-06 21:45 ` 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=20220106214556.2461363-10-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=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=liviu.dudau@arm.com \ --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.