summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1db39c0)
raw | patch | inline | side by side (parent: 1db39c0)
author | Archit Taneja <archit@ti.com> | |
Fri, 7 Sep 2012 12:24:27 +0000 (17:54 +0530) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Wed, 26 Sep 2012 11:58:36 +0000 (14:58 +0300) |
With addition of output entities, a device connects to an output, and an output
connects to overlay manager. Replace the dssdev->manager references with
dssdev->output->manager to access the manager correctly.
When enabling the VENC output, check whether the output entity connected to
display is not NULL.
Signed-off-by: Archit Taneja <archit@ti.com>
connects to overlay manager. Replace the dssdev->manager references with
dssdev->output->manager to access the manager correctly.
When enabling the VENC output, check whether the output entity connected to
display is not NULL.
Signed-off-by: Archit Taneja <archit@ti.com>
drivers/video/omap2/dss/venc.c | patch | blob | history |
index 24d278b3e7fd3d28c6ae9d3d8b7697215b54742c..56efa3bb465d1ef4dd8011b89ead18ae36e41e03 100644 (file)
static int venc_power_on(struct omap_dss_device *dssdev)
{
+ struct omap_overlay_manager *mgr = dssdev->output->manager;
u32 l;
int r;
venc_write_reg(VENC_OUTPUT_CONTROL, l);
- dss_mgr_set_timings(dssdev->manager, &venc.timings);
+ dss_mgr_set_timings(mgr, &venc.timings);
r = regulator_enable(venc.vdda_dac_reg);
if (r)
goto err1;
- r = dss_mgr_enable(dssdev->manager);
+ r = dss_mgr_enable(mgr);
if (r)
goto err2;
static void venc_power_off(struct omap_dss_device *dssdev)
{
+ struct omap_overlay_manager *mgr = dssdev->output->manager;
+
venc_write_reg(VENC_OUTPUT_CONTROL, 0);
dss_set_dac_pwrdn_bgz(0);
- dss_mgr_disable(dssdev->manager);
+ dss_mgr_disable(mgr);
regulator_disable(venc.vdda_dac_reg);
int omapdss_venc_display_enable(struct omap_dss_device *dssdev)
{
+ struct omap_dss_output *out = dssdev->output;
int r;
DSSDBG("venc_display_enable\n");
mutex_lock(&venc.venc_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;
}