From 9796094735d5753ea6b8e225851baa46e1fcf9a5 Mon Sep 17 00:00:00 2001
From: Jordan Crouse <jordan.crouse@amd.com>
Date: Fri, 8 Dec 2006 02:40:56 -0800
Subject: [PATCH] --- yaml --- r: 43829 b: refs/heads/master c:
 58219896df521ddd749bee48a8465db69b6163f3 h: refs/heads/master i:   43827:
 3d7a23bb52debd66a3269d24c6ed74f779a0c698 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/video/geode/video_gx.c | 13 +++++++++++--
 trunk/drivers/video/geode/video_gx.h |  2 ++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c6e1e433a4d6..12f0fab55c96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53d53bd4ab3fd1498f728fa96635ab95d1ec8ba0
+refs/heads/master: 58219896df521ddd749bee48a8465db69b6163f3
diff --git a/trunk/drivers/video/geode/video_gx.c b/trunk/drivers/video/geode/video_gx.c
index bee0741794a3..7f3f18d06718 100644
--- a/trunk/drivers/video/geode/video_gx.c
+++ b/trunk/drivers/video/geode/video_gx.c
@@ -220,7 +220,13 @@ gx_configure_tft(struct fb_info *info)
 	/*  Set the dither control */
 	writel(0x70, par->vid_regs + GX_FP_DFC);
 
-	/* Turn on the device */
+	/* Enable the FP data and power (in case the BIOS didn't) */
+
+	fp = readl(par->vid_regs + GX_DCFG);
+	fp |= GX_DCFG_FP_PWR_EN | GX_DCFG_FP_DATA_EN;
+	writel(fp, par->vid_regs + GX_DCFG);
+
+	/* Unblank the panel */
 
 	fp = readl(par->vid_regs + GX_FP_PM);
 	fp |= GX_FP_PM_P;
@@ -245,9 +251,12 @@ static void gx_configure_display(struct fb_info *info)
 	writel(misc, par->vid_regs + GX_MISC);
 
 	/* Write the display configuration */
-
 	dcfg = readl(par->vid_regs + GX_DCFG);
 
+	/* Disable hsync and vsync */
+	dcfg &= ~(GX_DCFG_VSYNC_EN | GX_DCFG_HSYNC_EN);
+	writel(dcfg, par->vid_regs + GX_DCFG);
+
 	/* Clear bits from existing mode. */
 	dcfg &= ~(GX_DCFG_CRT_SYNC_SKW_MASK
 		  | GX_DCFG_CRT_HSYNC_POL   | GX_DCFG_CRT_VSYNC_POL
diff --git a/trunk/drivers/video/geode/video_gx.h b/trunk/drivers/video/geode/video_gx.h
index 119d0abddb2d..ce28d8f382dc 100644
--- a/trunk/drivers/video/geode/video_gx.h
+++ b/trunk/drivers/video/geode/video_gx.h
@@ -25,6 +25,8 @@ extern struct geode_vid_ops gx_vid_ops;
 #  define GX_DCFG_HSYNC_EN		0x00000002
 #  define GX_DCFG_VSYNC_EN		0x00000004
 #  define GX_DCFG_DAC_BL_EN		0x00000008
+#  define GX_DCFG_FP_PWR_EN		0x00000040
+#  define GX_DCFG_FP_DATA_EN		0x00000080
 #  define GX_DCFG_CRT_HSYNC_POL		0x00000100
 #  define GX_DCFG_CRT_VSYNC_POL		0x00000200
 #  define GX_DCFG_CRT_SYNC_SKW_MASK	0x0001C000