Merge branch 'merge'

81 files changed, 1881 insertions, 258 deletions

diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index 78488bb41aeb..0dda73da8628 100644
--- a/drivers/video/68328fb.c
+++ b/drivers/video/68328fb.c
@@ -32,7 +32,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3badb48d662b..c40b9b8b1e7e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -86,9 +86,11 @@ config FB_MACMODES
        default n
 
 config FB_BACKLIGHT
-       bool
-       depends on FB
-       default n
+        bool
+        depends on FB
+        select BACKLIGHT_LCD_SUPPORT
+        select BACKLIGHT_CLASS_DEVICE
+        default n
 
 config FB_MODE_HELPERS
         bool "Enable Video Mode Handling Helpers"
@@ -420,7 +422,7 @@ config FB_OF
 
 config FB_CONTROL
         bool "Apple \"control\" display support"
-        depends on (FB = y) && PPC_PMAC
+        depends on (FB = y) && PPC_PMAC && PPC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -431,7 +433,7 @@ config FB_CONTROL
 
 config FB_PLATINUM
         bool "Apple \"platinum\" display support"
-        depends on (FB = y) && PPC_PMAC
+        depends on (FB = y) && PPC_PMAC && PPC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -442,7 +444,7 @@ config FB_PLATINUM
 
 config FB_VALKYRIE
         bool "Apple \"valkyrie\" display support"
-        depends on (FB = y) && (MAC || PPC_PMAC)
+        depends on (FB = y) && (MAC || (PPC_PMAC && PPC32))
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -453,7 +455,7 @@ config FB_VALKYRIE
 
 config FB_CT65550
         bool "Chips 65550 display support"
-        depends on (FB = y) && PPC
+        depends on (FB = y) && PPC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -721,10 +723,8 @@ config FB_NVIDIA_I2C
 
 config FB_NVIDIA_BACKLIGHT
         bool "Support for backlight control"
-        depends on FB_NVIDIA && PPC_PMAC
+        depends on FB_NVIDIA && PMAC_BACKLIGHT
         select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
         default y
         help
           Say Y here if you want to control the backlight of your display.
@@ -769,10 +769,8 @@ config FB_RIVA_DEBUG
 
 config FB_RIVA_BACKLIGHT
         bool "Support for backlight control"
-        depends on FB_RIVA && PPC_PMAC
+        depends on FB_RIVA && PMAC_BACKLIGHT
         select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
         default y
         help
           Say Y here if you want to control the backlight of your display.
@@ -1025,10 +1023,8 @@ config FB_RADEON_I2C
 
 config FB_RADEON_BACKLIGHT
         bool "Support for backlight control"
-        depends on FB_RADEON && PPC_PMAC
+        depends on FB_RADEON && PMAC_BACKLIGHT
         select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
         default y
         help
           Say Y here if you want to control the backlight of your display.
@@ -1059,10 +1055,8 @@ config FB_ATY128
 
 config FB_ATY128_BACKLIGHT
         bool "Support for backlight control"
-        depends on FB_ATY128 && PPC_PMAC
+        depends on FB_ATY128 && PMAC_BACKLIGHT
         select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
         default y
         help
           Say Y here if you want to control the backlight of your display.
@@ -1111,10 +1105,8 @@ config FB_ATY_GX
 
 config FB_ATY_BACKLIGHT
         bool "Support for backlight control"
-        depends on FB_ATY && PPC_PMAC
+        depends on FB_ATY && PMAC_BACKLIGHT
         select FB_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
         default y
         help
           Say Y here if you want to control the backlight of your display.
@@ -1518,6 +1510,26 @@ config FB_PXA_PARAMETERS
 
           <file:Documentation/fb/pxafb.txt> describes the available parameters.
 
+config FB_MBX
+        tristate "2700G LCD framebuffer support"
+        depends on FB && ARCH_PXA
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Framebuffer driver for the Intel 2700G (Marathon) Graphics
+          Accelerator
+
+config FB_MBX_DEBUG
+       bool "Enable debugging info via debugfs"
+       depends on FB_MBX && DEBUG_FS
+       default n
+       ---help---
+         Enable this if you want debugging information using the debug
+         filesystem (debugfs)
+
+         If unsure, say N.
+
 config FB_W100
         tristate "W100 frame buffer support"
         depends on FB && PXA_SHARPSL
@@ -1600,7 +1612,7 @@ if FB || SGI_NEWPORT_CONSOLE
         source "drivers/video/logo/Kconfig"
 endif
 
-if FB && SYSFS
+if SYSFS
         source "drivers/video/backlight/Kconfig"
 endif
 
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 6283d015f8f5..481c6c9695f8 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -4,6 +4,7 @@
 
 # Each configuration option enables a list of files.
 
+obj-y                             += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
                                      modedb.o fbcvt.o
@@ -38,6 +39,7 @@ obj-$(CONFIG_FB_SIS)		  += sis/
 obj-$(CONFIG_FB_KYRO)             += kyro/
 obj-$(CONFIG_FB_SAVAGE)           += savage/
 obj-$(CONFIG_FB_GEODE)            += geode/
+obj-$(CONFIG_FB_MBX)              += mbx/
 obj-$(CONFIG_FB_I810)             += vgastate.o
 obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o
 obj-$(CONFIG_FB_VIRGE)            += virgefb.o
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 0f2ed75a681f..397005eb392d 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index f9bc9f777e75..f1ba54f4fc39 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -45,7 +45,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index fd95c2dbd4f7..70dd8115a4d8 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -39,7 +39,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index eaeaf4d1a094..1fd22f460b0f 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -34,7 +34,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index e69ab65f7843..5831893bf7a0 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -53,7 +53,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 72c589109471..8b08121b390b 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -52,7 +52,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -457,6 +456,10 @@ static void wait_for_fifo(u16 entries, struct aty128fb_par *par);
 static void wait_for_idle(struct aty128fb_par *par);
 static u32 depth_to_dst(u32 depth);
 
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+static void aty128_bl_set_power(struct fb_info *info, int power);
+#endif
+
 #define BIOS_IN8(v)     (readb(bios + (v)))
 #define BIOS_IN16(v)    (readb(bios + (v)) | \
                           (readb(bios + (v) + 1) << 8))
@@ -1258,25 +1261,11 @@ static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)
                 reg &= ~LVDS_DISPLAY_DIS;
                 aty_st_le32(LVDS_GEN_CNTL, reg);
 #ifdef CONFIG_FB_ATY128_BACKLIGHT
-                mutex_lock(&info->bl_mutex);
-                if (info->bl_dev) {
-                        down(&info->bl_dev->sem);
-                        info->bl_dev->props->update_status(info->bl_dev);
-                        up(&info->bl_dev->sem);
-                }
-                mutex_unlock(&info->bl_mutex);
+                aty128_bl_set_power(info, FB_BLANK_UNBLANK);
 #endif  
         } else {
 #ifdef CONFIG_FB_ATY128_BACKLIGHT
-                mutex_lock(&info->bl_mutex);
-                if (info->bl_dev) {
-                        down(&info->bl_dev->sem);
-                        info->bl_dev->props->brightness = 0;
-                        info->bl_dev->props->power = FB_BLANK_POWERDOWN;
-                        info->bl_dev->props->update_status(info->bl_dev);
-                        up(&info->bl_dev->sem);
-                }
-                mutex_unlock(&info->bl_mutex);
+                aty128_bl_set_power(info, FB_BLANK_POWERDOWN);
 #endif  
                 reg = aty_ld_le32(LVDS_GEN_CNTL);
                 reg |= LVDS_DISPLAY_DIS;
@@ -1703,6 +1692,7 @@ static int __devinit aty128fb_setup(char *options)
 
 static struct backlight_properties aty128_bl_data;
 
+/* Call with fb_info->bl_mutex held */
 static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
                 int level)
 {
@@ -1710,10 +1700,8 @@ static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
         int atylevel;
 
         /* Get and convert the value */
-        mutex_lock(&info->bl_mutex);
         atylevel = MAX_LEVEL -
                 (info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL);
-        mutex_unlock(&info->bl_mutex);
 
         if (atylevel < 0)
                 atylevel = 0;
@@ -1731,7 +1719,8 @@ static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
 /* That one prevents proper CRT output with LCD off */
 #undef BACKLIGHT_DAC_OFF
 
-static int aty128_bl_update_status(struct backlight_device *bd)
+/* Call with fb_info->bl_mutex held */
+static int __aty128_bl_update_status(struct backlight_device *bd)
 {
         struct aty128fb_par *par = class_get_devdata(&bd->class_dev);
         unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
@@ -1784,6 +1773,19 @@ static int aty128_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
+static int aty128_bl_update_status(struct backlight_device *bd)
+{
+        struct aty128fb_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __aty128_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
 static int aty128_bl_get_brightness(struct backlight_device *bd)
 {
         return bd->props->brightness;
@@ -1796,6 +1798,16 @@ static struct backlight_properties aty128_bl_data = {
         .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
+static void aty128_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+        up(&info->bl_dev->sem);
+        info->bl_dev->props->power = power;
+        __aty128_bl_update_status(info->bl_dev);
+        down(&info->bl_dev->sem);
+        mutex_unlock(&info->bl_mutex);
+}
+
 static void aty128_bl_init(struct aty128fb_par *par)
 {
         struct fb_info *info = pci_get_drvdata(par->pdev);
@@ -2198,12 +2210,8 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
                 return 0;
 
 #ifdef CONFIG_FB_ATY128_BACKLIGHT
-        if (machine_is(powermac) && blank) {
-                down(&fb->bl_dev->sem);
-                fb->bl_dev->props->power = FB_BLANK_POWERDOWN;
-                fb->bl_dev->props->update_status(fb->bl_dev);
-                up(&fb->bl_dev->sem);
-        }
+        if (machine_is(powermac) && blank)
+                aty128_bl_set_power(fb, FB_BLANK_POWERDOWN);
 #endif
 
         if (blank & FB_BLANK_VSYNC_SUSPEND)
@@ -2219,14 +2227,12 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
                 aty128_set_crt_enable(par, par->crt_on && !blank);
                 aty128_set_lcd_enable(par, par->lcd_on && !blank);
         }
+
 #ifdef CONFIG_FB_ATY128_BACKLIGHT
-        if (machine_is(powermac) && !blank) {
-                down(&fb->bl_dev->sem);
-                fb->bl_dev->props->power = FB_BLANK_UNBLANK;
-                fb->bl_dev->props->update_status(fb->bl_dev);
-                up(&fb->bl_dev->sem);
-        }
+        if (machine_is(powermac) && !blank)
+                aty128_bl_set_power(fb, FB_BLANK_UNBLANK);
 #endif
+
         return 0;
 }
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 0c9706746d79..053ff63365b7 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2129,15 +2129,14 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
 static struct backlight_properties aty_bl_data;
 
+/* Call with fb_info->bl_mutex held */
 static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)
 {
         struct fb_info *info = pci_get_drvdata(par->pdev);
         int atylevel;
 
         /* Get and convert the value */
-        mutex_lock(&info->bl_mutex);
         atylevel = info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL;
-        mutex_unlock(&info->bl_mutex);
 
         if (atylevel < 0)
                 atylevel = 0;
@@ -2147,7 +2146,8 @@ static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)
         return atylevel;
 }
 
-static int aty_bl_update_status(struct backlight_device *bd)
+/* Call with fb_info->bl_mutex held */
+static int __aty_bl_update_status(struct backlight_device *bd)
 {
         struct atyfb_par *par = class_get_devdata(&bd->class_dev);
         unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);
@@ -2172,6 +2172,19 @@ static int aty_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
+static int aty_bl_update_status(struct backlight_device *bd)
+{
+        struct atyfb_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __aty_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
 static int aty_bl_get_brightness(struct backlight_device *bd)
 {
         return bd->props->brightness;
@@ -2184,6 +2197,16 @@ static struct backlight_properties aty_bl_data = {
         .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
+static void aty_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+        up(&info->bl_dev->sem);
+        info->bl_dev->props->power = power;
+        __aty_bl_update_status(info->bl_dev);
+        down(&info->bl_dev->sem);
+        mutex_unlock(&info->bl_mutex);
+}
+
 static void aty_bl_init(struct atyfb_par *par)
 {
         struct fb_info *info = pci_get_drvdata(par->pdev);
@@ -2789,17 +2812,9 @@ static int atyfb_blank(int blank, struct fb_info *info)
         if (par->lock_blank || par->asleep)
                 return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (machine_is(powermac) && blank > FB_BLANK_NORMAL) {
-                mutex_lock(&info->bl_mutex);
-                if (info->bl_dev) {
-                        down(&info->bl_dev->sem);
-                        info->bl_dev->props->power = FB_BLANK_POWERDOWN;
-                        info->bl_dev->props->update_status(info->bl_dev);
-                        up(&info->bl_dev->sem);
-                }
-                mutex_unlock(&info->bl_mutex);
-        }
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+        if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
+                aty_bl_set_power(info, FB_BLANK_POWERDOWN);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank > FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
@@ -2829,17 +2844,9 @@ static int atyfb_blank(int blank, struct fb_info *info)
         }
         aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (machine_is(powermac) && blank <= FB_BLANK_NORMAL) {
-                mutex_lock(&info->bl_mutex);
-                if (info->bl_dev) {
-                        down(&info->bl_dev->sem);
-                        info->bl_dev->props->power = FB_BLANK_UNBLANK;
-                        info->bl_dev->props->update_status(info->bl_dev);
-                        up(&info->bl_dev->sem);
-                }
-                mutex_unlock(&info->bl_mutex);
-        }
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+        if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
+                aty_bl_set_power(info, FB_BLANK_UNBLANK);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 60c37add2579..0ed577e7cc21 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -58,7 +58,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/time.h>
@@ -267,6 +266,8 @@ static int force_measure_pll = 0;
 #ifdef CONFIG_MTRR
 static int nomtrr = 0;
 #endif
+static int force_sleep;
+static int ignore_devlist;
 
 /*
  * prototypes
@@ -2328,9 +2329,9 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
                 /* -2 is special: means  ON on mobility chips and do not
                  * change on others
                  */
-                radeonfb_pm_init(rinfo, rinfo->is_mobility ? 1 : -1);
+                radeonfb_pm_init(rinfo, rinfo->is_mobility ? 1 : -1, ignore_devlist, force_sleep);
         } else
-                radeonfb_pm_init(rinfo, default_dynclk);
+                radeonfb_pm_init(rinfo, default_dynclk, ignore_devlist, force_sleep);
 
         pci_set_drvdata(pdev, info);
 
@@ -2478,6 +2479,12 @@ static int __init radeonfb_setup (char *options)
                         force_measure_pll = 1;
                 } else if (!strncmp(this_opt, "ignore_edid", 11)) {
                         ignore_edid = 1;
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+                } else if (!strncmp(this_opt, "force_sleep", 11)) {
+                        force_sleep = 1;
+                } else if (!strncmp(this_opt, "ignore_devlist", 14)) {
+                        ignore_devlist = 1;
+#endif
                 } else
                         mode_option = this_opt;
         }
