From patchwork Wed Dec 10 15:48:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 5469831 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AE88F9F47A for ; Wed, 10 Dec 2014 15:49:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB78320166 for ; Wed, 10 Dec 2014 15:49:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4B2652011D for ; Wed, 10 Dec 2014 15:49:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ACB746E61D; Wed, 10 Dec 2014 07:49:02 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.w1.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 17B296E621 for ; Wed, 10 Dec 2014 07:49:00 -0800 (PST) Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NGD00GJ9ISE3GA0@mailout3.w1.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 10 Dec 2014 15:53:02 +0000 (GMT) X-AuditID: cbfec7f5-b7fc86d0000066b7-6d-54886b6abc99 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 4E.20.26295.A6B68845; Wed, 10 Dec 2014 15:48:58 +0000 (GMT) Received: from AMDC1061.digital.local ([106.116.147.88]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NGD00L5CIL48260@eusync1.samsung.com>; Wed, 10 Dec 2014 15:48:58 +0000 (GMT) From: Andrzej Hajda To: linux-kernel@vger.kernel.org (open list) Subject: [RFC 03/15] drm/panel: add restrack support Date: Wed, 10 Dec 2014 16:48:21 +0100 Message-id: <1418226513-14105-4-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1418226513-14105-1-git-send-email-a.hajda@samsung.com> References: <1418226513-14105-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t/xy7pZ2R0hBj+e6VvcWneO1eLAi4Us FlMfPmGzmH8EyL3y9T2bxblXj1gsDvzZwWjRvHg9m8Wk+xNYLC487WGz+Halg8liyp/lTBab Hl9jtdg8/w+jxeVdc9gsZpzfx2Rx+zKvxdojd9ktnk64yGbRuvcIu8XPXfNYHEQ9Wpp72Dye bLrI6LFz1l12j02rOtk87lzbw+axf+4ado/73ceZPDYvqffo27KK0eP4je1MHp83yQVwR3HZ pKTmZJalFunbJXBlHO/fzFZwWK2iceEDlgbGBQpdjJwcEgImEtdnTWKBsMUkLtxbz9bFyMUh JLCUUeLyn9esEE4fk8SXT21sIFVsApoSfzffBLNFBHQkrvd0M4MUMQtsYJdYN30fWEIYaOzV OafAxrIIqEosP/AUzOYVcJY49OknO8Q6OYmTxyazgticAi4Sf5/vZQSxhYBqlmx7zzqBkXcB I8MqRtHU0uSC4qT0XCO94sTc4tK8dL3k/NxNjJDo+LqDcekxq0OMAhyMSjy8OxTbQoRYE8uK K3MPMUpwMCuJ8C5M7ggR4k1JrKxKLcqPLyrNSS0+xMjEwSnVwNi3/524/MNzNt9mMMzgts3h WnjijACv090ND6Udq02+zZC0/lWe39n32Ka8vqP0ReWTig0Pvft2cHzr3SKc8E3p2MlZcx9n yLvEf+tRs9vSFBDBy8Fa+knmXmx0T3hL1Ss+rqduFheM8kuCZs6U2SM3/eO6hy9680773q/T +cbTxpZk8OdatxJLcUaioRZzUXEiAM6QgyhsAgAA Cc: Alexandre Courbot , "moderated list:ARM/S5P EXYNOS AR..." , Mike Turquette , "open list:DRM PANEL DRIVERS" , "open list:GPIO SUBSYSTEM" , Greg Kroah-Hartman , Liam Girdwood , Rob Herring , Kishon Vijay Abraham I , Andrzej Hajda , "open list:OPEN FIRMWARE AND..." , Mark Brown , Grant Likely , Russell King , "moderated list:ARM/CLKDEV SUPPORT" , Marek Szyprowski 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 The patch adds Device Tree restrack support to drm/panel framework. As panels supports only Device Tree based lookup all panels can be converted to restrack. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/drm_panel.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_panel.h | 4 ++ include/linux/restrack.h | 2 + 3 files changed, 103 insertions(+) diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index 2ef988e..db04696 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -22,7 +22,9 @@ */ #include +#include #include +#include #include #include @@ -41,6 +43,7 @@ int drm_panel_add(struct drm_panel *panel) mutex_lock(&panel_lock); list_add_tail(&panel->list, &panel_list); mutex_unlock(&panel_lock); + restrack_up(RESTRACK_TYPE_DRM_PANEL, panel->dev->of_node, panel); return 0; } @@ -48,6 +51,7 @@ EXPORT_SYMBOL(drm_panel_add); void drm_panel_remove(struct drm_panel *panel) { + restrack_down(RESTRACK_TYPE_DRM_PANEL, panel->dev->of_node, panel); mutex_lock(&panel_lock); list_del_init(&panel->list); mutex_unlock(&panel_lock); @@ -93,6 +97,99 @@ struct drm_panel *of_drm_find_panel(struct device_node *np) return NULL; } EXPORT_SYMBOL(of_drm_find_panel); + +struct drm_panel_restrack_desc { + struct drm_panel **ptr; + const char *name; + int port; + struct restrack_desc desc; +}; + +static int drm_panel_restrack_init(struct device *dev, + struct restrack_desc *desc) +{ + struct drm_panel_restrack_desc *rd = restrack_desc_to_rd(rd, desc); + struct device_node *np; + + if (rd->name) { + desc->if_id = of_parse_phandle(dev->of_node, rd->name, 0); + goto end; + } + + np = NULL; + while ((np = of_graph_get_next_endpoint(dev->of_node, np))) { + struct of_endpoint ep; + + of_graph_parse_endpoint(np, &ep); + if (ep.port != rd->port) + continue; + desc->if_id = of_graph_get_remote_port_parent(np); + of_node_put(np); + break; + } + +end: + return desc->if_id ? 0 : -EINVAL; +} + +static void drm_panel_restrack_destroy(struct device *dev, + struct restrack_desc *desc) +{ + struct drm_panel_restrack_desc *rd = restrack_desc_to_rd(rd, desc); + + of_node_put(desc->if_id); + kfree(rd); +} + +static int drm_panel_restrack_ifup(struct device *dev, + struct restrack_desc *desc, void *data) +{ + struct drm_panel_restrack_desc *rd = restrack_desc_to_rd(rd, desc); + + *rd->ptr = data; + return PTR_ERR_OR_ZERO(*rd->ptr); +} + +static void drm_panel_restrack_ifdown(struct device *dev, + struct restrack_desc *desc, void *data) +{ + struct drm_panel_restrack_desc *rd = restrack_desc_to_rd(rd, desc); + + *rd->ptr = ERR_PTR(-EPROBE_DEFER); +} + +static const struct restrack_ops drm_panel_restrack_ops = { + .if_type = RESTRACK_TYPE_DRM_PANEL, + .init = drm_panel_restrack_init, + .destroy = drm_panel_restrack_destroy, + .if_up = drm_panel_restrack_ifup, + .if_down = drm_panel_restrack_ifdown, +}; + +/** + * drm_panel_restrack_desc - drm_panel resource descriptor allocator + * @panel: pointer to variable which will be set to drm_panel handle + * @prop_name: property name containing phandle to the panel node, it can be + * NULL if driver uses only of_graph + * @port: of_graph port number in case of_graph is used + * + * The function creates resource description for panel, which shall be used by + * *restrack_register functions. + */ +struct restrack_desc *drm_panel_restrack_desc(struct drm_panel **panel, + const char *prop_name, int port) +{ + struct drm_panel_restrack_desc *rd; + + RESTRACK_DESC_ALLOC(rd, drm_panel_restrack_ops, panel, prop_name); + if (!rd) + return ERR_PTR(-ENOMEM); + + rd->port = port; + return &rd->desc; +} +EXPORT_SYMBOL_GPL(drm_panel_restrack_desc); + #endif MODULE_AUTHOR("Thierry Reding "); diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 1fbcc96..46eb88e 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -130,6 +130,10 @@ int drm_panel_detach(struct drm_panel *panel); #ifdef CONFIG_OF struct drm_panel *of_drm_find_panel(struct device_node *np); + +struct restrack_desc; +struct restrack_desc *drm_panel_restrack_desc(struct drm_panel **panel, + const char *prop_name, int port); #else static inline struct drm_panel *of_drm_find_panel(struct device_node *np) { diff --git a/include/linux/restrack.h b/include/linux/restrack.h index 6cf8144f..af5b617 100644 --- a/include/linux/restrack.h +++ b/include/linux/restrack.h @@ -3,6 +3,8 @@ #include +#define RESTRACK_TYPE_DRM_PANEL 1 + struct device; struct restrack_ctx; struct restrack_desc;