shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: lvds: if port is null return -EINVAL

Browse Source 
Change-Id: I9503b4f2d317a12d91ce136213d8d2e629b72823
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
This commit is contained in:
Huang Jiachai
2017-07-18 11:59:59 +08:00
committed by Huang, Tao
parent 2d1c413b96
commit 6724059ae5
1 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
drivers/gpu/drm/rockchip/rockchip_lvds.c
View File

@@ -673,65 +673,68 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
lvds->drm_dev = drm_dev;
port = of_graph_get_port_by_id(dev->of_node, 1);
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;
}
lvds->panel = of_drm_find_panel(panel_node);
if (!lvds->panel) {
DRM_ERROR("failed to find panel\n");
of_node_put(panel_node);
return -EPROBE_DEFER;
}
if (of_property_read_string(panel_node, "rockchip,output", &name))
/* default set it as output rgb */
lvds->output = DISPLAY_OUTPUT_RGB;
else
lvds->output = lvds_name_to_output(name);
if (lvds->output < 0) {
dev_err(dev, "invalid output type [%s]\n", name);
return lvds->output;
}
if (of_property_read_string(panel_node, "rockchip,data-mapping",
&name))
/* default set it as format jeida */
lvds->format = LVDS_FORMAT_JEIDA;
else
lvds->format = lvds_name_to_format(name);
if (lvds->format < 0) {
dev_err(dev, "invalid data-mapping format [%s]\n", name);
return lvds->format;
}
if (of_property_read_u32(panel_node, "rockchip,data-width", &i)) {
lvds->format |= LVDS_24BIT;
} else {
if (i == 24) {
lvds->format |= LVDS_24BIT;
} else if (i == 18) {
lvds->format |= LVDS_18BIT;
} else {
dev_err(dev,
"rockchip-lvds unsupport data-width[%d]\n", i);
return -EINVAL;
}
}
of_node_put(panel_node);
if (!port) {
dev_err(dev, "can't found port point, please init lvds panel 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;
}
lvds->panel = of_drm_find_panel(panel_node);
if (!lvds->panel) {
DRM_ERROR("failed to find panel\n");
of_node_put(panel_node);
return -EPROBE_DEFER;
}
if (of_property_read_string(panel_node, "rockchip,output", &name))
/* default set it as output rgb */
lvds->output = DISPLAY_OUTPUT_RGB;
else
lvds->output = lvds_name_to_output(name);
if (lvds->output < 0) {
dev_err(dev, "invalid output type [%s]\n", name);
return lvds->output;
}
if (of_property_read_string(panel_node, "rockchip,data-mapping",
&name))
/* default set it as format jeida */
lvds->format = LVDS_FORMAT_JEIDA;
else
lvds->format = lvds_name_to_format(name);
if (lvds->format < 0) {
dev_err(dev, "invalid data-mapping format [%s]\n", name);
return lvds->format;
}
if (of_property_read_u32(panel_node, "rockchip,data-width", &i)) {
lvds->format |= LVDS_24BIT;
} else {
if (i == 24) {
lvds->format |= LVDS_24BIT;
} else if (i == 18) {
lvds->format |= LVDS_18BIT;
} else {
dev_err(dev,
"rockchip-lvds unsupport data-width[%d]\n", i);
return -EINVAL;
}
}
of_node_put(panel_node);
encoder = &lvds->encoder;
encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
dev->of_node);