summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/venc_panel.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-08-16 11:55:15 +0530
committerArchit Taneja <archit@ti.com>2012-08-16 18:10:17 +0530
commitfebe2905d08b238f4ee2eb7e99c402bf85f0f70f (patch)
treef3f51e80ff2695550ccc7ae203d447c9979c6817 /drivers/video/omap2/dss/venc_panel.c
parent6e883324b2ef9971ec208da2bf2f49268c36f2bb (diff)
downloadblackbird-obmc-linux-febe2905d08b238f4ee2eb7e99c402bf85f0f70f.tar.gz
blackbird-obmc-linux-febe2905d08b238f4ee2eb7e99c402bf85f0f70f.zip
OMAPDSS: VENC: Maintain copy of venc type in driver data
The VENC driver currently relies on the omap_dss_device struct to configure the venc type. This makes the VENC interface driver dependent on the omap_dss_device struct. Make the VENC driver data maintain it's own 'venc type' field. A panel driver is expected to call omapdss_venc_set_type() before enabling the interface or changing the type via display sysfs attributes. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc_panel.c')
-rw-r--r--drivers/video/omap2/dss/venc_panel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/venc_panel.c b/drivers/video/omap2/dss/venc_panel.c
index 80963697d384..ef213618a25c 100644
--- a/drivers/video/omap2/dss/venc_panel.c
+++ b/drivers/video/omap2/dss/venc_panel.c
@@ -68,6 +68,7 @@ static ssize_t display_output_type_store(struct device *dev,
if (dssdev->phy.venc.type != new_type) {
dssdev->phy.venc.type = new_type;
+ omapdss_venc_set_type(dssdev, new_type);
if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
omapdss_venc_display_disable(dssdev);
omapdss_venc_display_enable(dssdev);
@@ -128,6 +129,7 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
}
omapdss_venc_set_timings(dssdev, &dssdev->panel.timings);
+ omapdss_venc_set_type(dssdev, dssdev->phy.venc.type);
r = omapdss_venc_display_enable(dssdev);
if (r)
OpenPOWER on IntegriCloud