From patchwork Mon Jan 23 15:11:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 2655 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 33B883F046 for ; Mon, 23 Jan 2023 16:12:40 +0100 (CET) Received: by mail-pj1-f71.google.com with SMTP id x8-20020a17090a8a8800b0022941842cc0sf9572650pjn.3 for ; Mon, 23 Jan 2023 07:12:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1674486759; cv=pass; d=google.com; s=arc-20160816; b=J0XO69VEf/QetOqg94b/Clyg5gzce/4oJ4mnV+IPgcuAsvTwWvElpyYb859AbCwF5X vdP1uLvjH0Pcf0jxtATU9+0izQ7aA0qGRsvbZtRQpBq3r6s6qkrtHZChL5rVEytPXNQy Q7ukL89g68LQuuj0ZBlmiy1SVrwXJQFImqCHeyjiRyieuVJ3FMlP7ZHKIrZk+Ml6yilO f/7tN0FhvO3BJhuBfwVKT4ZR59N4brSUfD2X5RmPMrZTXhzgQqMbBwgTtMbAYlDwuS8h c1+3nw9ZSzgjOSlRej9hxRJGEzL26eieHudVd34nVUm1KVHR0JCBrQ9K60cuaihiaKWX rbrw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3Y7s/ulxHFSGawNxIH6V1omksNFZCAlQ3JqaXKlMUBI=; b=l0FEGuRO2QYaZZT+H0Uy9XWrVcbnVqh/RR43Yuc0e4eg/QlVsuCOZiiX1nnxrtrJl3 lM2KHzpckOx4deXhMA5RaDD+wz3QaKyGQELIFgGYS5Rt4biMWufg0coRuQ53ZzaZQeJH gKaopFQRyxS3aNT6L+j22g7sFSjQArl7bphJ+si/weTS5L74AdFFBBg7vsRLw7Q1MI/H tblOQQoKruz/MXEIwULtjdbc3gyjBl7rvQ//ETfadEQUjMZ3LFVJmrwBaCqsrbmRizjX DuDf6fZ48vnHnYUNk6ERfVrUJmuQ0ObUVvXkL6EsxefBmgdvRzv6p8dk3++c5SmtU1zz IhVg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QrWykG4K; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3Y7s/ulxHFSGawNxIH6V1omksNFZCAlQ3JqaXKlMUBI=; b=Bjf6AvqlSFyNWIxlSZy9tdi2MojP4Nfey5cGmdBNrOEqU80rLv9KDNn9cMI6OkLvSC gB+TwKb2RfhjThgJLSYYp4nEjjKzso0rhmdw+yhSdSRDIkDkKNiQo6sQWyvZM6Wev7w+ cDetEWNQRQERmsbt41ah4VLVdD7Al0pJlBTik= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3Y7s/ulxHFSGawNxIH6V1omksNFZCAlQ3JqaXKlMUBI=; b=dFnwK8LswSo4ga1MN/kgx6CW/fdoaKLeFeTBev0Z8pgWk5msZRepurrF9bIlZbY4Md uUFqRte8wu0XgyfXbotOThQvnKqOxLp/TE3nI0Z7wG7VGyQNCV72skTmJyfmeTDzerPN Q+M/cKDrsZ2yAXWnxWG3mjZrLlP6/EL0KpnRxseR90fohFzIYzYhno1TnZgDP85zUz6f 9/Ke/x6vKrZsJO+kJg0K5pVipILiAQ5P/mBXEd8QJcpiOyCcegVEJPw7wUPlGPGHAteG 27Ao+gjkVS3ah8/AQ4S0KPsrJkHboDjFyBdEoz1ivpHmUHzMRFGwlmvNxAF909ylr9Wa u2dQ== X-Gm-Message-State: AFqh2kqUnFQQfOLqJeRs/vjkDqLTKCZR+OROxqxvQLssgseu7Qt2tG3Z 6Ogo/Df3G1PhuS+9kRsSLTYT5qpS X-Google-Smtp-Source: AMrXdXuOQ63lXSNZCrddr8BsTE2P3K5mB7irSYCYl31R1eiDoX7+r2OnxFA+EPqrj61ZYD+Gpz4jVA== X-Received: by 2002:a17:902:6908:b0:194:ca6b:4422 with SMTP id j8-20020a170902690800b00194ca6b4422mr1591114plk.3.1674486758864; Mon, 23 Jan 2023 07:12:38 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:ecc4:b0:194:d87a:ffa6 with SMTP id a4-20020a170902ecc400b00194d87affa6ls11555534plh.1.-pod-prod-gmail; Mon, 23 Jan 2023 07:12:38 -0800 (PST) X-Received: by 2002:a17:902:db01:b0:195:efb2:6c6d with SMTP id m1-20020a170902db0100b00195efb26c6dmr13999275plx.45.1674486757775; Mon, 23 Jan 2023 07:12:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674486757; cv=none; d=google.com; s=arc-20160816; b=07zzFx6TBeQaaOcxVZ1kJiyob4pVfpwSchZnzO4tT2e8LMGg0ZCFn72rV5rewPioqd jsxJyGsAIBsrxPyTnfQyJJ3Fag6KxYESe7zNN3MJinu9rWjDBv+9gO1LjhlXjeWr6ZKY GYoJCy1l5c9lNhMMkqUypeRcZ5VFAlf6I0rTLj8nwKZGLSP3CP023OYWIVPmKYW6NMY7 s2oZmpxbWc82W+iUADLzm3uSlcDR3FP2/CDmybU5aFSIhuRvQSmySSr6Uw75EwdM5x3Z gKzaE9zcyE36aqzZ9TreJKoo+WPd65LlnX4rS97XQZU+uVn2PLeVSSlN4x6mLRLSKsj2 Ep+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=MmdIsQUt1eQ5Mg1zNk3b8g7tN9qiVqUYt0El2a9KJYU=; b=GcgirwGWM1CwqJNCNhRCZt8UrN/pjnYfVfycPSZeoP44M/zVL9DHnheNFYLbljnCpn l+QknEapqOfgFyALga6Q4GskBn4k/ZVF0yOUM/NfvcH8WQm2Iyg7/5bb7JlgCtyWksIq mPKSw9knxIhhMvdM2pFKldLJUjQha7R8/6tppNuHDL4zNWzg/e/5LjFzvrdvBpU/uumc ZDI9d03wKyM6ewPPB3GpCSwWDXufau/eGQ9skps8b5K1DWJEzSxzSxFwq/2F5VggwYkO BAGYCUjJcikrIhvJ68ouH41oOFbA6+0Qhnc+IuhyImCT8Ub/gHqA5XXmWTM55F4wNouk 9wzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QrWykG4K; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id j12-20020a170902c3cc00b00189e9256a07sor801676plj.56.2023.01.23.07.12.37 for (Google Transport Security); Mon, 23 Jan 2023 07:12:37 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:902:ab50:b0:194:d5ed:b9ea with SMTP id ij16-20020a170902ab5000b00194d5edb9eamr13099534plb.57.1674486757426; Mon, 23 Jan 2023 07:12:37 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a15f:2279:f361:f93b:7971]) by smtp.gmail.com with ESMTPSA id d5-20020a170903230500b001754fa42065sm19207111plh.143.2023.01.23.07.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 07:12:36 -0800 (PST) From: Jagan Teki To: Andrzej Hajda , Inki Dae , Marek Szyprowski , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Frieder Schrempf , Fancy Fang , Tim Harvey , Michael Nazzareno Trimarchi , Adam Ford , Neil Armstrong , Robert Foss , Laurent Pinchart , Tommaso Merciai , Marek Vasut Cc: Matteo Lisi , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, NXP Linux Team , linux-amarula , Jagan Teki , Maxime Ripard , Linus Walleij , Maarten Lankhorst Subject: [RESEND PATCH v11 01/18] drm: of: Lookup if child node has DSI panel or bridge Date: Mon, 23 Jan 2023 20:41:55 +0530 Message-Id: <20230123151212.269082-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123151212.269082-1-jagan@amarulasolutions.com> References: <20230123151212.269082-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QrWykG4K; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Devices can also be child nodes when we also control that device through the upstream device (ie, MIPI-DCS for a MIPI-DSI device). Unlike the drm_of_find_panel_or_bridge helper it requires a special case to lookup a child node of the given parent that isn't either port or ports. Lookup for a child DSI node of the given parent that isn't either port or ports. If it is found then it will directly find the panel or bridge otherwise lookup for the child node with a given port and endpoint number as drm_of_find_panel_or_bridge does. Supporting this feature via existing drm_of_find_panel_or_bridge found several issues while handling usecases. Here is the previously failed attempt of similar and the same has been reverted later. commit <80253168dbfd> ("drm: of: Lookup if child node has panel or bridge") So, add a separate helper to handle this DSI use case. Example OF graph representation of DSI host, which has port but not has ports and has child panel node. dsi { compatible = "allwinner,sun6i-a31-mipi-dsi"; #address-cells = <1>; #size-cells = <0>; port { dsi_in_tcon0: endpoint { remote-endpoint = ; }; panel@0 { reg = <0>; }; }; Example OF graph representation of DSI host, which has ports but not has port and has child panel node. dsi { compatible = "samsung,exynos5433-mipi-dsi"; #address-cells = <1>; #size-cells = <0>; ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; dsi_to_mic: endpoint { remote-endpoint = <&mic_to_dsi>; }; }; }; panel@0 { reg = <0>; }; }; Example OF graph representation of DSI host, which has neither a port nor a ports but has child panel node. dsi0 { compatible = "ste,mcde-dsi"; #address-cells = <1>; #size-cells = <0>; panel@0 { reg = <0>; }; }; Cc: Maxime Ripard Cc: Laurent Pinchart Cc: Linus Walleij Cc: Maarten Lankhorst Signed-off-by: Jagan Teki --- Changes for v11: - drop extra line Changes for v10: - new patch drivers/gpu/drm/drm_of.c | 112 ++++++++++++++++++++++++++++++++------- include/drm/drm_of.h | 12 +++++ 2 files changed, 104 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 7bbcb999bb75..e165951e3545 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -216,6 +216,35 @@ int drm_of_encoder_active_endpoint(struct device_node *node, } EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint); +static int of_drm_find_panel_or_bridge(struct device_node *remote, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + int ret = -EPROBE_DEFER; + + if (panel) { + *panel = of_drm_find_panel(remote); + if (!IS_ERR(*panel)) + ret = 0; + else + *panel = NULL; + } + + /* No panel found yet, check for a bridge next. */ + if (bridge) { + if (ret) { + *bridge = of_drm_find_bridge(remote); + if (*bridge) + ret = 0; + } else { + *bridge = NULL; + } + } + + of_node_put(remote); + return ret; +} + /** * drm_of_find_panel_or_bridge - return connected panel or bridge device * @np: device tree node containing encoder output ports @@ -238,7 +267,6 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, struct drm_panel **panel, struct drm_bridge **bridge) { - int ret = -EPROBE_DEFER; struct device_node *remote; if (!panel && !bridge) @@ -259,30 +287,74 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, if (!remote) return -ENODEV; - if (panel) { - *panel = of_drm_find_panel(remote); - if (!IS_ERR(*panel)) - ret = 0; - else - *panel = NULL; - } + return of_drm_find_panel_or_bridge(remote, panel, bridge); +} +EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge); - /* No panel found yet, check for a bridge next. */ - if (bridge) { - if (ret) { - *bridge = of_drm_find_bridge(remote); - if (*bridge) - ret = 0; - } else { - *bridge = NULL; - } +/** + * drm_of_dsi_find_panel_or_bridge - return connected DSI panel or bridge device + * @np: device tree node containing encoder output ports + * @port: port in the device tree node + * @endpoint: endpoint in the device tree node + * @panel: pointer to hold returned drm_panel + * @bridge: pointer to hold returned drm_bridge + * + * Lookup for a child DSI node of the given parent that isn't either port + * or ports. If it is found then it will directly find the panel or bridge + * otherwise lookup for the child node with a given port and endpoint number + * as drm_of_find_panel_or_bridge does. + * + * Lookup a given child DSI node or a DT node's port and endpoint number, + * find the connected node and return either the associated struct drm_panel + * or drm_bridge device. Either @panel or @bridge must not be NULL. + * + * Returns zero if successful, or one of the standard error codes if it fails. + */ +int drm_of_dsi_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + struct device_node *remote; + + if (!panel && !bridge) + return -EINVAL; + if (panel) + *panel = NULL; + /** + * Devices can also be child nodes when we also control that device + * through the upstream device (ie, MIPI-DCS for a MIPI-DSI device). + * + * Lookup for a child node of the given parent that isn't either port + * or ports. + */ + for_each_available_child_of_node(np, remote) { + if (of_node_name_eq(remote, "port") || + of_node_name_eq(remote, "ports")) + continue; + + goto of_find_panel_or_bridge; } - of_node_put(remote); - return ret; + /* + * of_graph_get_remote_node() produces a noisy error message if port + * node isn't found and the absence of the port is a legit case here, + * so at first we silently check whether graph presents in the + * device-tree node. + */ + if (!of_graph_is_present(np)) + return -ENODEV; + + remote = of_graph_get_remote_node(np, port, endpoint); + +of_find_panel_or_bridge: + if (!remote) + return -ENODEV; + + return of_drm_find_panel_or_bridge(remote, panel, bridge); } -EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge); +EXPORT_SYMBOL_GPL(drm_of_dsi_find_panel_or_bridge); enum drm_of_lvds_pixels { DRM_OF_LVDS_EVEN = BIT(0), diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 10ab58c40746..7a97157c1fa0 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -47,6 +47,10 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, int port, int endpoint, struct drm_panel **panel, struct drm_bridge **bridge); +int drm_of_dsi_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge); int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, const struct device_node *port2); int drm_of_lvds_get_data_mapping(const struct device_node *port); @@ -99,6 +103,14 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np, return -EINVAL; } +static inline int drm_of_dsi_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + return -EINVAL; +} + static inline int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, const struct device_node *port2)