6 files changed, 65 insertions, 1 deletions

diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index 4e173ef20a7d..a814b6c2605c 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -23,6 +23,26 @@ config FB_GEODE_GX
 
           If unsure, say N.
 
+config FB_GEODE_GX_SET_FBSIZE
+        bool "Manually specify the Geode GX framebuffer size"
+        depends on FB_GEODE_GX
+        default n
+        ---help---
+          If you want to manually specify the size of your GX framebuffer,
+          say Y here, otherwise say N to dynamically probe it.
+
+          Say N unless you know what you are doing.
+
+config FB_GEODE_GX_FBSIZE
+        hex "Size of the GX framebuffer, in bytes"
+        depends on FB_GEODE_GX_SET_FBSIZE
+        default "0x1600000"
+        ---help---
+          Specify the size of the GX framebuffer.  Normally, you will
+          want this to be MB aligned.  Common values are 0x80000 (8MB)
+          and 0x1600000 (16MB).  Don't change this unless you know what
+          you are doing
+
 config FB_GEODE_GX1
         tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)"
         depends on FB && FB_GEODE && EXPERIMENTAL
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
index 0245169366b3..0f16e4bffc6c 100644
--- a/drivers/video/geode/display_gx.c
+++ b/drivers/video/geode/display_gx.c
@@ -21,6 +21,12 @@
 #include "geodefb.h"
 #include "display_gx.h"
 
+#ifdef CONFIG_FB_GEODE_GX_SET_FBSIZE
+unsigned int gx_frame_buffer_size(void)
+{
+        return CONFIG_FB_GEODE_GX_FBSIZE;
+}
+#else
 unsigned int gx_frame_buffer_size(void)
 {
         unsigned int val;
@@ -35,6 +41,7 @@ unsigned int gx_frame_buffer_size(void)
         val = (unsigned int)(inw(0xAC1E)) & 0xFFl;
         return (val << 19);
 }
+#endif
 
 int gx_line_delta(int xres, int bpp)
 {
@@ -90,6 +97,7 @@ static void gx_set_mode(struct fb_info *info)
         writel(((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2,
                par->dc_regs + DC_LINE_SIZE);
 
+
         /* Enable graphics and video data and unmask address lines. */
         dcfg |= DC_DCFG_GDEN | DC_DCFG_VDEN | DC_DCFG_A20M | DC_DCFG_A18M;
 
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
index 41e79f440670..e962c7679d08 100644
--- a/drivers/video/geode/display_gx.h
+++ b/drivers/video/geode/display_gx.h
@@ -93,4 +93,5 @@ extern struct geode_dc_ops gx_dc_ops;
 #define DC_PAL_ADDRESS 0x70
 #define DC_PAL_DATA    0x74
 
+#define DC_GLIU0_MEM_OFFSET 0x84
 #endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index a454dcb8e215..742fd04178c3 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -240,6 +240,12 @@ static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *de
         if (!info->screen_base)
                 return -ENOMEM;
 
+        /* Set the 16MB aligned base address of the graphics memory region
+         * in the display controller */
+
+        writel(info->fix.smem_start & 0xFF000000,
+                        par->dc_regs + DC_GLIU0_MEM_OFFSET);
+
         dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
                  info->fix.smem_len / 1024, info->fix.smem_start);
 
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 2b2a7880ea75..616ce339c5fa 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -178,7 +178,21 @@ static void gx_set_dclk_frequency(struct fb_info *info)
 static void gx_configure_display(struct fb_info *info)
 {
         struct geodefb_par *par = info->par;
-        u32 dcfg, fp_pm;
+        u32 dcfg, fp_pm, misc;
+
+        /* Set up the MISC register */
+
+        misc = readl(par->vid_regs + GX_MISC);
+
+        /* Power up the DAC */
+        misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+
+        /* Disable gamma correction */
+        misc |= GX_MISC_GAM_EN;
+
+        writel(misc, par->vid_regs + GX_MISC);
+
+        /* Write the display configuration */
 
         dcfg = readl(par->vid_regs + GX_DCFG);
 
@@ -199,9 +213,17 @@ static void gx_configure_display(struct fb_info *info)
         if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
                 dcfg |= GX_DCFG_CRT_VSYNC_POL;
 
+        /* Enable the display logic */
+        /* Set up the DACS to blank normally */
+
+        dcfg |= GX_DCFG_CRT_EN | GX_DCFG_DAC_BL_EN;
+
+        /* Enable the external DAC VREF? */
+
         writel(dcfg, par->vid_regs + GX_DCFG);
 
         /* Power on flat panel. */
+
         fp_pm = readl(par->vid_regs + GX_FP_PM);
         fp_pm |= GX_FP_PM_P;
         writel(fp_pm, par->vid_regs + GX_FP_PM);
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
index 2d9211f3ed84..238181a7d536 100644
--- a/drivers/video/geode/video_gx.h
+++ b/drivers/video/geode/video_gx.h
@@ -28,6 +28,13 @@ extern struct geode_vid_ops gx_vid_ops;
 #  define GX_DCFG_GV_GAM                0x00200000
 #  define GX_DCFG_DAC_VREF              0x04000000
 
+/* Geode GX MISC video configuration */
+
+#define GX_MISC 0x50
+#define GX_MISC_GAM_EN     0x00000001
+#define GX_MISC_DAC_PWRDN  0x00000400
+#define GX_MISC_A_PWRDN    0x00000800
+
 /* Geode GX flat panel display control registers */
 #define GX_FP_PM 0x410
 #  define GX_FP_PM_P 0x01000000