p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/fsl-dcu: handle missing panel gracefully 

If the device tree property fsl,panel is missing, drm_panel_attach
is called with a NULL pointer as first argument. Having a panel is
basically mandatory since RGB is the only supported connector.
Check if a panel node has been found, return -ENODEV and cleanup
otherwise.

Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner 2015-12-02 18:03:50 -08:00
parent a109f66f4b
commit b7d11305b8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
View File

@ -171,15 +171,19 @@ int fsl_dcu_drm_connector_create(struct fsl_dcu_drm_device *fsl_dev,
DRM_MODE_DPMS_OFF); DRM_MODE_DPMS_OFF);
panel_node = of_parse_phandle(fsl_dev->np, "fsl,panel", 0); panel_node = of_parse_phandle(fsl_dev->np, "fsl,panel", 0);
if (panel_node) { if (!panel_node) {
fsl_dev->connector.panel = of_drm_find_panel(panel_node); dev_err(fsl_dev->dev, "fsl,panel property not found\n");
if (!fsl_dev->connector.panel) { ret = -ENODEV;
ret = -EPROBE_DEFER; goto err_sysfs;
goto err_sysfs;
}
of_node_put(panel_node);
} }
fsl_dev->connector.panel = of_drm_find_panel(panel_node);
if (!fsl_dev->connector.panel) {
ret = -EPROBE_DEFER;
goto err_panel;
}
of_node_put(panel_node);
ret = drm_panel_attach(fsl_dev->connector.panel, connector); ret = drm_panel_attach(fsl_dev->connector.panel, connector);
if (ret) { if (ret) {
dev_err(fsl_dev->dev, "failed to attach panel\n"); dev_err(fsl_dev->dev, "failed to attach panel\n");
@ -188,6 +192,8 @@ int fsl_dcu_drm_connector_create(struct fsl_dcu_drm_device *fsl_dev,
return 0; return 0;
err_panel:
of_node_put(panel_node);
err_sysfs: err_sysfs:
drm_connector_unregister(connector); drm_connector_unregister(connector);
err_cleanup: err_cleanup: