From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F5D2C4332F for ; Wed, 14 Dec 2022 18:06:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDB8910E43B; Wed, 14 Dec 2022 18:06:32 +0000 (UTC) Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5BA3210E023 for ; Wed, 14 Dec 2022 18:06:23 +0000 (UTC) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-14449b7814bso17641505fac.3 for ; Wed, 14 Dec 2022 10:06:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=li1rcgSePKzYQom2Bzp4ApE+JydsHJh0h5VVFVmticY=; b=g+C/cMznNslTUXzx8ydstQQMyBOHoLyGLH3+YpxV30zUWS3tYUXlpMUnoxbayPRBgS k0dM0Vde9JIiXU5atfjFGA+Y+OfD5b5Cjoekz6oQiR58tDlxp5UL1ScMwRZCqbDBkPJM MF5YEXqF+GBsKMPYdpCT2b5uc1RJbP/k+PAfcMZdaUOJf5nUoADWxCGVQO2bkX24HXXe SGIWtpL8TEqYx8rXkLNdVw6WU8dujEbqOEvytghFvqtfcgDdCvggA4y+2bgHZ/T+7u1h IQG+xscTnSHeDbTcVJlmGBMXEwyR5sIwah9+epcvcfpKdSJ5T5tbFweXsW9VyAEzuXWL FJKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding: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=li1rcgSePKzYQom2Bzp4ApE+JydsHJh0h5VVFVmticY=; b=aOIASpFNsyiSzmrRQVAt0eXMfJbE7ve4dSPj1yK7mKmvKX2dBz/GdEnJEOJwU8N29J n+M1h1DLbTKg7cXsj1eYUoydTwfdJl6Tg/kbhvJeel3mXAuMw00NyyFLa8eQ+iQ6arEl tvN8+20o0ljKe/ZJHQPyrIKHpf78ZYnYRppGc6jZ3R3C5dmNEFVSCMzPSbCMFR9BvCup 2RUngOSIhCdiO1lY3lW8fmGF3APlPul7HDRWxJCa4ilef23FPlWQz+M1mvhqljZI9eCm EbrJQxeL7F36Esw+t+dT5kJa+cKBL1EpuUFSQalUkLamI3sdyMeYS/u9W98SYU6HBh+x A8gQ== X-Gm-Message-State: ANoB5pkTE7eKC19uJdkD3ZlZ7KUozTftq1QciaFwP/5FiuqrTximLpOp VL5bFjJTIFUVrJF8zXWo4OG1W8f3AhU= X-Google-Smtp-Source: AA0mqf7ouUJVKaPK7GsexpfPjbqTBOXdYQYnoNc0cvxcglHKCv3iNZciGosUyrWOYwgCpqjZVRq6wQ== X-Received: by 2002:a05:6870:6a91:b0:144:d50f:2f3 with SMTP id mv17-20020a0568706a9100b00144d50f02f3mr16942105oab.57.1671041181173; Wed, 14 Dec 2022 10:06:21 -0800 (PST) Received: from localhost.localdomain (76-244-6-13.lightspeed.rcsntx.sbcglobal.net. [76.244.6.13]) by smtp.gmail.com with ESMTPSA id y8-20020a056870b00800b0013b0b19100fsm3034008oae.32.2022.12.14.10.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 10:06:20 -0800 (PST) From: Chris Morgan To: dri-devel@lists.freedesktop.org Subject: [PATCH V5 1/4] drm: of: Add drm_of_get_dsi_bus helper function Date: Wed, 14 Dec 2022 12:06:08 -0600 Message-Id: <20221214180611.109651-2-macroalpha82@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221214180611.109651-1-macroalpha82@gmail.com> References: <20221214180611.109651-1-macroalpha82@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Chris Morgan , tzimmermann@suse.de, sam@ravnborg.org, robh+dt@kernel.org, thierry.reding@gmail.com, krzysztof.kozlowski+dt@linaro.org, Maya Matuszczyk Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Chris Morgan Add helper function to find DSI host for devices where DSI panel is not a minor of a DSI bus (such as the Samsung AMS495QA01 panel or the official Raspberry Pi touchscreen display). Signed-off-by: Chris Morgan Signed-off-by: Maya Matuszczyk --- drivers/gpu/drm/drm_of.c | 62 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 11 +++++++ 2 files changed, 73 insertions(+) diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 7bbcb999bb75..7d89ac164069 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -493,3 +494,64 @@ int drm_of_get_data_lanes_count_ep(const struct device_node *port, return ret; } EXPORT_SYMBOL_GPL(drm_of_get_data_lanes_count_ep); + +/** + * drm_of_get_dsi_bus - find the DSI bus for a given device + * @dev: parent device of display (SPI, I2C) + * @dsi_host: DSI host to be populated + * @info: DSI device info to be updated with correct DSI node + * + * Given a panel device parented to a non-DSI device, follow the + * devicetree to find the correct DSI host node and populate the + * dsi_host with the correct host and info with the correct node. + * Returns zero if successful, -EPROBE_DEFER if the DSI host is + * found but not available, or -ENODEV otherwise. + */ +int drm_of_get_dsi_bus(struct device *dev, + struct mipi_dsi_host **dsi_host, + struct mipi_dsi_device_info *info) +{ + struct device_node *endpoint, *dsi_host_node; + + /* + * Get first endpoint child from device. + */ + endpoint = of_graph_get_next_endpoint(dev->of_node, NULL); + if (!endpoint) + return -ENODEV; + + /* + * Follow the first endpoint to get the DSI host node. + */ + dsi_host_node = of_graph_get_remote_port_parent(endpoint); + if (!dsi_host_node) + goto error; + + /* + * Get the DSI host from the DSI host node. If we get an error + * or the return is null assume we're not ready to probe just + * yet. Release the DSI host node since we're done with it. + */ + *dsi_host = of_find_mipi_dsi_host_by_node(dsi_host_node); + of_node_put(dsi_host_node); + if (IS_ERR_OR_NULL(*dsi_host)) { + of_node_put(endpoint); + return -EPROBE_DEFER; + } + + /* + * Set the node of the mipi_dsi_device_info to the correct node + * and then release the endpoint node since we're done with it. + */ + info->node = of_graph_get_remote_port(endpoint); + if (IS_ERR_OR_NULL(info->node)) + goto error; + + of_node_put(endpoint); + return 0; + +error: + of_node_put(endpoint); + return -ENODEV; +} +EXPORT_SYMBOL_GPL(drm_of_get_dsi_bus); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 10ab58c40746..a694ce71c3b2 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -15,6 +15,8 @@ struct drm_encoder; struct drm_panel; struct drm_bridge; struct device_node; +struct mipi_dsi_device_info; +struct mipi_dsi_host; /** * enum drm_lvds_dual_link_pixels - Pixel order of an LVDS dual-link connection @@ -56,6 +58,9 @@ int drm_of_get_data_lanes_count_ep(const struct device_node *port, int port_reg, int reg, const unsigned int min, const unsigned int max); +int drm_of_get_dsi_bus(struct device *dev, + struct mipi_dsi_host **dsi_host, + struct mipi_dsi_device_info *info); #else static inline uint32_t drm_of_crtc_port_mask(struct drm_device *dev, struct device_node *port) @@ -127,6 +132,12 @@ drm_of_get_data_lanes_count_ep(const struct device_node *port, { return -EINVAL; } +static int drm_of_get_dsi_bus(struct device *dev, + struct mipi_dsi_host **dsi_host, + struct mipi_dsi_device_info *info); +{ + return -EINVAL; +} #endif /* -- 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFEB4C4332F for ; Wed, 14 Dec 2022 18:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238606AbiLNSH2 (ORCPT ); Wed, 14 Dec 2022 13:07:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238628AbiLNSHB (ORCPT ); Wed, 14 Dec 2022 13:07:01 -0500 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B58542A959 for ; Wed, 14 Dec 2022 10:06:23 -0800 (PST) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-1322d768ba7so17634126fac.5 for ; Wed, 14 Dec 2022 10:06:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=li1rcgSePKzYQom2Bzp4ApE+JydsHJh0h5VVFVmticY=; b=g+C/cMznNslTUXzx8ydstQQMyBOHoLyGLH3+YpxV30zUWS3tYUXlpMUnoxbayPRBgS k0dM0Vde9JIiXU5atfjFGA+Y+OfD5b5Cjoekz6oQiR58tDlxp5UL1ScMwRZCqbDBkPJM MF5YEXqF+GBsKMPYdpCT2b5uc1RJbP/k+PAfcMZdaUOJf5nUoADWxCGVQO2bkX24HXXe SGIWtpL8TEqYx8rXkLNdVw6WU8dujEbqOEvytghFvqtfcgDdCvggA4y+2bgHZ/T+7u1h IQG+xscTnSHeDbTcVJlmGBMXEwyR5sIwah9+epcvcfpKdSJ5T5tbFweXsW9VyAEzuXWL FJKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding: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=li1rcgSePKzYQom2Bzp4ApE+JydsHJh0h5VVFVmticY=; b=qg7RvMO8RuzXH79QmHZdTe7YzcwUmhVw0gN7CRB5jmehTutwNqCeyxu6KiNZ6yswje ewayXaUG3GjGzywP3YqsDjtQQHqTlqfh7wDdDGdiob+kPYCGdYjSTfdDHBTjol6FvWdn Xr1wDudcpKUFe/MlpE8+tt1tW5VbiijJ7Kevc9KqIBaGx/aXStlREZdcNAxGtia+Q+6v Fqcp9VevyBNFTAgUoJvw+9Sh4BM5hI3vPc25BOmUj1mUG1ycM9lnR0fBYqRZgfDunH4J thVayb7Ep2Ld+s5x5zE7Bs3YnVMv9KxMHTlbWSC/Hzw2NOI7ZLlIWZ6d7eGlwZ+mEHN2 7BAQ== X-Gm-Message-State: ANoB5pmFP3XiQwlOxblVCXX206S7xtHPkMSjBfb7eSTkLzqSB5pvAp3M xISZDHy1aSrHvqoEFYDDYj4= X-Google-Smtp-Source: AA0mqf7ouUJVKaPK7GsexpfPjbqTBOXdYQYnoNc0cvxcglHKCv3iNZciGosUyrWOYwgCpqjZVRq6wQ== X-Received: by 2002:a05:6870:6a91:b0:144:d50f:2f3 with SMTP id mv17-20020a0568706a9100b00144d50f02f3mr16942105oab.57.1671041181173; Wed, 14 Dec 2022 10:06:21 -0800 (PST) Received: from localhost.localdomain (76-244-6-13.lightspeed.rcsntx.sbcglobal.net. [76.244.6.13]) by smtp.gmail.com with ESMTPSA id y8-20020a056870b00800b0013b0b19100fsm3034008oae.32.2022.12.14.10.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 10:06:20 -0800 (PST) From: Chris Morgan To: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org, tzimmermann@suse.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, heiko@sntech.de, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, daniel@ffwll.ch, airlied@gmail.com, sam@ravnborg.org, thierry.reding@gmail.com, linus.walleij@linaro.org, Chris Morgan , Maya Matuszczyk Subject: [PATCH V5 1/4] drm: of: Add drm_of_get_dsi_bus helper function Date: Wed, 14 Dec 2022 12:06:08 -0600 Message-Id: <20221214180611.109651-2-macroalpha82@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221214180611.109651-1-macroalpha82@gmail.com> References: <20221214180611.109651-1-macroalpha82@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Chris Morgan Add helper function to find DSI host for devices where DSI panel is not a minor of a DSI bus (such as the Samsung AMS495QA01 panel or the official Raspberry Pi touchscreen display). Signed-off-by: Chris Morgan Signed-off-by: Maya Matuszczyk --- drivers/gpu/drm/drm_of.c | 62 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 11 +++++++ 2 files changed, 73 insertions(+) diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 7bbcb999bb75..7d89ac164069 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -493,3 +494,64 @@ int drm_of_get_data_lanes_count_ep(const struct device_node *port, return ret; } EXPORT_SYMBOL_GPL(drm_of_get_data_lanes_count_ep); + +/** + * drm_of_get_dsi_bus - find the DSI bus for a given device + * @dev: parent device of display (SPI, I2C) + * @dsi_host: DSI host to be populated + * @info: DSI device info to be updated with correct DSI node + * + * Given a panel device parented to a non-DSI device, follow the + * devicetree to find the correct DSI host node and populate the + * dsi_host with the correct host and info with the correct node. + * Returns zero if successful, -EPROBE_DEFER if the DSI host is + * found but not available, or -ENODEV otherwise. + */ +int drm_of_get_dsi_bus(struct device *dev, + struct mipi_dsi_host **dsi_host, + struct mipi_dsi_device_info *info) +{ + struct device_node *endpoint, *dsi_host_node; + + /* + * Get first endpoint child from device. + */ + endpoint = of_graph_get_next_endpoint(dev->of_node, NULL); + if (!endpoint) + return -ENODEV; + + /* + * Follow the first endpoint to get the DSI host node. + */ + dsi_host_node = of_graph_get_remote_port_parent(endpoint); + if (!dsi_host_node) + goto error; + + /* + * Get the DSI host from the DSI host node. If we get an error + * or the return is null assume we're not ready to probe just + * yet. Release the DSI host node since we're done with it. + */ + *dsi_host = of_find_mipi_dsi_host_by_node(dsi_host_node); + of_node_put(dsi_host_node); + if (IS_ERR_OR_NULL(*dsi_host)) { + of_node_put(endpoint); + return -EPROBE_DEFER; + } + + /* + * Set the node of the mipi_dsi_device_info to the correct node + * and then release the endpoint node since we're done with it. + */ + info->node = of_graph_get_remote_port(endpoint); + if (IS_ERR_OR_NULL(info->node)) + goto error; + + of_node_put(endpoint); + return 0; + +error: + of_node_put(endpoint); + return -ENODEV; +} +EXPORT_SYMBOL_GPL(drm_of_get_dsi_bus); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 10ab58c40746..a694ce71c3b2 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -15,6 +15,8 @@ struct drm_encoder; struct drm_panel; struct drm_bridge; struct device_node; +struct mipi_dsi_device_info; +struct mipi_dsi_host; /** * enum drm_lvds_dual_link_pixels - Pixel order of an LVDS dual-link connection @@ -56,6 +58,9 @@ int drm_of_get_data_lanes_count_ep(const struct device_node *port, int port_reg, int reg, const unsigned int min, const unsigned int max); +int drm_of_get_dsi_bus(struct device *dev, + struct mipi_dsi_host **dsi_host, + struct mipi_dsi_device_info *info); #else static inline uint32_t drm_of_crtc_port_mask(struct drm_device *dev, struct device_node *port) @@ -127,6 +132,12 @@ drm_of_get_data_lanes_count_ep(const struct device_node *port, { return -EINVAL; } +static int drm_of_get_dsi_bus(struct device *dev, + struct mipi_dsi_host **dsi_host, + struct mipi_dsi_device_info *info); +{ + return -EINVAL; +} #endif /* -- 2.34.1