summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/output.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-23 14:35:40 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-06-17 14:00:57 +0300
commitefedce1425976fc73154a826552aad4f54086a25 (patch)
tree66fe0f21efd3ff2d2efb275e91f51e3a488a5108 /drivers/video/omap2/dss/output.c
parent5d47dbc85228de3ce82dea11af3c169e66cbf520 (diff)
downloadop-kernel-dev-efedce1425976fc73154a826552aad4f54086a25.zip
op-kernel-dev-efedce1425976fc73154a826552aad4f54086a25.tar.gz
OMAPDSS: modify get/find functions to go through the device chain
In the future will have arbitrarily long video pipeline chains, instead of the current two-entities-per-pipeline model. This patch changes the affected get/find style functions so that they properly go through the video pipeline chain, for example when getting the overlay manager connected to a given display. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/output.c')
-rw-r--r--drivers/video/omap2/dss/output.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c
index 0ba168e..3f5c0a7 100644
--- a/drivers/video/omap2/dss/output.c
+++ b/drivers/video/omap2/dss/output.c
@@ -146,7 +146,13 @@ EXPORT_SYMBOL(omap_dss_find_output_by_node);
struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev)
{
- return omap_dss_get_device(dssdev->output);
+ while (dssdev->output)
+ dssdev = dssdev->output;
+
+ if (dssdev->id != 0)
+ return omap_dss_get_device(dssdev);
+
+ return NULL;
}
EXPORT_SYMBOL(omapdss_find_output_from_display);
OpenPOWER on IntegriCloud