From 95353d1cae1ce3ecb053e48b456a16b8cfe98d80 Mon Sep 17 00:00:00 2001
From: Archit Taneja <archit@ti.com>
Date: Thu, 16 Aug 2012 11:56:31 +0530
Subject: [PATCH] --- yaml --- r: 333511 b: refs/heads/master c:
 89e7195634e563b72288bf13ef4dbdf4709d2d08 h: refs/heads/master i:   333509:
 3c5bc0759cc150bfa55ef8e3d23207fd2083ba55   333507:
 a93202262a72b76db5a54f8d97007ad3a23005b7   333503:
 c7e0918abd3d3f1523e9c0e36a6fec0f2f1e8d6c v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/video/omap2/dss/dss.h        |  2 ++
 trunk/drivers/video/omap2/dss/venc.c       | 13 ++++++++++++-
 trunk/drivers/video/omap2/dss/venc_panel.c |  2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b28376a34a4..411f29b01a32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: febe2905d08b238f4ee2eb7e99c402bf85f0f70f
+refs/heads/master: 89e7195634e563b72288bf13ef4dbdf4709d2d08
diff --git a/trunk/drivers/video/omap2/dss/dss.h b/trunk/drivers/video/omap2/dss/dss.h
index c17d298b0474..41c00dc63cc5 100644
--- a/trunk/drivers/video/omap2/dss/dss.h
+++ b/trunk/drivers/video/omap2/dss/dss.h
@@ -479,6 +479,8 @@ u32 omapdss_venc_get_wss(struct omap_dss_device *dssdev);
 int omapdss_venc_set_wss(struct omap_dss_device *dssdev, u32 wss);
 void omapdss_venc_set_type(struct omap_dss_device *dssdev,
 		enum omap_dss_venc_type type);
+void omapdss_venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,
+		bool invert_polarity);
 int venc_panel_init(void);
 void venc_panel_exit(void);
 
diff --git a/trunk/drivers/video/omap2/dss/venc.c b/trunk/drivers/video/omap2/dss/venc.c
index 2d90fcf7e8f9..7d3eef8a010f 100644
--- a/trunk/drivers/video/omap2/dss/venc.c
+++ b/trunk/drivers/video/omap2/dss/venc.c
@@ -303,6 +303,7 @@ static struct {
 
 	struct omap_video_timings timings;
 	enum omap_dss_venc_type type;
+	bool invert_polarity;
 } venc;
 
 static inline void venc_write_reg(int idx, u32 val)
@@ -447,7 +448,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
 	else /* S-Video */
 		l |= (1 << 0) | (1 << 2);
 
-	if (dssdev->phy.venc.invert_polarity == false)
+	if (venc.invert_polarity == false)
 		l |= 1 << 3;
 
 	venc_write_reg(VENC_OUTPUT_CONTROL, l);
@@ -639,6 +640,16 @@ void omapdss_venc_set_type(struct omap_dss_device *dssdev,
 	mutex_unlock(&venc.venc_lock);
 }
 
+void omapdss_venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,
+		bool invert_polarity)
+{
+	mutex_lock(&venc.venc_lock);
+
+	venc.invert_polarity = invert_polarity;
+
+	mutex_unlock(&venc.venc_lock);
+}
+
 static int __init venc_init_display(struct omap_dss_device *dssdev)
 {
 	DSSDBG("init_display\n");
diff --git a/trunk/drivers/video/omap2/dss/venc_panel.c b/trunk/drivers/video/omap2/dss/venc_panel.c
index ef213618a25c..d55b8784ecfd 100644
--- a/trunk/drivers/video/omap2/dss/venc_panel.c
+++ b/trunk/drivers/video/omap2/dss/venc_panel.c
@@ -130,6 +130,8 @@ 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);
+	omapdss_venc_invert_vid_out_polarity(dssdev,
+		dssdev->phy.venc.invert_polarity);
 
 	r = omapdss_venc_display_enable(dssdev);
 	if (r)