@@ -2533,3 +2540,9 @@ module_param(panel_yres, int, 0);
 MODULE_PARM_DESC(panel_yres, "int: set panel yres");
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+module_param(force_sleep, bool, 0);
+MODULE_PARM_DESC(force_sleep, "bool: force D2 sleep mode on all hardware");
+module_param(ignore_devlist, bool, 0);
+MODULE_PARM_DESC(ignore_devlist, "bool: ignore workarounds for bugs in specific laptops");
+#endif
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index b9b9396d3bde..e308ed2d249a 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -27,6 +27,99 @@
 
 #include "ati_ids.h"
 
+static void radeon_reinitialize_M10(struct radeonfb_info *rinfo);
+
+/*
+ * Workarounds for bugs in PC laptops:
+ * - enable D2 sleep in some IBM Thinkpads
+ * - special case for Samsung P35
+ *
+ * Whitelist by subsystem vendor/device because
+ * its the subsystem vendor's fault!
+ */
+
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+struct radeon_device_id {
+        const char *ident;                     /* (arbitrary) Name */
+        const unsigned short subsystem_vendor; /* Subsystem Vendor ID */
+        const unsigned short subsystem_device; /* Subsystem Device ID */
+        const enum radeon_pm_mode pm_mode_modifier; /* modify pm_mode */
+        const reinit_function_ptr new_reinit_func;   /* changed reinit_func */
+};
+
+#define BUGFIX(model, sv, sd, pm, fn) { \
+        .ident = model, \
+        .subsystem_vendor = sv, \
+        .subsystem_device = sd, \
+        .pm_mode_modifier = pm, \
+        .new_reinit_func  = fn  \
+}
+
+static struct radeon_device_id radeon_workaround_list[] = {
+        BUGFIX("IBM Thinkpad R32",
+               PCI_VENDOR_ID_IBM, 0x1905,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R40",
+               PCI_VENDOR_ID_IBM, 0x0526,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R40",
+               PCI_VENDOR_ID_IBM, 0x0527,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R50/R51/T40/T41",
+               PCI_VENDOR_ID_IBM, 0x0531,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R51/T40/T41/T42",
+               PCI_VENDOR_ID_IBM, 0x0530,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T30",
+               PCI_VENDOR_ID_IBM, 0x0517,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T40p",
+               PCI_VENDOR_ID_IBM, 0x054d,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T42",
+               PCI_VENDOR_ID_IBM, 0x0550,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad X31/X32",
+               PCI_VENDOR_ID_IBM, 0x052f,
+               radeon_pm_d2, NULL),
+        BUGFIX("Samsung P35",
+               PCI_VENDOR_ID_SAMSUNG, 0xc00c,
+               radeon_pm_off, radeon_reinitialize_M10),
+        { .ident = NULL }
+};
+
+static int radeon_apply_workarounds(struct radeonfb_info *rinfo)
+{
+        struct radeon_device_id *id;
+
+        for (id = radeon_workaround_list; id->ident != NULL; id++ )
+                if ((id->subsystem_vendor == rinfo->pdev->subsystem_vendor ) &&
+                    (id->subsystem_device == rinfo->pdev->subsystem_device )) {
+
+                        /* we found a device that requires workaround */
+                        printk(KERN_DEBUG "radeonfb: %s detected"
+                               ", enabling workaround\n", id->ident);
+
+                        rinfo->pm_mode |= id->pm_mode_modifier;
+
+                        if (id->new_reinit_func != NULL)
+                                rinfo->reinit_func = id->new_reinit_func;
+
+                        return 1;
+                }
+        return 0;  /* not found */
+}
+
+#else  /* defined(CONFIG_PM) && defined(CONFIG_X86) */
+static inline int radeon_apply_workarounds(struct radeonfb_info *rinfo)
+{
+        return 0;
+}
+#endif /* defined(CONFIG_PM) && defined(CONFIG_X86) */
+
+
+
 static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
 {
         u32 tmp;
@@ -852,18 +945,26 @@ static void radeon_pm_setup_for_suspend(struct radeonfb_info *rinfo)
         /* because both INPLL and OUTPLL take the same lock, that's why. */
         tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
         OUTPLL( pllMCLK_MISC, tmp);
-        
-        /* AGP PLL control */
-        if (rinfo->family <= CHIP_FAMILY_RV280) {
-                OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
 
-                OUTREG(BUS_CNTL1,
-                       (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
-                       | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));   // 440BX
-        } else {
-                OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
-                OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
+        /* BUS_CNTL1__MOBILE_PLATORM_SEL setting is northbridge chipset
+         * and radeon chip dependent. Thus we only enable it on Mac for
+         * now (until we get more info on how to compute the correct
+         * value for various X86 bridges).
+         */
+#ifdef CONFIG_PPC_PMAC
+        if (machine_is(powermac)) {
+                /* AGP PLL control */
+                if (rinfo->family <= CHIP_FAMILY_RV280) {
+                        OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
+                        OUTREG(BUS_CNTL1,
+                               (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
+                               | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));   // 440BX
+                } else {
+                        OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
+                        OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
+                }
         }
+#endif
 
         OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
                                   & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
@@ -2713,7 +2814,7 @@ static void radeonfb_early_resume(void *data)
 
 #endif /* CONFIG_PM */
 
-void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
+void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep)
 {
         /* Find PM registers in config space if any*/
         rinfo->pm_reg = pci_find_capability(rinfo->pdev, PCI_CAP_ID_PM);
@@ -2729,22 +2830,13 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
         }
 
 #if defined(CONFIG_PM)
+#if defined(CONFIG_PPC_PMAC)
         /* Check if we can power manage on suspend/resume. We can do
          * D2 on M6, M7 and M9, and we can resume from D3 cold a few other
          * "Mac" cards, but that's all. We need more infos about what the
          * BIOS does tho. Right now, all this PM stuff is pmac-only for that
          * reason. --BenH
          */
-        /* Special case for Samsung P35 laptops
-         */
-        if ((rinfo->pdev->vendor == PCI_VENDOR_ID_ATI) &&
-            (rinfo->pdev->device == PCI_CHIP_RV350_NP) &&
-            (rinfo->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG) &&
-            (rinfo->pdev->subsystem_device == 0xc00c)) {
-                rinfo->reinit_func = radeon_reinitialize_M10;
-                rinfo->pm_mode |= radeon_pm_off;
-        }
-#if defined(CONFIG_PPC_PMAC)
         if (machine_is(powermac) && rinfo->of_node) {
                 if (rinfo->is_mobility && rinfo->pm_reg &&
                     rinfo->family <= CHIP_FAMILY_RV250)
@@ -2790,6 +2882,18 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
         }
 #endif /* defined(CONFIG_PPC_PMAC) */
 #endif /* defined(CONFIG_PM) */
+
+        if (ignore_devlist)
+                printk(KERN_DEBUG
+                       "radeonfb: skipping test for device workarounds\n");
+        else
+                radeon_apply_workarounds(rinfo);
+
+        if (force_sleep) {
+                printk(KERN_DEBUG
+                       "radeonfb: forcefully enabling D2 sleep mode\n");
+                rinfo->pm_mode |= radeon_pm_d2;
+        }
 }
 
 void radeonfb_pm_exit(struct radeonfb_info *rinfo)
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 38657b2d10eb..d5ff224a6258 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -273,6 +273,8 @@ enum radeon_pm_mode {
         radeon_pm_off   = 0x00000002,   /* Can resume from D3 cold */
 };
 
+typedef void (*reinit_function_ptr)(struct radeonfb_info *rinfo);
+
 struct radeonfb_info {
         struct fb_info          *info;
 
@@ -338,7 +340,7 @@ struct radeonfb_info {
         int                     dynclk;
         int                     no_schedule;
         enum radeon_pm_mode     pm_mode;
-        void                    (*reinit_func)(struct radeonfb_info *rinfo);
+        reinit_function_ptr     reinit_func;
 
         /* Lock on register access */
         spinlock_t              reg_lock;
@@ -600,7 +602,7 @@ extern int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8
 /* PM Functions */
 extern int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state);
 extern int radeonfb_pci_resume(struct pci_dev *pdev);
-extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk);
+extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep);
 extern void radeonfb_pm_exit(struct radeonfb_info *rinfo);
 
 /* Monitor probe functions */
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 022f9d3473f5..02f15297a021 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -10,7 +10,7 @@ menuconfig BACKLIGHT_LCD_SUPPORT
 
 config BACKLIGHT_CLASS_DEVICE
         tristate "Lowlevel Backlight controls"
-        depends on BACKLIGHT_LCD_SUPPORT && FB
+        depends on BACKLIGHT_LCD_SUPPORT
         default m
         help
           This framework adds support for low-level control of the LCD
@@ -26,7 +26,7 @@ config BACKLIGHT_DEVICE
 
 config LCD_CLASS_DEVICE
         tristate "Lowlevel LCD controls"
-        depends on BACKLIGHT_LCD_SUPPORT && FB
+        depends on BACKLIGHT_LCD_SUPPORT
         default m
         help
           This framework adds support for low-level control of LCD.
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 0e465c80ef24..73cb426bf2d7 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -150,12 +149,11 @@ static int chipsfb_blank(int blank, struct fb_info *info)
         mutex_lock(&pmac_backlight_mutex);
 
         if (pmac_backlight) {
-                down(&pmac_backlight->sem);
-
                 /* used to disable backlight only for blank > 1, but it seems
                  * useful at blank = 1 too (saves battery, extends backlight
                  * life)
                  */
+                down(&pmac_backlight->sem);
                 if (blank)
                         pmac_backlight->props->power = FB_BLANK_POWERDOWN;
                 else
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 7355da09c721..daf43f535a0b 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -41,7 +41,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 878707a04398..d9315d99445f 100644
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -7,9 +7,9 @@
 
 #include <linux/types.h>
 #include <linux/kdev_t.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/vt_kern.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 94e9f7069bef..390439b3d899 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -64,7 +64,6 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>        /* MSch: for IRQ probe */
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index c89f90edf8ac..eb4d03fa5391 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -31,7 +31,6 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
@@ -198,7 +197,7 @@ static int __init mdacon_setup(char *str)
 __setup("mdacon=", mdacon_setup);
 #endif
 
-static int __init mda_detect(void)
+static int mda_detect(void)
 {
         int count=0;
         u16 *p, p_save;
@@ -283,7 +282,7 @@ static int __init mda_detect(void)
         return 1;
 }
 
-static void __init mda_initialize(void)
+static void mda_initialize(void)
 {
         write_mda_b(97, 0x00);          /* horizontal total */
         write_mda_b(80, 0x01);          /* horizontal displayed */
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 03041311711b..7fa1afeae8dc 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/tty.h>
 #include <linux/kd.h>
 #include <linux/selection.h>
 #include <linux/console.h>
diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c
index 5cd5e114d1e6..b78eac63459f 100644
--- a/drivers/video/console/promcon.c
+++ b/drivers/video/console/promcon.c
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/console.h>
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 3957fc7523e2..557c563e4aed 100644
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 45c4f227e56e..45586aaabd1e 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -37,7 +37,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/errno.h>
 #include <linux/vt_kern.h>
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 05735ff4e9c5..0a2c10a1abf8 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -38,7 +38,6 @@
 #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
@@ -48,6 +47,7 @@
 #include <linux/spinlock.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/screen_info.h>
 #include <linux/smp_lock.h>
 #include <video/vga.h>
 #include <asm/io.h>
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index acdd6a103dbb..8cc6c0e2d27a 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -36,7 +36,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 2e2924957d8f..aae6d9c26e88 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -41,7 +41,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index a3e189f90a7d..c40e72dafb0e 100644
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -81,7 +81,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/zorro.h>
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 5abd3cb00671..b083ea7e9c69 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -2,7 +2,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index f0a621ecc288..737257d278f0 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -48,7 +48,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/fb_notify.c b/drivers/video/fb_notify.c
new file mode 100644
index 000000000000..8c020389e4fa
--- /dev/null
+++ b/drivers/video/fb_notify.c
@@ -0,0 +1,46 @@
+/*
+ *  linux/drivers/video/fb_notify.c
+ *
+ *  Copyright (C) 2006 Antonino Daplas <adaplas@pol.net>
+ *
+ *      2001 - Documented with DocBook
+ *      - Brad Douglas <brad@neruo.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+#include <linux/fb.h>
+#include <linux/notifier.h>
+
+static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
+
+/**
+ *      fb_register_client - register a client notifier
+ *      @nb: notifier block to callback on events
+ */
+int fb_register_client(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&fb_notifier_list, nb);
+}
+EXPORT_SYMBOL(fb_register_client);
+
+/**
+ *      fb_unregister_client - unregister a client notifier
+ *      @nb: notifier block to callback on events
+ */
+int fb_unregister_client(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
+}
+EXPORT_SYMBOL(fb_unregister_client);
+
+/**
+ * fb_notifier_call_chain - notify clients of fb_events
+ *
+ */
+int fb_notifier_call_chain(unsigned long val, void *v)
+{
+        return blocking_notifier_call_chain(&fb_notifier_list, val, v);
+}
+EXPORT_SYMBOL_GPL(fb_notifier_call_chain);
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index 1f98392a43b3..e8b135f3d80d 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -13,7 +13,6 @@
 
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 33034f81114d..17961e3ecaa0 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/tty.h>
+#include <linux/vt.h>
 #include <linux/init.h>
 #include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
@@ -52,7 +52,6 @@
 
 #define FBPIXMAPSIZE    (1024 * 8)
 
-static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
 struct fb_info *registered_fb[FB_MAX];
 int num_registered_fb;
 
@@ -791,8 +790,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                     event.info = info;
                     event.data = &mode1;
-                    ret = blocking_notifier_call_chain(&fb_notifier_list,
-                                              FB_EVENT_MODE_DELETE, &event);
+                    ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event);
                 }
 
                 if (!ret)
