From 47591f66e50c153b29b78f727d2ba91ba58316cc Mon Sep 17 00:00:00 2001
From: Pawel Osciak <p.osciak@samsung.com>
Date: Tue, 10 Aug 2010 18:02:43 -0700
Subject: [PATCH] --- yaml --- r: 208503 b: refs/heads/master c:
 04ab9ef97771ba88789672a1f0d0ddcf8dbc0924 h: refs/heads/master i:   208501:
 0dd711278258ea8ea4b11ec165a9bc4e75747028   208499:
 9a398e4eac3c0e2fc0b73cb4d720aed658c7b939   208495:
 78710465ced127c59325369d0cc8860649644ff1 v: v3

---
 [refs]                                            |  2 +-
 .../arch/arm/plat-samsung/include/plat/regs-fb.h  |  4 ++++
 trunk/drivers/video/s3c-fb.c                      | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2817e309f2ea..04897c212d5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cfdcb2393b05cc80f89ed0110c0f90423d2fee1
+refs/heads/master: 04ab9ef97771ba88789672a1f0d0ddcf8dbc0924
diff --git a/trunk/arch/arm/plat-samsung/include/plat/regs-fb.h b/trunk/arch/arm/plat-samsung/include/plat/regs-fb.h
index 4359918b58b0..8f39aa5b26ea 100644
--- a/trunk/arch/arm/plat-samsung/include/plat/regs-fb.h
+++ b/trunk/arch/arm/plat-samsung/include/plat/regs-fb.h
@@ -223,6 +223,10 @@
 /* S5PV210 */
 #define SHADOWCON				(0x34)
 #define SHADOWCON_WINx_PROTECT(_win)		(1 << (10 + (_win)))
+/* DMA channels (all windows) */
+#define SHADOWCON_CHx_ENABLE(_win)		(1 << (_win))
+/* Local input channels (windows 0-2) */
+#define SHADOWCON_CHx_LOCAL_ENABLE(_win)	(1 << (5 + (_win)))
 
 #define VIDOSDxA_TOPLEFT_X_MASK			(0x7ff << 11)
 #define VIDOSDxA_TOPLEFT_X_SHIFT		(11)
diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c
index a95314ddf709..8ea974dd92c5 100644
--- a/trunk/drivers/video/s3c-fb.c
+++ b/trunk/drivers/video/s3c-fb.c
@@ -634,6 +634,13 @@ static int s3c_fb_set_par(struct fb_info *info)
 	writel(data, regs + sfb->variant.wincon + (win_no * 4));
 	writel(0x0, regs + sfb->variant.winmap + (win_no * 4));
 
+	/* Enable DMA channel for this window */
+	if (sfb->variant.has_shadowcon) {
+		data = readl(sfb->regs + SHADOWCON);
+		data |= SHADOWCON_CHx_ENABLE(win_no);
+		writel(data, sfb->regs + SHADOWCON);
+	}
+
 	shadow_protect_win(win, 0);
 
 	return 0;
@@ -1091,7 +1098,15 @@ static void s3c_fb_free_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
  */
 static void s3c_fb_release_win(struct s3c_fb *sfb, struct s3c_fb_win *win)
 {
+	u32 data;
+
 	if (win->fbinfo) {
+		if (sfb->variant.has_shadowcon) {
+			data = readl(sfb->regs + SHADOWCON);
+			data &= ~SHADOWCON_CHx_ENABLE(win->index);
+			data &= ~SHADOWCON_CHx_LOCAL_ENABLE(win->index);
+			writel(data, sfb->regs + SHADOWCON);
+		}
 		unregister_framebuffer(win->fbinfo);
 		if (win->fbinfo->cmap.len)
 			fb_dealloc_cmap(&win->fbinfo->cmap);