qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video/drm: display: check route_* status 

Change-Id: I2154678dc200f453b1dd9af624c3c616b9871a5d
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi 2018-02-26 10:14:27 +08:00 committed by Kever Yang
parent 38efbccc2d
commit 1e44acfc69
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/video/drm/rockchip_display.c
View File

@ -85,10 +85,9 @@ static struct udevice *get_panel_device(struct display_state *state, ofnode conn
node = dev_read_subnode(conn_state->dev, "panel"); node = dev_read_subnode(conn_state->dev, "panel");
if (ofnode_valid(node) && if (ofnode_valid(node) &&
of_device_is_available(ofnode_to_np(node))){ of_device_is_available(ofnode_to_np(node))) {
ret = uclass_get_device_by_ofnode(UCLASS_PANEL, node, &dev); ret = uclass_get_device_by_ofnode(UCLASS_PANEL, node, &dev);
if(!ret) { if (!ret) {
printf("%s get panel dev\n", __func__);
panel_state->node = node; panel_state->node = node;
return dev; return dev;
} }
@ -122,12 +121,10 @@ static struct udevice *get_panel_device(struct display_state *state, ofnode conn
ret = uclass_get_device_by_ofnode(UCLASS_PANEL, ret = uclass_get_device_by_ofnode(UCLASS_PANEL,
np_to_ofnode(panel), np_to_ofnode(panel),
&dev); &dev);
if (ret) { if (!ret) {
printf("Warn: can't find panel drv %d\n", ret); panel_state->node = np_to_ofnode(panel);
continue; return dev;
} }
panel_state->node = np_to_ofnode(panel);
return dev;
} }
} }
@ -144,9 +141,10 @@ static int connector_phy_init(struct display_state *state)
ret = uclass_get_device_by_phandle(UCLASS_PHY, conn_state->dev, "phys", ret = uclass_get_device_by_phandle(UCLASS_PHY, conn_state->dev, "phys",
&dev); &dev);
if (ret) { if (ret) {
printf("Warn: can't find phy driver\n"); debug("Warn: can't find phy driver\n");
return 0; return 0;
} }
phy = (const struct rockchip_phy *)dev_get_driver_data(dev); phy = (const struct rockchip_phy *)dev_get_driver_data(dev);
if (!phy) { if (!phy) {
printf("failed to find phy driver\n"); printf("failed to find phy driver\n");
@ -197,10 +195,13 @@ static int connector_panel_init(struct display_state *state)
printf("failed to init panel driver\n"); printf("failed to init panel driver\n");
return ret; return ret;
} }
dsp_lut_node = dev_read_subnode(dev, "dsp-lut"); dsp_lut_node = dev_read_subnode(dev, "dsp-lut");
if (!ofnode_valid(dsp_lut_node)) { if (!ofnode_valid(dsp_lut_node)) {
printf("%s can not find dsp-lut node\n", __func__); debug("%s can not find dsp-lut node\n", __func__);
return 0;
} }
ofnode_get_property(dsp_lut_node, "gamma-lut", &len); ofnode_get_property(dsp_lut_node, "gamma-lut", &len);
if (len > 0) { if (len > 0) {
conn_state->gamma.size = len / sizeof(u32); conn_state->gamma.size = len / sizeof(u32);
@ -817,7 +818,9 @@ static int rockchip_display_probe(struct udevice *dev)
if (!ofnode_valid(route_node)) if (!ofnode_valid(route_node))
return -ENODEV; return -ENODEV;
ofnode_for_each_subnode(node, route_node){ ofnode_for_each_subnode(node, route_node) {
if (!ofnode_is_available(node))
continue;
phandle = ofnode_read_u32_default(node, "connect", -1); phandle = ofnode_read_u32_default(node, "connect", -1);
if (phandle < 0) { if (phandle < 0) {
printf("Warn: can't find connect node's handle\n"); printf("Warn: can't find connect node's handle\n");