@@ -837,8 +835,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                                 info->flags &= ~FBINFO_MISC_USEREVENT;
                                 event.info = info;
-                                blocking_notifier_call_chain(&fb_notifier_list,
-                                                evnt, &event);
+                                fb_notifier_call_chain(evnt, &event);
                         }
                 }
         }
@@ -861,8 +858,7 @@ fb_blank(struct fb_info *info, int blank)
 
                 event.info = info;
                 event.data = &blank;
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                FB_EVENT_BLANK, &event);
+                fb_notifier_call_chain(FB_EVENT_BLANK, &event);
         }
 
         return ret;
@@ -933,8 +929,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 con2fb.framebuffer = -1;
                 event.info = info;
                 event.data = &con2fb;
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                    FB_EVENT_GET_CONSOLE_MAP, &event);
+                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
                 return copy_to_user(argp, &con2fb,
                                     sizeof(con2fb)) ? -EFAULT : 0;
         case FBIOPUT_CON2FBMAP:
@@ -952,9 +947,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                     return -EINVAL;
                 event.info = info;
                 event.data = &con2fb;
-                return blocking_notifier_call_chain(&fb_notifier_list,
-                                           FB_EVENT_SET_CONSOLE_MAP,
-                                           &event);
+                return fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
+                                              &event);
         case FBIOBLANK:
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
@@ -1330,8 +1324,7 @@ register_framebuffer(struct fb_info *fb_info)
         registered_fb[i] = fb_info;
 
         event.info = fb_info;
-        blocking_notifier_call_chain(&fb_notifier_list,
-                            FB_EVENT_FB_REGISTERED, &event);
+        fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
         return 0;
 }
 
@@ -1365,30 +1358,11 @@ unregister_framebuffer(struct fb_info *fb_info)
         fb_cleanup_class_device(fb_info);
         class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));
         event.info = fb_info;
