mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 05:18:55 +00:00
a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
107 lines
2.7 KiB
Diff
107 lines
2.7 KiB
Diff
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
|
|
index e15fa2389e3f..20193d6f33ba 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
|
|
@@ -231,12 +231,55 @@ struct endpoint_list {
|
|
DECLARE_KFIFO(fifo, struct device_node *, 16);
|
|
};
|
|
|
|
+static void sun4i_drv_traverse_endpoints(struct endpoint_list *list,
|
|
+ struct device_node *node,
|
|
+ int port_id)
|
|
+{
|
|
+ struct device_node *ep, *remote, *port;
|
|
+
|
|
+ port = of_graph_get_port_by_id(node, port_id);
|
|
+ if (!port) {
|
|
+ DRM_DEBUG_DRIVER("No output to bind on port %d\n", port_id);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ for_each_available_child_of_node(port, ep) {
|
|
+ remote = of_graph_get_remote_port_parent(ep);
|
|
+ if (!remote) {
|
|
+ DRM_DEBUG_DRIVER("Error retrieving the output node\n");
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * If the node is our TCON, the first port is used for
|
|
+ * panel or bridges, and will not be part of the
|
|
+ * component framework.
|
|
+ */
|
|
+ if (sun4i_drv_node_is_tcon(node)) {
|
|
+ struct of_endpoint endpoint;
|
|
+
|
|
+ if (of_graph_parse_endpoint(ep, &endpoint)) {
|
|
+ DRM_DEBUG_DRIVER("Couldn't parse endpoint\n");
|
|
+ of_node_put(remote);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (!endpoint.id) {
|
|
+ DRM_DEBUG_DRIVER("Endpoint is our panel... skipping\n");
|
|
+ of_node_put(remote);
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ kfifo_put(&list->fifo, remote);
|
|
+ }
|
|
+}
|
|
+
|
|
static int sun4i_drv_add_endpoints(struct device *dev,
|
|
struct endpoint_list *list,
|
|
struct component_match **match,
|
|
struct device_node *node)
|
|
{
|
|
- struct device_node *port, *ep, *remote;
|
|
int count = 0;
|
|
|
|
/*
|
|
@@ -272,43 +315,8 @@ static int sun4i_drv_add_endpoints(struct device *dev,
|
|
count++;
|
|
}
|
|
|
|
- /* Inputs are listed first, then outputs */
|
|
- port = of_graph_get_port_by_id(node, 1);
|
|
- if (!port) {
|
|
- DRM_DEBUG_DRIVER("No output to bind\n");
|
|
- return count;
|
|
- }
|
|
-
|
|
- for_each_available_child_of_node(port, ep) {
|
|
- remote = of_graph_get_remote_port_parent(ep);
|
|
- if (!remote) {
|
|
- DRM_DEBUG_DRIVER("Error retrieving the output node\n");
|
|
- continue;
|
|
- }
|
|
-
|
|
- /*
|
|
- * If the node is our TCON, the first port is used for
|
|
- * panel or bridges, and will not be part of the
|
|
- * component framework.
|
|
- */
|
|
- if (sun4i_drv_node_is_tcon(node)) {
|
|
- struct of_endpoint endpoint;
|
|
-
|
|
- if (of_graph_parse_endpoint(ep, &endpoint)) {
|
|
- DRM_DEBUG_DRIVER("Couldn't parse endpoint\n");
|
|
- of_node_put(remote);
|
|
- continue;
|
|
- }
|
|
-
|
|
- if (!endpoint.id) {
|
|
- DRM_DEBUG_DRIVER("Endpoint is our panel... skipping\n");
|
|
- of_node_put(remote);
|
|
- continue;
|
|
- }
|
|
- }
|
|
-
|
|
- kfifo_put(&list->fifo, remote);
|
|
- }
|
|
+ /* each node has at least one output */
|
|
+ sun4i_drv_traverse_endpoints(list, node, 1);
|
|
|
|
return count;
|
|
}
|