![Eric Anholt](/assets/img/avatar_default.png)
The panel_bridge bridge attaches to the panel's OF node, not the
lvds-encoder's node. Put in a little no-op bridge of our own so that
our consumers can still find a bridge where they expect.
This also fixes an unintended unregistration and leak of the
panel-bridge on module remove.
Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: 13dfc0540a
("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bri
dge.")
Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114191647.22207-1-eric@anholt.net
124 lines
3.1 KiB
C
124 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2016 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_bridge.h>
|
|
#include <drm/drm_panel.h>
|
|
|
|
#include <linux/of_graph.h>
|
|
|
|
struct lvds_encoder {
|
|
struct drm_bridge bridge;
|
|
struct drm_bridge *panel_bridge;
|
|
};
|
|
|
|
static int lvds_encoder_attach(struct drm_bridge *bridge)
|
|
{
|
|
struct lvds_encoder *lvds_encoder = container_of(bridge,
|
|
struct lvds_encoder,
|
|
bridge);
|
|
|
|
return drm_bridge_attach(bridge->encoder, lvds_encoder->panel_bridge,
|
|
bridge);
|
|
}
|
|
|
|
static struct drm_bridge_funcs funcs = {
|
|
.attach = lvds_encoder_attach,
|
|
};
|
|
|
|
static int lvds_encoder_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *port;
|
|
struct device_node *endpoint;
|
|
struct device_node *panel_node;
|
|
struct drm_panel *panel;
|
|
struct lvds_encoder *lvds_encoder;
|
|
|
|
lvds_encoder = devm_kzalloc(&pdev->dev, sizeof(*lvds_encoder),
|
|
GFP_KERNEL);
|
|
if (!lvds_encoder)
|
|
return -ENOMEM;
|
|
|
|
/* Locate the panel DT node. */
|
|
port = of_graph_get_port_by_id(pdev->dev.of_node, 1);
|
|
if (!port) {
|
|
dev_dbg(&pdev->dev, "port 1 not found\n");
|
|
return -ENXIO;
|
|
}
|
|
|
|
endpoint = of_get_child_by_name(port, "endpoint");
|
|
of_node_put(port);
|
|
if (!endpoint) {
|
|
dev_dbg(&pdev->dev, "no endpoint for port 1\n");
|
|
return -ENXIO;
|
|
}
|
|
|
|
panel_node = of_graph_get_remote_port_parent(endpoint);
|
|
of_node_put(endpoint);
|
|
if (!panel_node) {
|
|
dev_dbg(&pdev->dev, "no remote endpoint for port 1\n");
|
|
return -ENXIO;
|
|
}
|
|
|
|
panel = of_drm_find_panel(panel_node);
|
|
of_node_put(panel_node);
|
|
if (!panel) {
|
|
dev_dbg(&pdev->dev, "panel not found, deferring probe\n");
|
|
return -EPROBE_DEFER;
|
|
}
|
|
|
|
lvds_encoder->panel_bridge =
|
|
devm_drm_panel_bridge_add(&pdev->dev,
|
|
panel, DRM_MODE_CONNECTOR_LVDS);
|
|
if (IS_ERR(lvds_encoder->panel_bridge))
|
|
return PTR_ERR(lvds_encoder->panel_bridge);
|
|
|
|
/* The panel_bridge bridge is attached to the panel's of_node,
|
|
* but we need a bridge attached to our of_node for our user
|
|
* to look up.
|
|
*/
|
|
lvds_encoder->bridge.of_node = pdev->dev.of_node;
|
|
lvds_encoder->bridge.funcs = &funcs;
|
|
drm_bridge_add(&lvds_encoder->bridge);
|
|
|
|
platform_set_drvdata(pdev, lvds_encoder);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int lvds_encoder_remove(struct platform_device *pdev)
|
|
{
|
|
struct lvds_encoder *lvds_encoder = platform_get_drvdata(pdev);
|
|
|
|
drm_bridge_remove(&lvds_encoder->bridge);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id lvds_encoder_match[] = {
|
|
{ .compatible = "lvds-encoder" },
|
|
{ .compatible = "thine,thc63lvdm83d" },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, lvds_encoder_match);
|
|
|
|
static struct platform_driver lvds_encoder_driver = {
|
|
.probe = lvds_encoder_probe,
|
|
.remove = lvds_encoder_remove,
|
|
.driver = {
|
|
.name = "lvds-encoder",
|
|
.of_match_table = lvds_encoder_match,
|
|
},
|
|
};
|
|
module_platform_driver(lvds_encoder_driver);
|
|
|
|
MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");
|
|
MODULE_DESCRIPTION("Transparent parallel to LVDS encoder");
|
|
MODULE_LICENSE("GPL");
|