From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Thierry Reding <thierry.reding@gmail.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Rob Clark <robdclark@gmail.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] Revert "drm: of: Lookup if child node has panel or bridge"
Date: Wed, 20 Apr 2022 16:12:30 -0700 [thread overview]
Message-ID: <20220420231230.58499-2-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20220420231230.58499-1-bjorn.andersson@linaro.org>
Commit '80253168dbfd ("drm: of: Lookup if child node has panel or
bridge")' attempted to simplify the case of expressing a simple panel
under a DSI controller, by assuming that the first non-graph child node
was a panel or bridge.
Unfortunately for non-trivial cases the first child node might not be a
panel or bridge. Examples of this can be a aux-bus in the case of
DisplayPort, or an opp-table represented before the panel node.
In these cases the reverted commit prevents the caller from ever finding
a reference to the panel.
This reverts commit '80253168dbfd ("drm: of: Lookup if child node has
panel or bridge")', in favor of using an explicit graph reference to the
panel in the trivial case as well.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/gpu/drm/drm_of.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 026e4e29a0f3..9a2cfab3a177 100644
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -244,21 +244,6 @@ int drm_of_find_panel_or_bridge(const struct device_node *np,
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_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,
@@ -269,8 +254,6 @@ int drm_of_find_panel_or_bridge(const struct device_node *np,
return -ENODEV;
remote = of_graph_get_remote_node(np, port, endpoint);
-
-of_find_panel_or_bridge:
if (!remote)
return -ENODEV;
--
2.35.1
next prev parent reply other threads:[~2022-04-20 23:10 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 23:12 [PATCH 1/2] Revert "drm: of: Properly try all possible cases for bridge/panel detection" Bjorn Andersson
2022-04-20 23:12 ` Bjorn Andersson [this message]
2022-04-21 7:20 ` (subset) [PATCH 2/2] Revert "drm: of: Lookup if child node has panel or bridge" Maxime Ripard
2022-04-21 7:45 ` Jagan Teki
2022-04-21 8:23 ` Maxime Ripard
2022-04-21 8:59 ` Paul Kocialkowski
2022-04-26 7:54 ` Paul Kocialkowski
2022-04-26 8:10 ` Jagan Teki
2022-04-27 14:34 ` Maxime Ripard
2022-04-28 6:17 ` Marek Szyprowski
2022-04-28 8:25 ` Jagan Teki
2022-04-28 8:39 ` Jagan Teki
2022-04-28 22:17 ` Laurent Pinchart
2022-04-29 8:24 ` Jagan Teki
2022-04-29 15:46 ` Maxime Ripard
2022-04-29 16:05 ` Laurent Pinchart
2022-05-04 15:08 ` Maxime Ripard
2022-04-26 11:33 ` Laurent Pinchart
2022-04-26 12:41 ` Paul Kocialkowski
2022-04-26 12:54 ` Maxime Ripard
2022-04-26 12:55 ` Maxime Ripard
2022-04-26 13:04 ` Paul Kocialkowski
2022-04-26 13:19 ` Maxime Ripard
2022-04-26 13:50 ` Paul Kocialkowski
2022-04-26 21:10 ` Bjorn Andersson
2022-04-27 7:34 ` Paul Kocialkowski
2022-05-03 0:03 ` Bjorn Andersson
2022-04-26 12:58 ` Paul Kocialkowski
2022-04-27 13:10 ` Laurent Pinchart
2022-04-26 12:51 ` Maxime Ripard
2022-04-27 6:59 ` Jagan Teki
2022-04-27 11:52 ` Jagan Teki
2022-04-27 12:19 ` Paul Kocialkowski
2022-04-27 12:59 ` Jagan Teki
2022-04-27 13:10 ` Laurent Pinchart
2022-04-20 23:19 ` [PATCH 1/2] Revert "drm: of: Properly try all possible cases for bridge/panel detection" Bjorn Andersson
2022-04-21 7:13 ` Paul Kocialkowski
2022-04-21 7:26 ` Maxime Ripard
2022-04-22 7:58 ` Raphael Gallais-Pou
2022-04-21 7:11 ` Paul Kocialkowski
2022-04-21 7:20 ` (subset) " Maxime Ripard
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=20220420231230.58499-2-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=paul.kocialkowski@bootlin.com \
--cc=robdclark@gmail.com \
--cc=thierry.reding@gmail.com \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®