From patchwork Thu Sep 17 14:57:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 7208291 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A5BBB9F336 for ; Thu, 17 Sep 2015 14:58:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3574207E4 for ; Thu, 17 Sep 2015 14:58:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A5A6020815 for ; Thu, 17 Sep 2015 14:58:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B8B036E6C0; Thu, 17 Sep 2015 07:58:08 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 49CCC6E6C0; Thu, 17 Sep 2015 07:58:07 -0700 (PDT) Received: from eliezer.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id 10BE7182BA; Thu, 17 Sep 2015 07:58:07 -0700 (PDT) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 7F33AF00910; Thu, 17 Sep 2015 07:57:58 -0700 (PDT) From: Eric Anholt To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/4] drm: Move exynos "match_add all devices matching my drivers" to core. Date: Thu, 17 Sep 2015 10:57:57 -0400 Message-Id: <1442501878-9037-3-git-send-email-eric@anholt.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442501878-9037-1-git-send-email-eric@anholt.net> References: <1442501878-9037-1-git-send-email-eric@anholt.net> Cc: linux-arm-msm@vger.kernel.org, Seung-Woo Kim , linux-kernel@vger.kernel.org, Kyungmin Park X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a really nice way to handle the component setup. The subsystem driver knows that it's got a bunch of component drivers, and for any devices that matched its component drivers, it wants all of those to bind to it as master. Signed-off-by: Eric Anholt --- v2: Extend the kerneldoc. drivers/gpu/drm/drm_platform_helper.c | 40 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 37 ++++++------------------------ include/drm/drmP.h | 5 +++++ 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/drm_platform_helper.c b/drivers/gpu/drm/drm_platform_helper.c index 450846f..c4f03541 100644 --- a/drivers/gpu/drm/drm_platform_helper.c +++ b/drivers/gpu/drm/drm_platform_helper.c @@ -7,6 +7,7 @@ * option) any later version. */ +#include #include /** @@ -51,3 +52,42 @@ void drm_platform_unregister_drivers(struct platform_driver *const *drv, platform_driver_unregister(drv[count]); } EXPORT_SYMBOL_GPL(drm_platform_unregister_drivers); + +static int compare_dev(struct device *dev, void *data) +{ + return dev == (struct device *)data; +} + +/** + * drm_platform_component_match_add_drivers - For each driver passed + * in, finds each device that probed with it and adds it as a component + * driver to the match list. + * @dev: master device for the components + * @match: pointer to the match structure pointer. For the first + * component_match_add(), this should be a pointer to a NULL + * pointer, which will get filled in by the call. + * @drivers: array of platform drivers whose devices should all be + * added to the match + * @count: number of platform drivers to match + */ +void drm_platform_component_match_add_drivers(struct device *dev, + struct component_match **match, + struct platform_driver *const *drivers, + int count) +{ + int i; + + for (i = 0; i < count; i++) { + struct device_driver *drv = &drivers[i]->driver; + struct device *p = NULL, *d; + + while ((d = bus_find_device(&platform_bus_type, p, drv, + (void *)platform_bus_type.match))) { + put_device(p); + component_match_add(dev, match, compare_dev, d); + p = d; + } + put_device(p); + } +} +EXPORT_SYMBOL_GPL(drm_platform_component_match_add_drivers); diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 83f829b..9151304 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -412,32 +412,6 @@ static struct platform_driver *const exynos_drm_drv_with_simple_dev[] = { }; #define PDEV_COUNT ARRAY_SIZE(exynos_drm_drv_with_simple_dev) -static int compare_dev(struct device *dev, void *data) -{ - return dev == (struct device *)data; -} - -static struct component_match *exynos_drm_match_add(struct device *dev) -{ - struct component_match *match = NULL; - int i; - - for (i = 0; i < ARRAY_SIZE(exynos_drm_kms_drivers); ++i) { - struct device_driver *drv = &exynos_drm_kms_drivers[i]->driver; - struct device *p = NULL, *d; - - while ((d = bus_find_device(&platform_bus_type, p, drv, - (void *)platform_bus_type.match))) { - put_device(p); - component_match_add(dev, &match, compare_dev, d); - p = d; - } - put_device(p); - } - - return match ?: ERR_PTR(-ENODEV); -} - static int exynos_drm_bind(struct device *dev) { return drm_platform_init(&exynos_drm_driver, to_platform_device(dev)); @@ -455,14 +429,17 @@ static const struct component_master_ops exynos_drm_ops = { static int exynos_drm_platform_probe(struct platform_device *pdev) { - struct component_match *match; + struct component_match *match = NULL; pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); exynos_drm_driver.num_ioctls = ARRAY_SIZE(exynos_ioctls); - match = exynos_drm_match_add(&pdev->dev); - if (IS_ERR(match)) - return PTR_ERR(match); + drm_platform_component_match_add_drivers(&pdev->dev, &match, + exynos_drm_kms_drivers, + ARRAY_SIZE(exynos_drm_kms_drivers)); + + if (!match) + return -ENODEV; return component_master_add_with_match(&pdev->dev, &exynos_drm_ops, match); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index a774574..b65d886 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -88,6 +88,7 @@ struct device_node; struct videomode; struct reservation_object; struct dma_buf_attachment; +struct component_match; /* * 4 debug categories are defined: @@ -1091,6 +1092,10 @@ int drm_platform_register_drivers(struct platform_driver *const *drv, int count); void drm_platform_unregister_drivers(struct platform_driver *const *drv, int count); +void drm_platform_component_match_add_drivers(struct device *dev, + struct component_match **match, + struct platform_driver **drivers, + int count); /* returns true if currently okay to sleep */ static __inline__ bool drm_can_sleep(void)