Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bad7d29 authored by Mark Yao's avatar Mark Yao Committed by Dave Airlie
Browse files

Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()" 



This reverts commit 52f5eb60.

Rockchip drm can't work with generic drm_of_component_probe now

Signed-off-by: default avatarMark Yao <mark.yao@rock-chips.com>
Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0c545ac4

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+75 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_of.h>

#include <linux/dma-mapping.h>

#include <linux/pm_runtime.h>

#include <linux/module.h>
@@ -419,6 +418,29 @@ static int compare_of(struct device *dev, void *data) 
	return dev->of_node == np;

}



static void rockchip_add_endpoints(struct device *dev,

				   struct component_match **match,

				   struct device_node *port)

{

	struct device_node *ep, *remote;



	for_each_child_of_node(port, ep) {

		remote = of_graph_get_remote_port_parent(ep);

		if (!remote || !of_device_is_available(remote)) {

			of_node_put(remote);

			continue;

		} else if (!of_device_is_available(remote->parent)) {

			dev_warn(dev, "parent device of %s is not available\n",

				 remote->full_name);

			of_node_put(remote);

			continue;

		}



		component_match_add(dev, match, compare_of, remote);

		of_node_put(remote);

	}

}



static int rockchip_drm_bind(struct device *dev)

{

	struct drm_device *drm;
@@ -461,14 +483,61 @@ static const struct component_master_ops rockchip_drm_ops = { 


static int rockchip_drm_platform_probe(struct platform_device *pdev)

{

	int ret = drm_of_component_probe(&pdev->dev, compare_of,

					 &rockchip_drm_ops);

	struct device *dev = &pdev->dev;

	struct component_match *match = NULL;

	struct device_node *np = dev->of_node;

	struct device_node *port;

	int i;



	/* keep compatibility with old code that was returning -ENODEV */

	if (ret == -EINVAL)

	if (!np)

		return -ENODEV;

	/*

	 * Bind the crtc ports first, so that

	 * drm_of_find_possible_crtcs called from encoder .bind callbacks

	 * works as expected.

	 */

	for (i = 0;; i++) {

		port = of_parse_phandle(np, "ports", i);

		if (!port)

			break;



	return ret;

		if (!of_device_is_available(port->parent)) {

			of_node_put(port);

			continue;

		}



		component_match_add(dev, &match, compare_of, port->parent);

		of_node_put(port);

	}



	if (i == 0) {

		dev_err(dev, "missing 'ports' property\n");

		return -ENODEV;

	}



	if (!match) {

		dev_err(dev, "No available vop found for display-subsystem.\n");

		return -ENODEV;

	}

	/*

	 * For each bound crtc, bind the encoders attached to its

	 * remote endpoint.

	 */

	for (i = 0;; i++) {

		port = of_parse_phandle(np, "ports", i);

		if (!port)

			break;



		if (!of_device_is_available(port->parent)) {

			of_node_put(port);

			continue;

		}



		rockchip_add_endpoints(dev, &match, port);

		of_node_put(port);

	}



	return component_master_add_with_match(dev, &rockchip_drm_ops, match);

}



static int rockchip_drm_platform_remove(struct platform_device *pdev)