-        blocking_notifier_call_chain(&fb_notifier_list,
-                                     FB_EVENT_FB_UNREGISTERED, &event);
+        fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
         return 0;
 }
 
 /**
- *      fb_register_client - register a client notifier
- *      @nb: notifier block to callback on events
- */
-int fb_register_client(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_register(&fb_notifier_list, nb);
-}
-
-/**
- *      fb_unregister_client - unregister a client notifier
- *      @nb: notifier block to callback on events
- */
-int fb_unregister_client(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
-}
-
-/**
  *      fb_set_suspend - low level driver signals suspend
  *      @info: framebuffer affected
  *      @state: 0 = resuming, !=0 = suspending
@@ -1403,13 +1377,11 @@ void fb_set_suspend(struct fb_info *info, int state)
 
         event.info = info;
         if (state) {
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                FB_EVENT_SUSPEND, &event);
+                fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
                 info->state = FBINFO_STATE_SUSPENDED;
         } else {
                 info->state = FBINFO_STATE_RUNNING;
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                FB_EVENT_RESUME, &event);
+                fb_notifier_call_chain(FB_EVENT_RESUME, &event);
         }
 }
 
@@ -1480,9 +1452,7 @@ int fb_new_modelist(struct fb_info *info)
 
         if (!list_empty(&info->modelist)) {
                 event.info = info;
-                err = blocking_notifier_call_chain(&fb_notifier_list,
-                                           FB_EVENT_NEW_MODELIST,
-                                           &event);
+                err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
         }
 
         return err;
@@ -1594,8 +1564,6 @@ EXPORT_SYMBOL(fb_blank);
 EXPORT_SYMBOL(fb_pan_display);
 EXPORT_SYMBOL(fb_get_buffer_offset);
 EXPORT_SYMBOL(fb_set_suspend);
-EXPORT_SYMBOL(fb_register_client);
-EXPORT_SYMBOL(fb_unregister_client);
 EXPORT_SYMBOL(fb_get_options);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 3ccfff715a51..de93139ccbb5 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -26,7 +26,6 @@
  * for more details.
  *
  */
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index 605d1a132020..1b981b635675 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 4d3a8871d3d1..bcf9cea54d8b 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 5ef12a3dfa50..0d3643fc6293 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -25,7 +25,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 4e39035cf335..fb9e67228543 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -36,7 +36,6 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 01864767450d..4cc6b454265e 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -17,7 +17,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index abd920a663a0..91cf3b577d15 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -11,7 +11,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index fbe8a2c4b04c..a6ca02f2156a 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -33,7 +33,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/init.h>
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 8a0c2d3d3805..67f384f86758 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -33,7 +33,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index cdbae173d69a..ff233b84dec4 100644
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
@@ -15,9 +15,9 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 5f393d985b11..5715b8ad0ddc 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 3f39d84015f1..06af89d44a0d 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -113,7 +113,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -122,6 +121,7 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
+#include <linux/screen_info.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 3b78a57924f0..2a9322f9cfdc 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -24,7 +24,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index 2fdbe9b2b04b..f0d614a80f1f 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -16,7 +16,6 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioctl.h>
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index e6cbd9de944a..80a043807161 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -24,7 +24,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/nubus.h>
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index b95779b57c06..9c25c2f7966b 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index f85421bf7cb5..38c8d38de4fd 100644
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -29,7 +29,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/mbx/Makefile b/drivers/video/mbx/Makefile
new file mode 100644
index 000000000000..16c1165cf9c7
--- /dev/null
+++ b/drivers/video/mbx/Makefile
@@ -0,0 +1,4 @@
+# Makefile for the 2700G controller driver.
+
+obj-$(CONFIG_FB_MBX)       += mbxfb.o
+obj-$(CONFIG_FB_MBX_DEBUG) += mbxfbdebugfs.o
diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c
new file mode 100644
index 000000000000..84aab3ad024e
--- /dev/null
+++ b/drivers/video/mbx/mbxdebugfs.c
@@ -0,0 +1,188 @@
+#include <linux/debugfs.h>
+
+#define BIG_BUFFER_SIZE (1024)
+
+static char big_buffer[BIG_BUFFER_SIZE];
+
+struct mbxfb_debugfs_data {
+        struct dentry *dir;
+        struct dentry *sysconf;
+        struct dentry *clock;
+        struct dentry *display;
+        struct dentry *gsctl;
+};
+
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->u.generic_ip;
+        return 0;
+}
+
+static ssize_t write_file_dummy(struct file *file, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        return count;
+}
+
+static ssize_t sysconf_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "SYSCFG = %08lx\n", SYSCFG);
+        s += sprintf(s, "PFBASE = %08lx\n", PFBASE);
+        s += sprintf(s, "PFCEIL = %08lx\n", PFCEIL);
+        s += sprintf(s, "POLLFLAG = %08lx\n", POLLFLAG);
+        s += sprintf(s, "SYSRST = %08lx\n", SYSRST);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+
+static ssize_t gsctl_read_file(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "GSCTRL = %08lx\n", GSCTRL);
+        s += sprintf(s, "VSCTRL = %08lx\n", VSCTRL);
+        s += sprintf(s, "GBBASE = %08lx\n", GBBASE);
+        s += sprintf(s, "VBBASE = %08lx\n", VBBASE);
+        s += sprintf(s, "GDRCTRL = %08lx\n", GDRCTRL);
+        s += sprintf(s, "VCMSK = %08lx\n", VCMSK);
+        s += sprintf(s, "GSCADR = %08lx\n", GSCADR);
+        s += sprintf(s, "VSCADR = %08lx\n", VSCADR);
+        s += sprintf(s, "VUBASE = %08lx\n", VUBASE);
+        s += sprintf(s, "VVBASE = %08lx\n", VVBASE);
+        s += sprintf(s, "GSADR = %08lx\n", GSADR);
+        s += sprintf(s, "VSADR = %08lx\n", VSADR);
+        s += sprintf(s, "HCCTRL = %08lx\n", HCCTRL);
+        s += sprintf(s, "HCSIZE = %08lx\n", HCSIZE);
+        s += sprintf(s, "HCPOS = %08lx\n", HCPOS);
+        s += sprintf(s, "HCBADR = %08lx\n", HCBADR);
+        s += sprintf(s, "HCCKMSK = %08lx\n", HCCKMSK);
+        s += sprintf(s, "GPLUT = %08lx\n", GPLUT);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static ssize_t display_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "DSCTRL = %08lx\n", DSCTRL);
+        s += sprintf(s, "DHT01 = %08lx\n", DHT01);
+        s += sprintf(s, "DHT02 = %08lx\n", DHT02);
+        s += sprintf(s, "DHT03 = %08lx\n", DHT03);
+        s += sprintf(s, "DVT01 = %08lx\n", DVT01);
+        s += sprintf(s, "DVT02 = %08lx\n", DVT02);
+        s += sprintf(s, "DVT03 = %08lx\n", DVT03);
+        s += sprintf(s, "DBCOL = %08lx\n", DBCOL);
+        s += sprintf(s, "BGCOLOR = %08lx\n", BGCOLOR);
+        s += sprintf(s, "DINTRS = %08lx\n", DINTRS);
+        s += sprintf(s, "DINTRE = %08lx\n", DINTRE);
+        s += sprintf(s, "DINTRCNT = %08lx\n", DINTRCNT);
+        s += sprintf(s, "DSIG = %08lx\n", DSIG);
+        s += sprintf(s, "DMCTRL = %08lx\n", DMCTRL);
+        s += sprintf(s, "CLIPCTRL = %08lx\n", CLIPCTRL);
+        s += sprintf(s, "SPOCTRL = %08lx\n", SPOCTRL);
+        s += sprintf(s, "SVCTRL = %08lx\n", SVCTRL);
+        s += sprintf(s, "DLSTS = %08lx\n", DLSTS);
+        s += sprintf(s, "DLLCTRL = %08lx\n", DLLCTRL);
+        s += sprintf(s, "DVLNUM = %08lx\n", DVLNUM);
+        s += sprintf(s, "DUCTRL = %08lx\n", DUCTRL);
+        s += sprintf(s, "DVECTRL = %08lx\n", DVECTRL);
+        s += sprintf(s, "DHDET = %08lx\n", DHDET);
+        s += sprintf(s, "DVDET = %08lx\n", DVDET);
+        s += sprintf(s, "DODMSK = %08lx\n", DODMSK);
+        s += sprintf(s, "CSC01 = %08lx\n", CSC01);
+        s += sprintf(s, "CSC02 = %08lx\n", CSC02);
+        s += sprintf(s, "CSC03 = %08lx\n", CSC03);
+        s += sprintf(s, "CSC04 = %08lx\n", CSC04);
+        s += sprintf(s, "CSC05 = %08lx\n", CSC05);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static ssize_t clock_read_file(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "SYSCLKSRC = %08lx\n", SYSCLKSRC);
+        s += sprintf(s, "PIXCLKSRC = %08lx\n", PIXCLKSRC);
+        s += sprintf(s, "CLKSLEEP = %08lx\n", CLKSLEEP);
+        s += sprintf(s, "COREPLL = %08lx\n", COREPLL);
+        s += sprintf(s, "DISPPLL = %08lx\n", DISPPLL);
+        s += sprintf(s, "PLLSTAT = %08lx\n", PLLSTAT);
+        s += sprintf(s, "VOVRCLK = %08lx\n", VOVRCLK);
+        s += sprintf(s, "PIXCLK = %08lx\n", PIXCLK);
+        s += sprintf(s, "MEMCLK = %08lx\n", MEMCLK);
+        s += sprintf(s, "M24CLK = %08lx\n", M24CLK);
+        s += sprintf(s, "MBXCLK = %08lx\n", MBXCLK);
+        s += sprintf(s, "SDCLK = %08lx\n", SDCLK);
+        s += sprintf(s, "PIXCLKDIV = %08lx\n", PIXCLKDIV);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static struct file_operations sysconf_fops = {
+        .read = sysconf_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations clock_fops = {
+        .read = clock_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations display_fops = {
+        .read = display_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations gsctl_fops = {
+        .read = gsctl_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+
+static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)
+{
+        struct mbxfb_info *mfbi = fbi->par;
+        struct mbxfb_debugfs_data *dbg;
+
+        dbg = kzalloc(sizeof(struct mbxfb_debugfs_data), GFP_KERNEL);
+        mfbi->debugfs_data = dbg;
+
+        dbg->dir = debugfs_create_dir("mbxfb", NULL);
+        dbg->sysconf = debugfs_create_file("sysconf", 0444, dbg->dir,
+                                      fbi, &sysconf_fops);
+        dbg->clock = debugfs_create_file("clock", 0444, dbg->dir,
+                                    fbi, &clock_fops);
+        dbg->display = debugfs_create_file("display", 0444, dbg->dir,
+                                      fbi, &display_fops);
+        dbg->gsctl = debugfs_create_file("gsctl", 0444, dbg->dir,
+                                    fbi, &gsctl_fops);
+}
+
+static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi)
+{
+        struct mbxfb_info *mfbi = fbi->par;
+        struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data;
+
+        debugfs_remove(dbg->gsctl);
+        debugfs_remove(dbg->display);
+        debugfs_remove(dbg->clock);
+        debugfs_remove(dbg->sysconf);
+        debugfs_remove(dbg->dir);
+}
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
new file mode 100644
index 000000000000..6849ab75d403
--- /dev/null
+++ b/drivers/video/mbx/mbxfb.c
@@ -0,0 +1,683 @@
+/*
+ *  linux/drivers/video/mbx/mbxfb.c
+ *
+ *  Copyright (C) 2006 Compulab, Ltd.
+ *  Mike Rapoport <mike@compulab.co.il>
+ *
+ *   Based on pxafb.c
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ *   Intel 2700G (Marathon) Graphics Accelerator Frame Buffer Driver
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/io.h>
+
+#include <video/mbxfb.h>
+
+#include "regs.h"
+#include "reg_bits.h"
+
+static unsigned long virt_base_2700;
+
+#define MIN_XRES        16
+#define MIN_YRES        16
+#define MAX_XRES        2048
+#define MAX_YRES        2048
+
+#define MAX_PALETTES    16
+
+/* FIXME: take care of different chip revisions with different sizes
+   of ODFB */
+#define MEMORY_OFFSET   0x60000
+
+struct mbxfb_info {
+        struct device *dev;
+
+        struct resource *fb_res;
+        struct resource *fb_req;
+
+        struct resource *reg_res;
+        struct resource *reg_req;
+
+        void __iomem *fb_virt_addr;
+        unsigned long fb_phys_addr;
+
+        void __iomem *reg_virt_addr;
+        unsigned long reg_phys_addr;
+
+        int (*platform_probe) (struct fb_info * fb);
+        int (*platform_remove) (struct fb_info * fb);
+
+        u32 pseudo_palette[MAX_PALETTES];
+#ifdef CONFIG_FB_MBX_DEBUG
+        void *debugfs_data;
+#endif
+
+};
+
+static struct fb_var_screeninfo mbxfb_default __devinitdata = {
+        .xres = 640,
+        .yres = 480,
+        .xres_virtual = 640,
+        .yres_virtual = 480,
+        .bits_per_pixel = 16,
+        .red = {11, 5, 0},
+        .green = {5, 6, 0},
+        .blue = {0, 5, 0},
+        .activate = FB_ACTIVATE_TEST,
+        .height = -1,
+        .width = -1,
+        .pixclock = 40000,
+        .left_margin = 48,
+        .right_margin = 16,
+        .upper_margin = 33,
+        .lower_margin = 10,
+        .hsync_len = 96,
+        .vsync_len = 2,
+        .vmode = FB_VMODE_NONINTERLACED,
+        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct fb_fix_screeninfo mbxfb_fix  __devinitdata = {
+        .id = "MBX",
+        .type = FB_TYPE_PACKED_PIXELS,
+        .visual = FB_VISUAL_TRUECOLOR,
+        .xpanstep = 0,
+        .ypanstep = 0,
+        .ywrapstep = 0,
+        .accel = FB_ACCEL_NONE,
+};
+
+struct pixclock_div {
+        u8 m;
+        u8 n;
+        u8 p;
+};
+
+static unsigned int mbxfb_get_pixclock(unsigned int pixclock_ps,
+                                       struct pixclock_div *div)
+{
+        u8 m, n, p;
+        unsigned int err = 0;
+        unsigned int min_err = ~0x0;
+        unsigned int clk;
+        unsigned int best_clk = 0;
+        unsigned int ref_clk = 13000;   /* FIXME: take from platform data */
+        unsigned int pixclock;
+
+        /* convert pixclock to KHz */
+        pixclock = PICOS2KHZ(pixclock_ps);
+
+        for (m = 1; m < 64; m++) {
+                for (n = 1; n < 8; n++) {
+                        for (p = 0; p < 8; p++) {
+                                clk = (ref_clk * m) / (n * (1 << p));
+                                err = (clk > pixclock) ? (clk - pixclock) :
+                                        (pixclock - clk);
+                                if (err < min_err) {
+                                        min_err = err;
+                                        best_clk = clk;
+                                        div->m = m;
+                                        div->n = n;
+                                        div->p = p;
+                                }
+                        }
+                }
+        }
+        return KHZ2PICOS(best_clk);
+}
+
+static int mbxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                           u_int trans, struct fb_info *info)
+{
+        u32 val, ret = 1;
+
+        if (regno < MAX_PALETTES) {
+                u32 *pal = info->pseudo_palette;
+
+                val = (red & 0xf800) | ((green & 0xfc00) >> 5) |
+                        ((blue & 0xf800) >> 11);
+                pal[regno] = val;
+                ret = 0;
+        }
+
+        return ret;
+}
+
+static int mbxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct pixclock_div div;
+
+        var->pixclock = mbxfb_get_pixclock(var->pixclock, &div);
+
+        if (var->xres < MIN_XRES)
+                var->xres = MIN_XRES;
+        if (var->yres < MIN_YRES)
+                var->yres = MIN_YRES;
+        if (var->xres > MAX_XRES)
+                return -EINVAL;
+        if (var->yres > MAX_YRES)
+                return -EINVAL;
+        var->xres_virtual = max(var->xres_virtual, var->xres);
+        var->yres_virtual = max(var->yres_virtual, var->yres);
+
+        switch (var->bits_per_pixel) {
+                /* 8 bits-per-pixel is not supported yet */
+        case 8:
+                return -EINVAL;
+        case 16:
+                var->green.length = (var->green.length == 5) ? 5 : 6;
+                var->red.length = 5;
+                var->blue.length = 5;
+                var->transp.length = 6 - var->green.length;
+                var->blue.offset = 0;
+                var->green.offset = 5;
+                var->red.offset = 5 + var->green.length;
+                var->transp.offset = (5 + var->red.offset) & 15;
+                break;
+        case 24:                /* RGB 888   */
+        case 32:                /* RGBA 8888 */
+                var->red.offset = 16;
+                var->red.length = 8;
+                var->green.offset = 8;
+                var->green.length = 8;
+                var->blue.offset = 0;
+                var->blue.length = 8;
+                var->transp.length = var->bits_per_pixel - 24;
+                var->transp.offset = (var->transp.length) ? 24 : 0;
+                break;
+        }
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
+        var->transp.msb_right = 0;
+
+        return 0;
+}
+
+static int mbxfb_set_par(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct pixclock_div div;
+        ushort hbps, ht, hfps, has;
+        ushort vbps, vt, vfps, vas;
+        u32 gsctrl = readl(GSCTRL);
+        u32 gsadr = readl(GSADR);
+
+        info->fix.line_length = var->xres_virtual * var->bits_per_pixel / 8;
+
+        /* setup color mode */
+        gsctrl &= ~(FMsk(GSCTRL_GPIXFMT));
+        /* FIXME: add *WORKING* support for 8-bits per color */
+        if (info->var.bits_per_pixel == 8) {
+                return -EINVAL;
+        } else {
+                fb_dealloc_cmap(&info->cmap);
+                gsctrl &= ~GSCTRL_LUT_EN;
+
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                switch (info->var.bits_per_pixel) {
+                case 16:
+                        if (info->var.green.length == 5)
+                                gsctrl |= GSCTRL_GPIXFMT_ARGB1555;
+                        else
+                                gsctrl |= GSCTRL_GPIXFMT_RGB565;
+                        break;
+                case 24:
+                        gsctrl |= GSCTRL_GPIXFMT_RGB888;
+                        break;
+                case 32:
+                        gsctrl |= GSCTRL_GPIXFMT_ARGB8888;
+                        break;
+                }
+        }
+
+        /* setup resolution */
+        gsctrl &= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));
+        gsctrl |= Gsctrl_Width(info->var.xres - 1) |
+                Gsctrl_Height(info->var.yres - 1);
+        writel(gsctrl, GSCTRL);
+        udelay(1000);
+
+        gsadr &= ~(FMsk(GSADR_SRCSTRIDE));
+        gsadr |= Gsadr_Srcstride(info->var.xres * info->var.bits_per_pixel /
+                                 (8 * 16) - 1);
+        writel(gsadr, GSADR);
+        udelay(1000);
+
+        /* setup timings */
+        var->pixclock = mbxfb_get_pixclock(info->var.pixclock, &div);
+
+        writel((Disp_Pll_M(div.m) | Disp_Pll_N(div.n) |
+                Disp_Pll_P(div.p) | DISP_PLL_EN), DISPPLL);
+
+        hbps = var->hsync_len;
+        has = hbps + var->left_margin;
+        hfps = has + var->xres;
+        ht = hfps + var->right_margin;
+
+        vbps = var->vsync_len;
+        vas = vbps + var->upper_margin;
+        vfps = vas + var->yres;
+        vt = vfps + var->lower_margin;
+
+        writel((Dht01_Hbps(hbps) | Dht01_Ht(ht)), DHT01);
+        writel((Dht02_Hlbs(has) | Dht02_Has(has)), DHT02);
+        writel((Dht03_Hfps(hfps) | Dht03_Hrbs(hfps)), DHT03);
+        writel((Dhdet_Hdes(has) | Dhdet_Hdef(hfps)), DHDET);
+
+        writel((Dvt01_Vbps(vbps) | Dvt01_Vt(vt)), DVT01);
+        writel((Dvt02_Vtbs(vas) | Dvt02_Vas(vas)), DVT02);
+        writel((Dvt03_Vfps(vfps) | Dvt03_Vbbs(vfps)), DVT03);
+        writel((Dvdet_Vdes(vas) | Dvdet_Vdef(vfps)), DVDET);
+        writel((Dvectrl_Vevent(vfps) | Dvectrl_Vfetch(vbps)), DVECTRL);
+
+        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+
+        return 0;
+}
+
+static int mbxfb_blank(int blank, struct fb_info *info)
+{
+        switch (blank) {
+        case FB_BLANK_POWERDOWN:
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_NORMAL:
+                writel((readl(DSCTRL) & ~DSCTRL_SYNCGEN_EN), DSCTRL);
+                udelay(1000);
+                writel((readl(PIXCLK) & ~PIXCLK_EN), PIXCLK);
+                udelay(1000);
+                writel((readl(VOVRCLK) & ~VOVRCLK_EN), VOVRCLK);
+                udelay(1000);
+                break;
+        case FB_BLANK_UNBLANK:
+                writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+                udelay(1000);
+                writel((readl(PIXCLK) | PIXCLK_EN), PIXCLK);
+                udelay(1000);
+                break;
+        }
+        return 0;
+}
+
+static struct fb_ops mbxfb_ops = {
+        .owner = THIS_MODULE,
+        .fb_check_var = mbxfb_check_var,
+        .fb_set_par = mbxfb_set_par,
+        .fb_setcolreg = mbxfb_setcolreg,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+        .fb_blank = mbxfb_blank,
+};
+
+/*
+  Enable external SDRAM controller. Assume that all clocks are active
+  by now.
+*/
+static void __devinit setup_memc(struct fb_info *fbi)
+{
+        struct mbxfb_info *mfbi = fbi->par;
+        unsigned long tmp;
+        int i;
+
+        /* FIXME: use platfrom specific parameters */
+        /* setup SDRAM controller */
+        writel((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |
+                LMCFG_LMA_TS),
+               LMCFG);
+        udelay(1000);
+
+        writel(LMPWR_MC_PWR_ACT, LMPWR);
+        udelay(1000);
+
+        /* setup SDRAM timings */
+        writel((Lmtim_Tras(7) | Lmtim_Trp(3) | Lmtim_Trcd(3) |
+                Lmtim_Trc(9) | Lmtim_Tdpl(2)),
+               LMTIM);
+        udelay(1000);
+        /* setup SDRAM refresh rate */
+        writel(0xc2b, LMREFRESH);
+        udelay(1000);
+        /* setup SDRAM type parameters */
+        writel((LMTYPE_CASLAT_3 | LMTYPE_BKSZ_2 | LMTYPE_ROWSZ_11 |
+                LMTYPE_COLSZ_8),
+               LMTYPE);
+        udelay(1000);
+        /* enable memory controller */
+        writel(LMPWR_MC_PWR_ACT, LMPWR);
+        udelay(1000);
+
+        /* perform dummy reads */
+        for ( i = 0; i < 16; i++ ) {
+                tmp = readl(fbi->screen_base);
+        }
+}
+
+static void enable_clocks(struct fb_info *fbi)
+{
+        /* enable clocks */
+        writel(SYSCLKSRC_PLL_2, SYSCLKSRC);
+        udelay(1000);
+        writel(PIXCLKSRC_PLL_1, PIXCLKSRC);
+        udelay(1000);
+        writel(0x00000000, CLKSLEEP);
+        udelay(1000);
+        writel((Core_Pll_M(0x17) | Core_Pll_N(0x3) | Core_Pll_P(0x0) |
+                CORE_PLL_EN),
+               COREPLL);
+        udelay(1000);
+        writel((Disp_Pll_M(0x1b) | Disp_Pll_N(0x7) | Disp_Pll_P(0x1) |
+                DISP_PLL_EN),
+               DISPPLL);
+
+        writel(0x00000000, VOVRCLK);
+        udelay(1000);
+        writel(PIXCLK_EN, PIXCLK);
+        udelay(1000);
+        writel(MEMCLK_EN, MEMCLK);
+        udelay(1000);
+        writel(0x00000006, M24CLK);
+        udelay(1000);
+        writel(0x00000006, MBXCLK);
+        udelay(1000);
+        writel(SDCLK_EN, SDCLK);
+        udelay(1000);
+        writel(0x00000001, PIXCLKDIV);
+        udelay(1000);
+}
+
+static void __devinit setup_graphics(struct fb_info *fbi)
+{
+        unsigned long gsctrl;
+
+        gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres - 1) |
+                Gsctrl_Height(fbi->var.yres - 1);
+        switch (fbi->var.bits_per_pixel) {
+        case 16:
+                if (fbi->var.green.length == 5)
+                        gsctrl |= GSCTRL_GPIXFMT_ARGB1555;
+                else
+                        gsctrl |= GSCTRL_GPIXFMT_RGB565;
+                break;
+        case 24:
+                gsctrl |= GSCTRL_GPIXFMT_RGB888;
+                break;
+        case 32:
+                gsctrl |= GSCTRL_GPIXFMT_ARGB8888;
+                break;
+        }
+
+        writel(gsctrl, GSCTRL);
+        udelay(1000);
+        writel(0x00000000, GBBASE);
+        udelay(1000);
+        writel(0x00ffffff, GDRCTRL);
+        udelay(1000);
+        writel((GSCADR_STR_EN | Gscadr_Gbase_Adr(0x6000)), GSCADR);
+        udelay(1000);
+        writel(0x00000000, GPLUT);
+        udelay(1000);
+}
+
+static void __devinit setup_display(struct fb_info *fbi)
+{
+        unsigned long dsctrl = 0;
+
+        dsctrl = DSCTRL_BLNK_POL;
+        if (fbi->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                dsctrl |= DSCTRL_HS_POL;
+        if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                dsctrl |= DSCTRL_VS_POL;
+        writel(dsctrl, DSCTRL);
+        udelay(1000);
+        writel(0xd0303010, DMCTRL);
+        udelay(1000);
+        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+}
+
+static void __devinit enable_controller(struct fb_info *fbi)
+{
+        writel(SYSRST_RST, SYSRST);
+        udelay(1000);
+
+
+        enable_clocks(fbi);
+        setup_memc(fbi);
+        setup_graphics(fbi);
+        setup_display(fbi);
+}
+
+#ifdef CONFIG_PM
+/*
+ * Power management hooks.  Note that we won't be called from IRQ context,
+ * unlike the blank functions above, so we may sleep.
+ */
+static int mbxfb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        /* make frame buffer memory enter self-refresh mode */
+        writel(LMPWR_MC_PWR_SRM, LMPWR);
+        while (LMPWRSTAT != LMPWRSTAT_MC_PWR_SRM)
+                ; /* empty statement */
+
+        /* reset the device, since it's initial state is 'mostly sleeping' */
+        writel(SYSRST_RST, SYSRST);
+        return 0;
+}
+
+static int mbxfb_resume(struct platform_device *dev)
+{
+        struct fb_info *fbi = platform_get_drvdata(dev);
+
+        enable_clocks(fbi);
+/*      setup_graphics(fbi); */
+/*      setup_display(fbi); */
+
+        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+        return 0;
+}
+#else
+#define mbxfb_suspend   NULL
+#define mbxfb_resume    NULL
+#endif
+
+/* debugfs entries */
+#ifndef CONFIG_FB_MBX_DEBUG
+#define mbxfb_debugfs_init(x)   do {} while(0)
+#define mbxfb_debugfs_remove(x) do {} while(0)
+#endif
+
+#define res_size(_r) (((_r)->end - (_r)->start) + 1)
+
+static int __devinit mbxfb_probe(struct platform_device *dev)
+{
+        int ret;
+        struct fb_info *fbi;
+        struct mbxfb_info *mfbi;
+        struct mbxfb_platform_data *pdata;
+
+        dev_dbg(dev, "mbxfb_probe\n");
+
+        fbi = framebuffer_alloc(sizeof(struct mbxfb_info), &dev->dev);
+        if (fbi == NULL) {
+                dev_err(&dev->dev, "framebuffer_alloc failed\n");
+                return -ENOMEM;
+        }
+
+        mfbi = fbi->par;
+        fbi->pseudo_palette = mfbi->pseudo_palette;
+        pdata = dev->dev.platform_data;
+        if (pdata->probe)
+                mfbi->platform_probe = pdata->probe;
+        if (pdata->remove)
+                mfbi->platform_remove = pdata->remove;
+
+        mfbi->fb_res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        mfbi->reg_res = platform_get_resource(dev, IORESOURCE_MEM, 1);
+
+        if (!mfbi->fb_res || !mfbi->reg_res) {
+                dev_err(&dev->dev, "no resources found\n");
+                ret = -ENODEV;
+                goto err1;
+        }
+
+        mfbi->fb_req = request_mem_region(mfbi->fb_res->start,
+                                          res_size(mfbi->fb_res), dev->name);
+        if (mfbi->fb_req == NULL) {
+                dev_err(&dev->dev, "failed to claim framebuffer memory\n");
+                ret = -EINVAL;
+                goto err1;
+        }
+        mfbi->fb_phys_addr = mfbi->fb_res->start;
+
+        mfbi->reg_req = request_mem_region(mfbi->reg_res->start,
+                                           res_size(mfbi->reg_res), dev->name);
+        if (mfbi->reg_req == NULL) {
+                dev_err(&dev->dev, "failed to claim Marathon registers\n");
+                ret = -EINVAL;
+                goto err2;
+        }
+        mfbi->reg_phys_addr = mfbi->reg_res->start;
+
+        mfbi->reg_virt_addr = ioremap_nocache(mfbi->reg_phys_addr,
+                                              res_size(mfbi->reg_req));
+        if (!mfbi->reg_virt_addr) {
+                dev_err(&dev->dev, "failed to ioremap Marathon registers\n");
+                ret = -EINVAL;
+                goto err3;
+        }
+        virt_base_2700 = (unsigned long)mfbi->reg_virt_addr;
+
+        mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr,
+                                             res_size(mfbi->fb_req));
+        if (!mfbi->reg_virt_addr) {
+                dev_err(&dev->dev, "failed to ioremap frame buffer\n");
+                ret = -EINVAL;
+                goto err4;
+        }
+
+        /* FIXME: get from platform */
+        fbi->screen_base = (char __iomem *)(mfbi->fb_virt_addr + 0x60000);
+        fbi->screen_size = 8 * 1024 * 1024;     /* 8 Megs */
+        fbi->fbops = &mbxfb_ops;
+
+        fbi->var = mbxfb_default;
+        fbi->fix = mbxfb_fix;
+        fbi->fix.smem_start = mfbi->fb_phys_addr + 0x60000;
+        fbi->fix.smem_len = 8 * 1024 * 1024;
+        fbi->fix.line_length = 640 * 2;
+
+        ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
+        if (ret < 0) {
+                dev_err(&dev->dev, "fb_alloc_cmap failed\n");
+                ret = -EINVAL;
+                goto err5;
+        }
+
+        platform_set_drvdata(dev, fbi);
+
+        printk(KERN_INFO "fb%d: mbx frame buffer device\n", fbi->node);
+
+        if (mfbi->platform_probe)
+                mfbi->platform_probe(fbi);
+
+        enable_controller(fbi);
+
+        mbxfb_debugfs_init(fbi);
+
+        ret = register_framebuffer(fbi);
+        if (ret < 0) {
+                dev_err(&dev->dev, "register_framebuffer failed\n");
+                ret = -EINVAL;
+                goto err6;
+        }
+
+        return 0;
+
+err6:
+        fb_dealloc_cmap(&fbi->cmap);
+err5:
+        iounmap(mfbi->fb_virt_addr);
+err4:
+        iounmap(mfbi->reg_virt_addr);
+err3:
+        release_mem_region(mfbi->reg_res->start, res_size(mfbi->reg_res));
+err2:
+        release_mem_region(mfbi->fb_res->start, res_size(mfbi->fb_res));
+err1:
+        framebuffer_release(fbi);
+
+        return ret;
+}
+
+static int __devexit mbxfb_remove(struct platform_device *dev)
+{
+        struct fb_info *fbi = platform_get_drvdata(dev);
+
+        writel(SYSRST_RST, SYSRST);
+        udelay(1000);
+
+        mbxfb_debugfs_remove(fbi);
+
+        if (fbi) {
+                struct mbxfb_info *mfbi = fbi->par;
+
+                unregister_framebuffer(fbi);
+                if (mfbi) {
+                        if (mfbi->platform_remove)
+                                mfbi->platform_remove(fbi);
+
+                        if (mfbi->fb_virt_addr)
+                                iounmap(mfbi->fb_virt_addr);
+                        if (mfbi->reg_virt_addr)
+                                iounmap(mfbi->reg_virt_addr);
+                        if (mfbi->reg_req)
+                                release_mem_region(mfbi->reg_req->start,
+                                                   res_size(mfbi->reg_req));
+                        if (mfbi->fb_req)
+                                release_mem_region(mfbi->fb_req->start,
+                                                   res_size(mfbi->fb_req));
+                }
+                framebuffer_release(fbi);
+        }
+
+        return 0;
+}
+
+static struct platform_driver mbxfb_driver = {
+        .probe = mbxfb_probe,
+        .remove = mbxfb_remove,
+        .suspend = mbxfb_suspend,
+        .resume = mbxfb_resume,
+        .driver = {
+                .name = "mbx-fb",
+        },
+};
+
+int __devinit mbxfb_init(void)
+{
+        return platform_driver_register(&mbxfb_driver);
+}
+
+static void __devexit mbxfb_exit(void)
+{
+        platform_driver_unregister(&mbxfb_driver);
+}
+
+module_init(mbxfb_init);
+module_exit(mbxfb_exit);
+
+MODULE_DESCRIPTION("loadable framebuffer driver for Marathon device");
+MODULE_AUTHOR("Mike Rapoport, Compulab");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/mbx/reg_bits.h b/drivers/video/mbx/reg_bits.h
new file mode 100644
index 000000000000..c226a8e45312
--- /dev/null
+++ b/drivers/video/mbx/reg_bits.h
@@ -0,0 +1,418 @@
+#ifndef __REG_BITS_2700G_
+#define __REG_BITS_2700G_
+
+/* use defines from asm-arm/arch-pxa/bitfields.h for bit fields access */
+#define UData(Data)     ((unsigned long) (Data))
+#define Fld(Size, Shft) (((Size) << 16) + (Shft))
+#define FSize(Field)    ((Field) >> 16)
+#define FShft(Field)    ((Field) & 0x0000FFFF)
+#define FMsk(Field)     (((UData (1) << FSize (Field)) - 1) << FShft (Field))
+#define FAlnMsk(Field)  ((UData (1) << FSize (Field)) - 1)
+#define F1stBit(Field)  (UData (1) << FShft (Field))
+
+#define SYSRST_RST      (1 << 0)
+
+/* SYSCLKSRC - SYSCLK Source Control Register */
+#define SYSCLKSRC_SEL   Fld(2,0)
+#define SYSCLKSRC_REF   ((0x0) << FShft(SYSCLKSRC_SEL))
+#define SYSCLKSRC_PLL_1 ((0x1) << FShft(SYSCLKSRC_SEL))
+#define SYSCLKSRC_PLL_2 ((0x2) << FShft(SYSCLKSRC_SEL))
+
+/* PIXCLKSRC - PIXCLK Source Control Register */
+#define PIXCLKSRC_SEL   Fld(2,0)
+#define PIXCLKSRC_REF   ((0x0) << FShft(PIXCLKSRC_SEL))
+#define PIXCLKSRC_PLL_1 ((0x1) << FShft(PIXCLKSRC_SEL))
+#define PIXCLKSRC_PLL_2 ((0x2) << FShft(PIXCLKSRC_SEL))
+
+/* Clock Disable Register */
+#define CLKSLEEP_SLP    (1 << 0)
+
+/* Core PLL Control Register */
+#define CORE_PLL_M      Fld(6,7)
+#define Core_Pll_M(x)   ((x) << FShft(CORE_PLL_M))
+#define CORE_PLL_N      Fld(3,4)
+#define Core_Pll_N(x)   ((x) << FShft(CORE_PLL_N))
+#define CORE_PLL_P      Fld(3,1)
+#define Core_Pll_P(x)   ((x) << FShft(CORE_PLL_P))
+#define CORE_PLL_EN     (1 << 0)
+
+/* Display PLL Control Register */
+#define DISP_PLL_M      Fld(6,7)
+#define Disp_Pll_M(x)   ((x) << FShft(DISP_PLL_M))
+#define DISP_PLL_N      Fld(3,4)
+#define Disp_Pll_N(x)   ((x) << FShft(DISP_PLL_N))
+#define DISP_PLL_P      Fld(3,1)
+#define Disp_Pll_P(x)   ((x) << FShft(DISP_PLL_P))
+#define DISP_PLL_EN     (1 << 0)
+
+/* PLL status register */
+#define PLLSTAT_CORE_PLL_LOST_L (1 << 3)
+#define PLLSTAT_CORE_PLL_LSTS   (1 << 2)
+#define PLLSTAT_DISP_PLL_LOST_L (1 << 1)
+#define PLLSTAT_DISP_PLL_LSTS   (1 << 0)
+
+/* Video and scale clock control register */
+#define VOVRCLK_EN      (1 << 0)
+
+/* Pixel clock control register */
+#define PIXCLK_EN       (1 << 0)
+
+/* Memory clock control register */
+#define MEMCLK_EN       (1 << 0)
+
+/* MBX clock control register */
+#define MBXCLK_DIV      Fld(2,2)
+#define MBXCLK_DIV_1    ((0x0) << FShft(MBXCLK_DIV))
+#define MBXCLK_DIV_2    ((0x1) << FShft(MBXCLK_DIV))
+#define MBXCLK_DIV_3    ((0x2) << FShft(MBXCLK_DIV))
+#define MBXCLK_DIV_4    ((0x3) << FShft(MBXCLK_DIV))
+#define MBXCLK_EN       Fld(2,0)
+#define MBXCLK_EN_NONE  ((0x0) << FShft(MBXCLK_EN))
+#define MBXCLK_EN_2D    ((0x1) << FShft(MBXCLK_EN))
+#define MBXCLK_EN_BOTH  ((0x2) << FShft(MBXCLK_EN))
+
+/* M24 clock control register */
+#define M24CLK_DIV      Fld(2,1)
+#define M24CLK_DIV_1    ((0x0) << FShft(M24CLK_DIV))
+#define M24CLK_DIV_2    ((0x1) << FShft(M24CLK_DIV))
+#define M24CLK_DIV_3    ((0x2) << FShft(M24CLK_DIV))
+#define M24CLK_DIV_4    ((0x3) << FShft(M24CLK_DIV))
+#define M24CLK_EN       (1 << 0)
+
+/* SDRAM clock control register */
+#define SDCLK_EN        (1 << 0)
+
+/* PixClk Divisor Register */
+#define PIXCLKDIV_PD    Fld(9,0)
+#define Pixclkdiv_Pd(x) ((x) << FShft(PIXCLKDIV_PD))
+
+/* LCD Config control register */
+#define LCDCFG_IN_FMT   Fld(3,28)
+#define Lcdcfg_In_Fmt(x)        ((x) << FShft(LCDCFG_IN_FMT))
+#define LCDCFG_LCD1DEN_POL      (1 << 27)
+#define LCDCFG_LCD1FCLK_POL     (1 << 26)
+#define LCDCFG_LCD1LCLK_POL     (1 << 25)
+#define LCDCFG_LCD1D_POL        (1 << 24)
+#define LCDCFG_LCD2DEN_POL      (1 << 23)
+#define LCDCFG_LCD2FCLK_POL     (1 << 22)
+#define LCDCFG_LCD2LCLK_POL     (1 << 21)
+#define LCDCFG_LCD2D_POL        (1 << 20)
+#define LCDCFG_LCD1_TS          (1 << 19)
+#define LCDCFG_LCD1D_DS         (1 << 18)
+#define LCDCFG_LCD1C_DS         (1 << 17)
+#define LCDCFG_LCD1_IS_IN       (1 << 16)
+#define LCDCFG_LCD2_TS          (1 << 3)
+#define LCDCFG_LCD2D_DS         (1 << 2)
+#define LCDCFG_LCD2C_DS         (1 << 1)
+#define LCDCFG_LCD2_IS_IN       (1 << 0)
+
+/* On-Die Frame Buffer Power Control Register */
+#define ODFBPWR_SLOW    (1 << 2)
+#define ODFBPWR_MODE    Fld(2,0)
+#define ODFBPWR_MODE_ACT        ((0x0) << FShft(ODFBPWR_MODE))
+#define ODFBPWR_MODE_ACT_LP     ((0x1) << FShft(ODFBPWR_MODE))
+#define ODFBPWR_MODE_SLEEP      ((0x2) << FShft(ODFBPWR_MODE))
+#define ODFBPWR_MODE_SHUTD      ((0x3) << FShft(ODFBPWR_MODE))
+
+/* On-Die Frame Buffer Power State Status Register */
+#define ODFBSTAT_ACT    (1 << 2)
+#define ODFBSTAT_SLP    (1 << 1)
+#define ODFBSTAT_SDN    (1 << 0)
+
+/* LMRST - Local Memory (SDRAM) Reset */
+#define LMRST_MC_RST    (1 << 0)
+
+/* LMCFG - Local Memory (SDRAM) Configuration Register */
+#define LMCFG_LMC_DS    (1 << 5)
+#define LMCFG_LMD_DS    (1 << 4)
+#define LMCFG_LMA_DS    (1 << 3)
+#define LMCFG_LMC_TS    (1 << 2)
+#define LMCFG_LMD_TS    (1 << 1)
+#define LMCFG_LMA_TS    (1 << 0)
+
+/* LMPWR - Local Memory (SDRAM) Power Control Register */
+#define LMPWR_MC_PWR_CNT        Fld(2,0)
+#define LMPWR_MC_PWR_ACT        ((0x0) << FShft(LMPWR_MC_PWR_CNT)) /* Active */
+#define LMPWR_MC_PWR_SRM        ((0x1) << FShft(LMPWR_MC_PWR_CNT)) /* Self-refresh */
+#define LMPWR_MC_PWR_DPD        ((0x3) << FShft(LMPWR_MC_PWR_CNT)) /* deep power down */
+
+/* LMPWRSTAT - Local Memory (SDRAM) Power Status Register */
+#define LMPWRSTAT_MC_PWR_CNT    Fld(2,0)
+#define LMPWRSTAT_MC_PWR_ACT    ((0x0) << FShft(LMPWRSTAT_MC_PWR_CNT)) /* Active */
+#define LMPWRSTAT_MC_PWR_SRM    ((0x1) << FShft(LMPWRSTAT_MC_PWR_CNT)) /* Self-refresh */
+#define LMPWRSTAT_MC_PWR_DPD    ((0x3) << FShft(LMPWRSTAT_MC_PWR_CNT)) /* deep power down */
+
+/* LMTYPE - Local Memory (SDRAM) Type Register */
+#define LMTYPE_CASLAT   Fld(3,10)
+#define LMTYPE_CASLAT_1 ((0x1) << FShft(LMTYPE_CASLAT))
+#define LMTYPE_CASLAT_2 ((0x2) << FShft(LMTYPE_CASLAT))
+#define LMTYPE_CASLAT_3 ((0x3) << FShft(LMTYPE_CASLAT))
+#define LMTYPE_BKSZ     Fld(2,8)
+#define LMTYPE_BKSZ_1   ((0x1) << FShft(LMTYPE_BKSZ))
+#define LMTYPE_BKSZ_2   ((0x2) << FShft(LMTYPE_BKSZ))
+#define LMTYPE_ROWSZ    Fld(4,4)
+#define LMTYPE_ROWSZ_11 ((0xb) << FShft(LMTYPE_ROWSZ))
+#define LMTYPE_ROWSZ_12 ((0xc) << FShft(LMTYPE_ROWSZ))
+#define LMTYPE_ROWSZ_13 ((0xd) << FShft(LMTYPE_ROWSZ))
+#define LMTYPE_COLSZ    Fld(4,0)
+#define LMTYPE_COLSZ_7  ((0x7) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_8  ((0x8) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_9  ((0x9) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_10 ((0xa) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_11 ((0xb) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_12 ((0xc) << FShft(LMTYPE_COLSZ))
+
+/* LMTIM - Local Memory (SDRAM) Timing Register */
+#define LMTIM_TRAS      Fld(4,16)
+#define Lmtim_Tras(x)   ((x) << FShft(LMTIM_TRAS))
+#define LMTIM_TRP       Fld(4,12)
+#define Lmtim_Trp(x)    ((x) << FShft(LMTIM_TRP))
+#define LMTIM_TRCD      Fld(4,8)
+#define Lmtim_Trcd(x)   ((x) << FShft(LMTIM_TRCD))
+#define LMTIM_TRC       Fld(4,4)
+#define Lmtim_Trc(x)    ((x) << FShft(LMTIM_TRC))
+#define LMTIM_TDPL      Fld(4,0)
+#define Lmtim_Tdpl(x)   ((x) << FShft(LMTIM_TDPL))
+
+/* LMREFRESH - Local Memory (SDRAM) tREF Control Register */
+#define LMREFRESH_TREF  Fld(2,0)
+#define Lmrefresh_Tref(x)       ((x) << FShft(LMREFRESH_TREF))
+
+/* GSCTRL - Graphics surface control register */
+#define GSCTRL_LUT_EN   (1 << 31)
+#define GSCTRL_GPIXFMT  Fld(4,27)
+#define GSCTRL_GPIXFMT_INDEXED  ((0x0) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_ARGB4444 ((0x4) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_ARGB1555 ((0x5) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_RGB888   ((0x6) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_RGB565   ((0x7) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_ARGB8888 ((0x8) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GAMMA_EN (1 << 26)
+
+#define GSCTRL_GSWIDTH Fld(11,11)
+#define Gsctrl_Width(Pixel)     /* Display Width [1..2048 pix.]  */ \
+                        (((Pixel) - 1) << FShft(GSCTRL_GSWIDTH))
+
+#define GSCTRL_GSHEIGHT Fld(11,0)
+#define Gsctrl_Height(Pixel)    /* Display Height [1..2048 pix.]  */ \
+                        (((Pixel) - 1) << FShft(GSCTRL_GSHEIGHT))
+
+/* GBBASE fileds */
+#define GBBASE_GLALPHA Fld(8,24)
+#define Gbbase_Glalpha(x)       ((x) << FShft(GBBASE_GLALPHA))
+
+#define GBBASE_COLKEY Fld(24,0)
+#define Gbbase_Colkey(x)        ((x) << FShft(GBBASE_COLKEY))
+
+/* GDRCTRL fields */
+#define GDRCTRL_PIXDBL  (1 << 31)
+#define GDRCTRL_PIXHLV  (1 << 30)
+#define GDRCTRL_LNDBL   (1 << 29)
+#define GDRCTRL_LNHLV   (1 << 28)
+#define GDRCTRL_COLKEYM Fld(24,0)
+#define Gdrctrl_Colkeym(x)      ((x) << FShft(GDRCTRL_COLKEYM))
+
+/* GSCADR graphics stream control address register fields */
+#define GSCADR_STR_EN   (1 << 31)
+#define GSCADR_COLKEY_EN        (1 << 30)
+#define GSCADR_COLKEYSCR        (1 << 29)
+#define GSCADR_BLEND_M  Fld(2,27)
+#define GSCADR_BLEND_NONE       ((0x0) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_INV        ((0x1) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_GLOB       ((0x2) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_PIX        ((0x3) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_POS        Fld(2,24)
+#define GSCADR_BLEND_GFX        ((0x0) << FShft(GSCADR_BLEND_POS))
+#define GSCADR_BLEND_VID        ((0x1) << FShft(GSCADR_BLEND_POS))
+#define GSCADR_BLEND_CUR        ((0x2) << FShft(GSCADR_BLEND_POS))
+#define GSCADR_GBASE_ADR        Fld(23,0)
+#define Gscadr_Gbase_Adr(x)     ((x) << FShft(GSCADR_GBASE_ADR))
+
+/* GSADR graphics stride address register fields */
+#define GSADR_SRCSTRIDE Fld(10,22)
+#define Gsadr_Srcstride(x)      ((x) << FShft(GSADR_SRCSTRIDE))
+#define GSADR_XSTART    Fld(11,11)
+#define Gsadr_Xstart(x)         ((x) << FShft(GSADR_XSTART))
+#define GSADR_YSTART    Fld(11,0)
+#define Gsadr_Ystart(y)         ((y) << FShft(GSADR_YSTART))
+
+/* GPLUT graphics palette register fields */
+#define GPLUT_LUTADR    Fld(8,24)
+#define Gplut_Lutadr(x) ((x) << FShft(GPLUT_LUTADR))
+#define GPLUT_LUTDATA   Fld(24,0)
+#define Gplut_Lutdata(x)        ((x) << FShft(GPLUT_LUTDATA))
+
+/* HCCTRL - Hardware Cursor Register fields */
+#define HCCTRL_CUR_EN   (1 << 31)
+#define HCCTRL_COLKEY_EN        (1 << 29)
+#define HCCTRL_COLKEYSRC        (1 << 28)
+#define HCCTRL_BLEND_M  Fld(2,26)
+#define HCCTRL_BLEND_NONE       ((0x0) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_BLEND_INV        ((0x1) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_BLEND_GLOB       ((0x2) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_BLEND_PIX        ((0x3) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_CPIXFMT  Fld(3,23)
+#define HCCTRL_CPIXFMT_RGB332   ((0x3) << FShft(HCCTRL_CPIXFMT))
+#define HCCTRL_CPIXFMT_ARGB4444 ((0x4) << FShft(HCCTRL_CPIXFMT))
+#define HCCTRL_CPIXFMT_ARGB1555 ((0x5) << FShft(HCCTRL_CPIXFMT))
+#define HCCTRL_CBASE_ADR        Fld(23,0)
+#define Hcctrl_Cbase_Adr(x)     ((x) << FShft(HCCTRL_CBASE_ADR))
+
+/* HCSIZE Hardware Cursor Size Register fields */
+#define HCSIZE_BLEND_POS        Fld(2,29)
+#define HCSIZE_BLEND_GFX        ((0x0) << FShft(HCSIZE_BLEND_POS))
+#define HCSIZE_BLEND_VID        ((0x1) << FShft(HCSIZE_BLEND_POS))
+#define HCSIZE_BLEND_CUR        ((0x2) << FShft(HCSIZE_BLEND_POS))
+#define HCSIZE_CWIDTH   Fld(3,16)
+#define Hcsize_Cwidth(x)        ((x) << FShft(HCSIZE_CWIDTH))
+#define HCSIZE_CHEIGHT  Fld(3,0)
+#define Hcsize_Cheight(x)       ((x) << FShft(HCSIZE_CHEIGHT))
+
+/* HCPOS Hardware Cursor Position Register fields */
+#define HCPOS_SWITCHSRC (1 << 30)
+#define HCPOS_CURBLINK  Fld(6,24)
+#define Hcpos_Curblink(x)       ((x) << FShft(HCPOS_CURBLINK))
+#define HCPOS_XSTART    Fld(12,12)
+#define Hcpos_Xstart(x) ((x) << FShft(HCPOS_XSTART))
+#define HCPOS_YSTART    Fld(12,0)
+#define Hcpos_Ystart(y) ((y) << FShft(HCPOS_YSTART))
+
+/* HCBADR Hardware Cursor Blend Address Register */
+#define HCBADR_GLALPHA  Fld(8,24)
+#define Hcbadr_Glalpha(x)       ((x) << FShft(HCBADR_GLALPHA))
+#define HCBADR_COLKEY   Fld(24,0)
+#define Hcbadr_Colkey(x)        ((x) << FShft(HCBADR_COLKEY))
+
+/* HCCKMSK - Hardware Cursor Color Key Mask Register */
+#define HCCKMSK_COLKEY_M        Fld(24,0)
+#define Hcckmsk_Colkey_M(x)     ((x) << FShft(HCCKMSK_COLKEY_M))
+
+/* DSCTRL - Display sync control register */
+#define DSCTRL_SYNCGEN_EN       (1 << 31)
+#define DSCTRL_DPL_RST          (1 << 29)
+#define DSCTRL_PWRDN_M          (1 << 28)
+#define DSCTRL_UPDSYNCCNT       (1 << 26)
+#define DSCTRL_UPDINTCNT        (1 << 25)
+#define DSCTRL_UPDCNT           (1 << 24)
+#define DSCTRL_UPDWAIT  Fld(4,16)
+#define Dsctrl_Updwait(x)       ((x) << FShft(DSCTRL_UPDWAIT))
+#define DSCTRL_CLKPOL           (1 << 11)
+#define DSCTRL_CSYNC_EN         (1 << 10)
+#define DSCTRL_VS_SLAVE         (1 << 7)
+#define DSCTRL_HS_SLAVE         (1 << 6)
+#define DSCTRL_BLNK_POL         (1 << 5)
+#define DSCTRL_BLNK_DIS         (1 << 4)
+#define DSCTRL_VS_POL           (1 << 3)
+#define DSCTRL_VS_DIS           (1 << 2)
+#define DSCTRL_HS_POL           (1 << 1)
+#define DSCTRL_HS_DIS           (1 << 0)
+
+/* DHT01 - Display horizontal timing register 01 */
+#define DHT01_HBPS      Fld(12,16)
+#define Dht01_Hbps(x)   ((x) << FShft(DHT01_HBPS))
+#define DHT01_HT        Fld(12,0)
+#define Dht01_Ht(x)     ((x) << FShft(DHT01_HT))
+
+/* DHT02 - Display horizontal timing register 02 */
+#define DHT02_HAS       Fld(12,16)
+#define Dht02_Has(x)    ((x) << FShft(DHT02_HAS))
+#define DHT02_HLBS      Fld(12,0)
+#define Dht02_Hlbs(x)   ((x) << FShft(DHT02_HLBS))
+
+/* DHT03 - Display horizontal timing register 03 */
+#define DHT03_HFPS      Fld(12,16)
+#define Dht03_Hfps(x)   ((x) << FShft(DHT03_HFPS))
+#define DHT03_HRBS      Fld(12,0)
+#define Dht03_Hrbs(x)   ((x) << FShft(DHT03_HRBS))
+
+/* DVT01 - Display vertical timing register 01 */
+#define DVT01_VBPS      Fld(12,16)
+#define Dvt01_Vbps(x)   ((x) << FShft(DVT01_VBPS))
+#define DVT01_VT        Fld(12,0)
+#define Dvt01_Vt(x)     ((x) << FShft(DVT01_VT))
+
+/* DVT02 - Display vertical timing register 02 */
+#define DVT02_VAS       Fld(12,16)
+#define Dvt02_Vas(x)    ((x) << FShft(DVT02_VAS))
+#define DVT02_VTBS      Fld(12,0)
+#define Dvt02_Vtbs(x)   ((x) << FShft(DVT02_VTBS))
+
+/* DVT03 - Display vertical timing register 03 */
+#define DVT03_VFPS      Fld(12,16)
+#define Dvt03_Vfps(x)   ((x) << FShft(DVT03_VFPS))
+#define DVT03_VBBS      Fld(12,0)
+#define Dvt03_Vbbs(x)   ((x) << FShft(DVT03_VBBS))
+
+/* DVECTRL - display vertical event control register */
+#define DVECTRL_VEVENT  Fld(12,16)
+#define Dvectrl_Vevent(x)       ((x) << FShft(DVECTRL_VEVENT))
+#define DVECTRL_VFETCH  Fld(12,0)
+#define Dvectrl_Vfetch(x)       ((x) << FShft(DVECTRL_VFETCH))
+
+/* DHDET - display horizontal DE timing register */
+#define DHDET_HDES      Fld(12,16)
+#define Dhdet_Hdes(x)   ((x) << FShft(DHDET_HDES))
+#define DHDET_HDEF      Fld(12,0)
+#define Dhdet_Hdef(x)   ((x) << FShft(DHDET_HDEF))
+
+/* DVDET - display vertical DE timing register */
+#define DVDET_VDES      Fld(12,16)
+#define Dvdet_Vdes(x)   ((x) << FShft(DVDET_VDES))
+#define DVDET_VDEF      Fld(12,0)
+#define Dvdet_Vdef(x)   ((x) << FShft(DVDET_VDEF))
+
+/* DODMSK - display output data mask register */
+#define DODMSK_MASK_LVL (1 << 31)
+#define DODMSK_BLNK_LVL (1 << 30)
+#define DODMSK_MASK_B   Fld(8,16)
+#define Dodmsk_Mask_B(x)        ((x) << FShft(DODMSK_MASK_B))
+#define DODMSK_MASK_G   Fld(8,8)
+#define Dodmsk_Mask_G(x)        ((x) << FShft(DODMSK_MASK_G))
+#define DODMSK_MASK_R   Fld(8,0)
+#define Dodmsk_Mask_R(x)        ((x) << FShft(DODMSK_MASK_R))
+
+/* DBCOL - display border color control register */
+#define DBCOL_BORDCOL   Fld(24,0)
+#define Dbcol_Bordcol(x)        ((x) << FShft(DBCOL_BORDCOL))
+
+/* DVLNUM - display vertical line number register */
+#define DVLNUM_VLINE    Fld(12,0)
+#define Dvlnum_Vline(x) ((x) << FShft(DVLNUM_VLINE))
+
+/* DMCTRL - Display Memory Control Register */
+#define DMCTRL_MEM_REF  Fld(2,30)
+#define DMCTRL_MEM_REF_ACT      ((0x0) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_MEM_REF_HB       ((0x1) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_MEM_REF_VB       ((0x2) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_MEM_REF_BOTH     ((0x3) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_UV_THRHLD        Fld(6,24)
+#define Dmctrl_Uv_Thrhld(x)     ((x) << FShft(DMCTRL_UV_THRHLD))
+#define DMCTRL_V_THRHLD         Fld(7,16)
+#define Dmctrl_V_Thrhld(x)      ((x) << FShft(DMCTRL_V_THRHLD))
+#define DMCTRL_D_THRHLD         Fld(7,8)
+#define Dmctrl_D_Thrhld(x)      ((x) << FShft(DMCTRL_D_THRHLD))
+#define DMCTRL_BURSTLEN Fld(6,0)
+#define Dmctrl_Burstlen(x)      ((x) << FShft(DMCTRL_BURSTLEN))
+
+
+/* DLSTS - display load status register */
+#define DLSTS_RLD_ADONE (1 << 23)
+/* #define DLSTS_RLD_ADOUT      Fld(23,0) */
+
+/* DLLCTRL - display list load control register */
+#define DLLCTRL_RLD_ADRLN       Fld(8,24)
+#define Dllctrl_Rld_Adrln(x)    ((x) << FShft(DLLCTRL_RLD_ADRLN))
+
+/* SPOCTRL - Scale Pitch/Order Control Register */
+#define SPOCTRL_H_SC_BP         (1 << 31)
+#define SPOCTRL_V_SC_BP         (1 << 30)
+#define SPOCTRL_HV_SC_OR        (1 << 29)
+#define SPOCTRL_VS_UR_C         (1 << 27)
+#define SPOCTRL_VORDER  Fld(2,16)
+#define SPOCTRL_VORDER_1TAP     ((0x0) << FShft(SPOCTRL_VORDER))
+#define SPOCTRL_VORDER_2TAP     ((0x1) << FShft(SPOCTRL_VORDER))
+#define SPOCTRL_VORDER_4TAP     ((0x3) << FShft(SPOCTRL_VORDER))
+#define SPOCTRL_VPITCH  Fld(16,0)
+#define Spoctrl_Vpitch(x)       ((x) << FShft(SPOCTRL_VPITCH))
+
+#endif /* __REG_BITS_2700G_ */
diff --git a/drivers/video/mbx/regs.h b/drivers/video/mbx/regs.h
new file mode 100644
index 000000000000..ad20be07666b
--- /dev/null
+++ b/drivers/video/mbx/regs.h
@@ -0,0 +1,195 @@
+#ifndef __REGS_2700G_
+#define __REGS_2700G_
+
+/* extern unsigned long virt_base_2700; */
+/* #define __REG_2700G(x)       (*(volatile unsigned long*)((x)+virt_base_2700)) */
+#define __REG_2700G(x)  ((x)+virt_base_2700)
+
+/* System Configuration Registers (0x0000_0000  0x0000_0010) */
+#define SYSCFG          __REG_2700G(0x00000000)
+#define PFBASE          __REG_2700G(0x00000004)
+#define PFCEIL          __REG_2700G(0x00000008)
+#define POLLFLAG        __REG_2700G(0x0000000c)
+#define SYSRST          __REG_2700G(0x00000010)
+
+/* Interrupt Control Registers (0x0000_0014  0x0000_002F) */
+#define NINTPW          __REG_2700G(0x00000014)
+#define MINTENABLE      __REG_2700G(0x00000018)
+#define MINTSTAT        __REG_2700G(0x0000001c)
+#define SINTENABLE      __REG_2700G(0x00000020)
+#define SINTSTAT        __REG_2700G(0x00000024)
+#define SINTCLR         __REG_2700G(0x00000028)
+
+/* Clock Control Registers (0x0000_002C  0x0000_005F) */
+#define SYSCLKSRC       __REG_2700G(0x0000002c)
+#define PIXCLKSRC       __REG_2700G(0x00000030)
+#define CLKSLEEP        __REG_2700G(0x00000034)
+#define COREPLL         __REG_2700G(0x00000038)
+#define DISPPLL         __REG_2700G(0x0000003c)
+#define PLLSTAT         __REG_2700G(0x00000040)
+#define VOVRCLK         __REG_2700G(0x00000044)
+#define PIXCLK          __REG_2700G(0x00000048)
+#define MEMCLK          __REG_2700G(0x0000004c)
+#define M24CLK          __REG_2700G(0x00000054)
+#define MBXCLK          __REG_2700G(0x00000054)
+#define SDCLK           __REG_2700G(0x00000058)
+#define PIXCLKDIV       __REG_2700G(0x0000005c)
+
+/* LCD Port Control Register (0x0000_0060  0x0000_006F) */
+#define LCD_CONFIG      __REG_2700G(0x00000060)
+
+/* On-Die Frame Buffer Registers (0x0000_0064  0x0000_006B) */
+#define ODFBPWR         __REG_2700G(0x00000064)
+#define ODFBSTAT        __REG_2700G(0x00000068)
+
+/* GPIO Registers (0x0000_006C  0x0000_007F) */
+#define GPIOCGF         __REG_2700G(0x0000006c)
+#define GPIOHI          __REG_2700G(0x00000070)
+#define GPIOLO          __REG_2700G(0x00000074)
+#define GPIOSTAT        __REG_2700G(0x00000078)
+
+/* Pulse Width Modulator (PWM) Registers (0x0000_0200  0x0000_02FF) */
+#define PWMRST          __REG_2700G(0x00000200)
+#define PWMCFG          __REG_2700G(0x00000204)
+#define PWM0DIV         __REG_2700G(0x00000210)
+#define PWM0DUTY        __REG_2700G(0x00000214)
+#define PWM0PER         __REG_2700G(0x00000218)
+#define PWM1DIV         __REG_2700G(0x00000220)
+#define PWM1DUTY        __REG_2700G(0x00000224)
+#define PWM1PER         __REG_2700G(0x00000228)
+
+/* Identification (ID) Registers (0x0000_0300  0x0000_0FFF) */
+#define ID              __REG_2700G(0x00000FF0)
+
+/* Local Memory (SDRAM) Interface Registers (0x0000_1000  0x0000_1FFF) */
+#define LMRST           __REG_2700G(0x00001000)
+#define LMCFG           __REG_2700G(0x00001004)
+#define LMPWR           __REG_2700G(0x00001008)
+#define LMPWRSTAT       __REG_2700G(0x0000100c)
+#define LMCEMR          __REG_2700G(0x00001010)
+#define LMTYPE          __REG_2700G(0x00001014)
+#define LMTIM           __REG_2700G(0x00001018)
+#define LMREFRESH       __REG_2700G(0x0000101c)
+#define LMPROTMIN       __REG_2700G(0x00001020)
+#define LMPROTMAX       __REG_2700G(0x00001024)
+#define LMPROTCFG       __REG_2700G(0x00001028)
+#define LMPROTERR       __REG_2700G(0x0000102c)
+
+/* Plane Controller Registers (0x0000_2000  0x0000_2FFF) */
+#define GSCTRL          __REG_2700G(0x00002000)
+#define VSCTRL          __REG_2700G(0x00002004)
+#define GBBASE          __REG_2700G(0x00002020)
+#define VBBASE          __REG_2700G(0x00002024)
+#define GDRCTRL         __REG_2700G(0x00002040)
+#define VCMSK           __REG_2700G(0x00002044)
+#define GSCADR          __REG_2700G(0x00002060)
+#define VSCADR          __REG_2700G(0x00002064)
+#define VUBASE          __REG_2700G(0x00002084)
+#define VVBASE          __REG_2700G(0x000020a4)
+#define GSADR           __REG_2700G(0x000020c0)
+#define VSADR           __REG_2700G(0x000020c4)
+#define HCCTRL          __REG_2700G(0x00002100)
+#define HCSIZE          __REG_2700G(0x00002110)
+#define HCPOS           __REG_2700G(0x00002120)
+#define HCBADR          __REG_2700G(0x00002130)
+#define HCCKMSK         __REG_2700G(0x00002140)
+#define GPLUT           __REG_2700G(0x00002150)
+#define DSCTRL          __REG_2700G(0x00002154)
+#define DHT01           __REG_2700G(0x00002158)
+#define DHT02           __REG_2700G(0x0000215c)
+#define DHT03           __REG_2700G(0x00002160)
+#define DVT01           __REG_2700G(0x00002164)
+#define DVT02           __REG_2700G(0x00002168)
+#define DVT03           __REG_2700G(0x0000216c)
+#define DBCOL           __REG_2700G(0x00002170)
+#define BGCOLOR         __REG_2700G(0x00002174)
+#define DINTRS          __REG_2700G(0x00002178)
+#define DINTRE          __REG_2700G(0x0000217c)
+#define DINTRCNT        __REG_2700G(0x00002180)
+#define DSIG            __REG_2700G(0x00002184)
+#define DMCTRL          __REG_2700G(0x00002188)
+#define CLIPCTRL        __REG_2700G(0x0000218c)
+#define SPOCTRL         __REG_2700G(0x00002190)
+#define SVCTRL          __REG_2700G(0x00002194)
+
+/* 0x0000_2198 */
+/* 0x0000_21A8 VSCOEFF[0:4] Video Scalar Vertical Coefficient [0:4] 4.14.5 */
+#define VSCOEFF0        __REG_2700G(0x00002198)
+#define VSCOEFF1        __REG_2700G(0x0000219c)
+#define VSCOEFF2        __REG_2700G(0x000021a0)
+#define VSCOEFF3        __REG_2700G(0x000021a4)
+#define VSCOEFF4        __REG_2700G(0x000021a8)
+
+#define SHCTRL          __REG_2700G(0x000021b0)
+
+/* 0x0000_21B4 */
+/* 0x0000_21D4 HSCOEFF[0:8] Video Scalar Horizontal Coefficient [0:8] 4.14.7 */
+#define HSCOEFF0        __REG_2700G(0x000021b4)
+#define HSCOEFF1        __REG_2700G(0x000021b8)
+#define HSCOEFF2        __REG_2700G(0x000021bc)
+#define HSCOEFF3        __REG_2700G(0x000021b0)
+#define HSCOEFF4        __REG_2700G(0x000021c4)
+#define HSCOEFF5        __REG_2700G(0x000021c8)
+#define HSCOEFF6        __REG_2700G(0x000021cc)
+#define HSCOEFF7        __REG_2700G(0x000021d0)
+#define HSCOEFF8        __REG_2700G(0x000021d4)
+
+#define SSSIZE          __REG_2700G(0x000021D8)
+
+/* 0x0000_2200 */
+/* 0x0000_2240 VIDGAM[0:16] Video Gamma LUT Index [0:16] 4.15.2 */
+#define VIDGAM0         __REG_2700G(0x00002200)
+#define VIDGAM1         __REG_2700G(0x00002204)
+#define VIDGAM2         __REG_2700G(0x00002208)
+#define VIDGAM3         __REG_2700G(0x0000220c)
+#define VIDGAM4         __REG_2700G(0x00002210)
+#define VIDGAM5         __REG_2700G(0x00002214)
+#define VIDGAM6         __REG_2700G(0x00002218)
+#define VIDGAM7         __REG_2700G(0x0000221c)
+#define VIDGAM8         __REG_2700G(0x00002220)
+#define VIDGAM9         __REG_2700G(0x00002224)
+#define VIDGAM10        __REG_2700G(0x00002228)
+#define VIDGAM11        __REG_2700G(0x0000222c)
+#define VIDGAM12        __REG_2700G(0x00002230)
+#define VIDGAM13        __REG_2700G(0x00002234)
+#define VIDGAM14        __REG_2700G(0x00002238)
+#define VIDGAM15        __REG_2700G(0x0000223c)
+#define VIDGAM16        __REG_2700G(0x00002240)
+
+/* 0x0000_2250 */
+/* 0x0000_2290 GFXGAM[0:16] Graphics Gamma LUT Index [0:16] 4.15.3 */
+#define GFXGAM0         __REG_2700G(0x00002250)
+#define GFXGAM1         __REG_2700G(0x00002254)
+#define GFXGAM2         __REG_2700G(0x00002258)
+#define GFXGAM3         __REG_2700G(0x0000225c)
+#define GFXGAM4         __REG_2700G(0x00002260)
+#define GFXGAM5         __REG_2700G(0x00002264)
+#define GFXGAM6         __REG_2700G(0x00002268)
+#define GFXGAM7         __REG_2700G(0x0000226c)
+#define GFXGAM8         __REG_2700G(0x00002270)
+#define GFXGAM9         __REG_2700G(0x00002274)
+#define GFXGAM10        __REG_2700G(0x00002278)
+#define GFXGAM11        __REG_2700G(0x0000227c)
+#define GFXGAM12        __REG_2700G(0x00002280)
+#define GFXGAM13        __REG_2700G(0x00002284)
+#define GFXGAM14        __REG_2700G(0x00002288)
+#define GFXGAM15        __REG_2700G(0x0000228c)
+#define GFXGAM16        __REG_2700G(0x00002290)
+
+#define DLSTS           __REG_2700G(0x00002300)
+#define DLLCTRL         __REG_2700G(0x00002304)
+#define DVLNUM          __REG_2700G(0x00002308)
+#define DUCTRL          __REG_2700G(0x0000230c)
+#define DVECTRL         __REG_2700G(0x00002310)
+#define DHDET           __REG_2700G(0x00002314)
+#define DVDET           __REG_2700G(0x00002318)
+#define DODMSK          __REG_2700G(0x0000231c)
+#define CSC01           __REG_2700G(0x00002330)
+#define CSC02           __REG_2700G(0x00002334)
+#define CSC03           __REG_2700G(0x00002338)
+#define CSC04           __REG_2700G(0x0000233c)
+#define CSC05           __REG_2700G(0x00002340)
+
+#define FB_MEMORY_START __REG_2700G(0x00060000)
+
+#endif /* __REGS_2700G_ */
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index ff5454601e22..d1267904c280 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/sched.h>
 
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 773855a311e8..59a6f5fa5ae6 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -59,7 +59,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index 1c1c10c699c5..b45f577094ac 100644
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -26,9 +26,11 @@
  */
 #define MIN_LEVEL 0x158
 #define MAX_LEVEL 0x534
