linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Boyd <swboyd@chromium.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
	Jyri Sarha <jyri.sarha@iki.fi>, Tomi Valkeinen <tomba@kernel.org>,
	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 v3 24/34] drm/tilcdc: Migrate to aggregate driver
Date: Mon, 25 Oct 2021 17:00:34 -0700	[thread overview]
Message-ID: <20211026000044.885195-25-swboyd@chromium.org> (raw)
In-Reply-To: <20211026000044.885195-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: Jyri Sarha <jyri.sarha@iki.fi>
Cc: Tomi Valkeinen <tomba@kernel.org>
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/tilcdc/tilcdc_drv.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 6b03f89a98d4..d5c6567eec8d 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -531,13 +531,16 @@ static const struct dev_pm_ops tilcdc_pm_ops = {
 /*
  * Platform driver:
  */
-static int tilcdc_bind(struct device *dev)
+static int tilcdc_bind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
+
 	return tilcdc_init(&tilcdc_driver, dev);
 }
 
-static void tilcdc_unbind(struct device *dev)
+static void tilcdc_unbind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct drm_device *ddev = dev_get_drvdata(dev);
 
 	/* Check if a subcomponent has already triggered the unloading. */
@@ -547,9 +550,13 @@ static void tilcdc_unbind(struct device *dev)
 	tilcdc_fini(dev_get_drvdata(dev));
 }
 
-static const struct component_master_ops tilcdc_comp_ops = {
-	.bind = tilcdc_bind,
-	.unbind = tilcdc_unbind,
+static struct aggregate_driver tilcdc_aggregate_driver = {
+	.probe = tilcdc_bind,
+	.remove = tilcdc_unbind,
+	.driver = {
+		.name = "tilcdc_drm",
+		.owner = THIS_MODULE,
+	},
 };
 
 static int tilcdc_pdev_probe(struct platform_device *pdev)
@@ -566,12 +573,9 @@ static int tilcdc_pdev_probe(struct platform_device *pdev)
 	ret = tilcdc_get_external_components(&pdev->dev, &match);
 	if (ret < 0)
 		return ret;
-	else if (ret == 0)
+	if (ret == 0)
 		return tilcdc_init(&tilcdc_driver, &pdev->dev);
-	else
-		return component_master_add_with_match(&pdev->dev,
-						       &tilcdc_comp_ops,
-						       match);
+	return component_aggregate_register(&pdev->dev, &tilcdc_aggregate_driver, match);
 }
 
 static int tilcdc_pdev_remove(struct platform_device *pdev)
@@ -581,10 +585,10 @@ static int tilcdc_pdev_remove(struct platform_device *pdev)
 	ret = tilcdc_get_external_components(&pdev->dev, NULL);
 	if (ret < 0)
 		return ret;
-	else if (ret == 0)
+	if (ret == 0)
 		tilcdc_fini(platform_get_drvdata(pdev));
 	else
-		component_master_del(&pdev->dev, &tilcdc_comp_ops);
+		component_aggregate_unregister(&pdev->dev, &tilcdc_aggregate_driver);
 
 	return 0;
 }
-- 
https://chromeos.dev


  parent reply	other threads:[~2021-10-26  0:02 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26  0:00 [PATCH v3 00/34] component: Make into an aggregate bus Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 01/34] component: Introduce struct aggregate_device Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 02/34] component: Remove most references to 'master' Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 03/34] component: Introduce the aggregate bus_type Stephen Boyd
2021-10-26  4:40   ` kernel test robot
2021-10-26 14:02   ` kernel test robot
2021-10-26 19:33     ` Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 04/34] component: Move struct aggregate_device out to header file Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 05/34] component: Add {bind,unbind}_component() ops that take aggregate device Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 06/34] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 07/34] drm/msm: Migrate to aggregate driver Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 08/34] drm/komeda: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 09/34] drm/arm/hdlcd: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 10/34] drm/malidp: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 11/34] drm/armada: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 12/34] drm/etnaviv: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 13/34] drm/kirin: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 14/34] drm/exynos: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 15/34] drm/imx: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 16/34] drm/ingenic: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 17/34] drm/mcde: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 18/34] drm/mediatek: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 19/34] drm/meson: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 20/34] drm/omap: " Stephen Boyd
2021-10-26 23:52   ` kernel test robot
2021-10-26  0:00 ` [PATCH v3 21/34] drm/rockchip: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 22/34] drm/sti: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 23/34] drm/sun4i: " Stephen Boyd
2021-10-26  0:00 ` Stephen Boyd [this message]
2021-11-01 19:35   ` [PATCH v3 24/34] drm/tilcdc: " Jyri Sarha
2021-10-26  0:00 ` [PATCH v3 25/34] drm/vc4: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 26/34] drm/zte: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 27/34] iommu/mtk: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 28/34] mei: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 29/34] power: supply: ab8500: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 30/34] fbdev: omap2: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 31/34] sound: hdac: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 32/34] ASoC: codecs: wcd938x: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 33/34] component: Get rid of drm_of_component_probe() Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 34/34] component: Remove component_master_ops and friends 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=20211026000044.885195-25-swboyd@chromium.org \
    --to=swboyd@chromium.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jyri.sarha@iki.fi \
    --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=robdclark@gmail.com \
    --cc=saravanak@google.com \
    --cc=tomba@kernel.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).