summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Neri <ricardo.neri@ti.com>2012-10-12 09:51:21 -0500
committerAndy Green <andy.green@linaro.org>2012-11-27 11:42:46 +0800
commit7287ce9661cd64df1b12904144d82da746c9dff1 (patch)
tree638f03df810ff83f07f94f169c1c20cc40b8326b
parent9de5dd15e66144b7fbca5cc451c7f571c955b3bf (diff)
OMAPDSS: Update 3D display enable to use DSS output
Rework how the 3D display enable access the display manager to utilize the output-owned manager. Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
-rw-r--r--drivers/video/omap2/dss/hdmi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index c857dd9277f..2184858c35f 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -764,14 +764,15 @@ int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,
int omapdss_hdmi_display_3d_enable(struct omap_dss_device *dssdev,
struct s3d_disp_info *info, int code)
{
+ struct omap_dss_output *out = dssdev->output;
int r = 0;
DSSDBG("ENTER hdmi_display_3d_enable\n");
mutex_lock(&hdmi.lock);
- if (dssdev->manager == NULL) {
- DSSERR("failed to enable display: no manager\n");
+ if (out == NULL || out->manager == NULL) {
+ DSSERR("failed to enable display: no output/manager\n");
r = -ENODEV;
goto err0;
}