+#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)
 
 static struct backlight_properties nvidia_bl_data;
 
+/* Call with fb_info->bl_mutex held */
 static int nvidia_bl_get_level_brightness(struct nvidia_par *par,
                 int level)
 {
@@ -36,9 +38,7 @@ static int nvidia_bl_get_level_brightness(struct nvidia_par *par,
         int nlevel;
 
         /* Get and convert the value */
-        mutex_lock(&info->bl_mutex);
-        nlevel = info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL;
-        mutex_unlock(&info->bl_mutex);
+        nlevel = MIN_LEVEL + info->bl_curve[level] * LEVEL_STEP;
 
         if (nlevel < 0)
                 nlevel = 0;
@@ -50,7 +50,8 @@ static int nvidia_bl_get_level_brightness(struct nvidia_par *par,
         return nlevel;
 }
 
-static int nvidia_bl_update_status(struct backlight_device *bd)
+/* Call with fb_info->bl_mutex held */
+static int __nvidia_bl_update_status(struct backlight_device *bd)
 {
         struct nvidia_par *par = class_get_devdata(&bd->class_dev);
         u32 tmp_pcrt, tmp_pmc, fpcontrol;
@@ -84,6 +85,19 @@ static int nvidia_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
+static int nvidia_bl_update_status(struct backlight_device *bd)
+{
+        struct nvidia_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pci_dev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __nvidia_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
 static int nvidia_bl_get_brightness(struct backlight_device *bd)
 {
         return bd->props->brightness;
@@ -96,6 +110,16 @@ static struct backlight_properties nvidia_bl_data = {
         .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
+void nvidia_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+        up(&info->bl_dev->sem);
+        info->bl_dev->props->power = power;
+        __nvidia_bl_update_status(info->bl_dev);
+        down(&info->bl_dev->sem);
+        mutex_unlock(&info->bl_mutex);
+}
+
 void nvidia_bl_init(struct nvidia_par *par)
 {
         struct fb_info *info = pci_get_drvdata(par->pci_dev);
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index 6fba656cd56b..861271017655 100644
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
@@ -68,9 +68,11 @@ extern u8 byte_rev[256];
 #ifdef CONFIG_FB_NVIDIA_BACKLIGHT
 extern void nvidia_bl_init(struct nvidia_par *par);
 extern void nvidia_bl_exit(struct nvidia_par *par);
+extern void nvidia_bl_set_power(struct fb_info *info, int power);
 #else
 static inline void nvidia_bl_init(struct nvidia_par *par) {}
 static inline void nvidia_bl_exit(struct nvidia_par *par) {}
+static inline void nvidia_bl_set_power(struct fb_info *info, int power) {}
 #endif
 
 #endif                          /* __NV_PROTO_H__ */
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index b02d6033cc0c..d4f850117874 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -35,10 +34,6 @@
 #include "nv_proto.h"
 #include "nv_dma.h"
 
-#ifndef CONFIG_PCI              /* sanity check */
-#error This driver requires PCI support.
-#endif
-
 #undef CONFIG_FB_NVIDIA_DEBUG
 #ifdef CONFIG_FB_NVIDIA_DEBUG
 #define NVTRACE          printk
@@ -933,16 +928,7 @@ static int nvidiafb_blank(int blank, struct fb_info *info)
         NVWriteSeq(par, 0x01, tmp);
         NVWriteCrtc(par, 0x1a, vesa);
 
-#ifdef CONFIG_FB_NVIDIA_BACKLIGHT
-        mutex_lock(&info->bl_mutex);
-        if (info->bl_dev) {
-                down(&info->bl_dev->sem);
-                info->bl_dev->props->power = blank;
-                info->bl_dev->props->update_status(info->bl_dev);
-                up(&info->bl_dev->sem);
-        }
-        mutex_unlock(&info->bl_mutex);
-#endif
+        nvidia_bl_set_power(info, blank);
 
         NVTRACE_LEAVE();
 
@@ -1313,20 +1299,19 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 
         nvidia_save_vga(par, &par->SavedReg);
 
+        pci_set_drvdata(pd, info);
+        nvidia_bl_init(par);
         if (register_framebuffer(info) < 0) {
                 printk(KERN_ERR PFX "error registering nVidia framebuffer\n");
                 goto err_out_iounmap_fb;
         }
 
-        pci_set_drvdata(pd, info);
 
         printk(KERN_INFO PFX
                "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",
                info->fix.id,
                par->FbMapSize / (1024 * 1024), info->fix.smem_start);
 
-        nvidia_bl_init(par);
-
         NVTRACE_LEAVE();
         return 0;
 
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 0e750a8510fc..bad0e98fb3b6 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -17,7 +17,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 450e802e0aa8..983be3ec2345 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -22,7 +22,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 49a203e1591c..a560a2223825 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -33,7 +33,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 0e0f977b05ee..1d81ef47efd3 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -57,7 +57,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c
index d92f352211ef..68ca3cc40770 100644
--- a/drivers/video/pmag-aa-fb.c
+++ b/drivers/video/pmag-aa-fb.c
@@ -29,7 +29,6 @@
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 4a1e0e856920..940ba2be55e9 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -53,7 +53,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index fc91dbf896d2..48536c3e58a4 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index 5e2c64f622cb..cf41ff177644 100644
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -25,7 +25,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 6a30c0ca1de0..9823ba939e11 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -34,7 +34,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -278,9 +277,11 @@ static const struct riva_regs reg_template = {
  */
 #define MIN_LEVEL 0x158
 #define MAX_LEVEL 0x534
+#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)
 
 static struct backlight_properties riva_bl_data;
 
+/* Call with fb_info->bl_mutex held */
 static int riva_bl_get_level_brightness(struct riva_par *par,
                 int level)
 {
@@ -288,9 +289,7 @@ static int riva_bl_get_level_brightness(struct riva_par *par,
         int nlevel;
 
         /* Get and convert the value */
-        mutex_lock(&info->bl_mutex);
-        nlevel = info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL;
-        mutex_unlock(&info->bl_mutex);
+        nlevel = MIN_LEVEL + info->bl_curve[level] * LEVEL_STEP;
 
         if (nlevel < 0)
                 nlevel = 0;
@@ -302,7 +301,8 @@ static int riva_bl_get_level_brightness(struct riva_par *par,
         return nlevel;
 }
 
-static int riva_bl_update_status(struct backlight_device *bd)
+/* Call with fb_info->bl_mutex held */
+static int __riva_bl_update_status(struct backlight_device *bd)
 {
         struct riva_par *par = class_get_devdata(&bd->class_dev);
         U032 tmp_pcrt, tmp_pmc;
@@ -327,6 +327,19 @@ static int riva_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
+static int riva_bl_update_status(struct backlight_device *bd)
+{
+        struct riva_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __riva_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
 static int riva_bl_get_brightness(struct backlight_device *bd)
 {
         return bd->props->brightness;
@@ -339,6 +352,16 @@ static struct backlight_properties riva_bl_data = {
         .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
+static void riva_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+        up(&info->bl_dev->sem);
+        info->bl_dev->props->power = power;
+        __riva_bl_update_status(info->bl_dev);
+        down(&info->bl_dev->sem);
+        mutex_unlock(&info->bl_mutex);
+}
+
 static void riva_bl_init(struct riva_par *par)
 {
         struct fb_info *info = pci_get_drvdata(par->pdev);
@@ -419,6 +442,7 @@ static void riva_bl_exit(struct riva_par *par)
 #else
 static inline void riva_bl_init(struct riva_par *par) {}
 static inline void riva_bl_exit(struct riva_par *par) {}
+static inline void riva_bl_set_power(struct fb_info *info, int power) {}
 #endif /* CONFIG_FB_RIVA_BACKLIGHT */
 
 /* ------------------------------------------------------------------------- *
@@ -1337,16 +1361,7 @@ static int rivafb_blank(int blank, struct fb_info *info)
         SEQout(par, 0x01, tmp);
         CRTCout(par, 0x1a, vesa);
 
-#ifdef CONFIG_FB_RIVA_BACKLIGHT
-        mutex_lock(&info->bl_mutex);
-        if (info->bl_dev) {
-                down(&info->bl_dev->sem);
-                info->bl_dev->props->power = blank;
-                info->bl_dev->props->update_status(info->bl_dev);
-                up(&info->bl_dev->sem);
-        }
-        mutex_unlock(&info->bl_mutex);
-#endif
+        riva_bl_set_power(info, blank);
 
         NVTRACE_LEAVE();
 
@@ -2116,6 +2131,9 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
 
         fb_destroy_modedb(info->monspecs.modedb);
         info->monspecs.modedb = NULL;
+
+        pci_set_drvdata(pd, info);
+        riva_bl_init(info->par);
         ret = register_framebuffer(info);
         if (ret < 0) {
                 printk(KERN_ERR PFX
@@ -2123,8 +2141,6 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
                 goto err_iounmap_screen_base;
         }
 
-        pci_set_drvdata(pd, info);
-
         printk(KERN_INFO PFX
                 "PCI nVidia %s framebuffer ver %s (%dMB @ 0x%lX)\n",
                 info->fix.id,
@@ -2132,8 +2148,6 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
                 info->fix.smem_len / (1024 * 1024),
                 info->fix.smem_start);
 
-        riva_bl_init(info->par);
-
         NVTRACE_LEAVE();
         return 0;
 
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index f461eb10cc79..ad3bdd6f1ac1 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -76,7 +76,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 4729af477fbf..461e094e7b45 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -46,7 +46,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index b848ca7db7f9..895ebda7d9e3 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -44,7 +44,13 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
 #include <linux/tty.h>
+#else
+#include <linux/screen_info.h>
+#endif
+
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/selection.h>
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 67f429e93189..bb96cb65fdaa 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -47,7 +47,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c
index e046e20f02b9..f80356dfa8e8 100644
--- a/drivers/video/sun3fb.c
+++ b/drivers/video/sun3fb.c
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 239b1496874b..689ce0270b81 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -63,7 +63,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 6c2c78ab9827..94fde625a6c0 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -17,7 +17,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c
index d904da44e1aa..07389ba01eff 100644
--- a/drivers/video/tx3912fb.c
+++ b/drivers/video/tx3912fb.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 1d76c035050e..47f27924a7d7 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -44,7 +44,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 5718924b677f..2196448396ec 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -13,13 +13,13 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 
 #include <video/vga.h>
 #include <asm/io.h>
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index d073ffb6e1f9..a9b99b01bd8e 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 3c404c9bd36c..43d5a6d9c4a6 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -15,13 +15,13 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 
 #include <asm/io.h>
 #include <video/vga.h>
diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 5ea2345dab99..64378959dd7b 100644
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -39,7 +39,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/zorro.h>