lkml.org 
[lkml]   [2016]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 06/10] drm/rockchip: analogix_dp: make panel detect to an optional action
    Date
    Some boards don't need to declare a panel device node, like the
    display interface is DP monitors, so it's necessary to make the
    panel detect to an optional action.

    Signed-off-by: Yakir Yang <ykk@rock-chips.com>
    ---
    Changes in v2: None

    drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 48 ++++++++++++-------------
    1 file changed, 22 insertions(+), 26 deletions(-)

    diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    index d684c97..f29ca3d 100644
    --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    @@ -325,38 +325,34 @@ static int rockchip_dp_probe(struct platform_device *pdev)
    {
    struct device *dev = &pdev->dev;
    struct device_node *panel_node, *port, *endpoint;
    + struct drm_panel *panel = NULL;
    struct rockchip_dp_device *dp;
    - struct drm_panel *panel;

    port = of_graph_get_port_by_id(dev->of_node, 1);
    - if (!port) {
    - dev_err(dev, "can't find output port\n");
    - return -EINVAL;
    - }
    -
    - endpoint = of_get_child_by_name(port, "endpoint");
    - of_node_put(port);
    - if (!endpoint) {
    - dev_err(dev, "no output endpoint found\n");
    - return -EINVAL;
    - }
    -
    - panel_node = of_graph_get_remote_port_parent(endpoint);
    - of_node_put(endpoint);
    - if (!panel_node) {
    - dev_err(dev, "no output node found\n");
    - return -EINVAL;
    - }
    -
    - panel = of_drm_find_panel(panel_node);
    - if (!panel) {
    - DRM_ERROR("failed to find panel\n");
    + if (port) {
    + endpoint = of_get_child_by_name(port, "endpoint");
    + of_node_put(port);
    + if (!endpoint) {
    + dev_err(dev, "no output endpoint found\n");
    + return -EINVAL;
    + }
    +
    + panel_node = of_graph_get_remote_port_parent(endpoint);
    + of_node_put(endpoint);
    + if (!panel_node) {
    + dev_err(dev, "no output node found\n");
    + return -EINVAL;
    + }
    +
    + panel = of_drm_find_panel(panel_node);
    + if (!panel) {
    + DRM_ERROR("failed to find panel\n");
    + of_node_put(panel_node);
    + return -EPROBE_DEFER;
    + }
    of_node_put(panel_node);
    - return -EPROBE_DEFER;
    }

    - of_node_put(panel_node);
    -
    dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
    if (!dp)
    return -ENOMEM;
    --
    1.9.1

    \
     
     \ /
      Last update: 2016-05-24 07:21    [W:4.951 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site