Skip to content

Commit b089c0a

Browse files
anderssonmripard
authored andcommitted
Revert "drm: of: Lookup if child node has panel or bridge"
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> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20220420231230.58499-2-bjorn.andersson@linaro.org
1 parent 169466d commit b089c0a

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

drivers/gpu/drm/drm_of.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -244,21 +244,6 @@ int drm_of_find_panel_or_bridge(const struct device_node *np,
244244
if (panel)
245245
*panel = NULL;
246246

247-
/**
248-
* Devices can also be child nodes when we also control that device
249-
* through the upstream device (ie, MIPI-DCS for a MIPI-DSI device).
250-
*
251-
* Lookup for a child node of the given parent that isn't either port
252-
* or ports.
253-
*/
254-
for_each_available_child_of_node(np, remote) {
255-
if (of_node_name_eq(remote, "port") ||
256-
of_node_name_eq(remote, "ports"))
257-
continue;
258-
259-
goto of_find_panel_or_bridge;
260-
}
261-
262247
/*
263248
* of_graph_get_remote_node() produces a noisy error message if port
264249
* 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,
269254
return -ENODEV;
270255

271256
remote = of_graph_get_remote_node(np, port, endpoint);
272-
273-
of_find_panel_or_bridge:
274257
if (!remote)
275258
return -ENODEV;
276259

0 commit comments

Comments
 (0)