diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-03-02 22:13:06 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 16:13:27 +0300 |
| commit | 27d624527d99265c2df999af3615ff71c29d06f4 (patch) | |
| tree | 7dc6bf622bfde27e4a25482aa0b80e8c902a630f /drivers/gpu/drm/omapdrm/dss/venc.c | |
| parent | c87193267d247c58f4517081d9cd04c8dc6302b8 (diff) | |
drm/omap: dss: Acquire next dssdev at probe time
Look up the next dssdev at probe time based on device tree links for all
DSS outputs and encoders. This will be used to reverse the order of the
dssdev connect and disconnect call chains.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/venc.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/venc.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index 5adf8510d67b..298e86cc9e14 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -800,7 +800,7 @@ static const struct component_ops venc_component_ops = { * Probe & Remove, Suspend & Resume */ -static void venc_init_output(struct venc_device *venc) +static int venc_init_output(struct venc_device *venc) { struct omap_dss_device *out = &venc->output; @@ -813,11 +813,22 @@ static void venc_init_output(struct venc_device *venc) out->owner = THIS_MODULE; out->of_ports = BIT(0); + out->next = omapdss_of_find_connected_device(out->dev->of_node, 0); + if (IS_ERR(out->next)) { + if (PTR_ERR(out->next) != -EPROBE_DEFER) + dev_err(out->dev, "failed to find video sink\n"); + return PTR_ERR(out->next); + } + omapdss_device_register(out); + + return 0; } static void venc_uninit_output(struct venc_device *venc) { + if (venc->output.next) + omapdss_device_put(venc->output.next); omapdss_device_unregister(&venc->output); } @@ -909,7 +920,9 @@ static int venc_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); - venc_init_output(venc); + r = venc_init_output(venc); + if (r) + goto err_pm_disable; r = component_add(&pdev->dev, &venc_component_ops); if (r) @@ -919,6 +932,7 @@ static int venc_probe(struct platform_device *pdev) err_uninit_output: venc_uninit_output(venc); +err_pm_disable: pm_runtime_disable(&pdev->dev); err_free: kfree(venc); |