From febe2905d08b238f4ee2eb7e99c402bf85f0f70f Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 16 Aug 2012 11:55:15 +0530 Subject: 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 --- drivers/video/omap2/dss/venc_panel.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/video/omap2/dss/venc_panel.c') diff --git a/drivers/video/omap2/dss/venc_panel.c b/drivers/video/omap2/dss/venc_panel.c index 80963697d38..ef213618a25 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) -- cgit v1.2.3-70-g09d2