Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

174 files changed, 25135 insertions, 3323 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 9b887ef64ff1..0f13448c6f79 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -76,6 +76,14 @@ config FB_DDC
        select I2C
        default n
 
+config FB_BOOT_VESA_SUPPORT
+        bool
+        depends on FB
+        default n
+        ---help---
+          If true, at least one selected framebuffer driver can take advantage
+          of VESA video modes set at an early boot stage via the vga= parameter.
+
 config FB_CFB_FILLRECT
         tristate
         depends on FB
@@ -172,11 +180,6 @@ config FB_DEFERRED_IO
         bool
         depends on FB
 
-config FB_METRONOME
-        tristate
-        depends on FB
-        depends on FB_DEFERRED_IO
-
 config FB_HECUBA
         tristate
         depends on FB
@@ -259,16 +262,24 @@ config FB_PM2
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
-          This is the frame buffer device driver for the Permedia2 AGP frame
-          buffer card from ASK, aka `Graphic Blaster Exxtreme'.  There is a
-          product page at
-          <http://www.ask.com.hk/product/Permedia%202/permedia2.htm>.
+          This is the frame buffer device driver for cards based on
+          the 3D Labs Permedia, Permedia 2 and Permedia 2V chips.
+          The driver was tested on the following cards:
+                Diamond FireGL 1000 PRO AGP
+                ELSA Gloria Synergy PCI
+                Appian Jeronimo PRO (both heads) PCI
+                3DLabs Oxygen ACX aka EONtronics Picasso P2 PCI
+                Techsource Raptor GFX-8P (aka Sun PGX-32) on SPARC
+                ASK Graphic Blaster Exxtreme AGP
+
+          To compile this driver as a module, choose M here: the
+          module will be called pm2fb.
 
 config FB_PM2_FIFO_DISCONNECT
         bool "enable FIFO disconnect feature"
         depends on FB_PM2 && PCI
         help
-          Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2).
+          Support the Permedia2 FIFO disconnect feature.
 
 config FB_ARMCLCD
         tristate "ARM PrimeCell PL110 support"
@@ -678,7 +689,7 @@ config FB_VESA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select VIDEO_SELECT
+        select FB_BOOT_VESA_SUPPORT
         help
           This is the frame buffer device driver for generic VESA 2.0
           compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -687,23 +698,14 @@ config FB_VESA
 
 config FB_EFI
         bool "EFI-based Framebuffer Support"
-        depends on (FB = y) && X86
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        help
-          This is the EFI frame buffer device driver. If the firmware on
-          your platform is UEFI2.0, select Y to add support for
-          Graphics Output Protocol for early console messages to appear.
-
-config FB_IMAC
-        bool "Intel-based Macintosh Framebuffer Support"
         depends on (FB = y) && X86 && EFI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
-          This is the frame buffer device driver for the Intel-based Macintosh
+          This is the EFI frame buffer device driver. If the firmware on
+          your platform is EFI 1.10 or UEFI 2.0, select Y to add support for
+          using the EFI framebuffer as your console.
 
 config FB_N411
        tristate "N411 Apollo/Hecuba devkit support"
@@ -1124,6 +1126,7 @@ config FB_INTEL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select FB_BOOT_VESA_SUPPORT
         help
           This driver supports the on-board graphics built in to the Intel
           830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
@@ -1476,6 +1479,7 @@ config FB_SIS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select FB_BOOT_VESA_SUPPORT
         help
           This is the frame buffer device driver for the SiS 300, 315, 330
           and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.
@@ -1498,6 +1502,24 @@ config FB_SIS_315
           (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760, 761) as well
           as XGI V3XT, V5, V8 and Z7.
 
+config FB_VIA
+       tristate "VIA UniChrome (Pro) and Chrome9 display support"
+       depends on FB && PCI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select FB_SOFT_CURSOR
+       select I2C_ALGOBIT
+       select I2C
+       help
+          This is the frame buffer device driver for Graphics chips of VIA
+          UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
+          CN700/VN800,CX700/VX700,P4M890) and Chrome9 Family (K8M890,CN896
+          /P4M900,VX800)
+          Say Y if you have a VIA UniChrome graphics board.
+
+          To compile this driver as a module, choose M here: the
+          module will be called viafb.
 config FB_NEOMAGIC
         tristate "NeoMagic display support"
         depends on FB && PCI
@@ -1527,25 +1549,25 @@ config FB_KYRO
           module will be called kyrofb.
 
 config FB_3DFX
-        tristate "3Dfx Banshee/Voodoo3 display support"
+        tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"
         depends on FB && PCI
         select FB_CFB_IMAGEBLIT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         help
-          This driver supports graphics boards with the 3Dfx Banshee/Voodoo3
-          chips. Say Y if you have such a graphics board.
+          This driver supports graphics boards with the 3Dfx Banshee,
+          Voodoo3 or VSA-100 (aka Voodoo4/5) chips. Say Y if you have
+          such a graphics board.
 
           To compile this driver as a module, choose M here: the
           module will be called tdfxfb.
 
 config FB_3DFX_ACCEL
-        bool "3Dfx Banshee/Voodoo3 Acceleration functions (EXPERIMENTAL)"
+        bool "3Dfx Acceleration functions (EXPERIMENTAL)"
         depends on FB_3DFX && EXPERIMENTAL
         ---help---
-        This will compile the 3Dfx Banshee/Voodoo3 frame buffer device
-        with acceleration functions.
-
+        This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
+        device driver with acceleration functions.
 
 config FB_VOODOO1
         tristate "3Dfx Voodoo Graphics (sst1) support"
@@ -1583,7 +1605,6 @@ config FB_CYBLA
         tristate "Cyberblade/i1 support"
         depends on FB && PCI && X86_32 && !64BIT
         select FB_CFB_IMAGEBLIT
-        select VIDEO_SELECT
         ---help---
           This driver is supposed to support the Trident Cyberblade/i1
           graphics core integrated in the VIA VT8601A North Bridge,
@@ -1611,17 +1632,16 @@ config FB_TRIDENT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         ---help---
-          This driver is supposed to support graphics boards with the
-          Trident CyberXXXX/Image/CyberBlade chips mostly found in laptops
+          This is the frame buffer device driver for Trident PCI/AGP chipsets.
+          Supported chipset families are TGUI 9440/96XX, 3DImage, Blade3D
+          and Blade XP.
+          There are also integrated versions of these chips called CyberXXXX,
+          CyberImage or CyberBlade. These chips are mostly found in laptops
           but also on some motherboards. For more information, read
           <file:Documentation/fb/tridentfb.txt>
 
-          Cyberblade/i1 support will be removed soon, use the cyblafb driver
-          instead.
-
           Say Y if you have such a graphics board.
 
-
           To compile this driver as a module, choose M here: the
           module will be called tridentfb.
 
@@ -1658,6 +1678,32 @@ config FB_PM3
           similar boards, 3DLabs Permedia3 Create!, Appian Jeronimo 2000
           and maybe other boards.
 
+config FB_CARMINE
+        tristate "Fujitsu carmine frame buffer support"
+        depends on FB && PCI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the frame buffer device driver for the Fujitsu Carmine chip.
+          The driver provides two independent frame buffer devices.
+
+choice
+        depends on FB_CARMINE
+        prompt "DRAM timing"
+        default FB_CARMINE_DRAM_EVAL
+
+config FB_CARMINE_DRAM_EVAL
+        bool "Eval board timings"
+        help
+          Use timings which work on the eval card.
+
+config CARMINE_DRAM_CUSTOM
+        bool "Custom board timings"
+        help
+          Use custom board timings.
+endchoice
+
 config FB_AU1100
         bool "Au1100 LCD Driver"
         depends on (FB = y) && MIPS && SOC_AU1100
@@ -1840,6 +1886,38 @@ config FB_W100
 
           If unsure, say N.
 
+config FB_SH_MOBILE_LCDC
+        tristate "SuperH Mobile LCDC framebuffer support"
+        depends on FB && SUPERH
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        default m
+        ---help---
+          Frame buffer driver for the on-chip SH-Mobile LCD controller.
+
+config FB_TMIO
+        tristate "Toshiba Mobile IO FrameBuffer support"
+        depends on FB && MFD_CORE
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for the Toshiba Mobile IO integrated as found
+          on the Sharp SL-6000 series
+
+          This driver is also available as a module ( = code which can be
+          inserted and removed from the running kernel whenever you want). The
+          module will be called tmiofb. If you want to compile it as a module,
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+
+          If unsure, say N.
+
+config FB_TMIO_ACCELL
+        bool "tmiofb acceleration"
+        depends on FB_TMIO
+        default y
+
 config FB_S3C2410
         tristate "S3C2410 LCD framebuffer support"
         depends on FB && ARCH_S3C2410
@@ -1938,18 +2016,22 @@ config FB_XILINX
           framebuffer. ML300 carries a 640*480 LCD display on the board,
           ML403 uses a standard DB15 VGA connector.
 
-config FB_AM200EPD
-       tristate "AM-200 E-Ink EPD devkit support"
-       depends on FB && ARCH_PXA && MMU
-       select FB_SYS_FILLRECT
-       select FB_SYS_COPYAREA
-       select FB_SYS_IMAGEBLIT
-       select FB_SYS_FOPS
-       select FB_DEFERRED_IO
-       select FB_METRONOME
+config FB_COBALT
+        tristate "Cobalt server LCD frame buffer support"
+        depends on FB && MIPS_COBALT
+
+config FB_SH7760
+       bool "SH7760/SH7763 LCDC support"
+       depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763)
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
        help
-         This enables support for the Metronome display controller used on
-         the E-Ink AM-200 EPD devkit.
+         Support for the SH7760/SH7763 integrated (D)STN/TFT LCD Controller.
+         Supports display resolutions up to 1024x1024 pixel, grayscale and
+         color operation, with depths ranging from 1 bpp to 8 bpp monochrome
+         and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
+         panels <= 320 pixel horizontal resolution.
 
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
@@ -1988,6 +2070,19 @@ config XEN_FBDEV_FRONTEND
           frame buffer driver.  It communicates with a back-end
           in another domain.
 
+config FB_METRONOME
+        tristate "E-Ink Metronome/8track controller support"
+        depends on FB
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        select FB_DEFERRED_IO
+        help
+          This driver implements support for the E-Ink Metronome
+          controller. The pre-release name for this device was 8track
+          and could also have been called by some vendors as PVI-nnnn.
+
 source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 04bca35403ff..248bddc8d0b0 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
 
 # Hardware specific drivers go first
 obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
-obj-$(CONFIG_FB_AM200EPD)         += am200epd.o
 obj-$(CONFIG_FB_ARC)              += arcfb.o
 obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
 obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
@@ -43,6 +42,7 @@ obj-$(CONFIG_FB_ATY)		  += aty/ macmodes.o
 obj-$(CONFIG_FB_ATY128)           += aty/ macmodes.o
 obj-$(CONFIG_FB_RADEON)           += aty/
 obj-$(CONFIG_FB_SIS)              += sis/
+obj-$(CONFIG_FB_VIA)              += via/
 obj-$(CONFIG_FB_KYRO)             += kyro/
 obj-$(CONFIG_FB_SAVAGE)           += savage/
 obj-$(CONFIG_FB_GEODE)            += geode/
@@ -98,6 +98,7 @@ obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
 obj-$(CONFIG_FB_ASILIANT)         += asiliantfb.o
 obj-$(CONFIG_FB_PXA)              += pxafb.o
 obj-$(CONFIG_FB_W100)             += w100fb.o
+obj-$(CONFIG_FB_TMIO)             += tmiofb.o
 obj-$(CONFIG_FB_AU1100)           += au1100fb.o
 obj-$(CONFIG_FB_AU1200)           += au1200fb.o
 obj-$(CONFIG_FB_PMAG_AA)          += pmag-aa-fb.o
@@ -106,22 +107,25 @@ obj-$(CONFIG_FB_PMAGB_B)	  += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
 obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
+obj-$(CONFIG_FB_SH7760)           += sh7760fb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
 obj-$(CONFIG_FB_FSL_DIU)          += fsl-diu-fb.o
+obj-$(CONFIG_FB_COBALT)           += cobalt_lcdfb.o
 obj-$(CONFIG_FB_PNX4008_DUM)      += pnx4008/
 obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
 obj-$(CONFIG_FB_IBM_GXT4500)      += gxt4500.o
 obj-$(CONFIG_FB_PS3)              += ps3fb.o
 obj-$(CONFIG_FB_SM501)            += sm501fb.o
 obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
+obj-$(CONFIG_FB_SH_MOBILE_LCDC)   += sh_mobile_lcdcfb.o
 obj-$(CONFIG_FB_OMAP)             += omap/
 obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
+obj-$(CONFIG_FB_CARMINE)          += carminefb.o
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
 obj-$(CONFIG_FB_VESA)             += vesafb.o
-obj-$(CONFIG_FB_IMAC)             += imacfb.o
 obj-$(CONFIG_FB_EFI)              += efifb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index eedb8285e32f..61c3d3f40fd1 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -23,12 +23,13 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/fb.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -338,7 +339,7 @@ acornfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 #endif
 
 #ifdef HAS_VIDC20
-#include <asm/arch/acornfb.h>
+#include <mach/acornfb.h>
 
 #define MAX_SIZE        2*1024*1024
 
diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c
deleted file mode 100644
index 51e26c1f5e8b..000000000000
--- a/drivers/video/am200epd.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
- *
- * Copyright (C) 2008, Jaya Kumar
- *
- * 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.
- *
- * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
- *
- * This work was made possible by help and equipment support from E-Ink
- * Corporation. http://support.eink.com/community
- *
- * This driver is written to be used with the Metronome display controller.
- * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600
- * Vizplex EPD on a Gumstix board using the Lyre interface board.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/list.h>
-#include <linux/uaccess.h>
-#include <linux/irq.h>
-
-#include <video/metronomefb.h>
-
-#include <asm/arch/pxa-regs.h>
-
-/* register offsets for gpio control */
-#define LED_GPIO_PIN 51
-#define STDBY_GPIO_PIN 48
-#define RST_GPIO_PIN 49
-#define RDY_GPIO_PIN 32
-#define ERR_GPIO_PIN 17
-#define PCBPWR_GPIO_PIN 16
-
-#define AF_SEL_GPIO_N 0x3
-#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
-#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
-#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
-#define GPDR1_OFFSET(pin) (pin - 32)
-#define GPCR1_OFFSET(pin) (pin - 32)
-#define GPSR1_OFFSET(pin) (pin - 32)
-#define GPCR0_OFFSET(pin) (pin)
-#define GPSR0_OFFSET(pin) (pin)
-
-static void am200_set_gpio_output(int pin, int val)
-{
-        u8 index;
-
-        index = pin >> 4;
-
-        switch (index) {
-        case 1:
-                if (val)
-                        GPSR0 |= (1 << GPSR0_OFFSET(pin));
-                else
-                        GPCR0 |= (1 << GPCR0_OFFSET(pin));
-                break;
-        case 2:
-                break;
-        case 3:
-                if (val)
-                        GPSR1 |= (1 << GPSR1_OFFSET(pin));
-                else
-                        GPCR1 |= (1 << GPCR1_OFFSET(pin));
-                break;
-        default:
-                printk(KERN_ERR "unimplemented\n");
-        }
-}
-
-static void __devinit am200_init_gpio_pin(int pin, int dir)
-{
-        u8 index;
-        /* dir 0 is output, 1 is input
-        - do 2 things here:
-        - set gpio alternate function to standard gpio
-        - set gpio direction to input or output  */
-
-        index = pin >> 4;
-        switch (index) {
-        case 1:
-                GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
-
-                if (dir)
-                        GPDR0 &= ~(1 << pin);
-                else
-                        GPDR0 |= (1 << pin);
-                break;
-        case 2:
-                GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
-
-                if (dir)
-                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-                else
-                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
-                break;
-        case 3:
-                GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
-
-                if (dir)
-                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-                else
-                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
-                break;
-        default:
-                printk(KERN_ERR "unimplemented\n");
-        }
-}
-
-static void am200_init_gpio_regs(struct metronomefb_par *par)
-{
-        am200_init_gpio_pin(LED_GPIO_PIN, 0);
-        am200_set_gpio_output(LED_GPIO_PIN, 0);
-
-        am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
-        am200_set_gpio_output(STDBY_GPIO_PIN, 0);
-
-        am200_init_gpio_pin(RST_GPIO_PIN, 0);
-        am200_set_gpio_output(RST_GPIO_PIN, 0);
-
-        am200_init_gpio_pin(RDY_GPIO_PIN, 1);
-
-        am200_init_gpio_pin(ERR_GPIO_PIN, 1);
-
-        am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
-        am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
-}
-
-static void am200_disable_lcd_controller(struct metronomefb_par *par)
-{
-        LCSR = 0xffffffff;      /* Clear LCD Status Register */
-        LCCR0 |= LCCR0_DIS;     /* Disable LCD Controller */
-
-        /* we reset and just wait for things to settle */
-        msleep(200);
-}
-
-static void am200_enable_lcd_controller(struct metronomefb_par *par)
-{
-        LCSR = 0xffffffff;
-        FDADR0 = par->metromem_desc_dma;
-        LCCR0 |= LCCR0_ENB;
-}
-
-static void am200_init_lcdc_regs(struct metronomefb_par *par)
-{
-        /* here we do:
-        - disable the lcd controller
-        - setup lcd control registers
-        - setup dma descriptor
-        - reenable lcd controller
-        */
-
-        /* disable the lcd controller */
-        am200_disable_lcd_controller(par);
-
-        /* setup lcd control registers */
-        LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
-                | LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
-
-        LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
-                | (27 << 10) /* hsync pulse width - 1 */
-                | (33 << 16) /* eol pixel count */
-                | (33 << 24); /* bol pixel count */
-
-        LCCR2 = (par->info->var.yres - 1) /* lines per panel */
-                | (24 << 10) /* vsync pulse width - 1 */
-                | (2 << 16) /* eof pixel count */
-                | (0 << 24); /* bof pixel count */
-
-        LCCR3 = 2 /* pixel clock divisor */
-                | (24 << 8) /* AC Bias pin freq */
-                | LCCR3_16BPP /* BPP */
-                | LCCR3_PCP;  /* PCP falling edge */
-
-}
-
-static void am200_post_dma_setup(struct metronomefb_par *par)
-{
-        par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
-        par->metromem_desc->mFSADR0 = par->metromem_dma;
-        par->metromem_desc->mFIDR0 = 0;
-        par->metromem_desc->mLDCMD0 = par->info->var.xres
-                                        * par->info->var.yres;
-        am200_enable_lcd_controller(par);
-}
-
-static void am200_free_irq(struct fb_info *info)
-{
-        free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
-}
-
-static irqreturn_t am200_handle_irq(int irq, void *dev_id)
-{
-        struct fb_info *info = dev_id;
-        struct metronomefb_par *par = info->par;
-
-        wake_up_interruptible(&par->waitq);
-        return IRQ_HANDLED;
-}
-
-static int am200_setup_irq(struct fb_info *info)
-{
-        int retval;
-
-        retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
-                                IRQF_DISABLED, "AM200", info);
-        if (retval) {
-                printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
-                return retval;
-        }
-
-        return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
-}
-
-static void am200_set_rst(struct metronomefb_par *par, int state)
-{
-        am200_set_gpio_output(RST_GPIO_PIN, state);
-}
-
-static void am200_set_stdby(struct metronomefb_par *par, int state)
-{
-        am200_set_gpio_output(STDBY_GPIO_PIN, state);
-}
-
-static int am200_wait_event(struct metronomefb_par *par)
-{
-        return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-}
-
-static int am200_wait_event_intr(struct metronomefb_par *par)
-{
-        return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-}
-
-static struct metronome_board am200_board = {
-        .owner                  = THIS_MODULE,
-        .free_irq               = am200_free_irq,
-        .setup_irq              = am200_setup_irq,
-        .init_gpio_regs         = am200_init_gpio_regs,
-        .init_lcdc_regs         = am200_init_lcdc_regs,
-        .post_dma_setup         = am200_post_dma_setup,
-        .set_rst                = am200_set_rst,
-        .set_stdby              = am200_set_stdby,
-        .met_wait_event         = am200_wait_event,
-        .met_wait_event_intr    = am200_wait_event_intr,
-};
-
-static struct platform_device *am200_device;
-
-static int __init am200_init(void)
-{
-        int ret;
-
-        /* request our platform independent driver */
-        request_module("metronomefb");
-
-        am200_device = platform_device_alloc("metronomefb", -1);
-        if (!am200_device)
-                return -ENOMEM;
-
-        platform_device_add_data(am200_device, &am200_board,
-                                        sizeof(am200_board));
-
-        /* this _add binds metronomefb to am200. metronomefb refcounts am200 */
-        ret = platform_device_add(am200_device);
-
-        if (ret)
-                platform_device_put(am200_device);
-
-        return ret;
-}
-
-static void __exit am200_exit(void)
-{
-        platform_device_unregister(am200_device);
-}
-
-module_init(am200_init);
-module_exit(am200_exit);
-
-MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
-MODULE_AUTHOR("Jaya Kumar");
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 05a328c11a8b..b8e9a8682f2d 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1136,7 +1136,6 @@ static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg
          * Interface to the low level console driver
          */
 
-int amifb_init(void);
 static void amifb_deinit(void);
 
         /*
@@ -2048,13 +2047,16 @@ static void amifb_copyarea(struct fb_info *info,
         width = x2 - dx;
         height = y2 - dy;
 
+        if (area->sx + dx < area->dx || area->sy + dy < area->dy)
+                return;
+
         /* update sx,sy */
         sx = area->sx + (dx - area->dx);
         sy = area->sy + (dy - area->dy);
 
         /* the source must be completely inside the virtual screen */
-        if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual ||
-            (sy + height) > info->var.yres_virtual)
+        if (sx + width > info->var.xres_virtual ||
+                        sy + height > info->var.yres_virtual)
                 return;
 
         if (dy > sy || (dy == sy && dx > sx)) {
@@ -2245,7 +2247,7 @@ static inline void chipfree(void)
          * Initialisation
          */
 
-int __init amifb_init(void)
+static int __init amifb_init(void)
 {
         int tag, i, err = 0;
         u_long chipptr;
@@ -2383,6 +2385,9 @@ default_chipset:
                 goto amifb_error;
         }
 
+        fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
+                                 &fb_info.modelist);
+
         round_down_bpp = 0;
         chipptr = chipalloc(fb_info.fix.smem_len+
                             SPRITEMEMSIZE+
@@ -3787,16 +3792,14 @@ static void ami_rebuild_copper(void)
         }
 }
 
-
-module_init(amifb_init);
-
-#ifdef MODULE
-MODULE_LICENSE("GPL");
-
-void cleanup_module(void)
+static void __exit amifb_exit(void)
 {
         unregister_framebuffer(&fb_info);
         amifb_deinit();
         amifb_video_off();
 }
-#endif /* MODULE */
+
+module_init(amifb_init);
+module_exit(amifb_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 5001bd4ef466..314d18694b6a 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -11,7 +11,6 @@
  *  Code is based on s3fb
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -958,20 +957,20 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         /* Prepare PCI device */
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(info->dev, "cannot enable PCI device\n");
+                dev_err(info->device, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "arkfb");
         if (rc < 0) {
-                dev_err(info->dev, "cannot reserve framebuffer region\n");
+                dev_err(info->device, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
         par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info);
         if (! par->dac) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "RAMDAC initialization failed\n");
+                dev_err(info->device, "RAMDAC initialization failed\n");
                 goto err_dac;
         }
 
@@ -982,7 +981,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for framebuffer failed\n");
+                dev_err(info->device, "iomap for framebuffer failed\n");
                 goto err_iomap;
         }
 
@@ -1004,19 +1003,19 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(info->dev, "mode %s not found\n", mode_option);
+                dev_err(info->device, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(info->dev, "cannot allocate colormap\n");
+                dev_err(info->device, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(info->dev, "cannot register framebugger\n");
+                dev_err(info->device, "cannot register framebugger\n");
                 goto err_reg_fb;
         }
 
@@ -1090,7 +1089,7 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct arkfb_info *par = info->par;
 
-        dev_info(info->dev, "suspend\n");
+        dev_info(info->device, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1121,16 +1120,13 @@ static int ark_pci_resume (struct pci_dev* dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct arkfb_info *par = info->par;
 
-        dev_info(info->dev, "resume\n");
+        dev_info(info->device, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
 
-        if (par->ref_count == 0) {
-                mutex_unlock(&(par->open_lock));
-                release_console_sem();
-                return 0;
-        }
+        if (par->ref_count == 0)
+                goto fail;
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -1143,8 +1139,8 @@ static int ark_pci_resume (struct pci_dev* dev)
         arkfb_set_par(info);
         fb_set_suspend(info, 0);
 
-        mutex_unlock(&(par->open_lock));
 fail:
+        mutex_unlock(&(par->open_lock));
         release_console_sem();
         return 0;
 }
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index dff35474b854..77eb8b34fbfa 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2593,13 +2593,16 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         width = x2 - dx;
         height = y2 - dy;
 
+        if (area->sx + dx < area->dx || area->sy + dy < area->dy)
+                return;
+
         /* update sx,sy */
         sx = area->sx + (dx - area->dx);
         sy = area->sy + (dy - area->dy);
 
         /* the source must be completely inside the virtual screen */
-        if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual ||
-            (sy + height) > info->var.yres_virtual)
+        if (sx + width > info->var.xres_virtual ||
+                        sy + height > info->var.yres_virtual)
                 return;
 
         if (dy > sy || (dy == sy && dx > sx)) {
@@ -3110,7 +3113,7 @@ int __init atafb_init(void)
         printk("atafb_init: start\n");
 
         if (!MACH_IS_ATARI)
-                return -ENXIO;
+                return -ENODEV;
 
         do {
 #ifdef ATAFB_EXT
@@ -3230,6 +3233,9 @@ int __init atafb_init(void)
                 return -EINVAL;
         }
 
+        fb_videomode_to_modelist(atafb_modedb, NUM_TOTAL_MODES,
+                                 &fb_info.modelist);
+
         atafb_set_disp(&fb_info);
 
         fb_alloc_cmap(&(fb_info.cmap), 1 << fb_info.var.bits_per_pixel, 0);
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index b004036d4087..f8d0a57a07cb 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -18,9 +18,9 @@
 #include <linux/delay.h>
 #include <linux/backlight.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
+#include <mach/gpio.h>
 
 #include <video/atmel_lcdc.h>
 
@@ -39,7 +39,9 @@
 #endif
 
 #if defined(CONFIG_ARCH_AT91)
-#define ATMEL_LCDFB_FBINFO_DEFAULT      FBINFO_DEFAULT
+#define ATMEL_LCDFB_FBINFO_DEFAULT      (FBINFO_DEFAULT \
+                                         | FBINFO_PARTIAL_PAN_OK \
+                                         | FBINFO_HWACCEL_YPAN)
 
 static inline void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo,
                                         struct fb_var_screeninfo *var)
@@ -177,7 +179,7 @@ static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_TRUECOLOR,
         .xpanstep       = 0,
-        .ypanstep       = 0,
+        .ypanstep       = 1,
         .ywrapstep      = 0,
         .accel          = FB_ACCEL_NONE,
 };
@@ -206,6 +208,36 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)
         return value;
 }
 
+static void atmel_lcdfb_stop_nowait(struct atmel_lcdfb_info *sinfo)
+{
+        /* Turn off the LCD controller and the DMA controller */
+        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
+                        sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
+
+        /* Wait for the LCDC core to become idle */
+        while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
+                msleep(10);
+
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
+}
+
+static void atmel_lcdfb_stop(struct atmel_lcdfb_info *sinfo)
+{
+        atmel_lcdfb_stop_nowait(sinfo);
+
+        /* Wait for DMA engine to become idle... */
+        while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
+                msleep(10);
+}
+
+static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo)
+{
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
+        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
+                (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET)
+                | ATMEL_LCDC_PWR);
+}
+
 static void atmel_lcdfb_update_dma(struct fb_info *info,
                                struct fb_var_screeninfo *var)
 {
@@ -240,9 +272,11 @@ static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
 {
         struct fb_info *info = sinfo->info;
         struct fb_var_screeninfo *var = &info->var;
+        unsigned int smem_len;
 
-        info->fix.smem_len = (var->xres_virtual * var->yres_virtual
-                            * ((var->bits_per_pixel + 7) / 8));
+        smem_len = (var->xres_virtual * var->yres_virtual
+                    * ((var->bits_per_pixel + 7) / 8));
+        info->fix.smem_len = max(smem_len, sinfo->smem_len);
 
         info->screen_base = dma_alloc_writecombine(info->device, info->fix.smem_len,
                                         (dma_addr_t *)&info->fix.smem_start, GFP_KERNEL);
@@ -256,6 +290,20 @@ static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
         return 0;
 }
 
+static const struct fb_videomode *atmel_lcdfb_choose_mode(struct fb_var_screeninfo *var,
+                                                     struct fb_info *info)
+{
+        struct fb_videomode varfbmode;
+        const struct fb_videomode *fbmode = NULL;
+
+        fb_var_to_videomode(&varfbmode, var);
+        fbmode = fb_find_nearest_mode(&varfbmode, &info->modelist);
+        if (fbmode)
+                fb_videomode_to_var(var, fbmode);
+        return fbmode;
+}
+
+
 /**
  *      atmel_lcdfb_check_var - Validates a var passed in.
  *      @var: frame buffer variable screen structure
@@ -289,6 +337,15 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
         clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
 
         dev_dbg(dev, "%s:\n", __func__);
+
+        if (!(var->pixclock && var->bits_per_pixel)) {
+                /* choose a suitable mode if possible */
+                if (!atmel_lcdfb_choose_mode(var, info)) {
+                        dev_err(dev, "needed value not specified\n");
+                        return -EINVAL;
+                }
+        }
+
         dev_dbg(dev, "  resolution: %ux%u\n", var->xres, var->yres);
         dev_dbg(dev, "  pixclk:     %lu KHz\n", PICOS2KHZ(var->pixclock));
         dev_dbg(dev, "  bpp:        %u\n", var->bits_per_pixel);
@@ -299,6 +356,13 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
                 return -EINVAL;
         }
 
+        /* Do not allow to have real resoulution larger than virtual */
+        if (var->xres > var->xres_virtual)
+                var->xres_virtual = var->xres;
+
+        if (var->yres > var->yres_virtual)
+                var->yres_virtual = var->yres;
+
         /* Force same alignment for each line */
         var->xres = (var->xres + 3) & ~3UL;
         var->xres_virtual = (var->xres_virtual + 3) & ~3UL;
@@ -308,6 +372,13 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
         var->transp.offset = var->transp.length = 0;
         var->xoffset = var->yoffset = 0;
 
+        if (info->fix.smem_len) {
+                unsigned int smem_len = (var->xres_virtual * var->yres_virtual
+                                         * ((var->bits_per_pixel + 7) / 8));
+                if (smem_len > info->fix.smem_len)
+                        return -EINVAL;
+        }
+
         /* Saturate vertical and horizontal timings at maximum values */
         var->vsync_len = min_t(u32, var->vsync_len,
                         (ATMEL_LCDC_VPW >> ATMEL_LCDC_VPW_OFFSET) + 1);
@@ -344,6 +415,10 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
                         var->red.offset = 11;
                         var->blue.offset = 0;
                         var->green.length = 6;
+                } else if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB555) {
+                        var->red.offset = 10;
+                        var->blue.offset = 0;
+                        var->green.length = 5;
                 } else {
                         /* BGR:555 mode */
                         var->red.offset = 0;
@@ -379,6 +454,17 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
         return 0;
 }
 
+/*
+ * LCD reset sequence
+ */
+static void atmel_lcdfb_reset(struct atmel_lcdfb_info *sinfo)
+{
+        might_sleep();
+
+        atmel_lcdfb_stop(sinfo);
+        atmel_lcdfb_start(sinfo);
+}
+
 /**
  *      atmel_lcdfb_set_par - Alters the hardware state.
  *      @info: frame buffer structure that represents a single frame buffer
@@ -401,19 +487,14 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
         unsigned long clk_value_khz;
         unsigned long bits_per_line;
 
+        might_sleep();
+
         dev_dbg(info->device, "%s:\n", __func__);
         dev_dbg(info->device, "  * resolution: %ux%u (%ux%u virtual)\n",
                  info->var.xres, info->var.yres,
                  info->var.xres_virtual, info->var.yres_virtual);
 
-        /* Turn off the LCD controller and the DMA controller */
-        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
-
-        /* Wait for the LCDC core to become idle */
-        while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
-                msleep(10);
-
-        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
+        atmel_lcdfb_stop_nowait(sinfo);
 
         if (info->var.bits_per_pixel == 1)
                 info->fix.visual = FB_VISUAL_MONO01;
@@ -511,18 +592,14 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
 
         /* Disable all interrupts */
         lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
+        /* Enable FIFO & DMA errors */
+        lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI | ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI);
 
         /* ...wait for DMA engine to become idle... */
         while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
                 msleep(10);
 
-        dev_dbg(info->device, "  * re-enable DMA engine\n");
-        /* ...and enable it with updated configuration */
-        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
-
-        dev_dbg(info->device, "  * re-enable LCDC core\n");
-        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
-                (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
+        atmel_lcdfb_start(sinfo);
 
         dev_dbg(info->device, "  * DONE\n");
 
@@ -645,10 +722,26 @@ static irqreturn_t atmel_lcdfb_interrupt(int irq, void *dev_id)
         u32 status;
 
         status = lcdc_readl(sinfo, ATMEL_LCDC_ISR);
-        lcdc_writel(sinfo, ATMEL_LCDC_IDR, status);
+        if (status & ATMEL_LCDC_UFLWI) {
+                dev_warn(info->device, "FIFO underflow %#x\n", status);
+                /* reset DMA and FIFO to avoid screen shifting */
+                schedule_work(&sinfo->task);
+        }
+        lcdc_writel(sinfo, ATMEL_LCDC_ICR, status);
         return IRQ_HANDLED;
 }
 
+/*
+ * LCD controller task (to reset the LCD)
+ */
+static void atmel_lcdfb_task(struct work_struct *work)
+{
+        struct atmel_lcdfb_info *sinfo =
+                container_of(work, struct atmel_lcdfb_info, task);
+
+        atmel_lcdfb_reset(sinfo);
+}
+
 static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo)
 {
         struct fb_info *info = sinfo->info;
@@ -691,6 +784,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         struct fb_info *info;
         struct atmel_lcdfb_info *sinfo;
         struct atmel_lcdfb_info *pdata_sinfo;
+        struct fb_videomode fbmode;
         struct resource *regs = NULL;
         struct resource *map = NULL;
         int ret;
@@ -714,6 +808,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                 sinfo->default_monspecs = pdata_sinfo->default_monspecs;
                 sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
                 sinfo->guard_time = pdata_sinfo->guard_time;
+                sinfo->smem_len = pdata_sinfo->smem_len;
                 sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight;
                 sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode;
         } else {
@@ -824,6 +919,10 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                 goto unmap_mmio;
         }
 
+        /* Some operations on the LCDC might sleep and
+         * require a preemptible task context */
+        INIT_WORK(&sinfo->task, atmel_lcdfb_task);
+
         ret = atmel_lcdfb_init_fbinfo(sinfo);
         if (ret < 0) {
                 dev_err(dev, "init fbinfo failed: %d\n", ret);
@@ -850,9 +949,13 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         ret = register_framebuffer(info);
         if (ret < 0) {
                 dev_err(dev, "failed to register framebuffer device: %d\n", ret);
-                goto free_cmap;
+                goto reset_drvdata;
         }
 
+        /* add selected videomode to modelist */
+        fb_var_to_videomode(&fbmode, &info->var);
+        fb_add_videomode(&fbmode, &info->modelist);
+
         /* Power up the LCDC screen */
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(1);
@@ -862,10 +965,12 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 
         return 0;
 
-
+reset_drvdata:
+        dev_set_drvdata(dev, NULL);
 free_cmap:
         fb_dealloc_cmap(&info->cmap);
 unregister_irqs:
+        cancel_work_sync(&sinfo->task);
         free_irq(sinfo->irq_base, info);
 unmap_mmio:
         exit_backlight(sinfo);
@@ -898,11 +1003,13 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct fb_info *info = dev_get_drvdata(dev);
-        struct atmel_lcdfb_info *sinfo = info->par;
+        struct atmel_lcdfb_info *sinfo;
 
-        if (!sinfo)
+        if (!info || !info->par)
                 return 0;
+        sinfo = info->par;
 
+        cancel_work_sync(&sinfo->task);
         exit_backlight(sinfo);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(0);
@@ -935,11 +1042,20 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
         struct fb_info *info = platform_get_drvdata(pdev);
         struct atmel_lcdfb_info *sinfo = info->par;
 
+        /*
+         * We don't want to handle interrupts while the clock is
+         * stopped. It may take forever.
+         */
+        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
+
         sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(0);
+
+        atmel_lcdfb_stop(sinfo);
         atmel_lcdfb_stop_clock(sinfo);
+
         return 0;
 }
 
@@ -949,9 +1065,15 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
         struct atmel_lcdfb_info *sinfo = info->par;
 
         atmel_lcdfb_start_clock(sinfo);
+        atmel_lcdfb_start(sinfo);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(1);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
+
+        /* Enable FIFO & DMA errors */
+        lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI
+                        | ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI);
+
         return 0;
 }
 
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 24ee96c4e9e9..243ea4ab20c8 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1339,10 +1339,8 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
         if (vclk * 12 < c.ppll_min)
                 vclk = c.ppll_min/12;
 
-        pll->post_divider = -1;
-
         /* now, find an acceptable divider */
-        for (i = 0; i < sizeof(post_dividers); i++) {
+        for (i = 0; i < ARRAY_SIZE(post_dividers); i++) {
                 output_freq = post_dividers[i] * vclk;
                 if (output_freq >= c.ppll_min && output_freq <= c.ppll_max) {
                         pll->post_divider = post_dividers[i];
@@ -1350,7 +1348,7 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
                 }
         }
 
-        if (pll->post_divider < 0)
+        if (i == ARRAY_SIZE(post_dividers))
                 return -EINVAL;
 
         /* calculate feedback divider */
@@ -1872,7 +1870,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
         struct fb_var_screeninfo var;
-        char video_card[DEVICE_NAME_SIZE];
+        char video_card[50];
         u8 chip_rev;
         u32 dac;
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index bd4ac0bafecb..cc6b470073da 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info);
      */
 
 static int aty_init(struct fb_info *info);
-static void aty_resume_chip(struct fb_info *info);
+
 #ifdef CONFIG_ATARI
 static int store_video_par(char *videopar, unsigned char m64_num);
 #endif
@@ -424,7 +424,6 @@ static struct {
 #endif /* CONFIG_FB_ATY_CT */
 };
 
-/* can not fail */
 static int __devinit correct_chipset(struct atyfb_par *par)
 {
         u8 rev;
@@ -437,6 +436,9 @@ static int __devinit correct_chipset(struct atyfb_par *par)
                 if (par->pci_id == aty_chips[i].pci_id)
                         break;
 
+        if (i < 0)
+                return -ENODEV;
+
         name = aty_chips[i].name;
         par->pll_limits.pll_max = aty_chips[i].pll;
         par->pll_limits.mclk = aty_chips[i].mclk;
@@ -2021,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         return 0;
 }
 
+static void aty_resume_chip(struct fb_info *info)
+{
+        struct atyfb_par *par = info->par;
+
+        aty_st_le32(MEM_CNTL, par->mem_cntl, par);
+
+        if (par->pll_ops->resume_pll)
+                par->pll_ops->resume_pll(info, &par->pll);
+
+        if (par->aux_start)
+                aty_st_le32(BUS_CNTL,
+                        aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
+}
+
 static int atyfb_pci_resume(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
@@ -2229,6 +2245,7 @@ static int __devinit aty_init(struct fb_info *info)
         const char *ramname = NULL, *xtal;
         int gtb_memsize, has_var = 0;
         struct fb_var_screeninfo var;
+        int ret;
 
         init_waitqueue_head(&par->vblank.wait);
         spin_lock_init(&par->int_lock);
@@ -2610,7 +2627,8 @@ static int __devinit aty_init(struct fb_info *info)
                         var.yres_virtual = var.yres;
         }
 
-        if (atyfb_check_var(&var, info)) {
+        ret = atyfb_check_var(&var, info);
+        if (ret) {
                 PRINTKE("can't set default video mode\n");
                 goto aty_init_exit;
         }
@@ -2621,10 +2639,12 @@ static int __devinit aty_init(struct fb_info *info)
 #endif /* CONFIG_FB_ATY_CT */
         info->var = var;
 
-        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+        ret = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (ret < 0)
                 goto aty_init_exit;
 
-        if (register_framebuffer(info) < 0) {
+        ret = register_framebuffer(info);
+        if (ret < 0) {
                 fb_dealloc_cmap(&info->cmap);
                 goto aty_init_exit;
         }
@@ -2650,20 +2670,7 @@ aty_init_exit:
             par->mtrr_aper = -1;
         }
 #endif
-        return -1;
-}
-
-static void aty_resume_chip(struct fb_info *info)
-{
-        struct atyfb_par *par = info->par;
-
-        aty_st_le32(MEM_CNTL, par->mem_cntl, par);
-
-        if (par->pll_ops->resume_pll)
-                par->pll_ops->resume_pll(info, &par->pll);
-
-        if (par->aux_start)
-                aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
+        return ret;
 }
 
 #ifdef CONFIG_ATARI
@@ -2709,8 +2716,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
         if (par->lock_blank || par->asleep)
                 return 0;
 
-#ifdef CONFIG_FB_ATY_BACKLIGHT
-#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
+#ifdef CONFIG_FB_ATY_GENERIC_LCD
         if (par->lcd_table && blank > FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
                 u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);
@@ -2739,8 +2745,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
         }
         aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
-#ifdef CONFIG_FB_ATY_BACKLIGHT
-#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
+#ifdef CONFIG_FB_ATY_GENERIC_LCD
         if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
                 u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);
@@ -3331,7 +3336,7 @@ static int __devinit init_from_bios(struct atyfb_par *par)
                 PRINTKE("no BIOS frequency table found, use parameters\n");
                 ret = -ENXIO;
         }
-        iounmap((void* __iomem )bios_base);
+        iounmap((void __iomem *)bios_base);
 
         return ret;
 }
@@ -3418,14 +3423,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         struct fb_info *info;
         struct resource *rp;
         struct atyfb_par *par;
-        int i, rc = -ENOMEM;
-
-        for (i = ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
-                if (pdev->device == aty_chips[i].pci_id)
-                        break;
-
-        if (i < 0)
-                return -ENODEV;
+        int rc = -ENOMEM;
 
         /* Enable device in PCI config */
         if (pci_enable_device(pdev)) {
@@ -3456,7 +3454,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         par = info->par;
         info->fix = atyfb_fix;
         info->device = &pdev->dev;
-        par->pci_id = aty_chips[i].pci_id;
+        par->pci_id = pdev->device;
         par->res_start = res_start;
         par->res_size = res_size;
         par->irq = pdev->irq;
@@ -3474,7 +3472,8 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         pci_set_drvdata(pdev, info);
 
         /* Init chip & register framebuffer */
-        if (aty_init(info))
+        rc = aty_init(info);
+        if (rc)
                 goto err_release_io;
 
 #ifdef __sparc__
@@ -3655,18 +3654,62 @@ static void __devexit atyfb_pci_remove(struct pci_dev *pdev)
         atyfb_remove(info);
 }
 
-/*
- * This driver uses its own matching table. That will be more difficult
- * to fix, so for now, we just match against any ATI ID and let the
- * probe() function find out what's up. That also mean we don't have
- * a module ID table though.
- */
 static struct pci_device_id atyfb_pci_tbl[] = {
-        { PCI_VENDOR_ID_ATI, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-          PCI_BASE_CLASS_DISPLAY << 16, 0xff0000, 0 },
-        { 0, }
+#ifdef CONFIG_FB_ATY_GX
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GX) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64CX) },
+#endif /* CONFIG_FB_ATY_GX */
+
+#ifdef CONFIG_FB_ATY_CT
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64CT) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64ET) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LT) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64VT) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GT) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64VU) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GU) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LG) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64VV) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GV) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GW) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GY) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GZ) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GB) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GD) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GI) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GP) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GQ) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LB) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LD) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LI) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LP) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LQ) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GM) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GN) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GO) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GL) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GR) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GS) },
+
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LM) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LN) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LR) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64LS) },
+#endif /* CONFIG_FB_ATY_CT */
+        { }
 };
 
+MODULE_DEVICE_TABLE(pci, atyfb_pci_tbl);
+
 static struct pci_driver atyfb_driver = {
         .name           = "atyfb",
         .id_table       = atyfb_pci_tbl,
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index 3ca27cb13caa..8718f7349d6b 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -5,57 +5,61 @@
  * --dte
  */
 
-static void radeon_fixup_offset(struct radeonfb_info *rinfo)
+#define FLUSH_CACHE_WORKAROUND  1
+
+void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries)
 {
-        u32 local_base;
-
-        /* *** Ugly workaround *** */
-        /*
-         * On some platforms, the video memory is mapped at 0 in radeon chip space
-         * (like PPCs) by the firmware. X will always move it up so that it's seen
-         * by the chip to be at the same address as the PCI BAR.
-         * That means that when switching back from X, there is a mismatch between
-         * the offsets programmed into the engine. This means that potentially,
-         * accel operations done before radeonfb has a chance to re-init the engine
-         * will have incorrect offsets, and potentially trash system memory !
-         *
-         * The correct fix is for fbcon to never call any accel op before the engine
-         * has properly been re-initialized (by a call to set_var), but this is a
-         * complex fix. This workaround in the meantime, called before every accel
-         * operation, makes sure the offsets are in sync.
-         */
+        int i;
 
-        radeon_fifo_wait (1);
-        local_base = INREG(MC_FB_LOCATION) << 16;
-        if (local_base == rinfo->fb_local_base)
-                return;
+        for (i=0; i<2000000; i++) {
+                rinfo->fifo_free = INREG(RBBM_STATUS) & 0x7f;
+                if (rinfo->fifo_free >= entries)
+                        return;
+                udelay(10);
+        }
+        printk(KERN_ERR "radeonfb: FIFO Timeout !\n");
+        /* XXX Todo: attempt to reset the engine */
+}
 
-        rinfo->fb_local_base = local_base;
+static inline void radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)
+{
+        if (entries <= rinfo->fifo_free)
+                rinfo->fifo_free -= entries;
+        else
+                radeon_fifo_update_and_wait(rinfo, entries);
+}
 
-        radeon_fifo_wait (3);
-        OUTREG(DEFAULT_PITCH_OFFSET, (rinfo->pitch << 0x16) |
-                                     (rinfo->fb_local_base >> 10));
-        OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
-        OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
+static inline void radeonfb_set_creg(struct radeonfb_info *rinfo, u32 reg,
+                                     u32 *cache, u32 new_val)
+{
+        if (new_val == *cache)
+                return;
+        *cache = new_val;
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(reg, new_val);
 }
 
 static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, 
                                    const struct fb_fillrect *region)
 {
-        radeon_fifo_wait(4);  
-  
-        OUTREG(DP_GUI_MASTER_CNTL,  
-                rinfo->dp_gui_master_cntl  /* contains, like GMC_DST_32BPP */
-                | GMC_BRUSH_SOLID_COLOR
-                | ROP3_P);
-        if (radeon_get_dstbpp(rinfo->depth) != DST_8BPP)
-                OUTREG(DP_BRUSH_FRGD_CLR, rinfo->pseudo_palette[region->color]);
-        else
-                OUTREG(DP_BRUSH_FRGD_CLR, region->color);
-        OUTREG(DP_WRITE_MSK, 0xffffffff);
-        OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM));
-
-        radeon_fifo_wait(2);  
+        radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
+                          rinfo->dp_gui_mc_base | GMC_BRUSH_SOLID_COLOR | ROP3_P);
+        radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
+                          DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
+        radeonfb_set_creg(rinfo, DP_BRUSH_FRGD_CLR, &rinfo->dp_brush_fg_cache,
+                          region->color);
+
+        /* Ensure the dst cache is flushed and the engine idle before
+         * issuing the operation.
+         *
+         * This works around engine lockups on some cards
+         */
+#if FLUSH_CACHE_WORKAROUND
+        radeon_fifo_wait(rinfo, 2);
+        OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
+        OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
+#endif
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DST_Y_X, (region->dy << 16) | region->dx);
         OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height);
 }
@@ -66,15 +70,14 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
         struct fb_fillrect modded;
         int vxres, vyres;
   
-        if (info->state != FBINFO_STATE_RUNNING)
+        WARN_ON(rinfo->gfx_mode);
+        if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
                 return;
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
                 cfb_fillrect(info, region);
                 return;
         }
 
-        radeon_fixup_offset(rinfo);
-
         vxres = info->var.xres_virtual;
         vyres = info->var.yres_virtual;
 
@@ -87,6 +90,10 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
         if(modded.dx + modded.width  > vxres) modded.width  = vxres - modded.dx;
         if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy;
 
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR )
+                modded.color = ((u32 *) (info->pseudo_palette))[region->color];
+
         radeonfb_prim_fillrect(rinfo, &modded);
 }
 
@@ -105,18 +112,22 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo,
         if ( xdir < 0 ) { sx += w-1; dx += w-1; }
         if ( ydir < 0 ) { sy += h-1; dy += h-1; }
 
-        radeon_fifo_wait(3);
-        OUTREG(DP_GUI_MASTER_CNTL,
-                rinfo->dp_gui_master_cntl /* i.e. GMC_DST_32BPP */
-                | GMC_BRUSH_NONE
-                | GMC_SRC_DSTCOLOR
-                | ROP3_S 
-                | DP_SRC_SOURCE_MEMORY );
-        OUTREG(DP_WRITE_MSK, 0xffffffff);
-        OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0)
-                        | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
-
-        radeon_fifo_wait(3);
+        radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
+                          rinfo->dp_gui_mc_base |
+                          GMC_BRUSH_NONE |
+                          GMC_SRC_DATATYPE_COLOR |
+                          ROP3_S |
+                          DP_SRC_SOURCE_MEMORY);
+        radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
+                          (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) |
+                          (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
+
+#if FLUSH_CACHE_WORKAROUND
+        radeon_fifo_wait(rinfo, 2);
+        OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
+        OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
+#endif
+        radeon_fifo_wait(rinfo, 3);
         OUTREG(SRC_Y_X, (sy << 16) | sx);
         OUTREG(DST_Y_X, (dy << 16) | dx);
         OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w);
@@ -135,15 +146,14 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         modded.width  = area->width;
         modded.height = area->height;
   
-        if (info->state != FBINFO_STATE_RUNNING)
+        WARN_ON(rinfo->gfx_mode);
+        if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
                 return;
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
                 cfb_copyarea(info, area);
                 return;
         }
 
-        radeon_fixup_offset(rinfo);
-
         vxres = info->var.xres_virtual;
         vyres = info->var.yres_virtual;
 
@@ -160,13 +170,112 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         radeonfb_prim_copyarea(rinfo, &modded);
 }
 
+static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
+                                    const struct fb_image *image,
+                                    u32 fg, u32 bg)
+{
+        unsigned int src_bytes, dwords;
+        u32 *bits;
+
+        radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
+                          rinfo->dp_gui_mc_base |
+                          GMC_BRUSH_NONE |
+                          GMC_SRC_DATATYPE_MONO_FG_BG |
+                          ROP3_S |
+                          GMC_BYTE_ORDER_MSB_TO_LSB |
+                          DP_SRC_SOURCE_HOST_DATA);
+        radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
+                          DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
+        radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg);
+        radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg);
+
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(DST_Y_X, (image->dy << 16) | image->dx);
+
+        /* Ensure the dst cache is flushed and the engine idle before
+         * issuing the operation.
+         *
+         * This works around engine lockups on some cards
+         */
+#if FLUSH_CACHE_WORKAROUND
+        radeon_fifo_wait(rinfo, 2);
+        OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
+        OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
+#endif
+
+        /* X here pads width to a multiple of 32 and uses the clipper to
+         * adjust the result. Is that really necessary ? Things seem to
+         * work ok for me without that and the doco doesn't seem to imply
+         * there is such a restriction.
+         */
+        OUTREG(DST_WIDTH_HEIGHT, (image->width << 16) | image->height);
+
+        src_bytes = (((image->width * image->depth) + 7) / 8) * image->height;
+        dwords = (src_bytes + 3) / 4;
+        bits = (u32*)(image->data);
+
+        while(dwords >= 8) {
+                radeon_fifo_wait(rinfo, 8);
+#if BITS_PER_LONG == 64
+                __raw_writeq(*((u64 *)(bits)), rinfo->mmio_base + HOST_DATA0);
+                __raw_writeq(*((u64 *)(bits+2)), rinfo->mmio_base + HOST_DATA2);
+                __raw_writeq(*((u64 *)(bits+4)), rinfo->mmio_base + HOST_DATA4);
+                __raw_writeq(*((u64 *)(bits+6)), rinfo->mmio_base + HOST_DATA6);
+                bits += 8;
+#else
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA1);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA2);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA3);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA4);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA5);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA6);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA7);
+#endif
+                dwords -= 8;
+        }
+        while(dwords--) {
+                radeon_fifo_wait(rinfo, 1);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0);
+        }
+}
+
 void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct radeonfb_info *rinfo = info->par;
+        u32 fg, bg;
 
-        if (info->state != FBINFO_STATE_RUNNING)
+        WARN_ON(rinfo->gfx_mode);
+        if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
                 return;
-        radeon_engine_idle();
+
+        if (!image->width || !image->height)
+                return;
+
+        /* We only do 1 bpp color expansion for now */
+        if (info->flags & FBINFO_HWACCEL_DISABLED || image->depth != 1)
+                goto fallback;
+
+        /* Fallback if running out of the screen. We may do clipping
+         * in the future */
+        if ((image->dx + image->width) > info->var.xres_virtual ||
+            (image->dy + image->height) > info->var.yres_virtual)
+                goto fallback;
+
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+                fg = ((u32*)(info->pseudo_palette))[image->fg_color];
+                bg = ((u32*)(info->pseudo_palette))[image->bg_color];
+        } else {
+                fg = image->fg_color;
+                bg = image->bg_color;
+        }
+
+        radeonfb_prim_imageblit(rinfo, image, fg, bg);
+        return;
+
+ fallback:
+        radeon_engine_idle(rinfo);
 
         cfb_imageblit(info, image);
 }
@@ -177,7 +286,8 @@ int radeonfb_sync(struct fb_info *info)
 
         if (info->state != FBINFO_STATE_RUNNING)
                 return 0;
-        radeon_engine_idle();
+
+        radeon_engine_idle(rinfo);
 
         return 0;
 }
@@ -203,9 +313,7 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
         host_path_cntl = INREG(HOST_PATH_CNTL);
         rbbm_soft_reset = INREG(RBBM_SOFT_RESET);
 
-        if (rinfo->family == CHIP_FAMILY_R300 ||
-            rinfo->family == CHIP_FAMILY_R350 ||
-            rinfo->family == CHIP_FAMILY_RV350) {
+        if (IS_R300_VARIANT(rinfo)) {
                 u32 tmp;
 
                 OUTREG(RBBM_SOFT_RESET, (rbbm_soft_reset |
@@ -241,9 +349,7 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
         INREG(HOST_PATH_CNTL);
         OUTREG(HOST_PATH_CNTL, host_path_cntl);
 
-        if (rinfo->family != CHIP_FAMILY_R300 ||
-            rinfo->family != CHIP_FAMILY_R350 ||
-            rinfo->family != CHIP_FAMILY_RV350)
+        if (!IS_R300_VARIANT(rinfo))
                 OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
 
         OUTREG(CLOCK_CNTL_INDEX, clock_cntl_index);
@@ -257,15 +363,24 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
         /* disable 3D engine */
         OUTREG(RB3D_CNTL, 0);
 
+        rinfo->fifo_free = 0;
         radeonfb_engine_reset(rinfo);
 
-        radeon_fifo_wait (1);
-        if ((rinfo->family != CHIP_FAMILY_R300) &&
-            (rinfo->family != CHIP_FAMILY_R350) &&
-            (rinfo->family != CHIP_FAMILY_RV350))
+        radeon_fifo_wait(rinfo, 1);
+        if (IS_R300_VARIANT(rinfo)) {
+                OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) |
+                       RB2D_DC_AUTOFLUSH_ENABLE |
+                       RB2D_DC_DC_DISABLE_IGNORE_PE);
+        } else {
+                /* This needs to be double checked with ATI. Latest X driver
+                 * completely "forgets" to set this register on < r3xx, and
+                 * we used to just write 0 there... I'll keep the 0 and update
+                 * that when we have sorted things out on X side.
+                 */
                 OUTREG(RB2D_DSTCACHE_MODE, 0);
+        }
 
-        radeon_fifo_wait (3);
+        radeon_fifo_wait(rinfo, 3);
         /* We re-read MC_FB_LOCATION from card as it can have been
          * modified by XFree drivers (ouch !)
          */
@@ -276,41 +391,57 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
         OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
         OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
 
-        radeon_fifo_wait (1);
-#if defined(__BIG_ENDIAN)
+        radeon_fifo_wait(rinfo, 1);
+#ifdef __BIG_ENDIAN
         OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN);
 #else
         OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN);
 #endif
-        radeon_fifo_wait (2);
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DEFAULT_SC_TOP_LEFT, 0);
         OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX |
                                          DEFAULT_SC_BOTTOM_MAX));
 
+        /* set default DP_GUI_MASTER_CNTL */
         temp = radeon_get_dstbpp(rinfo->depth);
-        rinfo->dp_gui_master_cntl = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS);
+        rinfo->dp_gui_mc_base = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS);
 
-        radeon_fifo_wait (1);
-        OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl |
-                                    GMC_BRUSH_SOLID_COLOR |
-                                    GMC_SRC_DATATYPE_COLOR));
+        rinfo->dp_gui_mc_cache = rinfo->dp_gui_mc_base |
+                GMC_BRUSH_SOLID_COLOR |
+                GMC_SRC_DATATYPE_COLOR;
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(DP_GUI_MASTER_CNTL, rinfo->dp_gui_mc_cache);
 
-        radeon_fifo_wait (7);
 
         /* clear line drawing regs */
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DST_LINE_START, 0);
         OUTREG(DST_LINE_END, 0);
 
-        /* set brush color regs */
-        OUTREG(DP_BRUSH_FRGD_CLR, 0xffffffff);
-        OUTREG(DP_BRUSH_BKGD_CLR, 0x00000000);
-
-        /* set source color regs */
-        OUTREG(DP_SRC_FRGD_CLR, 0xffffffff);
-        OUTREG(DP_SRC_BKGD_CLR, 0x00000000);
+        /* set brush and source color regs */
+        rinfo->dp_brush_fg_cache = 0xffffffff;
+        rinfo->dp_brush_bg_cache = 0x00000000;
+        rinfo->dp_src_fg_cache = 0xffffffff;
+        rinfo->dp_src_bg_cache = 0x00000000;
+        radeon_fifo_wait(rinfo, 4);
+        OUTREG(DP_BRUSH_FRGD_CLR, rinfo->dp_brush_fg_cache);
+        OUTREG(DP_BRUSH_BKGD_CLR, rinfo->dp_brush_bg_cache);
+        OUTREG(DP_SRC_FRGD_CLR, rinfo->dp_src_fg_cache);
+        OUTREG(DP_SRC_BKGD_CLR, rinfo->dp_src_bg_cache);
+
+        /* Default direction */
+        rinfo->dp_cntl_cache = DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM;
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(DP_CNTL, rinfo->dp_cntl_cache);
 
         /* default write mask */
+        radeon_fifo_wait(rinfo, 1);
         OUTREG(DP_WRITE_MSK, 0xffffffff);
 
-        radeon_engine_idle ();
+        /* Default to no swapping of host data */
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(RBBM_GUICNTL, RBBM_GUICNTL_HOST_DATA_SWAP_NONE);
+
+        /* Make sure it's settled */
+        radeon_engine_idle(rinfo);
 }
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 1a056adb61c8..f343ba83f0ae 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -66,7 +66,7 @@ static int radeon_bl_update_status(struct backlight_device *bd)
                 level = bd->props.brightness;
 
         del_timer_sync(&rinfo->lvds_timer);
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
         if (level > 0) {
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 400e9264e456..9a5821c65ebf 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -852,7 +852,6 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var,
         if (rinfo->asleep)
                 return 0;
 
-        radeon_fifo_wait(2);
         OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset)
                              * var->bits_per_pixel / 8) & ~7);
         return 0;
@@ -882,7 +881,6 @@ static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd,
                         if (rc)
                                 return rc;
 
-                        radeon_fifo_wait(2);
                         if (value & 0x01) {
                                 tmp = INREG(LVDS_GEN_CNTL);
 
@@ -940,7 +938,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch)
         if (rinfo->lock_blank)
                 return 0;
 
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         val = INREG(CRTC_EXT_CNTL);
         val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS |
@@ -1048,7 +1046,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)
 
         if (rinfo->asleep)
                 return 0;
-                
+
         return radeon_screen_blank(rinfo, blank, 0);
 }
 
@@ -1074,8 +1072,6 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
         pindex = regno;
 
         if (!rinfo->asleep) {
-                radeon_fifo_wait(9);
-
                 if (rinfo->bpp == 16) {
                         pindex = regno * 8;
 
@@ -1244,8 +1240,6 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
 {
         int i;
 
-        radeon_fifo_wait(20);
-
         /* Workaround from XFree */
         if (rinfo->is_mobility) {
                 /* A temporal workaround for the occational blanking on certain laptop
@@ -1286,11 +1280,10 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
         radeon_pll_errata_after_data(rinfo);
 
         /* Set PPLL ref. div */
-        if (rinfo->family == CHIP_FAMILY_R300 ||
+        if (IS_R300_VARIANT(rinfo) ||
             rinfo->family == CHIP_FAMILY_RS300 ||
-            rinfo->family == CHIP_FAMILY_R350 ||
-            rinfo->family == CHIP_FAMILY_RV350 ||
-            rinfo->family == CHIP_FAMILY_RV380 ) {
+            rinfo->family == CHIP_FAMILY_RS400 ||
+            rinfo->family == CHIP_FAMILY_RS480) {
                 if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) {
                         /* When restoring console mode, use saved PPLL_REF_DIV
                          * setting.
@@ -1342,7 +1335,7 @@ static void radeon_lvds_timer_func(unsigned long data)
 {
         struct radeonfb_info *rinfo = (struct radeonfb_info *)data;
 
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl);
 }
@@ -1360,10 +1353,11 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         if (nomodeset)
                 return;
 
+        radeon_engine_idle(rinfo);
+
         if (!regs_only)
                 radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0);
 
-        radeon_fifo_wait(31);
         for (i=0; i<10; i++)
                 OUTREG(common_regs[i].reg, common_regs[i].val);
 
@@ -1391,7 +1385,6 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         radeon_write_pll_regs(rinfo, mode);
 
         if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) {
-                radeon_fifo_wait(10);
                 OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp);
                 OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp);
                 OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid);
@@ -1406,7 +1399,6 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         if (!regs_only)
                 radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0);
 
-        radeon_fifo_wait(2);
         OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl);
         
         return;
@@ -1461,10 +1453,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs
                 /* Not all chip revs have the same format for this register,
                  * extract the source selection
                  */
-                if (rinfo->family == CHIP_FAMILY_R200 ||
-                    rinfo->family == CHIP_FAMILY_R300 ||
-                    rinfo->family == CHIP_FAMILY_R350 ||
-                    rinfo->family == CHIP_FAMILY_RV350) {
+                if (rinfo->family == CHIP_FAMILY_R200 || IS_R300_VARIANT(rinfo)) {
                         source = (fp2_gen_cntl >> 10) & 0x3;
                         /* sourced from transform unit, check for transform unit
                          * own source
@@ -1560,7 +1549,7 @@ static int radeonfb_set_par(struct fb_info *info)
         /* We always want engine to be idle on a mode switch, even
          * if we won't actually change the mode
          */
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         hSyncStart = mode->xres + mode->right_margin;
         hSyncEnd = hSyncStart + mode->hsync_len;
@@ -1855,7 +1844,6 @@ static int radeonfb_set_par(struct fb_info *info)
         return 0;
 }
 
-
 static struct fb_ops radeonfb_ops = {
         .owner                  = THIS_MODULE,
         .fb_check_var           = radeonfb_check_var,
@@ -1879,6 +1867,7 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         info->par = rinfo;
         info->pseudo_palette = rinfo->pseudo_palette;
         info->flags = FBINFO_DEFAULT
+                    | FBINFO_HWACCEL_IMAGEBLIT
                     | FBINFO_HWACCEL_COPYAREA
                     | FBINFO_HWACCEL_FILLRECT
                     | FBINFO_HWACCEL_XPAN
@@ -2005,11 +1994,11 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
             (rinfo->family == CHIP_FAMILY_RS200) ||
             (rinfo->family == CHIP_FAMILY_RS300) ||
             (rinfo->family == CHIP_FAMILY_RC410) ||
+            (rinfo->family == CHIP_FAMILY_RS400) ||
             (rinfo->family == CHIP_FAMILY_RS480) ) {
           u32 tom = INREG(NB_TOM);
           tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);
 
-                radeon_fifo_wait(6);
           OUTREG(MC_FB_LOCATION, tom);
           OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
           OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
@@ -2098,15 +2087,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
 
 static ssize_t radeon_show_one_edid(char *buf, loff_t off, size_t count, const u8 *edid)
 {
-        if (off > EDID_LENGTH)
-                return 0;
-
-        if (off + count > EDID_LENGTH)
-                count = EDID_LENGTH - off;
-
-        memcpy(buf, edid + off, count);
-
-        return count;
+        return memory_read_from_buffer(buf, count, &off, edid, EDID_LENGTH);
 }
 
 
@@ -2161,6 +2142,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
         struct radeonfb_info *rinfo;
         int ret;
         unsigned char c1, c2;
+        int err = 0;
 
         pr_debug("radeonfb_pci_register BEGIN\n");
         
@@ -2340,9 +2322,14 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
 
         /* Register some sysfs stuff (should be done better) */
         if (rinfo->mon1_EDID)
-                sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid1_attr);
+                err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj,
+                                                &edid1_attr);
         if (rinfo->mon2_EDID)
-                sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr);
+                err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj,
+                                                &edid2_attr);
+        if (err)
+                pr_warning("%s() Creating sysfs files failed, continuing\n",
+                           __func__);
 
         /* save current mode regs before we switch into the new one
          * so we can restore this upon __exit
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index f9e7c29ad9bf..2c5567175dca 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -69,7 +69,8 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
 {
         int rc;
 
-        strcpy(chan->adapter.name, name);
+        snprintf(chan->adapter.name, sizeof(chan->adapter.name),
+                 "radeonfb %s", name);
         chan->adapter.owner             = THIS_MODULE;
         chan->adapter.id                = I2C_HW_B_RADEON;
         chan->adapter.algo_data         = &chan->algo;
@@ -138,12 +139,8 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
 int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
                                u8 **out_edid)
 {
-        u32 reg = rinfo->i2c[conn-1].ddc_reg;
         u8 *edid;
 
-        OUTREG(reg, INREG(reg) &
-                        ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
-
         edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
 
         if (out_edid)
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 675abdafc2d8..3df5015f1d13 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2653,9 +2653,9 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED)) {
                 /* Make sure engine is reset */
-                radeon_engine_idle();
+                radeon_engine_idle(rinfo);
                 radeonfb_engine_reset(rinfo);
-                radeon_engine_idle();
+                radeon_engine_idle(rinfo);
         }
 
         /* Blank display and LCD */
@@ -2767,7 +2767,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
 
                 rinfo->asleep = 0;
         } else
-                radeon_engine_idle();
+                radeon_engine_idle(rinfo);
 
         /* Restore display & engine */
         radeon_write_mode (rinfo, &rinfo->state, 1);
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index c347e38cd0b0..ea0b5b47acaf 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -53,6 +53,7 @@ enum radeon_family {
         CHIP_FAMILY_RV380,    /* RV370/RV380/M22/M24 */
         CHIP_FAMILY_R420,     /* R420/R423/M18 */
         CHIP_FAMILY_RC410,
+        CHIP_FAMILY_RS400,
         CHIP_FAMILY_RS480,
         CHIP_FAMILY_LAST,
 };
@@ -289,7 +290,7 @@ struct radeonfb_info {
         struct radeon_regs      state;
         struct radeon_regs      init_state;
 
-        char                    name[DEVICE_NAME_SIZE];
+        char                    name[50];
 
         unsigned long           mmio_base_phys;
         unsigned long           fb_base_phys;
@@ -335,7 +336,15 @@ struct radeonfb_info {
         int                     mon2_type;
         u8                      *mon2_EDID;
 
-        u32                     dp_gui_master_cntl;
+        /* accel bits */
+        u32                     dp_gui_mc_base;
+        u32                     dp_gui_mc_cache;
+        u32                     dp_cntl_cache;
+        u32                     dp_brush_fg_cache;
+        u32                     dp_brush_bg_cache;
+        u32                     dp_src_fg_cache;
+        u32                     dp_src_bg_cache;
+        u32                     fifo_free;
 
         struct pll_info         pll;
 
@@ -347,6 +356,7 @@ struct radeonfb_info {
         int                     lock_blank;
         int                     dynclk;
         int                     no_schedule;
+        int                     gfx_mode;
         enum radeon_pm_mode     pm_mode;
         reinit_function_ptr     reinit_func;
 
@@ -391,8 +401,14 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)
 #define OUTREG8(addr,val)       writeb(val, (rinfo->mmio_base)+addr)
 #define INREG16(addr)           readw((rinfo->mmio_base)+addr)
 #define OUTREG16(addr,val)      writew(val, (rinfo->mmio_base)+addr)
+
+#ifdef CONFIG_PPC
+#define INREG(addr)             ({ eieio(); ld_le32(rinfo->mmio_base+(addr)); })
+#define OUTREG(addr,val)        do { eieio(); st_le32(rinfo->mmio_base+(addr),(val)); } while(0)
+#else
 #define INREG(addr)             readl((rinfo->mmio_base)+addr)
 #define OUTREG(addr,val)        writel(val, (rinfo->mmio_base)+addr)
+#endif
 
 static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr,
                        u32 val, u32 mask)
@@ -533,16 +549,25 @@ static inline u32 radeon_get_dstbpp(u16 depth)
 /*
  * 2D Engine helper routines
  */
+
+extern void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries);
+
 static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
 {
         int i;
 
-        /* initiate flush */
-        OUTREGP(RB2D_DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL,
+        /* Initiate flush */
+        OUTREGP(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL,
                 ~RB2D_DC_FLUSH_ALL);
 
+        /* Ensure FIFO is empty, ie, make sure the flush commands
+         * has reached the cache
+         */
+        radeon_fifo_update_and_wait(rinfo, 64);
+
+        /* Wait for the flush to complete */
         for (i=0; i < 2000000; i++) {
-                if (!(INREG(RB2D_DSTCACHE_CTLSTAT) & RB2D_DC_BUSY))
+                if (!(INREG(DSTCACHE_CTLSTAT) & RB2D_DC_BUSY))
                         return;
                 udelay(1);
         }
@@ -550,25 +575,12 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
 }
 
 
-static inline void _radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)
-{
-        int i;
-
-        for (i=0; i<2000000; i++) {
-                if ((INREG(RBBM_STATUS) & 0x7f) >= entries)
-                        return;
-                udelay(1);
-        }
-        printk(KERN_ERR "radeonfb: FIFO Timeout !\n");
-}
-
-
-static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)
+static inline void radeon_engine_idle(struct radeonfb_info *rinfo)
 {
         int i;
 
         /* ensure FIFO is empty before waiting for idle */
-        _radeon_fifo_wait (rinfo, 64);
+        radeon_fifo_update_and_wait (rinfo, 64);
 
         for (i=0; i<2000000; i++) {
                 if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) {
@@ -581,8 +593,6 @@ static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)
 }
 
 
-#define radeon_engine_idle()            _radeon_engine_idle(rinfo)
-#define radeon_fifo_wait(entries)       _radeon_fifo_wait(rinfo,entries)
 #define radeon_msleep(ms)               _radeon_msleep(rinfo,ms)
 
 
@@ -612,6 +622,7 @@ extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image);
 extern int radeonfb_sync(struct fb_info *info);
 extern void radeonfb_engine_init (struct radeonfb_info *rinfo);
 extern void radeonfb_engine_reset(struct radeonfb_info *rinfo);
+extern void radeon_fixup_mem_offset(struct radeonfb_info *rinfo);
 
 /* Other functions */
 extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch);
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 30bf7f2f1635..4a4dd9adc328 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -24,6 +24,13 @@ config LCD_CLASS_DEVICE
           To have support for your specific LCD panel you will have to
           select the proper drivers which depend on this option.
 
+config LCD_CORGI
+        tristate "LCD Panel support for SHARP corgi/spitz model"
+        depends on LCD_CLASS_DEVICE && SPI_MASTER && PXA_SHARPSL
+        help
+          Say y here to support the LCD panels usually found on SHARP
+          corgi (C7x0) and spitz (Cxx00) models.
+
 config LCD_LTV350QV
         tristate "Samsung LTV350QV LCD Panel"
         depends on LCD_CLASS_DEVICE && SPI_MASTER
@@ -36,6 +43,47 @@ config LCD_LTV350QV
 
           The LTV350QV panel is present on all ATSTK1000 boards.
 
+config LCD_ILI9320
+        tristate
+        depends on LCD_CLASS_DEVICE && BACKLIGHT_LCD_SUPPORT
+        default n
+        help
+          If you have a panel based on the ILI9320 controller chip
+          then say y to include a power driver for it.
+
+config LCD_TDO24M
+        tristate "Toppoly TDO24M LCD Panels support"
+        depends on LCD_CLASS_DEVICE && SPI_MASTER
+        default n
+        help
+          If you have a Toppoly TDO24M series LCD panel, say y here to
+          include the support for it.
+
+config LCD_VGG2432A4
+        tristate "VGG2432A4 LCM device support"
+        depends on BACKLIGHT_LCD_SUPPORT && LCD_CLASS_DEVICE && SPI_MASTER
+        select LCD_ILI9320
+        default n
+        help
+          If you have a VGG2432A4 panel based on the ILI9320 controller chip
+          then say y to include a power driver for it.
+
+config LCD_PLATFORM
+        tristate "Platform LCD controls"
+        depends on LCD_CLASS_DEVICE
+        help
+          This driver provides a platform-device registered LCD power
+          control interface.
+
+config LCD_TOSA
+        tristate "Sharp SL-6000 LCD Driver"
+        depends on LCD_CLASS_DEVICE && SPI
+        depends on MACH_TOSA
+        default n
+        help
+          If you have an Sharp SL-6000 Zaurus say Y to enable a driver
+          for its LCD.
+
 #
 # Backlight
 #
@@ -63,8 +111,20 @@ config BACKLIGHT_ATMEL_LCDC
           If in doubt, it's safe to enable this option; it doesn't kick
           in unless the board's description says it's wired that way.
 
+config BACKLIGHT_ATMEL_PWM
+        tristate "Atmel PWM backlight control"
+        depends on BACKLIGHT_CLASS_DEVICE && ATMEL_PWM
+        default n
+        help
+          Say Y here if you want to use the PWM peripheral in Atmel AT91 and
+          AVR32 devices. This driver will need additional platform data to know
+          which PWM instance to use and how to configure it.
+
+          To compile this driver as a module, choose M here: the module will be
+          called atmel-pwm-bl.
+
 config BACKLIGHT_CORGI
-        tristate "Generic (aka Sharp Corgi) Backlight Driver"
+        tristate "Generic (aka Sharp Corgi) Backlight Driver (DEPRECATED)"
         depends on BACKLIGHT_CLASS_DEVICE
         default n
         help
@@ -72,6 +132,9 @@ config BACKLIGHT_CORGI
           known as the Corgi backlight driver. If you have a Sharp Zaurus
           SL-C7xx, SL-Cxx00 or SL-6000x say y. Most users can say n.
 
+          Note: this driver is marked as deprecated, try enable SPI and
+          use the new corgi_lcd driver with integrated backlight control
+
 config BACKLIGHT_LOCOMO
         tristate "Sharp LOCOMO LCD/Backlight Driver"
         depends on BACKLIGHT_CLASS_DEVICE && SHARP_LOCOMO
@@ -119,3 +182,35 @@ config BACKLIGHT_PWM
         help
           If you have a LCD backlight adjustable by PWM, say Y to enable
           this driver.
+
+config BACKLIGHT_DA903X
+        tristate "Backlight Driver for DA9030/DA9034 using WLED"
+        depends on BACKLIGHT_CLASS_DEVICE && PMIC_DA903X
+        help
+          If you have a LCD backlight connected to the WLED output of DA9030
+          or DA9034 WLED output, say Y here to enable this driver.
+
+config BACKLIGHT_MBP_NVIDIA
+       tristate "MacBook Pro Nvidia Backlight Driver"
+       depends on BACKLIGHT_CLASS_DEVICE && X86
+       default n
+       help
+         If you have an Apple Macbook Pro with Nvidia graphics hardware say Y
+         to enable a driver for its backlight
+
+config BACKLIGHT_TOSA
+        tristate "Sharp SL-6000 Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        depends on MACH_TOSA && LCD_TOSA
+        default n
+        help
+          If you have an Sharp SL-6000 Zaurus say Y to enable a driver
+          for its backlight
+
+config BACKLIGHT_SAHARA
+        tristate "Tabletkiosk Sahara Touch-iT Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && X86
+        default n
+        help
+          If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
+          backlight driver.
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index b51a7cd12500..103427de6703 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -1,9 +1,16 @@
 # Backlight & LCD drivers
 
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
-obj-$(CONFIG_LCD_LTV350QV)      += ltv350qv.o
+obj-$(CONFIG_LCD_CORGI)            += corgi_lcd.o
+obj-$(CONFIG_LCD_LTV350QV)         += ltv350qv.o
+obj-$(CONFIG_LCD_ILI9320)          += ili9320.o
+obj-$(CONFIG_LCD_PLATFORM)         += platform_lcd.o
+obj-$(CONFIG_LCD_VGG2432A4)        += vgg2432a4.o
+obj-$(CONFIG_LCD_TDO24M)           += tdo24m.o
+obj-$(CONFIG_LCD_TOSA)             += tosa_lcd.o
 
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
+obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
 obj-$(CONFIG_BACKLIGHT_CORGI)   += corgi_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
@@ -11,3 +18,8 @@ obj-$(CONFIG_BACKLIGHT_OMAP1)	+= omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
+obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x.o
+obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
+obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
+obj-$(CONFIG_BACKLIGHT_SAHARA)  += kb3886_bl.o
+
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
new file mode 100644
index 000000000000..505c0823a105
--- /dev/null
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2008 Atmel Corporation
+ *
+ * Backlight driver using Atmel PWM peripheral.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/clk.h>
+#include <linux/gpio.h>
+#include <linux/backlight.h>
+#include <linux/atmel_pwm.h>
+#include <linux/atmel-pwm-bl.h>
+
+struct atmel_pwm_bl {
+        const struct atmel_pwm_bl_platform_data *pdata;
+        struct backlight_device                 *bldev;
+        struct platform_device                  *pdev;
+        struct pwm_channel                      pwmc;
+        int                                     gpio_on;
+};
+
+static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)
+{
+        struct atmel_pwm_bl *pwmbl = bl_get_data(bd);
+        int intensity = bd->props.brightness;
+        int pwm_duty;
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+                intensity = 0;
+
+        if (pwmbl->pdata->pwm_active_low)
+                pwm_duty = pwmbl->pdata->pwm_duty_min + intensity;
+        else
+                pwm_duty = pwmbl->pdata->pwm_duty_max - intensity;
+
+        if (pwm_duty > pwmbl->pdata->pwm_duty_max)
+                pwm_duty = pwmbl->pdata->pwm_duty_max;
+        if (pwm_duty < pwmbl->pdata->pwm_duty_min)
+                pwm_duty = pwmbl->pdata->pwm_duty_min;
+
+        if (!intensity) {
+                if (pwmbl->gpio_on != -1) {
+                        gpio_set_value(pwmbl->gpio_on,
+                                        0 ^ pwmbl->pdata->on_active_low);
+                }
+                pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);
+                pwm_channel_disable(&pwmbl->pwmc);
+        } else {
+                pwm_channel_enable(&pwmbl->pwmc);
+                pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);
+                if (pwmbl->gpio_on != -1) {
+                        gpio_set_value(pwmbl->gpio_on,
+                                        1 ^ pwmbl->pdata->on_active_low);
+                }
+        }
+
+        return 0;
+}
+
+static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)
+{
+        struct atmel_pwm_bl *pwmbl = bl_get_data(bd);
+        u8 intensity;
+
+        if (pwmbl->pdata->pwm_active_low) {
+                intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
+                        pwmbl->pdata->pwm_duty_min;
+        } else {
+                intensity = pwmbl->pdata->pwm_duty_max -
+                        pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY);
+        }
+
+        return intensity;
+}
+
+static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)
+{
+        unsigned long pwm_rate = pwmbl->pwmc.mck;
+        unsigned long prescale = DIV_ROUND_UP(pwm_rate,
+                        (pwmbl->pdata->pwm_frequency *
+                         pwmbl->pdata->pwm_compare_max)) - 1;
+
+        /*
+         * Prescale must be power of two and maximum 0xf in size because of
+         * hardware limit. PWM speed will be:
+         *      PWM module clock speed / (2 ^ prescale).
+         */
+        prescale = fls(prescale);
+        if (prescale > 0xf)
+                prescale = 0xf;
+
+        pwm_channel_writel(&pwmbl->pwmc, PWM_CMR, prescale);
+        pwm_channel_writel(&pwmbl->pwmc, PWM_CDTY,
+                        pwmbl->pdata->pwm_duty_min +
+                        pwmbl->bldev->props.brightness);
+        pwm_channel_writel(&pwmbl->pwmc, PWM_CPRD,
+                        pwmbl->pdata->pwm_compare_max);
+
+        dev_info(&pwmbl->pdev->dev, "Atmel PWM backlight driver "
+                        "(%lu Hz)\n", pwmbl->pwmc.mck /
+                        pwmbl->pdata->pwm_compare_max /
+                        (1 << prescale));
+
+        return pwm_channel_enable(&pwmbl->pwmc);
+}
+
+static struct backlight_ops atmel_pwm_bl_ops = {
+        .get_brightness = atmel_pwm_bl_get_intensity,
+        .update_status  = atmel_pwm_bl_set_intensity,
+};
+
+static int atmel_pwm_bl_probe(struct platform_device *pdev)
+{
+        const struct atmel_pwm_bl_platform_data *pdata;
+        struct backlight_device *bldev;
+        struct atmel_pwm_bl *pwmbl;
+        int retval;
+
+        pwmbl = kzalloc(sizeof(struct atmel_pwm_bl), GFP_KERNEL);
+        if (!pwmbl)
+                return -ENOMEM;
+
+        pwmbl->pdev = pdev;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                retval = -ENODEV;
+                goto err_free_mem;
+        }
+
+        if (pdata->pwm_compare_max < pdata->pwm_duty_max ||
+                        pdata->pwm_duty_min > pdata->pwm_duty_max ||
+                        pdata->pwm_frequency == 0) {
+                retval = -EINVAL;
+                goto err_free_mem;
+        }
+
+        pwmbl->pdata = pdata;
+        pwmbl->gpio_on = pdata->gpio_on;
+
+        retval = pwm_channel_alloc(pdata->pwm_channel, &pwmbl->pwmc);
+        if (retval)
+                goto err_free_mem;
+
+        if (pwmbl->gpio_on != -1) {
+                retval = gpio_request(pwmbl->gpio_on, "gpio_atmel_pwm_bl");
+                if (retval) {
+                        pwmbl->gpio_on = -1;
+                        goto err_free_pwm;
+                }
+
+                /* Turn display off by defatult. */
+                retval = gpio_direction_output(pwmbl->gpio_on,
+                                0 ^ pdata->on_active_low);
+                if (retval)
+                        goto err_free_gpio;
+        }
+
+        bldev = backlight_device_register("atmel-pwm-bl",
+                        &pdev->dev, pwmbl, &atmel_pwm_bl_ops);
+        if (IS_ERR(bldev)) {
+                retval = PTR_ERR(bldev);
+                goto err_free_gpio;
+        }
+
+        pwmbl->bldev = bldev;
+
+        platform_set_drvdata(pdev, pwmbl);
+
+        /* Power up the backlight by default at middle intesity. */
+        bldev->props.power = FB_BLANK_UNBLANK;
+        bldev->props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min;
+        bldev->props.brightness = bldev->props.max_brightness / 2;
+
+        retval = atmel_pwm_bl_init_pwm(pwmbl);
+        if (retval)
+                goto err_free_bl_dev;
+
+        atmel_pwm_bl_set_intensity(bldev);
+
+        return 0;
+
+err_free_bl_dev:
+        platform_set_drvdata(pdev, NULL);
+        backlight_device_unregister(bldev);
+err_free_gpio:
+        if (pwmbl->gpio_on != -1)
+                gpio_free(pwmbl->gpio_on);
+err_free_pwm:
+        pwm_channel_free(&pwmbl->pwmc);
+err_free_mem:
+        kfree(pwmbl);
+        return retval;
+}
+
+static int __exit atmel_pwm_bl_remove(struct platform_device *pdev)
+{
+        struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev);
+
+        if (pwmbl->gpio_on != -1) {
+                gpio_set_value(pwmbl->gpio_on, 0);
+                gpio_free(pwmbl->gpio_on);
+        }
+        pwm_channel_disable(&pwmbl->pwmc);
+        pwm_channel_free(&pwmbl->pwmc);
+        backlight_device_unregister(pwmbl->bldev);
+        platform_set_drvdata(pdev, NULL);
+        kfree(pwmbl);
+
+        return 0;
+}
+
+static struct platform_driver atmel_pwm_bl_driver = {
+        .driver = {
+                .name = "atmel-pwm-bl",
+        },
+        /* REVISIT add suspend() and resume() */
+        .remove = __exit_p(atmel_pwm_bl_remove),
+};
+
+static int __init atmel_pwm_bl_init(void)
+{
+        return platform_driver_probe(&atmel_pwm_bl_driver, atmel_pwm_bl_probe);
+}
+module_init(atmel_pwm_bl_init);
+
+static void __exit atmel_pwm_bl_exit(void)
+{
+        platform_driver_unregister(&atmel_pwm_bl_driver);
+}
+module_exit(atmel_pwm_bl_exit);
+
+MODULE_AUTHOR("Hans-Christian egtvedt <hans-christian.egtvedt@atmel.com>");
+MODULE_DESCRIPTION("Atmel PWM backlight driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 39394757679c..fab0bc874b58 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -191,6 +191,7 @@ static struct device_attribute bl_device_attributes[] = {
  *   backlight_device class.
  * @name: the name of the new object(must be the same as the name of the
  *   respective framebuffer device).
+ * @parent: a pointer to the parent device
  * @devdata: an optional pointer to be stored for private driver use. The
  *   methods may retrieve it by using bl_get_data(bd).
  * @ops: the backlight operations structure.
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
new file mode 100644
index 000000000000..2afd47eefe74
--- /dev/null
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -0,0 +1,641 @@
+/*
+ *  LCD/Backlight Driver for Sharp Zaurus Handhelds (various models)
+ *
+ *  Copyright (c) 2004-2006 Richard Purdie
+ *
+ *  Based on Sharp's 2.4 Backlight Driver
+ *
+ *  Copyright (c) 2008 Marvell International Ltd.
+ *      Converted to SPI device based LCD/Backlight device driver
+ *      by Eric Miao <eric.miao@marvell.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/fb.h>
+#include <linux/lcd.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/corgi_lcd.h>
+#include <asm/mach/sharpsl_param.h>
+
+#define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
+
+/* Register Addresses */
+#define RESCTL_ADRS     0x00
+#define PHACTRL_ADRS    0x01
+#define DUTYCTRL_ADRS   0x02
+#define POWERREG0_ADRS  0x03
+#define POWERREG1_ADRS  0x04
+#define GPOR3_ADRS      0x05
+#define PICTRL_ADRS     0x06
+#define POLCTRL_ADRS    0x07
+
+/* Register Bit Definitions */
+#define RESCTL_QVGA     0x01
+#define RESCTL_VGA      0x00
+
+#define POWER1_VW_ON    0x01  /* VW Supply FET ON */
+#define POWER1_GVSS_ON  0x02  /* GVSS(-8V) Power Supply ON */
+#define POWER1_VDD_ON   0x04  /* VDD(8V),SVSS(-4V) Power Supply ON */
+
+#define POWER1_VW_OFF   0x00  /* VW Supply FET OFF */
+#define POWER1_GVSS_OFF 0x00  /* GVSS(-8V) Power Supply OFF */
+#define POWER1_VDD_OFF  0x00  /* VDD(8V),SVSS(-4V) Power Supply OFF */
+
+#define POWER0_COM_DCLK 0x01  /* COM Voltage DC Bias DAC Serial Data Clock */
+#define POWER0_COM_DOUT 0x02  /* COM Voltage DC Bias DAC Serial Data Out */
+#define POWER0_DAC_ON   0x04  /* DAC Power Supply ON */
+#define POWER0_COM_ON   0x08  /* COM Power Supply ON */
+#define POWER0_VCC5_ON  0x10  /* VCC5 Power Supply ON */
+
+#define POWER0_DAC_OFF  0x00  /* DAC Power Supply OFF */
+#define POWER0_COM_OFF  0x00  /* COM Power Supply OFF */
+#define POWER0_VCC5_OFF 0x00  /* VCC5 Power Supply OFF */
+
+#define PICTRL_INIT_STATE      0x01
+#define PICTRL_INIOFF          0x02
+#define PICTRL_POWER_DOWN      0x04
+#define PICTRL_COM_SIGNAL_OFF  0x08
+#define PICTRL_DAC_SIGNAL_OFF  0x10
+
+#define POLCTRL_SYNC_POL_FALL  0x01
+#define POLCTRL_EN_POL_FALL    0x02
+#define POLCTRL_DATA_POL_FALL  0x04
+#define POLCTRL_SYNC_ACT_H     0x08
+#define POLCTRL_EN_ACT_L       0x10
+
+#define POLCTRL_SYNC_POL_RISE  0x00
+#define POLCTRL_EN_POL_RISE    0x00
+#define POLCTRL_DATA_POL_RISE  0x00
+#define POLCTRL_SYNC_ACT_L     0x00
+#define POLCTRL_EN_ACT_H       0x00
+
+#define PHACTRL_PHASE_MANUAL   0x01
+#define DEFAULT_PHAD_QVGA     (9)
+#define DEFAULT_COMADJ        (125)
+
+struct corgi_lcd {
+        struct spi_device       *spi_dev;
+        struct lcd_device       *lcd_dev;
+        struct backlight_device *bl_dev;
+
+        int     limit_mask;
+        int     intensity;
+        int     power;
+        int     mode;
+        char    buf[2];
+
+        int     gpio_backlight_on;
+        int     gpio_backlight_cont;
+        int     gpio_backlight_cont_inverted;
+
+        void (*kick_battery)(void);
+};
+
+static int corgi_ssp_lcdtg_send(struct corgi_lcd *lcd, int reg, uint8_t val);
+
+static struct corgi_lcd *the_corgi_lcd;
+static unsigned long corgibl_flags;
+#define CORGIBL_SUSPENDED     0x01
+#define CORGIBL_BATTLOW       0x02
+
+/*
+ * This is only a psuedo I2C interface. We can't use the standard kernel
+ * routines as the interface is write only. We just assume the data is acked...
+ */
+static void lcdtg_ssp_i2c_send(struct corgi_lcd *lcd, uint8_t data)
+{
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS, data);
+        udelay(10);
+}
+
+static void lcdtg_i2c_send_bit(struct corgi_lcd *lcd, uint8_t data)
+{
+        lcdtg_ssp_i2c_send(lcd, data);
+        lcdtg_ssp_i2c_send(lcd, data | POWER0_COM_DCLK);
+        lcdtg_ssp_i2c_send(lcd, data);
+}
+
+static void lcdtg_i2c_send_start(struct corgi_lcd *lcd, uint8_t base)
+{
+        lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK | POWER0_COM_DOUT);
+        lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK);
+        lcdtg_ssp_i2c_send(lcd, base);
+}
+
+static void lcdtg_i2c_send_stop(struct corgi_lcd *lcd, uint8_t base)
+{
+        lcdtg_ssp_i2c_send(lcd, base);
+        lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK);
+        lcdtg_ssp_i2c_send(lcd, base | POWER0_COM_DCLK | POWER0_COM_DOUT);
+}
+
+static void lcdtg_i2c_send_byte(struct corgi_lcd *lcd,
+                                uint8_t base, uint8_t data)
+{
+        int i;
+        for (i = 0; i < 8; i++) {
+                if (data & 0x80)
+                        lcdtg_i2c_send_bit(lcd, base | POWER0_COM_DOUT);
+                else
+                        lcdtg_i2c_send_bit(lcd, base);
+                data <<= 1;
+        }
+}
+
+static void lcdtg_i2c_wait_ack(struct corgi_lcd *lcd, uint8_t base)
+{
+        lcdtg_i2c_send_bit(lcd, base);
+}
+
+static void lcdtg_set_common_voltage(struct corgi_lcd *lcd,
+                                     uint8_t base_data, uint8_t data)
+{
+        /* Set Common Voltage to M62332FP via I2C */
+        lcdtg_i2c_send_start(lcd, base_data);
+        lcdtg_i2c_send_byte(lcd, base_data, 0x9c);
+        lcdtg_i2c_wait_ack(lcd, base_data);
+        lcdtg_i2c_send_byte(lcd, base_data, 0x00);
+        lcdtg_i2c_wait_ack(lcd, base_data);
+        lcdtg_i2c_send_byte(lcd, base_data, data);
+        lcdtg_i2c_wait_ack(lcd, base_data);
+        lcdtg_i2c_send_stop(lcd, base_data);
+}
+
+static int corgi_ssp_lcdtg_send(struct corgi_lcd *lcd, int adrs, uint8_t data)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer = {
+                .len            = 1,
+                .cs_change      = 1,
+                .tx_buf         = lcd->buf,
+        };
+
+        lcd->buf[0] = ((adrs & 0x07) << 5) | (data & 0x1f);
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        return spi_sync(lcd->spi_dev, &msg);
+}
+
+/* Set Phase Adjust */
+static void lcdtg_set_phadadj(struct corgi_lcd *lcd, int mode)
+{
+        int adj;
+
+        switch(mode) {
+        case CORGI_LCD_MODE_VGA:
+                /* Setting for VGA */
+                adj = sharpsl_param.phadadj;
+                adj = (adj < 0) ? PHACTRL_PHASE_MANUAL :
+                                  PHACTRL_PHASE_MANUAL | ((adj & 0xf) << 1);
+                break;
+        case CORGI_LCD_MODE_QVGA:
+        default:
+                /* Setting for QVGA */
+                adj = (DEFAULT_PHAD_QVGA << 1) | PHACTRL_PHASE_MANUAL;
+                break;
+        }
+
+        corgi_ssp_lcdtg_send(lcd, PHACTRL_ADRS, adj);
+}
+
+static void corgi_lcd_power_on(struct corgi_lcd *lcd)
+{
+        int comadj;
+
+        /* Initialize Internal Logic & Port */
+        corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS,
+                        PICTRL_POWER_DOWN | PICTRL_INIOFF |
+                        PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF |
+                        PICTRL_DAC_SIGNAL_OFF);
+
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF |
+                        POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
+
+        /* VDD(+8V), SVSS(-4V) ON */
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
+        mdelay(3);
+
+        /* DAC ON */
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |
+                        POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+        /* INIB = H, INI = L  */
+        /* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */
+        corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS,
+                        PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF);
+
+        /* Set Common Voltage */
+        comadj = sharpsl_param.comadj;
+        if (comadj < 0)
+                comadj = DEFAULT_COMADJ;
+
+        lcdtg_set_common_voltage(lcd, POWER0_DAC_ON | POWER0_COM_OFF |
+                                 POWER0_VCC5_OFF, comadj);
+
+        /* VCC5 ON, DAC ON */
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |
+                        POWER0_COM_OFF | POWER0_VCC5_ON);
+
+        /* GVSS(-8V) ON, VDD ON */
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
+        mdelay(2);
+
+        /* COM SIGNAL ON (PICTL[3] = L) */
+        corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS, PICTRL_INIT_STATE);
+
+        /* COM ON, DAC ON, VCC5_ON */
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |
+                        POWER0_COM_ON | POWER0_VCC5_ON);
+
+        /* VW ON, GVSS ON, VDD ON */
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_ON | POWER1_GVSS_ON | POWER1_VDD_ON);
+
+        /* Signals output enable */
+        corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS, 0);
+
+        /* Set Phase Adjust */
+        lcdtg_set_phadadj(lcd, lcd->mode);
+
+        /* Initialize for Input Signals from ATI */
+        corgi_ssp_lcdtg_send(lcd, POLCTRL_ADRS,
+                        POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE |
+                        POLCTRL_DATA_POL_RISE | POLCTRL_SYNC_ACT_L |
+                        POLCTRL_EN_ACT_H);
+        udelay(1000);
+
+        switch (lcd->mode) {
+        case CORGI_LCD_MODE_VGA:
+                corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_VGA);
+                break;
+        case CORGI_LCD_MODE_QVGA:
+        default:
+                corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_QVGA);
+                break;
+        }
+}
+
+static void corgi_lcd_power_off(struct corgi_lcd *lcd)
+{
+        /* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */
+        msleep(34);
+
+        /* (1)VW OFF */
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
+
+        /* (2)COM OFF */
+        corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);
+
+        /* (3)Set Common Voltage Bias 0V */
+        lcdtg_set_common_voltage(lcd, POWER0_DAC_ON | POWER0_COM_OFF |
+                        POWER0_VCC5_ON, 0);
+
+        /* (4)GVSS OFF */
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
+
+        /* (5)VCC5 OFF */
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+        /* (6)Set PDWN, INIOFF, DACOFF */
+        corgi_ssp_lcdtg_send(lcd, PICTRL_ADRS,
+                        PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |
+                        PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);
+
+        /* (7)DAC OFF */
+        corgi_ssp_lcdtg_send(lcd, POWERREG0_ADRS,
+                        POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+        /* (8)VDD OFF */
+        corgi_ssp_lcdtg_send(lcd, POWERREG1_ADRS,
+                        POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
+}
+
+static int corgi_lcd_set_mode(struct lcd_device *ld, struct fb_videomode *m)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&ld->dev);
+        int mode = CORGI_LCD_MODE_QVGA;
+
+        if (m->xres == 640 || m->xres == 480)
+                mode = CORGI_LCD_MODE_VGA;
+
+        if (lcd->mode == mode)
+                return 0;
+
+        lcdtg_set_phadadj(lcd, mode);
+
+        switch (mode) {
+        case CORGI_LCD_MODE_VGA:
+                corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_VGA);
+                break;
+        case CORGI_LCD_MODE_QVGA:
+        default:
+                corgi_ssp_lcdtg_send(lcd, RESCTL_ADRS, RESCTL_QVGA);
+                break;
+        }
+
+        lcd->mode = mode;
+        return 0;
+}
+
+static int corgi_lcd_set_power(struct lcd_device *ld, int power)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&ld->dev);
+
+        if (POWER_IS_ON(power) && !POWER_IS_ON(lcd->power))
+                corgi_lcd_power_on(lcd);
+
+        if (!POWER_IS_ON(power) && POWER_IS_ON(lcd->power))
+                corgi_lcd_power_off(lcd);
+
+        lcd->power = power;
+        return 0;
+}
+
+static int corgi_lcd_get_power(struct lcd_device *ld)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&ld->dev);
+
+        return lcd->power;
+}
+
+static struct lcd_ops corgi_lcd_ops = {
+        .get_power      = corgi_lcd_get_power,
+        .set_power      = corgi_lcd_set_power,
+        .set_mode       = corgi_lcd_set_mode,
+};
+
+static int corgi_bl_get_intensity(struct backlight_device *bd)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&bd->dev);
+
+        return lcd->intensity;
+}
+
+static int corgi_bl_set_intensity(struct corgi_lcd *lcd, int intensity)
+{
+        int cont;
+
+        if (intensity > 0x10)
+                intensity += 0x10;
+
+        corgi_ssp_lcdtg_send(lcd, DUTYCTRL_ADRS, intensity);
+
+        /* Bit 5 via GPIO_BACKLIGHT_CONT */
+        cont = !!(intensity & 0x20) ^ lcd->gpio_backlight_cont_inverted;
+
+        if (gpio_is_valid(lcd->gpio_backlight_cont))
+                gpio_set_value(lcd->gpio_backlight_cont, cont);
+
+        if (gpio_is_valid(lcd->gpio_backlight_on))
+                gpio_set_value(lcd->gpio_backlight_on, intensity);
+
+        if (lcd->kick_battery)
+                lcd->kick_battery();
+
+        lcd->intensity = intensity;
+        return 0;
+}
+
+static int corgi_bl_update_status(struct backlight_device *bd)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&bd->dev);
+        int intensity = bd->props.brightness;
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                intensity = 0;
+
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+                intensity = 0;
+
+        if (corgibl_flags & CORGIBL_SUSPENDED)
+                intensity = 0;
+        if (corgibl_flags & CORGIBL_BATTLOW)
+                intensity &= lcd->limit_mask;
+
+        return corgi_bl_set_intensity(lcd, intensity);
+}
+
+void corgibl_limit_intensity(int limit)
+{
+        if (limit)
+                corgibl_flags |= CORGIBL_BATTLOW;
+        else
+                corgibl_flags &= ~CORGIBL_BATTLOW;
+
+        backlight_update_status(the_corgi_lcd->bl_dev);
+}
+EXPORT_SYMBOL(corgibl_limit_intensity);
+
+static struct backlight_ops corgi_bl_ops = {
+        .get_brightness = corgi_bl_get_intensity,
+        .update_status  = corgi_bl_update_status,
+};
+
+#ifdef CONFIG_PM
+static int corgi_lcd_suspend(struct spi_device *spi, pm_message_t state)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
+
+        corgibl_flags |= CORGIBL_SUSPENDED;
+        corgi_bl_set_intensity(lcd, 0);
+        corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN);
+        return 0;
+}
+
+static int corgi_lcd_resume(struct spi_device *spi)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
+
+        corgibl_flags &= ~CORGIBL_SUSPENDED;
+        corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_UNBLANK);
+        backlight_update_status(lcd->bl_dev);
+        return 0;
+}
+#else
+#define corgi_lcd_suspend       NULL
+#define corgi_lcd_resume        NULL
+#endif
+
+static int setup_gpio_backlight(struct corgi_lcd *lcd,
+                                struct corgi_lcd_platform_data *pdata)
+{
+        struct spi_device *spi = lcd->spi_dev;
+        int err;
+
+        lcd->gpio_backlight_on = -1;
+        lcd->gpio_backlight_cont = -1;
+
+        if (gpio_is_valid(pdata->gpio_backlight_on)) {
+                err = gpio_request(pdata->gpio_backlight_on, "BL_ON");
+                if (err) {
+                        dev_err(&spi->dev, "failed to request GPIO%d for "
+                                "backlight_on\n", pdata->gpio_backlight_on);
+                        return err;
+                }
+
+                lcd->gpio_backlight_on = pdata->gpio_backlight_on;
+                gpio_direction_output(lcd->gpio_backlight_on, 0);
+        }
+
+        if (gpio_is_valid(pdata->gpio_backlight_cont)) {
+                err = gpio_request(pdata->gpio_backlight_cont, "BL_CONT");
+                if (err) {
+                        dev_err(&spi->dev, "failed to request GPIO%d for "
+                                "backlight_cont\n", pdata->gpio_backlight_cont);
+                        goto err_free_backlight_on;
+                }
+
+                lcd->gpio_backlight_cont = pdata->gpio_backlight_cont;
+
+                /* spitz and akita use both GPIOs for backlight, and
+                 * have inverted polarity of GPIO_BACKLIGHT_CONT
+                 */
+                if (gpio_is_valid(lcd->gpio_backlight_on)) {
+                        lcd->gpio_backlight_cont_inverted = 1;
+                        gpio_direction_output(lcd->gpio_backlight_cont, 1);
+                } else {
+                        lcd->gpio_backlight_cont_inverted = 0;
+                        gpio_direction_output(lcd->gpio_backlight_cont, 0);
+                }
+        }
+        return 0;
+
+err_free_backlight_on:
+        if (gpio_is_valid(lcd->gpio_backlight_on))
+                gpio_free(lcd->gpio_backlight_on);
+        return err;
+}
+
+static int __devinit corgi_lcd_probe(struct spi_device *spi)
+{
+        struct corgi_lcd_platform_data *pdata = spi->dev.platform_data;
+        struct corgi_lcd *lcd;
+        int ret = 0;
+
+        if (pdata == NULL) {
+                dev_err(&spi->dev, "platform data not available\n");
+                return -EINVAL;
+        }
+
+        lcd = kzalloc(sizeof(struct corgi_lcd), GFP_KERNEL);
+        if (!lcd) {
+                dev_err(&spi->dev, "failed to allocate memory\n");
+                return -ENOMEM;
+        }
+
+        lcd->spi_dev = spi;
+
+        lcd->lcd_dev = lcd_device_register("corgi_lcd", &spi->dev,
+                                        lcd, &corgi_lcd_ops);
+        if (IS_ERR(lcd->lcd_dev)) {
+                ret = PTR_ERR(lcd->lcd_dev);
+                goto err_free_lcd;
+        }
+        lcd->power = FB_BLANK_POWERDOWN;
+        lcd->mode = (pdata) ? pdata->init_mode : CORGI_LCD_MODE_VGA;
+
+        lcd->bl_dev = backlight_device_register("corgi_bl", &spi->dev,
+                                        lcd, &corgi_bl_ops);
+        if (IS_ERR(lcd->bl_dev)) {
+                ret = PTR_ERR(lcd->bl_dev);
+                goto err_unregister_lcd;
+        }
+        lcd->bl_dev->props.max_brightness = pdata->max_intensity;
+        lcd->bl_dev->props.brightness = pdata->default_intensity;
+        lcd->bl_dev->props.power = FB_BLANK_UNBLANK;
+
+        ret = setup_gpio_backlight(lcd, pdata);
+        if (ret)
+                goto err_unregister_bl;
+
+        lcd->kick_battery = pdata->kick_battery;
+
+        dev_set_drvdata(&spi->dev, lcd);
+        corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_UNBLANK);
+        backlight_update_status(lcd->bl_dev);
+
+        lcd->limit_mask = pdata->limit_mask;
+        the_corgi_lcd = lcd;
+        return 0;
+
+err_unregister_bl:
+        backlight_device_unregister(lcd->bl_dev);
+err_unregister_lcd:
+        lcd_device_unregister(lcd->lcd_dev);
+err_free_lcd:
+        kfree(lcd);
+        return ret;
+}
+
+static int __devexit corgi_lcd_remove(struct spi_device *spi)
+{
+        struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
+
+        lcd->bl_dev->props.power = FB_BLANK_UNBLANK;
+        lcd->bl_dev->props.brightness = 0;
+        backlight_update_status(lcd->bl_dev);
+        backlight_device_unregister(lcd->bl_dev);
+
+        if (gpio_is_valid(lcd->gpio_backlight_on))
+                gpio_free(lcd->gpio_backlight_on);
+
+        if (gpio_is_valid(lcd->gpio_backlight_cont))
+                gpio_free(lcd->gpio_backlight_cont);
+
+        corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN);
+        lcd_device_unregister(lcd->lcd_dev);
+        kfree(lcd);
+
+        return 0;
+}
+
+static struct spi_driver corgi_lcd_driver = {
+        .driver         = {
+                .name   = "corgi-lcd",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = corgi_lcd_probe,
+        .remove         = __devexit_p(corgi_lcd_remove),
+        .suspend        = corgi_lcd_suspend,
+        .resume         = corgi_lcd_resume,
+};
+
+static int __init corgi_lcd_init(void)
+{
+        return spi_register_driver(&corgi_lcd_driver);
+}
+module_init(corgi_lcd_init);
+
+static void __exit corgi_lcd_exit(void)
+{
+        spi_unregister_driver(&corgi_lcd_driver);
+}
+module_exit(corgi_lcd_exit);
+
+MODULE_DESCRIPTION("LCD and backlight driver for SHARP C7x0/Cxx00");
+MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x.c
new file mode 100644
index 000000000000..242c38250166
--- /dev/null
+++ b/drivers/video/backlight/da903x.c
@@ -0,0 +1,201 @@
+/*
+ * Backlight driver for Dialog Semiconductor DA9030/DA9034
+ *
+ * Copyright (C) 2008 Compulab, Ltd.
+ *      Mike Rapoport <mike@compulab.co.il>
+ *
+ * Copyright (C) 2006-2008 Marvell International Ltd.
+ *      Eric Miao <eric.miao@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/mfd/da903x.h>
+
+#define DA9030_WLED_CONTROL     0x25
+#define DA9030_WLED_CP_EN       (1 << 6)
+#define DA9030_WLED_TRIM(x)     ((x) & 0x7)
+
+#define DA9034_WLED_CONTROL1    0x3C
+#define DA9034_WLED_CONTROL2    0x3D
+
+#define DA9034_WLED_BOOST_EN    (1 << 5)
+
+#define DA9030_MAX_BRIGHTNESS   7
+#define DA9034_MAX_BRIGHTNESS   0x7f
+
+struct da903x_backlight_data {
+        struct device *da903x_dev;
+        int id;
+        int current_brightness;
+};
+
+static int da903x_backlight_set(struct backlight_device *bl, int brightness)
+{
+        struct da903x_backlight_data *data = bl_get_data(bl);
+        struct device *dev = data->da903x_dev;
+        uint8_t val;
+        int ret = 0;
+
+        switch (data->id) {
+        case DA9034_ID_WLED:
+                ret = da903x_update(dev, DA9034_WLED_CONTROL1,
+                                brightness, 0x7f);
+                if (ret)
+                        return ret;
+
+                if (data->current_brightness && brightness == 0)
+                        ret = da903x_clr_bits(dev,
+                                        DA9034_WLED_CONTROL2,
+                                        DA9034_WLED_BOOST_EN);
+
+                if (data->current_brightness == 0 && brightness)
+                        ret = da903x_set_bits(dev,
+                                        DA9034_WLED_CONTROL2,
+                                        DA9034_WLED_BOOST_EN);
+                break;
+        case DA9030_ID_WLED:
+                val = DA9030_WLED_TRIM(brightness);
+                val |= brightness ? DA9030_WLED_CP_EN : 0;
+                ret = da903x_write(dev, DA9030_WLED_CONTROL, val);
+                break;
+        }
+
+        if (ret)
+                return ret;
+
+        data->current_brightness = brightness;
+        return 0;
+}
+
+static int da903x_backlight_update_status(struct backlight_device *bl)
+{
+        int brightness = bl->props.brightness;
+
+        if (bl->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        return da903x_backlight_set(bl, brightness);
+}
+
+static int da903x_backlight_get_brightness(struct backlight_device *bl)
+{
+        struct da903x_backlight_data *data = bl_get_data(bl);
+        return data->current_brightness;
+}
+
+static struct backlight_ops da903x_backlight_ops = {
+        .update_status  = da903x_backlight_update_status,
+        .get_brightness = da903x_backlight_get_brightness,
+};
+
+static int da903x_backlight_probe(struct platform_device *pdev)
+{
+        struct da903x_backlight_data *data;
+        struct backlight_device *bl;
+        int max_brightness;
+
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (data == NULL)
+                return -ENOMEM;
+
+        switch (pdev->id) {
+        case DA9030_ID_WLED:
+                max_brightness = DA9030_MAX_BRIGHTNESS;
+                break;
+        case DA9034_ID_WLED:
+                max_brightness = DA9034_MAX_BRIGHTNESS;
+                break;
+        default:
+                dev_err(&pdev->dev, "invalid backlight device ID(%d)\n",
+                                pdev->id);
+                return -EINVAL;
+        }
+
+        data->id = pdev->id;
+        data->da903x_dev = pdev->dev.parent;
+        data->current_brightness = 0;
+
+        bl = backlight_device_register(pdev->name, data->da903x_dev,
+                        data, &da903x_backlight_ops);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                return PTR_ERR(bl);
+        }
+
+        bl->props.max_brightness = max_brightness;
+        bl->props.brightness = max_brightness;
+
+        platform_set_drvdata(pdev, bl);
+        backlight_update_status(bl);
+        return 0;
+}
+
+static int da903x_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct da903x_backlight_data *data = bl_get_data(bl);
+
+        backlight_device_unregister(bl);
+        kfree(data);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int da903x_backlight_suspend(struct platform_device *pdev,
+                                 pm_message_t state)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        return da903x_backlight_set(bl, 0);
+}
+
+static int da903x_backlight_resume(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+
+        backlight_update_status(bl);
+        return 0;
+}
+#else
+#define da903x_backlight_suspend        NULL
+#define da903x_backlight_resume         NULL
+#endif
+
+static struct platform_driver da903x_backlight_driver = {
+        .driver         = {
+                .name   = "da903x-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = da903x_backlight_probe,
+        .remove         = da903x_backlight_remove,
+        .suspend        = da903x_backlight_suspend,
+        .resume         = da903x_backlight_resume,
+};
+
+static int __init da903x_backlight_init(void)
+{
+        return platform_driver_register(&da903x_backlight_driver);
+}
+module_init(da903x_backlight_init);
+
+static void __exit da903x_backlight_exit(void)
+{
+        platform_driver_unregister(&da903x_backlight_driver);
+}
+module_exit(da903x_backlight_exit);
+
+MODULE_DESCRIPTION("Backlight Driver for Dialog Semiconductor DA9030/DA9034");
+MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>"
+              "Mike Rapoport <mike@compulab.co.il>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:da903x-backlight");
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index fbea2bd129c7..d4cfed0b26d5 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -18,8 +18,8 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 
-#include <asm/cpu/dac.h>
-#include <asm/hp6xx.h>
+#include <cpu/dac.h>
+#include <mach/hp6xx.h>
 #include <asm/hd64461.h>
 
 #define HP680_MAX_INTENSITY 255
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
new file mode 100644
index 000000000000..ba89b41b639c
--- /dev/null
+++ b/drivers/video/backlight/ili9320.c
@@ -0,0 +1,330 @@
+/* drivers/video/backlight/ili9320.c
+ *
+ * ILI9320 LCD controller driver core.
+ *
+ * Copyright 2007 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/lcd.h>
+#include <linux/module.h>
+
+#include <linux/spi/spi.h>
+
+#include <video/ili9320.h>
+
+#include "ili9320.h"
+
+
+static inline int ili9320_write_spi(struct ili9320 *ili,
+                                    unsigned int reg,
+                                    unsigned int value)
+{
+        struct ili9320_spi *spi = &ili->access.spi;
+        unsigned char *addr = spi->buffer_addr;
+        unsigned char *data = spi->buffer_data;
+
+        /* spi message consits of:
+         * first byte: ID and operation
+         */
+
+        addr[0] = spi->id | ILI9320_SPI_INDEX | ILI9320_SPI_WRITE;
+        addr[1] = reg >> 8;
+        addr[2] = reg;
+
+        /* second message is the data to transfer */
+
+        data[0] = spi->id | ILI9320_SPI_DATA  | ILI9320_SPI_WRITE;
+        data[1] = value >> 8;
+        data[2] = value;
+
+        return spi_sync(spi->dev, &spi->message);
+}
+
+int ili9320_write(struct ili9320 *ili, unsigned int reg, unsigned int value)
+{
+        dev_dbg(ili->dev, "write: reg=%02x, val=%04x\n", reg, value);
+        return ili->write(ili, reg, value);
+}
+
+EXPORT_SYMBOL_GPL(ili9320_write);
+
+int ili9320_write_regs(struct ili9320 *ili,
+                       struct ili9320_reg *values,
+                       int nr_values)
+{
+        int index;
+        int ret;
+
+        for (index = 0; index < nr_values; index++, values++) {
+                ret = ili9320_write(ili, values->address, values->value);
+                if (ret != 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(ili9320_write_regs);
+
+static void ili9320_reset(struct ili9320 *lcd)
+{
+        struct ili9320_platdata *cfg = lcd->platdata;
+
+        cfg->reset(1);
+        mdelay(50);
+
+        cfg->reset(0);
+        mdelay(50);
+
+        cfg->reset(1);
+        mdelay(100);
+}
+
+static inline int ili9320_init_chip(struct ili9320 *lcd)
+{
+        int ret;
+
+        ili9320_reset(lcd);
+
+        ret = lcd->client->init(lcd, lcd->platdata);
+        if (ret != 0) {
+                dev_err(lcd->dev, "failed to initialise display\n");
+                return ret;
+        }
+
+        lcd->initialised = 1;
+        return 0;
+}
+
+static inline int ili9320_power_on(struct ili9320 *lcd)
+{
+        if (!lcd->initialised)
+                ili9320_init_chip(lcd);
+
+        lcd->display1 |= (ILI9320_DISPLAY1_D(3) | ILI9320_DISPLAY1_BASEE);
+        ili9320_write(lcd, ILI9320_DISPLAY1, lcd->display1);
+
+        return 0;
+}
+
+static inline int ili9320_power_off(struct ili9320 *lcd)
+{
+        lcd->display1 &= ~(ILI9320_DISPLAY1_D(3) | ILI9320_DISPLAY1_BASEE);
+        ili9320_write(lcd, ILI9320_DISPLAY1, lcd->display1);
+
+        return 0;
+}
+
+#define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
+
+static int ili9320_power(struct ili9320 *lcd, int power)
+{
+        int ret = 0;
+
+        dev_dbg(lcd->dev, "power %d => %d\n", lcd->power, power);
+
+        if (POWER_IS_ON(power) && !POWER_IS_ON(lcd->power))
+                ret = ili9320_power_on(lcd);
+        else if (!POWER_IS_ON(power) && POWER_IS_ON(lcd->power))
+                ret = ili9320_power_off(lcd);
+
+        if (ret == 0)
+                lcd->power = power;
+        else
+                dev_warn(lcd->dev, "failed to set power mode %d\n", power);
+
+        return ret;
+}
+
+static inline struct ili9320 *to_our_lcd(struct lcd_device *lcd)
+{
+        return lcd_get_data(lcd);
+}
+
+static int ili9320_set_power(struct lcd_device *ld, int power)
+{
+        struct ili9320 *lcd = to_our_lcd(ld);
+
+        return ili9320_power(lcd, power);
+}
+
+static int ili9320_get_power(struct lcd_device *ld)
+{
+        struct ili9320 *lcd = to_our_lcd(ld);
+
+        return lcd->power;
+}
+
+static struct lcd_ops ili9320_ops = {
+        .get_power      = ili9320_get_power,
+        .set_power      = ili9320_set_power,
+};
+
+static void __devinit ili9320_setup_spi(struct ili9320 *ili,
+                                        struct spi_device *dev)
+{
+        struct ili9320_spi *spi = &ili->access.spi;
+
+        ili->write = ili9320_write_spi;
+        spi->dev = dev;
+
+        /* fill the two messages we are going to use to send the data
+         * with, the first the address followed by the data. The datasheet
+         * says they should be done as two distinct cycles of the SPI CS line.
+         */
+
+        spi->xfer[0].tx_buf = spi->buffer_addr;
+        spi->xfer[1].tx_buf = spi->buffer_data;
+        spi->xfer[0].len = 3;
+        spi->xfer[1].len = 3;
+        spi->xfer[0].bits_per_word = 8;
+        spi->xfer[1].bits_per_word = 8;
+        spi->xfer[0].cs_change = 1;
+
+        spi_message_init(&spi->message);
+        spi_message_add_tail(&spi->xfer[0], &spi->message);
+        spi_message_add_tail(&spi->xfer[1], &spi->message);
+}
+
+int __devinit ili9320_probe_spi(struct spi_device *spi,
+                                struct ili9320_client *client)
+{
+        struct ili9320_platdata *cfg = spi->dev.platform_data;
+        struct device *dev = &spi->dev;
+        struct ili9320 *ili;
+        struct lcd_device *lcd;
+        int ret = 0;
+
+        /* verify we where given some information */
+
+        if (cfg == NULL) {
+                dev_err(dev, "no platform data supplied\n");
+                return -EINVAL;
+        }
+
+        if (cfg->hsize <= 0 || cfg->vsize <= 0 || cfg->reset == NULL) {
+                dev_err(dev, "invalid platform data supplied\n");
+                return -EINVAL;
+        }
+
+        /* allocate and initialse our state */
+
+        ili = kzalloc(sizeof(struct ili9320), GFP_KERNEL);
+        if (ili == NULL) {
+                dev_err(dev, "no memory for device\n");
+                return -ENOMEM;
+        }
+
+        ili->access.spi.id = ILI9320_SPI_IDCODE | ILI9320_SPI_ID(1);
+
+        ili->dev = dev;
+        ili->client = client;
+        ili->power = FB_BLANK_POWERDOWN;
+        ili->platdata = cfg;
+
+        dev_set_drvdata(&spi->dev, ili);
+
+        ili9320_setup_spi(ili, spi);
+
+        lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops);
+        if (IS_ERR(lcd)) {
+                dev_err(dev, "failed to register lcd device\n");
+                ret = PTR_ERR(lcd);
+                goto err_free;
+        }
+
+        ili->lcd = lcd;
+
+        dev_info(dev, "initialising %s\n", client->name);
+
+        ret = ili9320_power(ili, FB_BLANK_UNBLANK);
+        if (ret != 0) {
+                dev_err(dev, "failed to set lcd power state\n");
+                goto err_unregister;
+        }
+
+        return 0;
+
+ err_unregister:
+        lcd_device_unregister(lcd);
+
+ err_free:
+        kfree(ili);
+
+        return ret;
+}
+
+EXPORT_SYMBOL_GPL(ili9320_probe_spi);
+
+int __devexit ili9320_remove(struct ili9320 *ili)
+{
+        ili9320_power(ili, FB_BLANK_POWERDOWN);
+
+        lcd_device_unregister(ili->lcd);
+        kfree(ili);
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(ili9320_remove);
+
+#ifdef CONFIG_PM
+int ili9320_suspend(struct ili9320 *lcd, pm_message_t state)
+{
+        int ret;
+
+        dev_dbg(lcd->dev, "%s: event %d\n", __func__, state.event);
+
+        if (state.event == PM_EVENT_SUSPEND) {
+                ret = ili9320_power(lcd, FB_BLANK_POWERDOWN);
+
+                if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP) {
+                        ili9320_write(lcd, ILI9320_POWER1, lcd->power1 |
+                                      ILI9320_POWER1_SLP |
+                                      ILI9320_POWER1_DSTB);
+                        lcd->initialised = 0;
+                }
+
+                return ret;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(ili9320_suspend);
+
+int ili9320_resume(struct ili9320 *lcd)
+{
+        dev_info(lcd->dev, "resuming from power state %d\n", lcd->power);
+
+        if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP) {
+                ili9320_write(lcd, ILI9320_POWER1, 0x00);
+        }
+
+        return ili9320_power(lcd, FB_BLANK_UNBLANK);
+}
+
+EXPORT_SYMBOL_GPL(ili9320_resume);
+#endif
+
+/* Power down all displays on reboot, poweroff or halt */
+void ili9320_shutdown(struct ili9320 *lcd)
+{
+        ili9320_power(lcd, FB_BLANK_POWERDOWN);
+}
+
+EXPORT_SYMBOL_GPL(ili9320_shutdown);
+
+MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
+MODULE_DESCRIPTION("ILI9320 LCD Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/ili9320.h b/drivers/video/backlight/ili9320.h
new file mode 100644
index 000000000000..e388eca7cac5
--- /dev/null
+++ b/drivers/video/backlight/ili9320.h
@@ -0,0 +1,80 @@
+/* drivers/video/backlight/ili9320.h
+ *
+ * ILI9320 LCD controller driver core.
+ *
+ * Copyright 2007 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+/* Holder for register and value pairs. */
+struct ili9320_reg {
+        unsigned short          address;
+        unsigned short          value;
+};
+
+struct ili9320;
+
+struct ili9320_client {
+        const char      *name;
+        int     (*init)(struct ili9320 *ili, struct ili9320_platdata *cfg);
+
+};
+/* Device attached via an SPI bus. */
+struct  ili9320_spi {
+        struct spi_device       *dev;
+        struct spi_message      message;
+        struct spi_transfer     xfer[2];
+
+        unsigned char           id;
+        unsigned char           buffer_addr[4];
+        unsigned char           buffer_data[4];
+};
+
+/* ILI9320 device state. */
+struct ili9320 {
+        union {
+                struct ili9320_spi      spi;    /* SPI attachged device. */
+        } access;                               /* Register access method. */
+
+        struct device                   *dev;
+        struct lcd_device               *lcd;   /* LCD device we created. */
+        struct ili9320_client           *client;
+        struct ili9320_platdata         *platdata;
+
+        int                              power; /* current power state. */
+        int                              initialised;
+
+        unsigned short                   display1;
+        unsigned short                   power1;
+
+        int (*write)(struct ili9320 *ili, unsigned int reg, unsigned int val);
+};
+
+
+/* ILI9320 register access routines */
+
+extern int ili9320_write(struct ili9320 *ili,
+                         unsigned int reg, unsigned int value);
+
+extern int ili9320_write_regs(struct ili9320 *ili,
+                              struct ili9320_reg *values,
+                              int nr_values);
+
+/* Device probe */
+
+extern int ili9320_probe_spi(struct spi_device *spi,
+                             struct ili9320_client *cli);
+
+extern int ili9320_remove(struct ili9320 *lcd);
+extern void ili9320_shutdown(struct ili9320 *lcd);
+
+/* PM */
+
+extern int ili9320_suspend(struct ili9320 *lcd, pm_message_t state);
+extern int ili9320_resume(struct ili9320 *lcd);
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
new file mode 100644
index 000000000000..a38fda1742dd
--- /dev/null
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -0,0 +1,204 @@
+/*
+ *  Backlight Driver for the KB3886 Backlight
+ *
+ *  Copyright (c) 2007-2008 Claudio Nieder
+ *
+ *  Based on corgi_bl.c by Richard Purdie and kb3886 driver by Robert Woerle
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/delay.h>
+#include <linux/dmi.h>
+
+#define KB3886_PARENT 0x64
+#define KB3886_IO 0x60
+#define KB3886_ADC_DAC_PWM 0xC4
+#define KB3886_PWM0_WRITE 0x81
+#define KB3886_PWM0_READ 0x41
+
+static DEFINE_MUTEX(bl_mutex);
+
+static void kb3886_bl_set_intensity(int intensity)
+{
+        mutex_lock(&bl_mutex);
+        intensity = intensity&0xff;
+        outb(KB3886_ADC_DAC_PWM, KB3886_PARENT);
+        msleep(10);
+        outb(KB3886_PWM0_WRITE, KB3886_IO);
+        msleep(10);
+        outb(intensity, KB3886_IO);
+        mutex_unlock(&bl_mutex);
+}
+
+struct kb3886bl_machinfo {
+        int max_intensity;
+        int default_intensity;
+        int limit_mask;
+        void (*set_bl_intensity)(int intensity);
+};
+
+static struct kb3886bl_machinfo kb3886_bl_machinfo = {
+        .max_intensity = 0xff,
+        .default_intensity = 0xa0,
+        .limit_mask = 0x7f,
+        .set_bl_intensity = kb3886_bl_set_intensity,
+};
+
+static struct platform_device kb3886bl_device = {
+        .name           = "kb3886-bl",
+        .dev            = {
+                .platform_data  = &kb3886_bl_machinfo,
+        },
+        .id             = -1,
+};
+
+static struct platform_device *devices[] __initdata = {
+        &kb3886bl_device,
+};
+
+/*
+ * Back to driver
+ */
+
+static int kb3886bl_intensity;
+static struct backlight_device *kb3886_backlight_device;
+static struct kb3886bl_machinfo *bl_machinfo;
+
+static unsigned long kb3886bl_flags;
+#define KB3886BL_SUSPENDED     0x01
+
+static struct dmi_system_id __initdata kb3886bl_device_table[] = {
+        {
+                .ident = "Sahara Touch-iT",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "SDV"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "iTouch T201"),
+                },
+        },
+        { }
+};
+
+static int kb3886bl_send_intensity(struct backlight_device *bd)
+{
+        int intensity = bd->props.brightness;
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (kb3886bl_flags & KB3886BL_SUSPENDED)
+                intensity = 0;
+
+        bl_machinfo->set_bl_intensity(intensity);
+
+        kb3886bl_intensity = intensity;
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int kb3886bl_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct backlight_device *bd = platform_get_drvdata(pdev);
+
+        kb3886bl_flags |= KB3886BL_SUSPENDED;
+        backlight_update_status(bd);
+        return 0;
+}
+
+static int kb3886bl_resume(struct platform_device *pdev)
+{
+        struct backlight_device *bd = platform_get_drvdata(pdev);
+
+        kb3886bl_flags &= ~KB3886BL_SUSPENDED;
+        backlight_update_status(bd);
+        return 0;
+}
+#else
+#define kb3886bl_suspend        NULL
+#define kb3886bl_resume         NULL
+#endif
+
+static int kb3886bl_get_intensity(struct backlight_device *bd)
+{
+        return kb3886bl_intensity;
+}
+
+static struct backlight_ops kb3886bl_ops = {
+        .get_brightness = kb3886bl_get_intensity,
+        .update_status  = kb3886bl_send_intensity,
+};
+
+static int kb3886bl_probe(struct platform_device *pdev)
+{
+        struct kb3886bl_machinfo *machinfo = pdev->dev.platform_data;
+
+        bl_machinfo = machinfo;
+        if (!machinfo->limit_mask)
+                machinfo->limit_mask = -1;
+
+        kb3886_backlight_device = backlight_device_register("kb3886-bl",
+                &pdev->dev, NULL, &kb3886bl_ops);
+        if (IS_ERR(kb3886_backlight_device))
+                return PTR_ERR(kb3886_backlight_device);
+
+        platform_set_drvdata(pdev, kb3886_backlight_device);
+
+        kb3886_backlight_device->props.max_brightness = machinfo->max_intensity;
+        kb3886_backlight_device->props.power = FB_BLANK_UNBLANK;
+        kb3886_backlight_device->props.brightness = machinfo->default_intensity;
+        backlight_update_status(kb3886_backlight_device);
+
+        return 0;
+}
+
+static int kb3886bl_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bd = platform_get_drvdata(pdev);
+
+        backlight_device_unregister(bd);
+
+        return 0;
+}
+
+static struct platform_driver kb3886bl_driver = {
+        .probe          = kb3886bl_probe,
+        .remove         = kb3886bl_remove,
+        .suspend        = kb3886bl_suspend,
+        .resume         = kb3886bl_resume,
+        .driver         = {
+                .name   = "kb3886-bl",
+        },
+};
+
+static int __init kb3886_init(void)
+{
+        if (!dmi_check_system(kb3886bl_device_table))
+                return -ENODEV;
+
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+        return platform_driver_register(&kb3886bl_driver);
+}
+
+static void __exit kb3886_exit(void)
+{
+        platform_driver_unregister(&kb3886bl_driver);
+}
+
+module_init(kb3886_init);
+module_exit(kb3886_exit);
+
+MODULE_AUTHOR("Claudio Nieder <private@claudio.ch>");
+MODULE_DESCRIPTION("Tabletkiosk Sahara Touch-iT Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("dmi:*:svnSDV:pniTouchT201:*");
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 299fd318dd45..8e1731d3b228 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -27,14 +27,26 @@ static int fb_notifier_callback(struct notifier_block *self,
         struct fb_event *evdata = data;
 
         /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK)
+        switch (event) {
+        case FB_EVENT_BLANK:
+        case FB_EVENT_MODE_CHANGE:
+        case FB_EVENT_MODE_CHANGE_ALL:
+                break;
+        default:
                 return 0;
+        }
 
         ld = container_of(self, struct lcd_device, fb_notif);
+        if (!ld->ops)
+                return 0;
+
         mutex_lock(&ld->ops_lock);
-        if (ld->ops)
-                if (!ld->ops->check_fb || ld->ops->check_fb(evdata->info))
+        if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info)) {
+                if (event == FB_EVENT_BLANK)
                         ld->ops->set_power(ld, *(int *)evdata->data);
+                else
+                        ld->ops->set_mode(ld, evdata->data);
+        }
         mutex_unlock(&ld->ops_lock);
         return 0;
 }
diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
new file mode 100644
index 000000000000..06964af761c6
--- /dev/null
+++ b/drivers/video/backlight/mbp_nvidia_bl.c
@@ -0,0 +1,114 @@
+/*
+ *  Backlight Driver for Nvidia 8600 in Macbook Pro
+ *
+ *  Copyright (c) Red Hat <mjg@redhat.com>
+ *  Based on code from Pommed:
+ *  Copyright (C) 2006 Nicolas Boichat <nicolas @boichat.ch>
+ *  Copyright (C) 2006 Felipe Alfaro Solana <felipe_alfaro @linuxmail.org>
+ *  Copyright (C) 2007 Julien BLACHE <jb@jblache.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This driver triggers SMIs which cause the firmware to change the
+ *  backlight brightness. This is icky in many ways, but it's impractical to
+ *  get at the firmware code in order to figure out what it's actually doing.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/dmi.h>
+#include <linux/io.h>
+
+static struct backlight_device *mbp_backlight_device;
+
+static struct dmi_system_id __initdata mbp_device_table[] = {
+        {
+                .ident = "3,1",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3,1"),
+                },
+        },
+        {
+                .ident = "3,2",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3,2"),
+                },
+        },
+        {
+                .ident = "4,1",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4,1"),
+                },
+        },
+        { }
+};
+
+static int mbp_send_intensity(struct backlight_device *bd)
+{
+        int intensity = bd->props.brightness;
+
+        outb(0x04 | (intensity << 4), 0xb3);
+        outb(0xbf, 0xb2);
+
+        return 0;
+}
+
+static int mbp_get_intensity(struct backlight_device *bd)
+{
+        outb(0x03, 0xb3);
+        outb(0xbf, 0xb2);
+        return inb(0xb3) >> 4;
+}
+
+static struct backlight_ops mbp_ops = {
+        .get_brightness = mbp_get_intensity,
+        .update_status  = mbp_send_intensity,
+};
+
+static int __init mbp_init(void)
+{
+        if (!dmi_check_system(mbp_device_table))
+                return -ENODEV;
+
+        if (!request_region(0xb2, 2, "Macbook Pro backlight"))
+                return -ENXIO;
+
+        mbp_backlight_device = backlight_device_register("mbp_backlight",
+                                                         NULL, NULL,
+                                                         &mbp_ops);
+        if (IS_ERR(mbp_backlight_device)) {
+                release_region(0xb2, 2);
+                return PTR_ERR(mbp_backlight_device);
+        }
+
+        mbp_backlight_device->props.max_brightness = 15;
+        mbp_backlight_device->props.brightness =
+                mbp_get_intensity(mbp_backlight_device);
+        backlight_update_status(mbp_backlight_device);
+
+        return 0;
+}
+
+static void __exit mbp_exit(void)
+{
+        backlight_device_unregister(mbp_backlight_device);
+
+        release_region(0xb2, 2);
+}
+
+module_init(mbp_init);
+module_exit(mbp_exit);
+
+MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
+MODULE_DESCRIPTION("Nvidia-based Macbook Pro Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(dmi, mbp_device_table);
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index 891875d53a49..cbad67e89826 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -25,9 +25,9 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/board.h>
+#include <mach/mux.h>
 
 #define OMAPBL_MAX_INTENSITY            0xff
 
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
new file mode 100644
index 000000000000..738694d23889
--- /dev/null
+++ b/drivers/video/backlight/platform_lcd.c
@@ -0,0 +1,174 @@
+/* drivers/video/backlight/platform_lcd.c
+ *
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * Generic platform-device LCD power control interface.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+*/
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/lcd.h>
+
+#include <video/platform_lcd.h>
+
+struct platform_lcd {
+        struct device           *us;
+        struct lcd_device       *lcd;
+        struct plat_lcd_data    *pdata;
+
+        unsigned int             power;
+        unsigned int             suspended : 1;
+};
+
+static inline struct platform_lcd *to_our_lcd(struct lcd_device *lcd)
+{
+        return lcd_get_data(lcd);
+}
+
+static int platform_lcd_get_power(struct lcd_device *lcd)
+{
+        struct platform_lcd *plcd = to_our_lcd(lcd);
+
+        return plcd->power;
+}
+
+static int platform_lcd_set_power(struct lcd_device *lcd, int power)
+{
+        struct platform_lcd *plcd = to_our_lcd(lcd);
+        int lcd_power = 1;
+
+        if (power == FB_BLANK_POWERDOWN || plcd->suspended)
+                lcd_power = 0;
+
+        plcd->pdata->set_power(plcd->pdata, lcd_power);
+        plcd->power = power;
+
+        return 0;
+}
+
+static int platform_lcd_match(struct lcd_device *lcd, struct fb_info *info)
+{
+        struct platform_lcd *plcd = to_our_lcd(lcd);
+        struct plat_lcd_data *pdata = plcd->pdata;
+
+        if (pdata->match_fb)
+                return pdata->match_fb(pdata, info);
+
+        return plcd->us->parent == info->device;
+}
+
+static struct lcd_ops platform_lcd_ops = {
+        .get_power      = platform_lcd_get_power,
+        .set_power      = platform_lcd_set_power,
+        .check_fb       = platform_lcd_match,
+};
+
+static int __devinit platform_lcd_probe(struct platform_device *pdev)
+{
+        struct plat_lcd_data *pdata;
+        struct platform_lcd *plcd;
+        struct device *dev = &pdev->dev;
+        int err;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                dev_err(dev, "no platform data supplied\n");
+                return -EINVAL;
+        }
+
+        plcd = kzalloc(sizeof(struct platform_lcd), GFP_KERNEL);
+        if (!plcd) {
+                dev_err(dev, "no memory for state\n");
+                return -ENOMEM;
+        }
+
+        plcd->us = dev;
+        plcd->pdata = pdata;
+        plcd->lcd = lcd_device_register(dev_name(dev), dev,
+                                        plcd, &platform_lcd_ops);
+        if (IS_ERR(plcd->lcd)) {
+                dev_err(dev, "cannot register lcd device\n");
+                err = PTR_ERR(plcd->lcd);
+                goto err_mem;
+        }
+
+        platform_set_drvdata(pdev, plcd);
+        platform_lcd_set_power(plcd->lcd, FB_BLANK_NORMAL);
+
+        return 0;
+
+ err_mem:
+        kfree(plcd);
+        return err;
+}
+
+static int __devexit platform_lcd_remove(struct platform_device *pdev)
+{
+        struct platform_lcd *plcd = platform_get_drvdata(pdev);
+
+        lcd_device_unregister(plcd->lcd);
+        kfree(plcd);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
+{
+        struct platform_lcd *plcd = platform_get_drvdata(pdev);
+
+        plcd->suspended = 1;
+        platform_lcd_set_power(plcd->lcd, plcd->power);
+
+        return 0;
+}
+
+static int platform_lcd_resume(struct platform_device *pdev)
+{
+        struct platform_lcd *plcd = platform_get_drvdata(pdev);
+
+        plcd->suspended = 0;
+        platform_lcd_set_power(plcd->lcd, plcd->power);
+
+        return 0;
+}
+#else
+#define platform_lcd_suspend NULL
+#define platform_lcd_resume NULL
+#endif
+
+static struct platform_driver platform_lcd_driver = {
+        .driver         = {
+                .name   = "platform-lcd",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = platform_lcd_probe,
+        .remove         = __devexit_p(platform_lcd_remove),
+        .suspend        = platform_lcd_suspend,
+        .resume         = platform_lcd_resume,
+};
+
+static int __init platform_lcd_init(void)
+{
+        return platform_driver_register(&platform_lcd_driver);
+}
+
+static void __exit platform_lcd_cleanup(void)
+{
+        platform_driver_unregister(&platform_lcd_driver);
+}
+
+module_init(platform_lcd_init);
+module_exit(platform_lcd_cleanup);
+
+MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:platform-lcd");
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 6338d0e2fe07..ea07258565f0 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -68,8 +68,10 @@ static int pwm_backlight_probe(struct platform_device *pdev)
         struct pwm_bl_data *pb;
         int ret;
 
-        if (!data)
+        if (!data) {
+                dev_err(&pdev->dev, "failed to find platform data\n");
                 return -EINVAL;
+        }
 
         if (data->init) {
                 ret = data->init(&pdev->dev);
@@ -79,6 +81,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
         pb = kzalloc(sizeof(*pb), GFP_KERNEL);
         if (!pb) {
+                dev_err(&pdev->dev, "no memory for state\n");
                 ret = -ENOMEM;
                 goto err_alloc;
         }
@@ -91,7 +94,8 @@ static int pwm_backlight_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "unable to request PWM for backlight\n");
                 ret = PTR_ERR(pb->pwm);
                 goto err_pwm;
-        }
+        } else
+                dev_dbg(&pdev->dev, "got pwm for backlight\n");
 
         bl = backlight_device_register(pdev->name, &pdev->dev,
                         pb, &pwm_backlight_ops);
@@ -183,3 +187,5 @@ module_exit(pwm_backlight_exit);
 
 MODULE_DESCRIPTION("PWM based Backlight Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pwm-backlight");
+
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
new file mode 100644
index 000000000000..8427669162ea
--- /dev/null
+++ b/drivers/video/backlight/tdo24m.c
@@ -0,0 +1,396 @@
+/*
+ * tdo24m - SPI-based drivers for Toppoly TDO24M series LCD panels
+ *
+ * Copyright (C) 2008 Marvell International Ltd.
+ *      Eric Miao <eric.miao@marvell.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  publishhed by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/fb.h>
+#include <linux/lcd.h>
+
+#define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
+
+#define TDO24M_SPI_BUFF_SIZE    (4)
+#define MODE_QVGA       0
+#define MODE_VGA        1
+
+struct tdo24m {
+        struct spi_device       *spi_dev;
+        struct lcd_device       *lcd_dev;
+
+        struct spi_message      msg;
+        struct spi_transfer     xfer;
+        uint8_t                 *buf;
+
+        int                     power;
+        int                     mode;
+};
+
+/* use bit 30, 31 as the indicator of command parameter number */
+#define CMD0(x)         ((0 << 30) | (x))
+#define CMD1(x, x1)     ((1 << 30) | ((x) << 9) | 0x100 | (x1))
+#define CMD2(x, x1, x2) ((2 << 30) | ((x) << 18) | 0x20000 |\
+                        ((x1) << 9) | 0x100 | (x2))
+#define CMD_NULL        (-1)
+
+static uint32_t lcd_panel_reset[] = {
+        CMD0(0x1), /* reset */
+        CMD0(0x0), /* nop */
+        CMD0(0x0), /* nop */
+        CMD0(0x0), /* nop */
+        CMD_NULL,
+};
+
+static uint32_t lcd_panel_on[] = {
+        CMD0(0x29),             /* Display ON */
+        CMD2(0xB8, 0xFF, 0xF9), /* Output Control */
+        CMD0(0x11),             /* Sleep out */
+        CMD1(0xB0, 0x16),       /* Wake */
+        CMD_NULL,
+};
+
+static uint32_t lcd_panel_off[] = {
+        CMD0(0x28),             /* Display OFF */
+        CMD2(0xB8, 0x80, 0x02), /* Output Control */
+        CMD0(0x10),             /* Sleep in */
+        CMD1(0xB0, 0x00),       /* Deep stand by in */
+        CMD_NULL,
+};
+
+static uint32_t lcd_vga_pass_through[] = {
+        CMD1(0xB0, 0x16),
+        CMD1(0xBC, 0x80),
+        CMD1(0xE1, 0x00),
+        CMD1(0x36, 0x50),
+        CMD1(0x3B, 0x00),
+        CMD_NULL,
+};
+
+static uint32_t lcd_qvga_pass_through[] = {
+        CMD1(0xB0, 0x16),
+        CMD1(0xBC, 0x81),
+        CMD1(0xE1, 0x00),
+        CMD1(0x36, 0x50),
+        CMD1(0x3B, 0x22),
+        CMD_NULL,
+};
+
+static uint32_t lcd_vga_transfer[] = {
+        CMD1(0xcf, 0x02),       /* Blanking period control (1) */
+        CMD2(0xd0, 0x08, 0x04), /* Blanking period control (2) */
+        CMD1(0xd1, 0x01),       /* CKV timing control on/off */
+        CMD2(0xd2, 0x14, 0x00), /* CKV 1,2 timing control */
+        CMD2(0xd3, 0x1a, 0x0f), /* OEV timing control */
+        CMD2(0xd4, 0x1f, 0xaf), /* ASW timing control (1) */
+        CMD1(0xd5, 0x14),       /* ASW timing control (2) */
+        CMD0(0x21),             /* Invert for normally black display */
+        CMD0(0x29),             /* Display on */
+        CMD_NULL,
+};
+
+static uint32_t lcd_qvga_transfer[] = {
+        CMD1(0xd6, 0x02),       /* Blanking period control (1) */
+        CMD2(0xd7, 0x08, 0x04), /* Blanking period control (2) */
+        CMD1(0xd8, 0x01),       /* CKV timing control on/off */
+        CMD2(0xd9, 0x00, 0x08), /* CKV 1,2 timing control */
+        CMD2(0xde, 0x05, 0x0a), /* OEV timing control */
+        CMD2(0xdf, 0x0a, 0x19), /* ASW timing control (1) */
+        CMD1(0xe0, 0x0a),       /* ASW timing control (2) */
+        CMD0(0x21),             /* Invert for normally black display */
+        CMD0(0x29),             /* Display on */
+        CMD_NULL,
+};
+
+static uint32_t lcd_panel_config[] = {
+        CMD2(0xb8, 0xff, 0xf9), /* Output control */
+        CMD0(0x11),             /* sleep out */
+        CMD1(0xba, 0x01),       /* Display mode (1) */
+        CMD1(0xbb, 0x00),       /* Display mode (2) */
+        CMD1(0x3a, 0x60),       /* Display mode 18-bit RGB */
+        CMD1(0xbf, 0x10),       /* Drive system change control */
+        CMD1(0xb1, 0x56),       /* Booster operation setup */
+        CMD1(0xb2, 0x33),       /* Booster mode setup */
+        CMD1(0xb3, 0x11),       /* Booster frequency setup */
+        CMD1(0xb4, 0x02),       /* Op amp/system clock */
+        CMD1(0xb5, 0x35),       /* VCS voltage */
+        CMD1(0xb6, 0x40),       /* VCOM voltage */
+        CMD1(0xb7, 0x03),       /* External display signal */
+        CMD1(0xbd, 0x00),       /* ASW slew rate */
+        CMD1(0xbe, 0x00),       /* Dummy data for QuadData operation */
+        CMD1(0xc0, 0x11),       /* Sleep out FR count (A) */
+        CMD1(0xc1, 0x11),       /* Sleep out FR count (B) */
+        CMD1(0xc2, 0x11),       /* Sleep out FR count (C) */
+        CMD2(0xc3, 0x20, 0x40), /* Sleep out FR count (D) */
+        CMD2(0xc4, 0x60, 0xc0), /* Sleep out FR count (E) */
+        CMD2(0xc5, 0x10, 0x20), /* Sleep out FR count (F) */
+        CMD1(0xc6, 0xc0),       /* Sleep out FR count (G) */
+        CMD2(0xc7, 0x33, 0x43), /* Gamma 1 fine tuning (1) */
+        CMD1(0xc8, 0x44),       /* Gamma 1 fine tuning (2) */
+        CMD1(0xc9, 0x33),       /* Gamma 1 inclination adjustment */
+        CMD1(0xca, 0x00),       /* Gamma 1 blue offset adjustment */
+        CMD2(0xec, 0x01, 0xf0), /* Horizontal clock cycles */
+        CMD_NULL,
+};
+
+static int tdo24m_writes(struct tdo24m *lcd, uint32_t *array)
+{
+        struct spi_transfer *x = &lcd->xfer;
+        uint32_t data, *p = array;
+        int nparams, err = 0;
+
+        for (; *p != CMD_NULL; p++) {
+
+                nparams = (*p >> 30) & 0x3;
+
+                data = *p << (7 - nparams);
+                switch (nparams) {
+                case 0:
+                        lcd->buf[0] = (data >> 8) & 0xff;
+                        lcd->buf[1] = data & 0xff;
+                        break;
+                case 1:
+                        lcd->buf[0] = (data >> 16) & 0xff;
+                        lcd->buf[1] = (data >> 8) & 0xff;
+                        lcd->buf[2] = data & 0xff;
+                        break;
+                case 2:
+                        lcd->buf[0] = (data >> 24) & 0xff;
+                        lcd->buf[1] = (data >> 16) & 0xff;
+                        lcd->buf[2] = (data >> 8) & 0xff;
+                        lcd->buf[3] = data & 0xff;
+                        break;
+                default:
+                        continue;
+                }
+                x->len = nparams + 2;
+                err = spi_sync(lcd->spi_dev, &lcd->msg);
+                if (err)
+                        break;
+        }
+
+        return err;
+}
+
+static int tdo24m_adj_mode(struct tdo24m *lcd, int mode)
+{
+        switch (mode) {
+        case MODE_VGA:
+                tdo24m_writes(lcd, lcd_vga_pass_through);
+                tdo24m_writes(lcd, lcd_panel_config);
+                tdo24m_writes(lcd, lcd_vga_transfer);
+                break;
+        case MODE_QVGA:
+                tdo24m_writes(lcd, lcd_qvga_pass_through);
+                tdo24m_writes(lcd, lcd_panel_config);
+                tdo24m_writes(lcd, lcd_qvga_transfer);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        lcd->mode = mode;
+        return 0;
+}
+
+static int tdo24m_power_on(struct tdo24m *lcd)
+{
+        int err;
+
+        err = tdo24m_writes(lcd, lcd_panel_on);
+        if (err)
+                goto out;
+
+        err = tdo24m_writes(lcd, lcd_panel_reset);
+        if (err)
+                goto out;
+
+        err = tdo24m_adj_mode(lcd, lcd->mode);
+out:
+        return err;
+}
+
+static int tdo24m_power_off(struct tdo24m *lcd)
+{
+        return tdo24m_writes(lcd, lcd_panel_off);
+}
+
+static int tdo24m_power(struct tdo24m *lcd, int power)
+{
+        int ret = 0;
+
+        if (POWER_IS_ON(power) && !POWER_IS_ON(lcd->power))
+                ret = tdo24m_power_on(lcd);
+        else if (!POWER_IS_ON(power) && POWER_IS_ON(lcd->power))
+                ret = tdo24m_power_off(lcd);
+
+        if (!ret)
+                lcd->power = power;
+
+        return ret;
+}
+
+
+static int tdo24m_set_power(struct lcd_device *ld, int power)
+{
+        struct tdo24m *lcd = lcd_get_data(ld);
+        return tdo24m_power(lcd, power);
+}
+
+static int tdo24m_get_power(struct lcd_device *ld)
+{
+        struct tdo24m *lcd = lcd_get_data(ld);
+        return lcd->power;
+}
+
+static int tdo24m_set_mode(struct lcd_device *ld, struct fb_videomode *m)
+{
+        struct tdo24m *lcd = lcd_get_data(ld);
+        int mode = MODE_QVGA;
+
+        if (m->xres == 640 || m->xres == 480)
+                mode = MODE_VGA;
+
+        if (lcd->mode == mode)
+                return 0;
+
+        return tdo24m_adj_mode(lcd, mode);
+}
+
+static struct lcd_ops tdo24m_ops = {
+        .get_power      = tdo24m_get_power,
+        .set_power      = tdo24m_set_power,
+        .set_mode       = tdo24m_set_mode,
+};
+
+static int __devinit tdo24m_probe(struct spi_device *spi)
+{
+        struct tdo24m *lcd;
+        struct spi_message *m;
+        struct spi_transfer *x;
+        int err;
+
+        spi->bits_per_word = 8;
+        spi->mode = SPI_MODE_3;
+        err = spi_setup(spi);
+        if (err)
+                return err;
+
+        lcd = kzalloc(sizeof(struct tdo24m), GFP_KERNEL);
+        if (!lcd)
+                return -ENOMEM;
+
+        lcd->spi_dev = spi;
+        lcd->power = FB_BLANK_POWERDOWN;
+        lcd->mode = MODE_VGA;   /* default to VGA */
+
+        lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, sizeof(GFP_KERNEL));
+        if (lcd->buf == NULL) {
+                kfree(lcd);
+                return -ENOMEM;
+        }
+
+        m = &lcd->msg;
+        x = &lcd->xfer;
+
+        spi_message_init(m);
+
+        x->tx_buf = &lcd->buf[0];
+        spi_message_add_tail(x, m);
+
+        lcd->lcd_dev = lcd_device_register("tdo24m", &spi->dev,
+                                        lcd, &tdo24m_ops);
+        if (IS_ERR(lcd->lcd_dev)) {
+                err = PTR_ERR(lcd->lcd_dev);
+                goto out_free;
+        }
+
+        dev_set_drvdata(&spi->dev, lcd);
+        err = tdo24m_power(lcd, FB_BLANK_UNBLANK);
+        if (err)
+                goto out_unregister;
+
+        return 0;
+
+out_unregister:
+        lcd_device_unregister(lcd->lcd_dev);
+out_free:
+        kfree(lcd->buf);
+        kfree(lcd);
+        return err;
+}
+
+static int __devexit tdo24m_remove(struct spi_device *spi)
+{
+        struct tdo24m *lcd = dev_get_drvdata(&spi->dev);
+
+        tdo24m_power(lcd, FB_BLANK_POWERDOWN);
+        lcd_device_unregister(lcd->lcd_dev);
+        kfree(lcd->buf);
+        kfree(lcd);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int tdo24m_suspend(struct spi_device *spi, pm_message_t state)
+{
+        struct tdo24m *lcd = dev_get_drvdata(&spi->dev);
+
+        return tdo24m_power(lcd, FB_BLANK_POWERDOWN);
+}
+
+static int tdo24m_resume(struct spi_device *spi)
+{
+        struct tdo24m *lcd = dev_get_drvdata(&spi->dev);
+
+        return tdo24m_power(lcd, FB_BLANK_UNBLANK);
+}
+#else
+#define tdo24m_suspend  NULL
+#define tdo24m_resume   NULL
+#endif
+
+/* Power down all displays on reboot, poweroff or halt */
+static void tdo24m_shutdown(struct spi_device *spi)
+{
+        struct tdo24m *lcd = dev_get_drvdata(&spi->dev);
+
+        tdo24m_power(lcd, FB_BLANK_POWERDOWN);
+}
+
+static struct spi_driver tdo24m_driver = {
+        .driver = {
+                .name           = "tdo24m",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = tdo24m_probe,
+        .remove         = __devexit_p(tdo24m_remove),
+        .shutdown       = tdo24m_shutdown,
+        .suspend        = tdo24m_suspend,
+        .resume         = tdo24m_resume,
+};
+
+static int __init tdo24m_init(void)
+{
+        return spi_register_driver(&tdo24m_driver);
+}
+module_init(tdo24m_init);
+
+static void __exit tdo24m_exit(void)
+{
+        spi_unregister_driver(&tdo24m_driver);
+}
+module_exit(tdo24m_exit);
+
+MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
+MODULE_DESCRIPTION("Driver for Toppoly TDO24M LCD Panel");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
new file mode 100644
index 000000000000..43edbada12d1
--- /dev/null
+++ b/drivers/video/backlight/tosa_bl.c
@@ -0,0 +1,198 @@
+/*
+ *  LCD / Backlight control code for Sharp SL-6000x (tosa)
+ *
+ *  Copyright (c) 2005          Dirk Opfer
+ *  Copyright (c) 2007,2008     Dmitry Baryshkov
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+
+#include <asm/mach/sharpsl_param.h>
+
+#include <mach/tosa.h>
+
+#define COMADJ_DEFAULT  97
+
+#define DAC_CH1         0
+#define DAC_CH2         1
+
+struct tosa_bl_data {
+        struct i2c_client *i2c;
+        struct backlight_device *bl;
+
+        int comadj;
+};
+
+static void tosa_bl_set_backlight(struct tosa_bl_data *data, int brightness)
+{
+        struct spi_device *spi = data->i2c->dev.platform_data;
+
+        i2c_smbus_write_byte_data(data->i2c, DAC_CH1, data->comadj);
+
+        /* SetBacklightDuty */
+        i2c_smbus_write_byte_data(data->i2c, DAC_CH2, (u8)(brightness & 0xff));
+
+        /* SetBacklightVR */
+        gpio_set_value(TOSA_GPIO_BL_C20MA, brightness & 0x100);
+
+        tosa_bl_enable(spi, brightness);
+}
+
+static int tosa_bl_update_status(struct backlight_device *dev)
+{
+        struct backlight_properties *props = &dev->props;
+        struct tosa_bl_data *data = dev_get_drvdata(&dev->dev);
+        int power = max(props->power, props->fb_blank);
+        int brightness = props->brightness;
+
+        if (power)
+                brightness = 0;
+
+        tosa_bl_set_backlight(data, brightness);
+
+        return 0;
+}
+
+static int tosa_bl_get_brightness(struct backlight_device *dev)
+{
+        struct backlight_properties *props = &dev->props;
+
+        return props->brightness;
+}
+
+static struct backlight_ops bl_ops = {
+        .get_brightness         = tosa_bl_get_brightness,
+        .update_status          = tosa_bl_update_status,
+};
+
+static int __devinit tosa_bl_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct tosa_bl_data *data = kzalloc(sizeof(struct tosa_bl_data), GFP_KERNEL);
+        int ret = 0;
+        if (!data)
+                return -ENOMEM;
+
+        data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
+
+        ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
+        if (ret) {
+                dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
+                goto err_gpio_bl;
+        }
+        ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
+        if (ret)
+                goto err_gpio_dir;
+
+        i2c_set_clientdata(client, data);
+        data->i2c = client;
+
+        data->bl = backlight_device_register("tosa-bl", &client->dev,
+                        data, &bl_ops);
+        if (IS_ERR(data->bl)) {
+                ret = PTR_ERR(data->bl);
+                goto err_reg;
+        }
+
+        data->bl->props.brightness = 69;
+        data->bl->props.max_brightness = 512 - 1;
+        data->bl->props.power = FB_BLANK_UNBLANK;
+
+        backlight_update_status(data->bl);
+
+        return 0;
+
+err_reg:
+        data->bl = NULL;
+        i2c_set_clientdata(client, NULL);
+err_gpio_dir:
+        gpio_free(TOSA_GPIO_BL_C20MA);
+err_gpio_bl:
+        kfree(data);
+        return ret;
+}
+
+static int __devexit tosa_bl_remove(struct i2c_client *client)
+{
+        struct tosa_bl_data *data = i2c_get_clientdata(client);
+
+        backlight_device_unregister(data->bl);
+        data->bl = NULL;
+        i2c_set_clientdata(client, NULL);
+
+        gpio_free(TOSA_GPIO_BL_C20MA);
+
+        kfree(data);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int tosa_bl_suspend(struct i2c_client *client, pm_message_t pm)
+{
+        struct tosa_bl_data *data = i2c_get_clientdata(client);
+
+        tosa_bl_set_backlight(data, 0);
+
+        return 0;
+}
+
+static int tosa_bl_resume(struct i2c_client *client)
+{
+        struct tosa_bl_data *data = i2c_get_clientdata(client);
+
+        backlight_update_status(data->bl);
+        return 0;
+}
+#else
+#define tosa_bl_suspend NULL
+#define tosa_bl_resume NULL
+#endif
+
+static const struct i2c_device_id tosa_bl_id[] = {
+        { "tosa-bl", 0 },
+        { },
+};
+
+
+static struct i2c_driver tosa_bl_driver = {
+        .driver = {
+                .name           = "tosa-bl",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = tosa_bl_probe,
+        .remove         = __devexit_p(tosa_bl_remove),
+        .suspend        = tosa_bl_suspend,
+        .resume         = tosa_bl_resume,
+        .id_table       = tosa_bl_id,
+};
+
+static int __init tosa_bl_init(void)
+{
+        return i2c_add_driver(&tosa_bl_driver);
+}
+
+static void __exit tosa_bl_exit(void)
+{
+        i2c_del_driver(&tosa_bl_driver);
+}
+
+module_init(tosa_bl_init);
+module_exit(tosa_bl_exit);
+
+MODULE_AUTHOR("Dmitry Baryshkov");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("LCD/Backlight control for Sharp SL-6000 PDA");
+
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
new file mode 100644
index 000000000000..57a26649f1a5
--- /dev/null
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -0,0 +1,280 @@
+/*
+ *  LCD / Backlight control code for Sharp SL-6000x (tosa)
+ *
+ *  Copyright (c) 2005          Dirk Opfer
+ *  Copyright (c) 2007,2008     Dmitry Baryshkov
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/lcd.h>
+#include <linux/fb.h>
+
+#include <asm/mach/sharpsl_param.h>
+
+#include <mach/tosa.h>
+
+#define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
+
+#define TG_REG0_VQV     0x0001
+#define TG_REG0_COLOR   0x0002
+#define TG_REG0_UD      0x0004
+#define TG_REG0_LR      0x0008
+
+#define DAC_BASE        0x4e
+
+struct tosa_lcd_data {
+        struct spi_device *spi;
+        struct lcd_device *lcd;
+        struct i2c_client *i2c;
+
+        int lcd_power;
+};
+
+static int tosa_tg_send(struct spi_device *spi, int adrs, uint8_t data)
+{
+        u8 buf[1];
+        struct spi_message msg;
+        struct spi_transfer xfer = {
+                .len            = 1,
+                .cs_change      = 1,
+                .tx_buf         = buf,
+        };
+
+        buf[0] = ((adrs & 0x07) << 5) | (data & 0x1f);
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        return spi_sync(spi, &msg);
+}
+
+int tosa_bl_enable(struct spi_device *spi, int enable)
+{
+        /* bl_enable GP04=1 otherwise GP04=0*/
+        return tosa_tg_send(spi, TG_GPODR2, enable? 0x01 : 0x00);
+}
+EXPORT_SYMBOL(tosa_bl_enable);
+
+static void tosa_lcd_tg_init(struct tosa_lcd_data *data)
+{
+        /* TG on */
+        gpio_set_value(TOSA_GPIO_TG_ON, 0);
+
+        mdelay(60);
+
+        /* delayed 0clk TCTL signal for VGA */
+        tosa_tg_send(data->spi, TG_TPOSCTL, 0x00);
+        /* GPOS0=powercontrol, GPOS1=GPIO, GPOS2=TCTL */
+        tosa_tg_send(data->spi, TG_GPOSR, 0x02);
+}
+
+static void tosa_lcd_tg_on(struct tosa_lcd_data *data)
+{
+        struct spi_device *spi = data->spi;
+        const int value = TG_REG0_COLOR | TG_REG0_UD | TG_REG0_LR;
+        tosa_tg_send(spi, TG_PNLCTL, value | TG_REG0_VQV); /* this depends on mode */
+
+        /* TG LCD pannel power up */
+        tosa_tg_send(spi, TG_PINICTL,0x4);
+        mdelay(50);
+
+        /* TG LCD GVSS */
+        tosa_tg_send(spi, TG_PINICTL,0x0);
+
+        if (!data->i2c) {
+                /* after the pannel is powered up the first time, we can access the i2c bus */
+                /* so probe for the DAC */
+                struct i2c_adapter *adap = i2c_get_adapter(0);
+                struct i2c_board_info info = {
+                        .type   = "tosa-bl",
+                        .addr   = DAC_BASE,
+                        .platform_data = data->spi,
+                };
+                data->i2c = i2c_new_device(adap, &info);
+        }
+}
+
+static void tosa_lcd_tg_off(struct tosa_lcd_data *data)
+{
+        struct spi_device *spi = data->spi;
+
+        /* TG LCD VHSA off */
+        tosa_tg_send(spi, TG_PINICTL,0x4);
+        mdelay(50);
+
+        /* TG LCD signal off */
+        tosa_tg_send(spi, TG_PINICTL,0x6);
+        mdelay(50);
+
+        /* TG Off */
+        gpio_set_value(TOSA_GPIO_TG_ON, 1);
+        mdelay(100);
+}
+
+int tosa_lcd_set_power(struct lcd_device *lcd, int power)
+{
+        struct tosa_lcd_data *data = lcd_get_data(lcd);
+
+        if (POWER_IS_ON(power) && !POWER_IS_ON(data->lcd_power))
+                tosa_lcd_tg_on(data);
+
+        if (!POWER_IS_ON(power) && POWER_IS_ON(data->lcd_power))
+                tosa_lcd_tg_off(data);
+
+        data->lcd_power = power;
+        return 0;
+}
+
+static int tosa_lcd_get_power(struct lcd_device *lcd)
+{
+        struct tosa_lcd_data *data = lcd_get_data(lcd);
+
+        return data->lcd_power;
+}
+
+static struct lcd_ops tosa_lcd_ops = {
+        .set_power = tosa_lcd_set_power,
+        .get_power = tosa_lcd_get_power,
+};
+
+static int __devinit tosa_lcd_probe(struct spi_device *spi)
+{
+        int ret;
+        struct tosa_lcd_data *data;
+
+        data = kzalloc(sizeof(struct tosa_lcd_data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        /*
+         * bits_per_word cannot be configured in platform data
+         */
+        spi->bits_per_word = 8;
+
+        ret = spi_setup(spi);
+        if (ret < 0)
+                goto err_spi;
+
+        data->spi = spi;
+        dev_set_drvdata(&spi->dev, data);
+
+        ret = gpio_request(TOSA_GPIO_TG_ON, "tg #pwr");
+        if (ret < 0)
+                goto err_gpio_tg;
+
+        mdelay(60);
+
+        ret = gpio_direction_output(TOSA_GPIO_TG_ON, 0);
+        if (ret < 0)
+                goto err_gpio_dir;
+
+        mdelay(60);
+        tosa_lcd_tg_init(data);
+
+        tosa_lcd_tg_on(data);
+
+        data->lcd = lcd_device_register("tosa-lcd", &spi->dev, data,
+                        &tosa_lcd_ops);
+
+        if (IS_ERR(data->lcd)) {
+                ret = PTR_ERR(data->lcd);
+                data->lcd = NULL;
+                goto err_register;
+        }
+
+        return 0;
+
+err_register:
+        tosa_lcd_tg_off(data);
+err_gpio_dir:
+        gpio_free(TOSA_GPIO_TG_ON);
+err_gpio_tg:
+        dev_set_drvdata(&spi->dev, NULL);
+err_spi:
+        kfree(data);
+        return ret;
+}
+
+static int __devexit tosa_lcd_remove(struct spi_device *spi)
+{
+        struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
+
+        lcd_device_unregister(data->lcd);
+
+        if (data->i2c)
+                i2c_unregister_device(data->i2c);
+
+        tosa_lcd_tg_off(data);
+
+        gpio_free(TOSA_GPIO_TG_ON);
+        dev_set_drvdata(&spi->dev, NULL);
+        kfree(data);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int tosa_lcd_suspend(struct spi_device *spi, pm_message_t state)
+{
+        struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
+
+        tosa_lcd_tg_off(data);
+
+        return 0;
+}
+
+static int tosa_lcd_resume(struct spi_device *spi)
+{
+        struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
+
+        tosa_lcd_tg_init(data);
+        if (POWER_IS_ON(data->lcd_power))
+                tosa_lcd_tg_on(data);
+        else
+                tosa_lcd_tg_off(data);
+
+        return 0;
+}
+#else
+#define tosa_lcd_suspend        NULL
+#define tosa_lcd_reume NULL
+#endif
+
+static struct spi_driver tosa_lcd_driver = {
+        .driver = {
+                .name           = "tosa-lcd",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = tosa_lcd_probe,
+        .remove         = __devexit_p(tosa_lcd_remove),
+        .suspend        = tosa_lcd_suspend,
+        .resume         = tosa_lcd_resume,
+};
+
+static int __init tosa_lcd_init(void)
+{
+        return spi_register_driver(&tosa_lcd_driver);
+}
+
+static void __exit tosa_lcd_exit(void)
+{
+        spi_unregister_driver(&tosa_lcd_driver);
+}
+
+module_init(tosa_lcd_init);
+module_exit(tosa_lcd_exit);
+
+MODULE_AUTHOR("Dmitry Baryshkov");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("LCD/Backlight control for Sharp SL-6000 PDA");
+
diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c
new file mode 100644
index 000000000000..593c7687d54a
--- /dev/null
+++ b/drivers/video/backlight/vgg2432a4.c
@@ -0,0 +1,284 @@
+/* drivers/video/backlight/vgg2432a4.c
+ *
+ * VGG2432A4 (ILI9320) LCD controller driver.
+ *
+ * Copyright 2007 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/lcd.h>
+#include <linux/module.h>
+
+#include <linux/spi/spi.h>
+
+#include <video/ili9320.h>
+
+#include "ili9320.h"
+
+/* Device initialisation sequences */
+
+static struct ili9320_reg vgg_init1[] = {
+        {
+                .address = ILI9320_POWER1,
+                .value   = ILI9320_POWER1_AP(0) | ILI9320_POWER1_BT(0),
+        }, {
+                .address = ILI9320_POWER2,
+                .value   = (ILI9320_POWER2_VC(7) |
+                            ILI9320_POWER2_DC0(0) | ILI9320_POWER2_DC1(0)),
+        }, {
+                .address = ILI9320_POWER3,
+                .value   = ILI9320_POWER3_VRH(0),
+        }, {
+                .address = ILI9320_POWER4,
+                .value   = ILI9320_POWER4_VREOUT(0),
+        },
+};
+
+static struct ili9320_reg vgg_init2[] = {
+        {
+                .address = ILI9320_POWER1,
+                .value   = (ILI9320_POWER1_AP(3) | ILI9320_POWER1_APE |
+                            ILI9320_POWER1_BT(7) | ILI9320_POWER1_SAP),
+        }, {
+                .address = ILI9320_POWER2,
+                .value   = ILI9320_POWER2_VC(7) | ILI9320_POWER2_DC0(3),
+        }
+};
+
+static struct ili9320_reg vgg_gamma[] = {
+        {
+                .address = ILI9320_GAMMA1,
+                .value   = 0x0000,
+        }, {
+                .address = ILI9320_GAMMA2,
+                .value   = 0x0505,
+        }, {
+                .address = ILI9320_GAMMA3,
+                .value   = 0x0004,
+        }, {
+                .address = ILI9320_GAMMA4,
+                .value   = 0x0006,
+        }, {
+                .address = ILI9320_GAMMA5,
+                .value   = 0x0707,
+        }, {
+                .address = ILI9320_GAMMA6,
+                .value   = 0x0105,
+        }, {
+                .address = ILI9320_GAMMA7,
+                .value   = 0x0002,
+        }, {
+                .address = ILI9320_GAMMA8,
+                .value   = 0x0707,
+        }, {
+                .address = ILI9320_GAMMA9,
+                .value   = 0x0704,
+        }, {
+                .address = ILI9320_GAMMA10,
+                .value   = 0x807,
+        }
+
+};
+
+static struct ili9320_reg vgg_init0[] = {
+        [0]     = {
+                /* set direction and scan mode gate */
+                .address = ILI9320_DRIVER,
+                .value   = ILI9320_DRIVER_SS,
+        }, {
+                .address = ILI9320_DRIVEWAVE,
+                .value   = (ILI9320_DRIVEWAVE_MUSTSET |
+                            ILI9320_DRIVEWAVE_EOR | ILI9320_DRIVEWAVE_BC),
+        }, {
+                .address = ILI9320_ENTRYMODE,
+                .value   = ILI9320_ENTRYMODE_ID(3) | ILI9320_ENTRYMODE_BGR,
+        }, {
+                .address = ILI9320_RESIZING,
+                .value   = 0x0,
+        },
+};
+
+
+static int vgg2432a4_lcd_init(struct ili9320 *lcd,
+                              struct ili9320_platdata *cfg)
+{
+        unsigned int addr;
+        int ret;
+
+        /* Set VCore before anything else (VGG243237-6UFLWA) */
+        ret = ili9320_write(lcd, 0x00e5, 0x8000);
+        if (ret)
+                goto err_initial;
+
+        /* Start the oscillator up before we can do anything else. */
+        ret = ili9320_write(lcd, ILI9320_OSCILATION, ILI9320_OSCILATION_OSC);
+        if (ret)
+                goto err_initial;
+
+        /* must wait at-lesat 10ms after starting */
+        mdelay(15);
+
+        ret = ili9320_write_regs(lcd, vgg_init0, ARRAY_SIZE(vgg_init0));
+        if (ret != 0)
+                goto err_initial;
+
+        ili9320_write(lcd, ILI9320_DISPLAY2, cfg->display2);
+        ili9320_write(lcd, ILI9320_DISPLAY3, cfg->display3);
+        ili9320_write(lcd, ILI9320_DISPLAY4, cfg->display4);
+
+        ili9320_write(lcd, ILI9320_RGB_IF1, cfg->rgb_if1);
+        ili9320_write(lcd, ILI9320_FRAMEMAKER, 0x0);
+        ili9320_write(lcd, ILI9320_RGB_IF2, ILI9320_RGBIF2_DPL);
+
+        ret = ili9320_write_regs(lcd, vgg_init1, ARRAY_SIZE(vgg_init1));
+        if (ret != 0)
+                goto err_vgg;
+
+        mdelay(300);
+
+        ret = ili9320_write_regs(lcd, vgg_init2, ARRAY_SIZE(vgg_init2));
+        if (ret != 0)
+                goto err_vgg2;
+
+        mdelay(100);
+
+        ili9320_write(lcd, ILI9320_POWER3, 0x13c);
+
+        mdelay(100);
+
+        ili9320_write(lcd, ILI9320_POWER4, 0x1c00);
+        ili9320_write(lcd, ILI9320_POWER7, 0x000e);
+
+        mdelay(100);
+
+        ili9320_write(lcd, ILI9320_GRAM_HORIZ_ADDR, 0x00);
+        ili9320_write(lcd, ILI9320_GRAM_VERT_ADD, 0x00);
+
+        ret = ili9320_write_regs(lcd, vgg_gamma, ARRAY_SIZE(vgg_gamma));
+        if (ret != 0)
+                goto err_vgg3;
+
+        ili9320_write(lcd, ILI9320_HORIZ_START, 0x0);
+        ili9320_write(lcd, ILI9320_HORIZ_END, cfg->hsize - 1);
+        ili9320_write(lcd, ILI9320_VERT_START, 0x0);
+        ili9320_write(lcd, ILI9320_VERT_END, cfg->vsize - 1);
+
+        ili9320_write(lcd, ILI9320_DRIVER2,
+                      ILI9320_DRIVER2_NL(((cfg->vsize - 240) / 8) + 0x1D));
+
+        ili9320_write(lcd, ILI9320_BASE_IMAGE, 0x1);
+        ili9320_write(lcd, ILI9320_VERT_SCROLL, 0x00);
+
+        for (addr = ILI9320_PARTIAL1_POSITION; addr <= ILI9320_PARTIAL2_END;
+             addr++) {
+                ili9320_write(lcd, addr, 0x0);
+        }
+
+        ili9320_write(lcd, ILI9320_INTERFACE1, 0x10);
+        ili9320_write(lcd, ILI9320_INTERFACE2, cfg->interface2);
+        ili9320_write(lcd, ILI9320_INTERFACE3, cfg->interface3);
+        ili9320_write(lcd, ILI9320_INTERFACE4, cfg->interface4);
+        ili9320_write(lcd, ILI9320_INTERFACE5, cfg->interface5);
+        ili9320_write(lcd, ILI9320_INTERFACE6, cfg->interface6);
+
+        lcd->display1 = (ILI9320_DISPLAY1_D(3) | ILI9320_DISPLAY1_DTE |
+                         ILI9320_DISPLAY1_GON | ILI9320_DISPLAY1_BASEE |
+                         0x40);
+
+        ili9320_write(lcd, ILI9320_DISPLAY1, lcd->display1);
+
+        return 0;
+
+ err_vgg3:
+ err_vgg2:
+ err_vgg:
+ err_initial:
+        return ret;
+}
+
+#ifdef CONFIG_PM
+static int vgg2432a4_suspend(struct spi_device *spi, pm_message_t state)
+{
+        return ili9320_suspend(dev_get_drvdata(&spi->dev), state);
+}
+
+static int vgg2432a4_resume(struct spi_device *spi)
+{
+        return ili9320_resume(dev_get_drvdata(&spi->dev));
+}
+#else
+#define vgg2432a4_suspend       NULL
+#define vgg2432a4_resume        NULL
+#endif
+
+static struct ili9320_client vgg2432a4_client = {
+        .name   = "VGG2432A4",
+        .init   = vgg2432a4_lcd_init,
+};
+
+/* Device probe */
+
+static int __devinit vgg2432a4_probe(struct spi_device *spi)
+{
+        int ret;
+
+        ret = ili9320_probe_spi(spi, &vgg2432a4_client);
+        if (ret != 0) {
+                dev_err(&spi->dev, "failed to initialise ili9320\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int __devexit vgg2432a4_remove(struct spi_device *spi)
+{
+        return ili9320_remove(dev_get_drvdata(&spi->dev));
+}
+
+static void vgg2432a4_shutdown(struct spi_device *spi)
+{
+        ili9320_shutdown(dev_get_drvdata(&spi->dev));
+}
+
+static struct spi_driver vgg2432a4_driver = {
+        .driver = {
+                .name           = "VGG2432A4",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = vgg2432a4_probe,
+        .remove         = __devexit_p(vgg2432a4_remove),
+        .shutdown       = vgg2432a4_shutdown,
+        .suspend        = vgg2432a4_suspend,
+        .resume         = vgg2432a4_resume,
+};
+
+/* Device driver initialisation */
+
+static int __init vgg2432a4_init(void)
+{
+        return spi_register_driver(&vgg2432a4_driver);
+}
+
+static void __exit vgg2432a4_exit(void)
+{
+        spi_unregister_driver(&vgg2432a4_driver);
+}
+
+module_init(vgg2432a4_init);
+module_exit(vgg2432a4_exit);
+
+MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
+MODULE_DESCRIPTION("VGG2432A4 LCD Driver");
+MODULE_LICENSE("GPL v2");
+
+
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 49834a67a623..7644ed249564 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -58,7 +58,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 
-#include <asm/mach/bf54x-lq043.h>
+#include <mach/bf54x-lq043.h>
 
 #define NO_BL_SUPPORT
 
@@ -478,7 +478,7 @@ static int bfin_lcd_set_contrast(struct lcd_device *dev, int contrast)
         return 0;
 }
 
-static int bfin_lcd_check_fb(struct fb_info *fi)
+static int bfin_lcd_check_fb(struct lcd_device *dev, struct fb_info *fi)
 {
         if (!fi || (fi == &bfin_bf54x_fb))
                 return 1;
@@ -733,7 +733,6 @@ static int bfin_bf54x_remove(struct platform_device *pdev)
 static int bfin_bf54x_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct fb_info *fbinfo = platform_get_drvdata(pdev);
-        struct bfin_bf54xfb_info *info = fbinfo->par;
 
         bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() & ~EPPI_EN);
         disable_dma(CH_EPPI0);
@@ -747,8 +746,18 @@ static int bfin_bf54x_resume(struct platform_device *pdev)
         struct fb_info *fbinfo = platform_get_drvdata(pdev);
         struct bfin_bf54xfb_info *info = fbinfo->par;
 
-        enable_dma(CH_EPPI0);
-        bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() | EPPI_EN);
+        if (info->lq043_open_cnt) {
+
+                bfin_write_EPPI0_CONTROL(0);
+                SSYNC();
+
+                config_dma(info);
+                config_ppi(info);
+
+                /* start dma */
+                enable_dma(CH_EPPI0);
+                bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() | EPPI_EN);
+        }
 
         return 0;
 }
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index 135d6dd7e672..7d1b819e501c 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -396,7 +396,7 @@ static int bfin_lcd_set_contrast(struct lcd_device *dev, int contrast)
         return 0;
 }
 
-static int bfin_lcd_check_fb(struct fb_info *fi)
+static int bfin_lcd_check_fb(struct lcd_device *dev, struct fb_info *fi)
 {
         if (!fi || (fi == &bfin_t350mcqb_fb))
                 return 1;
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index e721644bad74..1e35ba6f18e0 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -372,7 +372,7 @@ static int __devexit bw2_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id bw2_match[] = {
+static const struct of_device_id bw2_match[] = {
         {
                 .name = "bwtwo",
         },
diff --git a/drivers/video/c2p.c b/drivers/video/c2p.c
index 5c30bbd33054..376bc07ff952 100644
--- a/drivers/video/c2p.c
+++ b/drivers/video/c2p.c
@@ -12,6 +12,7 @@
  *  for more details.
  */
 
+#include <linux/module.h>
 #include <linux/string.h>
 #include "c2p.h"
 
@@ -226,4 +227,6 @@ void c2p(u8 *dst, const u8 *src, u32 dx, u32 dy, u32 width, u32 height,
         dst += dst_nextline;
     }
 }
+EXPORT_SYMBOL_GPL(c2p);
 
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
new file mode 100644
index 000000000000..c9b191319a9a
--- /dev/null
+++ b/drivers/video/carminefb.c
@@ -0,0 +1,790 @@
+/*
+ * Frame buffer driver for the Carmine GPU.
+ *
+ * The driver configures the GPU as follows
+ * - FB0 is display 0 with unique memory area
+ * - FB1 is display 1 with unique memory area
+ * - both display use 32 bit colors
+ */
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fb.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+
+#include "carminefb.h"
+#include "carminefb_regs.h"
+
+#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
+#error  "The endianness of the target host has not been defined."
+#endif
+
+/*
+ * The initial video mode can be supplied via two different ways:
+ * - as a string that is passed to fb_find_mode() (module option fb_mode_str)
+ * - as an integer that picks the video mode from carmine_modedb[] (module
+ *   option fb_mode)
+ *
+ * If nothing is used than the initial video mode will be the
+ * CARMINEFB_DEFAULT_VIDEO_MODE member of the carmine_modedb[].
+ */
+#define CARMINEFB_DEFAULT_VIDEO_MODE    1
+
+static unsigned int fb_mode = CARMINEFB_DEFAULT_VIDEO_MODE;
+module_param(fb_mode, uint, 444);
+MODULE_PARM_DESC(fb_mode, "Initial video mode as integer.");
+
+static char *fb_mode_str;
+module_param(fb_mode_str, charp, 444);
+MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters.");
+
+/*
+ * Carminefb displays:
+ * 0b000 None
+ * 0b001 Display 0
+ * 0b010 Display 1
+ */
+static int fb_displays = CARMINE_USE_DISPLAY0 | CARMINE_USE_DISPLAY1;
+module_param(fb_displays, int, 444);
+MODULE_PARM_DESC(fb_displays, "Bit mode, which displays are used");
+
+struct carmine_hw {
+        void __iomem *v_regs;
+        void __iomem *screen_mem;
+        struct fb_info *fb[MAX_DISPLAY];
+};
+
+struct carmine_resolution {
+        u32 htp;
+        u32 hsp;
+        u32 hsw;
+        u32 hdp;
+        u32 vtr;
+        u32 vsp;
+        u32 vsw;
+        u32 vdp;
+        u32 disp_mode;
+};
+
+struct carmine_fb {
+        void __iomem *display_reg;
+        void __iomem *screen_base;
+        u32 smem_offset;
+        u32 cur_mode;
+        u32 new_mode;
+        struct carmine_resolution *res;
+        u32 pseudo_palette[16];
+};
+
+static struct fb_fix_screeninfo carminefb_fix __devinitdata = {
+        .id = "Carmine",
+        .type = FB_TYPE_PACKED_PIXELS,
+        .visual = FB_VISUAL_TRUECOLOR,
+        .accel = FB_ACCEL_NONE,
+};
+
+static const struct fb_videomode carmine_modedb[] = {
+        {
+                .name           = "640x480",
+                .xres           = 640,
+                .yres           = 480,
+        }, {
+                .name           = "800x600",
+                .xres           = 800,
+                .yres           = 600,
+        },
+};
+
+static struct carmine_resolution car_modes[] = {
+        {
+                /* 640x480 */
+                .htp = 800,
+                .hsp = 672,
+                .hsw = 96,
+                .hdp = 640,
+                .vtr = 525,
+                .vsp = 490,
+                .vsw = 2,
+                .vdp = 480,
+                .disp_mode = 0x1400,
+        },
+        {
+                /* 800x600 */
+                .htp = 1060,
+                .hsp = 864,
+                .hsw = 72,
+                .hdp = 800,
+                .vtr = 628,
+                .vsp = 601,
+                .vsw = 2,
+                .vdp = 600,
+                .disp_mode = 0x0d00,
+        }
+};
+
+static int carmine_find_mode(const struct fb_var_screeninfo *var)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(car_modes); i++)
+                if (car_modes[i].hdp == var->xres &&
+                    car_modes[i].vdp == var->yres)
+                        return i;
+        return -EINVAL;
+}
+
+static void c_set_disp_reg(const struct carmine_fb *par,
+                u32 offset, u32 val)
+{
+        writel(val, par->display_reg + offset);
+}
+
+static u32 c_get_disp_reg(const struct carmine_fb *par,
+                u32 offset)
+{
+        return readl(par->display_reg + offset);
+}
+
+static void c_set_hw_reg(const struct carmine_hw *hw,
+                u32 offset, u32 val)
+{
+        writel(val, hw->v_regs + offset);
+}
+
+static u32 c_get_hw_reg(const struct carmine_hw *hw,
+                u32 offset)
+{
+        return readl(hw->v_regs + offset);
+}
+
+static int carmine_setcolreg(unsigned regno, unsigned red, unsigned green,
+                unsigned blue, unsigned transp, struct fb_info *info)
+{
+        if (regno >= 16)
+                return 1;
+
+        red >>= 8;
+        green >>= 8;
+        blue >>= 8;
+        transp >>= 8;
+
+        ((u32 *)info->pseudo_palette)[regno] = be32_to_cpu(transp << 24 |
+                red << 0 | green << 8 | blue << 16);
+        return 0;
+}
+
+static int carmine_check_var(struct fb_var_screeninfo *var,
+                struct fb_info *info)
+{
+        int ret;
+
+        ret = carmine_find_mode(var);
+        if (ret < 0)
+                return ret;
+
+        if (var->grayscale || var->rotate || var->nonstd)
+                return -EINVAL;
+
+        var->xres_virtual = var->xres;
+        var->yres_virtual = var->yres;
+
+        var->bits_per_pixel = 32;
+
+#ifdef __BIG_ENDIAN
+        var->transp.offset = 24;
+        var->red.offset = 0;
+        var->green.offset = 8;
+        var->blue.offset = 16;
+#else
+        var->transp.offset = 24;
+        var->red.offset = 16;
+        var->green.offset = 8;
+        var->blue.offset = 0;
+#endif
+
+        var->red.length = 8;
+        var->green.length = 8;
+        var->blue.length = 8;
+        var->transp.length = 8;
+
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
+        var->transp.msb_right = 0;
+        return 0;
+}
+
+static void carmine_init_display_param(struct carmine_fb *par)
+{
+        u32 width;
+        u32 height;
+        u32 param;
+        u32 window_size;
+        u32 soffset = par->smem_offset;
+
+        c_set_disp_reg(par, CARMINE_DISP_REG_C_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_MLMR_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_CURSOR_MODE,
+                        CARMINE_CURSOR0_PRIORITY_MASK |
+                        CARMINE_CURSOR1_PRIORITY_MASK |
+                        CARMINE_CURSOR_CUTZ_MASK);
+
+        /* Set default cursor position */
+        c_set_disp_reg(par, CARMINE_DISP_REG_CUR1_POS, 0 << 16 | 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_CUR2_POS, 0 << 16 | 0);
+
+        /* Set default display mode */
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_EXT_MODE, CARMINE_WINDOW_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L1_EXT_MODE,
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_EXT_MODE, CARMINE_EXTEND_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_EXT_MODE, CARMINE_EXTEND_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_EXT_MODE, CARMINE_EXTEND_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_EXT_MODE, CARMINE_EXTEND_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_EXT_MODE, CARMINE_EXTEND_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_EXT_MODE, CARMINE_EXTEND_MODE |
+                        CARMINE_EXT_CMODE_DIRECT24_RGBA);
+
+        /* Set default frame size to layer mode register */
+        width = par->res->hdp * 4 / CARMINE_DISP_WIDTH_UNIT;
+        width = width << CARMINE_DISP_WIDTH_SHIFT;
+
+        height = par->res->vdp - 1;
+        param = width | height;
+
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_MODE_W_H, param);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L1_WIDTH, width);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_MODE_W_H, param);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_MODE_W_H, param);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_MODE_W_H, param);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_MODE_W_H, param);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_MODE_W_H, param);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_MODE_W_H, param);
+
+        /* Set default pos and size */
+        window_size = (par->res->vdp - 1) << CARMINE_DISP_WIN_H_SHIFT;
+        window_size |= par->res->hdp;
+
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L1_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L1_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_WIN_SIZE, window_size);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_WIN_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_WIN_SIZE, window_size);
+
+        /* Set default origin address */
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_ORG_ADR, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L1_ORG_ADR, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_ORG_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_ORG_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_ORG_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_ORG_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_ORG_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_ORG_ADR1, soffset);
+
+        /* Set default display address */
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_DISP_ADR, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_DISP_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_DISP_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_DISP_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_DISP_ADR1, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_DISP_ADR0, soffset);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_DISP_ADR0, soffset);
+
+        /* Set default display position */
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_DISP_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_DISP_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_DISP_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_DISP_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_DISP_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_DISP_POS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_DISP_POS, 0);
+
+        /* Set default blend mode */
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L0, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L1, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L2, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L3, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L4, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L5, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L6, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_BLEND_MODE_L7, 0);
+
+        /* default transparency mode */
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L1_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6_TRANS, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7_TRANS, 0);
+
+        /* Set default read skip parameter */
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0RM, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2RM, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3RM, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4RM, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5RM, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6RM, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7RM, 0);
+
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0PX, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2PX, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3PX, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4PX, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5PX, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6PX, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7PX, 0);
+
+        c_set_disp_reg(par, CARMINE_DISP_REG_L0PY, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L2PY, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L3PY, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L4PY, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L5PY, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L6PY, 0);
+        c_set_disp_reg(par, CARMINE_DISP_REG_L7PY, 0);
+}
+
+static void set_display_parameters(struct carmine_fb *par)
+{
+        u32 mode;
+        u32 hdp, vdp, htp, hsp, hsw, vtr, vsp, vsw;
+
+        /*
+         * display timing. Parameters are decreased by one because hardware
+         * spec is 0 to (n - 1)
+         * */
+        hdp = par->res->hdp - 1;
+        vdp = par->res->vdp - 1;
+        htp = par->res->htp - 1;
+        hsp = par->res->hsp - 1;
+        hsw = par->res->hsw - 1;
+        vtr = par->res->vtr - 1;
+        vsp = par->res->vsp - 1;
+        vsw = par->res->vsw - 1;
+
+        c_set_disp_reg(par, CARMINE_DISP_REG_H_TOTAL,
+                        htp << CARMINE_DISP_HTP_SHIFT);
+        c_set_disp_reg(par, CARMINE_DISP_REG_H_PERIOD,
+                        (hdp << CARMINE_DISP_HDB_SHIFT) | hdp);
+        c_set_disp_reg(par, CARMINE_DISP_REG_V_H_W_H_POS,
+                        (vsw << CARMINE_DISP_VSW_SHIFT) |
+                        (hsw << CARMINE_DISP_HSW_SHIFT) |
+                        (hsp));
+        c_set_disp_reg(par, CARMINE_DISP_REG_V_TOTAL,
+                        vtr << CARMINE_DISP_VTR_SHIFT);
+        c_set_disp_reg(par, CARMINE_DISP_REG_V_PERIOD_POS,
+                        (vdp << CARMINE_DISP_VDP_SHIFT) | vsp);
+
+        /* clock */
+        mode = c_get_disp_reg(par, CARMINE_DISP_REG_DCM1);
+        mode = (mode & ~CARMINE_DISP_DCM_MASK) |
+                (par->res->disp_mode & CARMINE_DISP_DCM_MASK);
+        /* enable video output and layer 0 */
+        mode |= CARMINE_DEN | CARMINE_L0E;
+        c_set_disp_reg(par, CARMINE_DISP_REG_DCM1, mode);
+}
+
+static int carmine_set_par(struct fb_info *info)
+{
+        struct carmine_fb *par = info->par;
+        int ret;
+
+        ret = carmine_find_mode(&info->var);
+        if (ret < 0)
+                return ret;
+
+        par->new_mode = ret;
+        if (par->cur_mode != par->new_mode) {
+
+                par->cur_mode = par->new_mode;
+                par->res = &car_modes[par->new_mode];
+
+                carmine_init_display_param(par);
+                set_display_parameters(par);
+        }
+
+        info->fix.line_length = info->var.xres * info->var.bits_per_pixel / 8;
+        return 0;
+}
+
+static int init_hardware(struct carmine_hw *hw)
+{
+        u32 flags;
+        u32 loops;
+        u32 ret;
+
+        /* Initalize Carmine */
+        /* Sets internal clock */
+        c_set_hw_reg(hw, CARMINE_CTL_REG + CARMINE_CTL_REG_CLOCK_ENABLE,
+                        CARMINE_DFLT_IP_CLOCK_ENABLE);
+
+        /* Video signal output is turned off */
+        c_set_hw_reg(hw, CARMINE_DISP0_REG + CARMINE_DISP_REG_DCM1, 0);
+        c_set_hw_reg(hw, CARMINE_DISP1_REG + CARMINE_DISP_REG_DCM1, 0);
+
+        /* Software reset */
+        c_set_hw_reg(hw, CARMINE_CTL_REG + CARMINE_CTL_REG_SOFTWARE_RESET, 1);
+        c_set_hw_reg(hw, CARMINE_CTL_REG + CARMINE_CTL_REG_SOFTWARE_RESET, 0);
+
+        /* I/O mode settings */
+        flags = CARMINE_DFLT_IP_DCTL_IO_CONT1 << 16 |
+                CARMINE_DFLT_IP_DCTL_IO_CONT0;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_IOCONT1_IOCONT0,
+                        flags);
+
+        /* DRAM initial sequence */
+        flags = CARMINE_DFLT_IP_DCTL_MODE << 16 | CARMINE_DFLT_IP_DCTL_ADD;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_MODE_ADD,
+                        flags);
+
+        flags = CARMINE_DFLT_IP_DCTL_SET_TIME1 << 16 |
+                CARMINE_DFLT_IP_DCTL_EMODE;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_SETTIME1_EMODE,
+                        flags);
+
+        flags = CARMINE_DFLT_IP_DCTL_REFRESH << 16 |
+                CARMINE_DFLT_IP_DCTL_SET_TIME2;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_REFRESH_SETTIME2,
+                        flags);
+
+        flags = CARMINE_DFLT_IP_DCTL_RESERVE2 << 16 |
+                CARMINE_DFLT_IP_DCTL_FIFO_DEPTH;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_RSV2_RSV1, flags);
+
+        flags = CARMINE_DFLT_IP_DCTL_DDRIF2 << 16 | CARMINE_DFLT_IP_DCTL_DDRIF1;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_DDRIF2_DDRIF1,
+                        flags);
+
+        flags = CARMINE_DFLT_IP_DCTL_RESERVE0 << 16 |
+                CARMINE_DFLT_IP_DCTL_STATES;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_RSV0_STATES,
+                        flags);
+
+        /* Executes DLL reset */
+        if (CARMINE_DCTL_DLL_RESET) {
+                for (loops = 0; loops < CARMINE_DCTL_INIT_WAIT_LIMIT; loops++) {
+
+                        ret = c_get_hw_reg(hw, CARMINE_DCTL_REG +
+                                        CARMINE_DCTL_REG_RSV0_STATES);
+                        ret &= CARMINE_DCTL_REG_STATES_MASK;
+                        if (!ret)
+                                break;
+
+                        mdelay(CARMINE_DCTL_INIT_WAIT_INTERVAL);
+                }
+
+                if (loops >= CARMINE_DCTL_INIT_WAIT_LIMIT) {
+                        printk(KERN_ERR "DRAM init failed\n");
+                        return -EIO;
+                }
+        }
+
+        flags = CARMINE_DFLT_IP_DCTL_MODE_AFT_RST << 16 |
+                CARMINE_DFLT_IP_DCTL_ADD;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_MODE_ADD, flags);
+
+        flags = CARMINE_DFLT_IP_DCTL_RESERVE0 << 16 |
+                CARMINE_DFLT_IP_DCTL_STATES_AFT_RST;
+        c_set_hw_reg(hw, CARMINE_DCTL_REG + CARMINE_DCTL_REG_RSV0_STATES,
+                        flags);
+
+        /* Initialize the write back register */
+        c_set_hw_reg(hw, CARMINE_WB_REG + CARMINE_WB_REG_WBM,
+                        CARMINE_WB_REG_WBM_DEFAULT);
+
+        /* Initialize the Kottos registers */
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_VRINTM, 0);
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_VRERRM, 0);
+
+        /* Set DC offsets */
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_DC_OFFSET_PX, 0);
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_DC_OFFSET_PY, 0);
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_DC_OFFSET_LX, 0);
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_DC_OFFSET_LY, 0);
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_DC_OFFSET_TX, 0);
+        c_set_hw_reg(hw, CARMINE_GRAPH_REG + CARMINE_GRAPH_REG_DC_OFFSET_TY, 0);
+        return 0;
+}
+
+static struct fb_ops carminefb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+
+        .fb_check_var   = carmine_check_var,
+        .fb_set_par     = carmine_set_par,
+        .fb_setcolreg   = carmine_setcolreg,
+};
+
+static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
+                int smem_offset, struct device *device, struct fb_info **rinfo)
+{
+        int ret;
+        struct fb_info *info;
+        struct carmine_fb *par;
+
+        info = framebuffer_alloc(sizeof *par, device);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->display_reg = regs;
+        par->smem_offset = smem_offset;
+
+        info->screen_base = smem_base + smem_offset;
+        info->screen_size = CARMINE_DISPLAY_MEM;
+        info->fbops = &carminefb_ops;
+
+        info->fix = carminefb_fix;
+        info->pseudo_palette = par->pseudo_palette;
+        info->flags = FBINFO_DEFAULT;
+
+        ret = fb_alloc_cmap(&info->cmap, 256, 1);
+        if (ret < 0)
+                goto err_free_fb;
+
+        if (fb_mode > ARRAY_SIZE(carmine_modedb))
+                fb_mode = CARMINEFB_DEFAULT_VIDEO_MODE;
+
+        par->cur_mode = par->new_mode = ~0;
+
+        ret = fb_find_mode(&info->var, info, fb_mode_str, carmine_modedb,
+                        ARRAY_SIZE(carmine_modedb),
+                        &carmine_modedb[fb_mode], 32);
+        if (!ret || ret == 4) {
+                ret = -EINVAL;
+                goto err_dealloc_cmap;
+        }
+
+        fb_videomode_to_modelist(carmine_modedb, ARRAY_SIZE(carmine_modedb),
+                        &info->modelist);
+
+        ret = register_framebuffer(info);
+        if (ret < 0)
+                goto err_dealloc_cmap;
+
+        printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
+                        info->fix.id);
+
+        *rinfo = info;
+        return 0;
+
+err_dealloc_cmap:
+        fb_dealloc_cmap(&info->cmap);
+err_free_fb:
+        framebuffer_release(info);
+        return ret;
+}
+
+static void cleanup_fb_device(struct fb_info *info)
+{
+        if (info) {
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
+                framebuffer_release(info);
+        }
+}
+
+static int __devinit carminefb_probe(struct pci_dev *dev,
+                const struct pci_device_id *ent)
+{
+        struct carmine_hw *hw;
+        struct device *device = &dev->dev;
+        struct fb_info *info;
+        int ret;
+
+        ret = pci_enable_device(dev);
+        if (ret)
+                return ret;
+
+        ret = -ENOMEM;
+        hw = kzalloc(sizeof *hw, GFP_KERNEL);
+        if (!hw)
+                goto err_enable_pci;
+
+        carminefb_fix.mmio_start = pci_resource_start(dev, CARMINE_CONFIG_BAR);
+        carminefb_fix.mmio_len = pci_resource_len(dev, CARMINE_CONFIG_BAR);
+
+        if (!request_mem_region(carminefb_fix.mmio_start,
+                                carminefb_fix.mmio_len,
+                                "carminefb regbase")) {
+                printk(KERN_ERR "carminefb: Can't reserve regbase.\n");
+                ret = -EBUSY;
+                goto err_free_hw;
+        }
+        hw->v_regs = ioremap_nocache(carminefb_fix.mmio_start,
+                        carminefb_fix.mmio_len);
+        if (!hw->v_regs) {
+                printk(KERN_ERR "carminefb: Can't remap %s register.\n",
+                                carminefb_fix.id);
+                goto err_free_reg_mmio;
+        }
+
+        carminefb_fix.smem_start = pci_resource_start(dev, CARMINE_MEMORY_BAR);
+        carminefb_fix.smem_len = pci_resource_len(dev, CARMINE_MEMORY_BAR);
+
+        /* The memory area tends to be very large (256 MiB). Remap only what
+         * is required for that largest resolution to avoid remaps at run
+         * time
+         */
+        if (carminefb_fix.smem_len > CARMINE_TOTAL_DIPLAY_MEM)
+                carminefb_fix.smem_len = CARMINE_TOTAL_DIPLAY_MEM;
+
+        else if (carminefb_fix.smem_len < CARMINE_TOTAL_DIPLAY_MEM) {
+                printk(KERN_ERR "carminefb: Memory bar is only %d bytes, %d "
+                                "are required.", carminefb_fix.smem_len,
+                                CARMINE_TOTAL_DIPLAY_MEM);
+                goto err_free_reg_mmio;
+        }
+
+        if (!request_mem_region(carminefb_fix.smem_start,
+                                carminefb_fix.smem_len, "carminefb smem")) {
+                printk(KERN_ERR "carminefb: Can't reserve smem.\n");
+                goto err_unmap_vregs;
+        }
+
+        hw->screen_mem = ioremap_nocache(carminefb_fix.smem_start,
+                        carminefb_fix.smem_len);
+        if (!hw->screen_mem) {
+                printk(KERN_ERR "carmine: Can't ioremap smem area.\n");
+                release_mem_region(carminefb_fix.smem_start,
+                                carminefb_fix.smem_len);
+                goto err_reg_smem;
+        }
+
+        ret = init_hardware(hw);
+        if (ret)
+                goto err_unmap_screen;
+
+        info = NULL;
+        if (fb_displays & CARMINE_USE_DISPLAY0) {
+                ret = alloc_carmine_fb(hw->v_regs + CARMINE_DISP0_REG,
+                                hw->screen_mem, CARMINE_DISPLAY_MEM * 0,
+                                device, &info);
+                if (ret)
+                        goto err_deinit_hw;
+        }
+
+        hw->fb[0] = info;
+
+        info = NULL;
+        if (fb_displays & CARMINE_USE_DISPLAY1) {
+                ret = alloc_carmine_fb(hw->v_regs + CARMINE_DISP1_REG,
+                                hw->screen_mem, CARMINE_DISPLAY_MEM * 1,
+                                device, &info);
+                if (ret)
+                        goto err_cleanup_fb0;
+        }
+
+        hw->fb[1] = info;
+        info = NULL;
+
+        pci_set_drvdata(dev, hw);
+        return 0;
+
+err_cleanup_fb0:
+        cleanup_fb_device(hw->fb[0]);
+err_deinit_hw:
+        /* disable clock, etc */
+        c_set_hw_reg(hw, CARMINE_CTL_REG + CARMINE_CTL_REG_CLOCK_ENABLE, 0);
+err_unmap_screen:
+        iounmap(hw->screen_mem);
+err_reg_smem:
+        release_mem_region(carminefb_fix.mmio_start, carminefb_fix.mmio_len);
+err_unmap_vregs:
+        iounmap(hw->v_regs);
+err_free_reg_mmio:
+        release_mem_region(carminefb_fix.mmio_start, carminefb_fix.mmio_len);
+err_free_hw:
+        kfree(hw);
+err_enable_pci:
+        pci_disable_device(dev);
+        return ret;
+}
+
+static void __devexit carminefb_remove(struct pci_dev *dev)
+{
+        struct carmine_hw *hw = pci_get_drvdata(dev);
+        struct fb_fix_screeninfo fix;
+        int i;
+
+        /* in case we use only fb1 and not fb1 */
+        if (hw->fb[0])
+                fix = hw->fb[0]->fix;
+        else
+                fix = hw->fb[1]->fix;
+
+        /* deactivate display(s) and switch clocks */
+        c_set_hw_reg(hw, CARMINE_DISP0_REG + CARMINE_DISP_REG_DCM1, 0);
+        c_set_hw_reg(hw, CARMINE_DISP1_REG + CARMINE_DISP_REG_DCM1, 0);
+        c_set_hw_reg(hw, CARMINE_CTL_REG + CARMINE_CTL_REG_CLOCK_ENABLE, 0);
+
+        for (i = 0; i < MAX_DISPLAY; i++)
+                cleanup_fb_device(hw->fb[i]);
+
+        iounmap(hw->screen_mem);
+        release_mem_region(fix.smem_start, fix.smem_len);
+        iounmap(hw->v_regs);
+        release_mem_region(fix.mmio_start, fix.mmio_len);
+
+        pci_set_drvdata(dev, NULL);
+        pci_disable_device(dev);
+        kfree(hw);
+}
+
+#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf
+static struct pci_device_id carmine_devices[] __devinitdata = {
+{
+        PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)},
+        {0, 0, 0, 0, 0, 0, 0}
+};
+
+MODULE_DEVICE_TABLE(pci, carmine_devices);
+
+static struct pci_driver carmine_pci_driver = {
+        .name           = "carminefb",
+        .id_table       = carmine_devices,
+        .probe          = carminefb_probe,
+        .remove         = __devexit_p(carminefb_remove),
+};
+
+static int __init carminefb_init(void)
+{
+        if (!(fb_displays &
+                (CARMINE_USE_DISPLAY0 | CARMINE_USE_DISPLAY1))) {
+                printk(KERN_ERR "If you disable both displays than you don't "
+                                "need the driver at all\n");
+                return -EINVAL;
+        }
+        return pci_register_driver(&carmine_pci_driver);
+}
+module_init(carminefb_init);
+
+static void __exit carminefb_cleanup(void)
+{
+        pci_unregister_driver(&carmine_pci_driver);
+}
+module_exit(carminefb_cleanup);
+
+MODULE_AUTHOR("Sebastian Siewior <bigeasy@linutronix.de>");
+MODULE_DESCRIPTION("Framebuffer driver for Fujitsu Carmine based devices");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/carminefb.h b/drivers/video/carminefb.h
new file mode 100644
index 000000000000..05306de0c6b6
--- /dev/null
+++ b/drivers/video/carminefb.h
@@ -0,0 +1,64 @@
+#ifndef CARMINE_CARMINE_H
+#define CARMINE_CARMINE_H
+
+#define CARMINE_MEMORY_BAR      2
+#define CARMINE_CONFIG_BAR      3
+
+#define MAX_DISPLAY     2
+#define CARMINE_DISPLAY_MEM     (800 * 600 * 4)
+#define CARMINE_TOTAL_DIPLAY_MEM        (CARMINE_DISPLAY_MEM * MAX_DISPLAY)
+
+#define CARMINE_USE_DISPLAY0    (1 << 0)
+#define CARMINE_USE_DISPLAY1    (1 << 1)
+
+/*
+ * This values work on the eval card. Custom boards may use different timings,
+ * here an example :)
+ */
+
+/* DRAM initialization values */
+#ifdef CONFIG_FB_CARMINE_DRAM_EVAL
+
+#define CARMINE_DFLT_IP_CLOCK_ENABLE            (0x03ff)
+#define CARMINE_DFLT_IP_DCTL_ADD                (0x05c3)
+#define CARMINE_DFLT_IP_DCTL_MODE               (0x0121)
+#define CARMINE_DFLT_IP_DCTL_EMODE              (0x8000)
+#define CARMINE_DFLT_IP_DCTL_SET_TIME1          (0x4749)
+#define CARMINE_DFLT_IP_DCTL_SET_TIME2          (0x2a22)
+#define CARMINE_DFLT_IP_DCTL_REFRESH            (0x0042)
+#define CARMINE_DFLT_IP_DCTL_STATES             (0x0003)
+#define CARMINE_DFLT_IP_DCTL_RESERVE0           (0x0020)
+#define CARMINE_DFLT_IP_DCTL_FIFO_DEPTH         (0x000f)
+#define CARMINE_DFLT_IP_DCTL_RESERVE2           (0x0000)
+#define CARMINE_DFLT_IP_DCTL_DDRIF1             (0x6646)
+#define CARMINE_DFLT_IP_DCTL_DDRIF2             (0x0055)
+#define CARMINE_DFLT_IP_DCTL_MODE_AFT_RST       (0x0021)
+#define CARMINE_DFLT_IP_DCTL_STATES_AFT_RST     (0x0002)
+#define CARMINE_DFLT_IP_DCTL_IO_CONT0           (0x0555)
+#define CARMINE_DFLT_IP_DCTL_IO_CONT1           (0x0555)
+#define CARMINE_DCTL_DLL_RESET                  (1)
+#endif
+
+#ifdef CONFIG_CARMINE_DRAM_CUSTOM
+
+#define CARMINE_DFLT_IP_CLOCK_ENABLE            (0x03ff)
+#define CARMINE_DFLT_IP_DCTL_ADD                (0x03b2)
+#define CARMINE_DFLT_IP_DCTL_MODE               (0x0161)
+#define CARMINE_DFLT_IP_DCTL_EMODE              (0x8000)
+#define CARMINE_DFLT_IP_DCTL_SET_TIME1          (0x2628)
+#define CARMINE_DFLT_IP_DCTL_SET_TIME2          (0x1a09)
+#define CARMINE_DFLT_IP_DCTL_REFRESH            (0x00fe)
+#define CARMINE_DFLT_IP_DCTL_STATES             (0x0003)
+#define CARMINE_DFLT_IP_DCTL_RESERVE0           (0x0020)
+#define CARMINE_DFLT_IP_DCTL_FIFO_DEPTH         (0x000f)
+#define CARMINE_DFLT_IP_DCTL_RESERVE2           (0x0000)
+#define CARMINE_DFLT_IP_DCTL_DDRIF1             (0x0646)
+#define CARMINE_DFLT_IP_DCTL_DDRIF2             (0x55aa)
+#define CARMINE_DFLT_IP_DCTL_MODE_AFT_RST       (0x0061)
+#define CARMINE_DFLT_IP_DCTL_STATES_AFT_RST     (0x0002)
+#define CARMINE_DFLT_IP_DCTL_IO_CONT0           (0x0555)
+#define CARMINE_DFLT_IP_DCTL_IO_CONT1           (0x0555)
+#define CARMINE_DCTL_DLL_RESET                  (1)
+#endif
+
+#endif
diff --git a/drivers/video/carminefb_regs.h b/drivers/video/carminefb_regs.h
new file mode 100644
index 000000000000..045215600b73
--- /dev/null
+++ b/drivers/video/carminefb_regs.h
@@ -0,0 +1,159 @@
+#ifndef _CARMINEFB_REGS_H
+#define _CARMINEFB_REGS_H
+
+#define CARMINE_OVERLAY_EXT_MODE        (0x00000002)
+#define CARMINE_GRAPH_REG               (0x00000000)
+#define CARMINE_DISP0_REG               (0x00100000)
+#define CARMINE_DISP1_REG               (0x00140000)
+#define CARMINE_WB_REG                  (0x00180000)
+#define CARMINE_DCTL_REG                (0x00300000)
+#define CARMINE_CTL_REG                 (0x00400000)
+#define CARMINE_WINDOW_MODE             (0x00000001)
+#define CARMINE_EXTEND_MODE             (CARMINE_WINDOW_MODE | \
+                                        CARMINE_OVERLAY_EXT_MODE)
+#define CARMINE_L0E                     (1 << 16)
+#define CARMINE_L2E                     (1 << 18)
+#define CARMINE_DEN                     (1 << 31)
+
+#define CARMINE_EXT_CMODE_DIRECT24_RGBA         (0xC0000000)
+#define CARMINE_DCTL_REG_MODE_ADD               (0x00)
+#define CARMINE_DCTL_REG_SETTIME1_EMODE         (0x04)
+#define CARMINE_DCTL_REG_REFRESH_SETTIME2       (0x08)
+#define CARMINE_DCTL_REG_RSV0_STATES            (0x0C)
+#define CARMINE_DCTL_REG_RSV2_RSV1              (0x10)
+#define CARMINE_DCTL_REG_DDRIF2_DDRIF1          (0x14)
+#define CARMINE_DCTL_REG_IOCONT1_IOCONT0        (0x24)
+#define CARMINE_DCTL_REG_STATES_MASK            (0x000F)
+#define CARMINE_DCTL_INIT_WAIT_INTERVAL         (1)
+#define CARMINE_DCTL_INIT_WAIT_LIMIT            (5000)
+#define CARMINE_WB_REG_WBM_DEFAULT              (0x0001c020)
+#define CARMINE_DISP_REG_L0RM                   (0x1880)
+#define CARMINE_DISP_REG_L0PX                   (0x1884)
+#define CARMINE_DISP_REG_L0PY                   (0x1888)
+#define CARMINE_DISP_REG_L2RM                   (0x18A0)
+#define CARMINE_DISP_REG_L2PX                   (0x18A4)
+#define CARMINE_DISP_REG_L2PY                   (0x18A8)
+#define CARMINE_DISP_REG_L3RM                   (0x18B0)
+#define CARMINE_DISP_REG_L3PX                   (0x18B4)
+#define CARMINE_DISP_REG_L3PY                   (0x18B8)
+#define CARMINE_DISP_REG_L4RM                   (0x18C0)
+#define CARMINE_DISP_REG_L4PX                   (0x18C4)
+#define CARMINE_DISP_REG_L4PY                   (0x18C8)
+#define CARMINE_DISP_REG_L5RM                   (0x18D0)
+#define CARMINE_DISP_REG_L5PX                   (0x18D4)
+#define CARMINE_DISP_REG_L5PY                   (0x18D8)
+#define CARMINE_DISP_REG_L6RM                   (0x1924)
+#define CARMINE_DISP_REG_L6PX                   (0x1928)
+#define CARMINE_DISP_REG_L6PY                   (0x192C)
+#define CARMINE_DISP_REG_L7RM                   (0x1964)
+#define CARMINE_DISP_REG_L7PX                   (0x1968)
+#define CARMINE_DISP_REG_L7PY                   (0x196C)
+#define CARMINE_WB_REG_WBM                      (0x0004)
+#define CARMINE_DISP_HTP_SHIFT                  (16)
+#define CARMINE_DISP_HDB_SHIFT                  (16)
+#define CARMINE_DISP_HSW_SHIFT                  (16)
+#define CARMINE_DISP_VSW_SHIFT                  (24)
+#define CARMINE_DISP_VTR_SHIFT                  (16)
+#define CARMINE_DISP_VDP_SHIFT                  (16)
+#define CARMINE_CURSOR_CUTZ_MASK                (0x00000100)
+#define CARMINE_CURSOR0_PRIORITY_MASK           (0x00010000)
+#define CARMINE_CURSOR1_PRIORITY_MASK           (0x00020000)
+#define CARMINE_DISP_WIDTH_SHIFT                (16)
+#define CARMINE_DISP_WIN_H_SHIFT                (16)
+#define CARMINE_DISP_REG_H_TOTAL                (0x0004)
+#define CARMINE_DISP_REG_H_PERIOD               (0x0008)
+#define CARMINE_DISP_REG_V_H_W_H_POS            (0x000C)
+#define CARMINE_DISP_REG_V_TOTAL                (0x0010)
+#define CARMINE_DISP_REG_V_PERIOD_POS           (0x0014)
+#define CARMINE_DISP_REG_L0_MODE_W_H            (0x0020)
+#define CARMINE_DISP_REG_L0_ORG_ADR             (0x0024)
+#define CARMINE_DISP_REG_L0_DISP_ADR            (0x0028)
+#define CARMINE_DISP_REG_L0_DISP_POS            (0x002C)
+#define CARMINE_DISP_REG_L1_WIDTH               (0x0030)
+#define CARMINE_DISP_REG_L1_ORG_ADR             (0x0034)
+#define CARMINE_DISP_REG_L2_MODE_W_H            (0x0040)
+#define CARMINE_DISP_REG_L2_ORG_ADR1            (0x0044)
+#define CARMINE_DISP_REG_L2_DISP_ADR1           (0x0048)
+#define CARMINE_DISP_REG_L2_DISP_POS            (0x0054)
+#define CARMINE_DISP_REG_L3_MODE_W_H            (0x0058)
+#define CARMINE_DISP_REG_L3_ORG_ADR1            (0x005C)
+#define CARMINE_DISP_REG_L3_DISP_ADR1           (0x0060)
+#define CARMINE_DISP_REG_L3_DISP_POS            (0x006C)
+#define CARMINE_DISP_REG_L4_MODE_W_H            (0x0070)
+#define CARMINE_DISP_REG_L4_ORG_ADR1            (0x0074)
+#define CARMINE_DISP_REG_L4_DISP_ADR1           (0x0078)
+#define CARMINE_DISP_REG_L4_DISP_POS            (0x0084)
+#define CARMINE_DISP_REG_L5_MODE_W_H            (0x0088)
+#define CARMINE_DISP_REG_L5_ORG_ADR1            (0x008C)
+#define CARMINE_DISP_REG_L5_DISP_ADR1           (0x0090)
+#define CARMINE_DISP_REG_L5_DISP_POS            (0x009C)
+#define CARMINE_DISP_REG_CURSOR_MODE            (0x00A0)
+#define CARMINE_DISP_REG_CUR1_POS               (0x00A8)
+#define CARMINE_DISP_REG_CUR2_POS               (0x00B0)
+#define CARMINE_DISP_REG_C_TRANS                (0x00BC)
+#define CARMINE_DISP_REG_MLMR_TRANS             (0x00C0)
+#define CARMINE_DISP_REG_L0_EXT_MODE            (0x0110)
+#define CARMINE_DISP_REG_L0_WIN_POS             (0x0114)
+#define CARMINE_DISP_REG_L0_WIN_SIZE            (0x0118)
+#define CARMINE_DISP_REG_L1_EXT_MODE            (0x0120)
+#define CARMINE_DISP_REG_L1_WIN_POS             (0x0124)
+#define CARMINE_DISP_REG_L1_WIN_SIZE            (0x0128)
+#define CARMINE_DISP_REG_L2_EXT_MODE            (0x0130)
+#define CARMINE_DISP_REG_L2_WIN_POS             (0x0134)
+#define CARMINE_DISP_REG_L2_WIN_SIZE            (0x0138)
+#define CARMINE_DISP_REG_L3_EXT_MODE            (0x0140)
+#define CARMINE_DISP_REG_L3_WIN_POS             (0x0144)
+#define CARMINE_DISP_REG_L3_WIN_SIZE            (0x0148)
+#define CARMINE_DISP_REG_L4_EXT_MODE            (0x0150)
+#define CARMINE_DISP_REG_L4_WIN_POS             (0x0154)
+#define CARMINE_DISP_REG_L4_WIN_SIZE            (0x0158)
+#define CARMINE_DISP_REG_L5_EXT_MODE            (0x0160)
+#define CARMINE_DISP_REG_L5_WIN_POS             (0x0164)
+#define CARMINE_DISP_REG_L5_WIN_SIZE            (0x0168)
+#define CARMINE_DISP_REG_L6_EXT_MODE            (0x1918)
+#define CARMINE_DISP_REG_L6_WIN_POS             (0x191c)
+#define CARMINE_DISP_REG_L6_WIN_SIZE            (0x1920)
+#define CARMINE_DISP_REG_L7_EXT_MODE            (0x1958)
+#define CARMINE_DISP_REG_L7_WIN_POS             (0x195c)
+#define CARMINE_DISP_REG_L7_WIN_SIZE            (0x1960)
+#define CARMINE_DISP_REG_BLEND_MODE_L0          (0x00B4)
+#define CARMINE_DISP_REG_BLEND_MODE_L1          (0x0188)
+#define CARMINE_DISP_REG_BLEND_MODE_L2          (0x018C)
+#define CARMINE_DISP_REG_BLEND_MODE_L3          (0x0190)
+#define CARMINE_DISP_REG_BLEND_MODE_L4          (0x0194)
+#define CARMINE_DISP_REG_BLEND_MODE_L5          (0x0198)
+#define CARMINE_DISP_REG_BLEND_MODE_L6          (0x1990)
+#define CARMINE_DISP_REG_BLEND_MODE_L7          (0x1994)
+#define CARMINE_DISP_REG_L0_TRANS               (0x01A0)
+#define CARMINE_DISP_REG_L1_TRANS               (0x01A4)
+#define CARMINE_DISP_REG_L2_TRANS               (0x01A8)
+#define CARMINE_DISP_REG_L3_TRANS               (0x01AC)
+#define CARMINE_DISP_REG_L4_TRANS               (0x01B0)
+#define CARMINE_DISP_REG_L5_TRANS               (0x01B4)
+#define CARMINE_DISP_REG_L6_TRANS               (0x1998)
+#define CARMINE_DISP_REG_L7_TRANS               (0x199c)
+#define CARMINE_EXTEND_MODE_MASK                (0x00000003)
+#define CARMINE_DISP_DCM_MASK                   (0x0000FFFF)
+#define CARMINE_DISP_REG_DCM1                   (0x0100)
+#define CARMINE_DISP_WIDTH_UNIT                 (64)
+#define CARMINE_DISP_REG_L6_MODE_W_H            (0x1900)
+#define CARMINE_DISP_REG_L6_ORG_ADR1            (0x1904)
+#define CARMINE_DISP_REG_L6_DISP_ADR0           (0x1908)
+#define CARMINE_DISP_REG_L6_DISP_POS            (0x1914)
+#define CARMINE_DISP_REG_L7_MODE_W_H            (0x1940)
+#define CARMINE_DISP_REG_L7_ORG_ADR1            (0x1944)
+#define CARMINE_DISP_REG_L7_DISP_ADR0           (0x1948)
+#define CARMINE_DISP_REG_L7_DISP_POS            (0x1954)
+#define CARMINE_CTL_REG_CLOCK_ENABLE            (0x000C)
+#define CARMINE_CTL_REG_SOFTWARE_RESET          (0x0010)
+#define CARMINE_CTL_REG_IST_MASK_ALL            (0x07FFFFFF)
+#define CARMINE_GRAPH_REG_VRINTM                (0x00028064)
+#define CARMINE_GRAPH_REG_VRERRM                (0x0002806C)
+#define CARMINE_GRAPH_REG_DC_OFFSET_PX          (0x0004005C)
+#define CARMINE_GRAPH_REG_DC_OFFSET_PY          (0x00040060)
+#define CARMINE_GRAPH_REG_DC_OFFSET_LX          (0x00040064)
+#define CARMINE_GRAPH_REG_DC_OFFSET_LY          (0x00040068)
+#define CARMINE_GRAPH_REG_DC_OFFSET_TX          (0x0004006C)
+#define CARMINE_GRAPH_REG_DC_OFFSET_TY          (0x00040070)
+
+#endif
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index b17e74671779..a2d1882791a5 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -589,7 +589,7 @@ static int __devexit cg14_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id cg14_match[] = {
+static const struct of_device_id cg14_match[] = {
         {
                 .name = "cgfourteen",
         },
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 3aa7b6cb0268..99f87fb61d05 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -456,7 +456,7 @@ static int __devexit cg3_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id cg3_match[] = {
+static const struct of_device_id cg3_match[] = {
         {
                 .name = "cgthree",
         },
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 2f64bb3bd254..940ec04f0f1b 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -34,10 +34,11 @@ static int cg6_blank(int, struct fb_info *);
 
 static void cg6_imageblit(struct fb_info *, const struct fb_image *);
 static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *);
+static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);
 static int cg6_sync(struct fb_info *);
 static int cg6_mmap(struct fb_info *, struct vm_area_struct *);
 static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long);
-static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);
+static int cg6_pan_display(struct fb_var_screeninfo *, struct fb_info *);
 
 /*
  *  Frame buffer operations
@@ -47,6 +48,7 @@ static struct fb_ops cg6_ops = {
         .owner                  = THIS_MODULE,
         .fb_setcolreg           = cg6_setcolreg,
         .fb_blank               = cg6_blank,
+        .fb_pan_display         = cg6_pan_display,
         .fb_fillrect            = cg6_fillrect,
         .fb_copyarea            = cg6_copyarea,
         .fb_imageblit           = cg6_imageblit,
@@ -161,6 +163,7 @@ static struct fb_ops cg6_ops = {
 #define CG6_THC_MISC_INT_ENAB           (1 << 5)
 #define CG6_THC_MISC_INT                (1 << 4)
 #define CG6_THC_MISC_INIT               0x9f
+#define CG6_THC_CURSOFF                 ((65536-32) | ((65536-32) << 16))
 
 /* The contents are unknown */
 struct cg6_tec {
@@ -280,6 +283,33 @@ static int cg6_sync(struct fb_info *info)
         return 0;
 }
 
+static void cg6_switch_from_graph(struct cg6_par *par)
+{
+        struct cg6_thc __iomem *thc = par->thc;
+        unsigned long flags;
+
+        spin_lock_irqsave(&par->lock, flags);
+
+        /* Hide the cursor. */
+        sbus_writel(CG6_THC_CURSOFF, &thc->thc_cursxy);
+
+        spin_unlock_irqrestore(&par->lock, flags);
+}
+
+static int cg6_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct cg6_par *par = (struct cg6_par *)info->par;
+
+        /* We just use this to catch switches out of
+         * graphics mode.
+         */
+        cg6_switch_from_graph(par);
+
+        if (var->xoffset || var->yoffset || var->vmode)
+                return -EINVAL;
+        return 0;
+}
+
 /**
  *      cg6_fillrect -  Draws a rectangle on the screen.
  *
@@ -643,9 +673,13 @@ static void __devinit cg6_chip_init(struct fb_info *info)
         struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_tec __iomem *tec = par->tec;
         struct cg6_fbc __iomem *fbc = par->fbc;
+        struct cg6_thc __iomem *thc = par->thc;
         u32 rev, conf, mode;
         int i;
 
+        /* Hide the cursor. */
+        sbus_writel(CG6_THC_CURSOFF, &thc->thc_cursxy);
+
         /* Turn off stuff in the Transform Engine. */
         sbus_writel(0, &tec->tec_matrix);
         sbus_writel(0, &tec->tec_clip);
@@ -814,7 +848,7 @@ static int __devexit cg6_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id cg6_match[] = {
+static const struct of_device_id cg6_match[] = {
         {
                 .name = "cgsix",
         },
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index c14b2435d23e..048b139f0e50 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -327,29 +327,7 @@ static const struct {
 #endif /* CONFIG_ZORRO */
 
 struct cirrusfb_regs {
-        long freq;
-        long nom;
-        long den;
-        long div;
-        long multiplexing;
-        long mclk;
-        long divMCLK;
-
-        long HorizRes;          /* The x resolution in pixel */
-        long HorizTotal;
-        long HorizDispEnd;
-        long HorizBlankStart;
-        long HorizBlankEnd;
-        long HorizSyncStart;
-        long HorizSyncEnd;
-
-        long VertRes;           /* the physical y resolution in scanlines */
-        long VertTotal;
-        long VertDispEnd;
-        long VertSyncStart;
-        long VertSyncEnd;
-        long VertBlankStart;
-        long VertBlankEnd;
+        int multiplexing;
 };
 
 #ifdef CIRRUSFB_DEBUG
@@ -367,110 +345,13 @@ struct cirrusfb_info {
 
         struct cirrusfb_regs currentmode;
         int blank_mode;
+        u32 pseudo_palette[16];
 
-        u32     pseudo_palette[16];
-
-#ifdef CONFIG_ZORRO
-        struct zorro_dev *zdev;
-#endif
-#ifdef CONFIG_PCI
-        struct pci_dev *pdev;
-#endif
         void (*unmap)(struct fb_info *info);
 };
 
-static unsigned cirrusfb_def_mode = 1;
-static int noaccel;
-
-/*
- *    Predefined Video Modes
- */
-
-static const struct {
-        const char *name;
-        struct fb_var_screeninfo var;
-} cirrusfb_predefined[] = {
-        {
-                /* autodetect mode */
-                .name   = "Autodetect",
-        }, {
-                /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
-                .name   = "640x480",
-                .var    = {
-                        .xres           = 640,
-                        .yres           = 480,
-                        .xres_virtual   = 640,
-                        .yres_virtual   = 480,
-                        .bits_per_pixel = 8,
-                        .red            = { .length = 8 },
-                        .green          = { .length = 8 },
-                        .blue           = { .length = 8 },
-                        .width          = -1,
-                        .height         = -1,
-                        .pixclock       = 40000,
-                        .left_margin    = 48,
-                        .right_margin   = 16,
-                        .upper_margin   = 32,
-                        .lower_margin   = 8,
-                        .hsync_len      = 96,
-                        .vsync_len      = 4,
-                        .sync   = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-                        .vmode          = FB_VMODE_NONINTERLACED
-                 }
-        }, {
-                /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
-                .name   = "800x600",
-                .var    = {
-                        .xres           = 800,
-                        .yres           = 600,
-                        .xres_virtual   = 800,
-                        .yres_virtual   = 600,
-                        .bits_per_pixel = 8,
-                        .red            = { .length = 8 },
-                        .green          = { .length = 8 },
-                        .blue           = { .length = 8 },
-                        .width          = -1,
-                        .height         = -1,
-                        .pixclock       = 20000,
-                        .left_margin    = 128,
-                        .right_margin   = 16,
-                        .upper_margin   = 24,
-                        .lower_margin   = 2,
-                        .hsync_len      = 96,
-                        .vsync_len      = 6,
-                        .vmode          = FB_VMODE_NONINTERLACED
-                 }
-        }, {
-                /*
-                 * Modeline from XF86Config:
-                 * Mode "1024x768" 80  1024 1136 1340 1432  768 770 774 805
-                 */
-                /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
-                .name   = "1024x768",
-                .var    = {
-                        .xres           = 1024,
-                        .yres           = 768,
-                        .xres_virtual   = 1024,
-                        .yres_virtual   = 768,
-                        .bits_per_pixel = 8,
-                        .red            = { .length = 8 },
-                        .green          = { .length = 8 },
-                        .blue           = { .length = 8 },
-                        .width          = -1,
-                        .height         = -1,
-                        .pixclock       = 12500,
-                        .left_margin    = 144,
-                        .right_margin   = 32,
-                        .upper_margin   = 30,
-                        .lower_margin   = 2,
-                        .hsync_len      = 192,
-                        .vsync_len      = 6,
-                        .vmode          = FB_VMODE_NONINTERLACED
-                }
-        }
-};
-
-#define NUM_TOTAL_MODES    ARRAY_SIZE(cirrusfb_predefined)
+static int noaccel __devinitdata;
+static char *mode_option __devinitdata = "640x480@60";
 
 /****************************************************************************/
 /**** BEGIN PROTOTYPES ******************************************************/
@@ -514,10 +395,6 @@ static struct fb_ops cirrusfb_ops = {
         .fb_imageblit   = cirrusfb_imageblit,
 };
 
-/*--- Hardware Specific Routines -------------------------------------------*/
-static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
-                                struct cirrusfb_regs *regs,
-                                struct fb_info *info);
 /*--- Internal routines ----------------------------------------------------*/
 static void init_vgachip(struct fb_info *info);
 static void switch_monitor(struct cirrusfb_info *cinfo, int on);
@@ -546,9 +423,7 @@ static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
                               u_short width, u_short height,
                               u_char color, u_short line_length);
 
-static void bestclock(long freq, long *best,
-                      long *nom, long *den,
-                      long *div, long maxfreq);
+static void bestclock(long freq, int *nom, int *den, int *div);
 
 #ifdef CIRRUSFB_DEBUG
 static void cirrusfb_dump(void);
@@ -584,71 +459,44 @@ static int cirrusfb_release(struct fb_info *info, int user)
 /****************************************************************************/
 /**** BEGIN Hardware specific Routines **************************************/
 
-/* Get a good MCLK value */
-static long cirrusfb_get_mclk(long freq, int bpp, long *div)
+/* Check if the MCLK is not a better clock source */
+static int cirrusfb_check_mclk(struct cirrusfb_info *cinfo, long freq)
 {
-        long mclk;
-
-        assert(div != NULL);
+        long mclk = vga_rseq(cinfo->regbase, CL_SEQR1F) & 0x3f;
 
-        /* Calculate MCLK, in case VCLK is high enough to require > 50MHz.
-         * Assume a 64-bit data path for now.  The formula is:
-         * ((B * PCLK * 2)/W) * 1.2
-         * B = bytes per pixel, PCLK = pixclock, W = data width in bytes */
-        mclk = ((bpp / 8) * freq * 2) / 4;
-        mclk = (mclk * 12) / 10;
-        if (mclk < 50000)
-                mclk = 50000;
-        DPRINTK("Use MCLK of %ld kHz\n", mclk);
-
-        /* Calculate value for SR1F.  Multiply by 2 so we can round up. */
-        mclk = ((mclk * 16) / 14318);
-        mclk = (mclk + 1) / 2;
-        DPRINTK("Set SR1F[5:0] to 0x%lx\n", mclk);
+        /* Read MCLK value */
+        mclk = (14318 * mclk) >> 3;
+        DPRINTK("Read MCLK of %ld kHz\n", mclk);
 
         /* Determine if we should use MCLK instead of VCLK, and if so, what we
-           * should divide it by to get VCLK */
-        switch (freq) {
-        case 24751 ... 25249:
-                *div = 2;
-                DPRINTK("Using VCLK = MCLK/2\n");
-                break;
-        case 49501 ... 50499:
-                *div = 1;
+         * should divide it by to get VCLK
+         */
+
+        if (abs(freq - mclk) < 250) {
                 DPRINTK("Using VCLK = MCLK\n");
-                break;
-        default:
-                *div = 0;
-                break;
+                return 1;
+        } else if (abs(freq - (mclk / 2)) < 250) {
+                DPRINTK("Using VCLK = MCLK/2\n");
+                return 2;
         }
 
-        return mclk;
+        return 0;
 }
 
 static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                               struct fb_info *info)
 {
-        int nom, den;           /* translyting from pixels->bytes */
-        int yres, i;
-        static struct { int xres, yres; } modes[] =
-        { { 1600, 1280 },
-          { 1280, 1024 },
-          { 1024, 768 },
-          { 800, 600 },
-          { 640, 480 },
-          { -1, -1 } };
+        int yres;
+        /* memory size in pixels */
+        unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
 
         switch (var->bits_per_pixel) {
         case 1:
-                nom = 4;
-                den = 8;
+                pixels /= 4;
                 break;          /* 8 pixel per byte, only 1/4th of mem usable */
         case 8:
         case 16:
-        case 24:
         case 32:
-                nom = var->bits_per_pixel / 8;
-                den = 1;
                 break;          /* 1 pixel == 1 byte */
         default:
                 printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
@@ -658,43 +506,29 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 return -EINVAL;
         }
 
-        if (var->xres * nom / den * var->yres > info->screen_size) {
-                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
-                        "resolution too high to fit into video memory!\n",
-                        var->xres, var->yres, var->bits_per_pixel);
-                DPRINTK("EXIT - EINVAL error\n");
-                return -EINVAL;
-        }
-
+        if (var->xres_virtual < var->xres)
+                var->xres_virtual = var->xres;
         /* use highest possible virtual resolution */
-        if (var->xres_virtual == -1 &&
-            var->yres_virtual == -1) {
-                printk(KERN_INFO
-                     "cirrusfb: using maximum available virtual resolution\n");
-                for (i = 0; modes[i].xres != -1; i++) {
-                        int size = modes[i].xres * nom / den * modes[i].yres;
-                        if (size < info->screen_size / 2)
-                                break;
-                }
-                if (modes[i].xres == -1) {
-                        printk(KERN_ERR "cirrusfb: could not find a virtual "
-                                "resolution that fits into video memory!!\n");
-                        DPRINTK("EXIT - EINVAL error\n");
-                        return -EINVAL;
-                }
-                var->xres_virtual = modes[i].xres;
-                var->yres_virtual = modes[i].yres;
+        if (var->yres_virtual == -1) {
+                var->yres_virtual = pixels / var->xres_virtual;
 
                 printk(KERN_INFO "cirrusfb: virtual resolution set to "
                         "maximum of %dx%d\n", var->xres_virtual,
                         var->yres_virtual);
         }
-
-        if (var->xres_virtual < var->xres)
-                var->xres_virtual = var->xres;
         if (var->yres_virtual < var->yres)
                 var->yres_virtual = var->yres;
 
+        if (var->xres_virtual * var->yres_virtual > pixels) {
+                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... "
+                      "virtual resolution too high to fit into video memory!\n",
+                        var->xres_virtual, var->yres_virtual,
+                        var->bits_per_pixel);
+                DPRINTK("EXIT - EINVAL error\n");
+                return -EINVAL;
+        }
+
+
         if (var->xoffset < 0)
                 var->xoffset = 0;
         if (var->yoffset < 0)
@@ -736,7 +570,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 var->blue.length = 5;
                 break;
 
-        case 24:
         case 32:
                 if (isPReP) {
                         var->red.offset = 8;
@@ -790,8 +623,6 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
         long maxclock;
         int maxclockidx = var->bits_per_pixel >> 3;
         struct cirrusfb_info *cinfo = info->par;
-        int xres, hfront, hsync, hback;
-        int yres, vfront, vsync, vback;
 
         switch (var->bits_per_pixel) {
         case 1:
@@ -805,10 +636,9 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
                 break;
 
         case 16:
-        case 24:
         case 32:
                 info->fix.line_length = var->xres_virtual * maxclockidx;
-                info->fix.visual = FB_VISUAL_DIRECTCOLOR;
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
                 break;
 
         default:
@@ -850,90 +680,33 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
         switch (var->bits_per_pixel) {
         case 16:
         case 32:
-                if (regs->HorizRes <= 800)
+                if (var->xres <= 800)
                         /* Xbh has this type of clock for 32-bit */
                         freq /= 2;
                 break;
         }
 #endif
-
-        bestclock(freq, &regs->freq, &regs->nom, &regs->den, &regs->div,
-                  maxclock);
-        regs->mclk = cirrusfb_get_mclk(freq, var->bits_per_pixel,
-                                        &regs->divMCLK);
-
-        xres = var->xres;
-        hfront = var->right_margin;
-        hsync = var->hsync_len;
-        hback = var->left_margin;
-
-        yres = var->yres;
-        vfront = var->lower_margin;
-        vsync = var->vsync_len;
-        vback = var->upper_margin;
-
-        if (var->vmode & FB_VMODE_DOUBLE) {
-                yres *= 2;
-                vfront *= 2;
-                vsync *= 2;
-                vback *= 2;
-        } else if (var->vmode & FB_VMODE_INTERLACED) {
-                yres = (yres + 1) / 2;
-                vfront = (vfront + 1) / 2;
-                vsync = (vsync + 1) / 2;
-                vback = (vback + 1) / 2;
-        }
-        regs->HorizRes = xres;
-        regs->HorizTotal = (xres + hfront + hsync + hback) / 8 - 5;
-        regs->HorizDispEnd = xres / 8 - 1;
-        regs->HorizBlankStart = xres / 8;
-        /* does not count with "-5" */
-        regs->HorizBlankEnd = regs->HorizTotal + 5;
-        regs->HorizSyncStart = (xres + hfront) / 8 + 1;
-        regs->HorizSyncEnd = (xres + hfront + hsync) / 8 + 1;
-
-        regs->VertRes = yres;
-        regs->VertTotal = yres + vfront + vsync + vback - 2;
-        regs->VertDispEnd = yres - 1;
-        regs->VertBlankStart = yres;
-        regs->VertBlankEnd = regs->VertTotal;
-        regs->VertSyncStart = yres + vfront - 1;
-        regs->VertSyncEnd = yres + vfront + vsync - 1;
-
-        if (regs->VertRes >= 1024) {
-                regs->VertTotal /= 2;
-                regs->VertSyncStart /= 2;
-                regs->VertSyncEnd /= 2;
-                regs->VertDispEnd /= 2;
-        }
-        if (regs->multiplexing) {
-                regs->HorizTotal /= 2;
-                regs->HorizSyncStart /= 2;
-                regs->HorizSyncEnd /= 2;
-                regs->HorizDispEnd /= 2;
-        }
-
         return 0;
 }
 
-static void cirrusfb_set_mclk(const struct cirrusfb_info *cinfo, int val,
-                                int div)
+static void cirrusfb_set_mclk_as_source(const struct cirrusfb_info *cinfo,
+                                        int div)
 {
+        unsigned char old1f, old1e;
         assert(cinfo != NULL);
+        old1f = vga_rseq(cinfo->regbase, CL_SEQR1F) & ~0x40;
 
-        if (div == 2) {
-                /* VCLK = MCLK/2 */
-                unsigned char old = vga_rseq(cinfo->regbase, CL_SEQR1E);
-                vga_wseq(cinfo->regbase, CL_SEQR1E, old | 0x1);
-                vga_wseq(cinfo->regbase, CL_SEQR1F, 0x40 | (val & 0x3f));
-        } else if (div == 1) {
-                /* VCLK = MCLK */
-                unsigned char old = vga_rseq(cinfo->regbase, CL_SEQR1E);
-                vga_wseq(cinfo->regbase, CL_SEQR1E, old & ~0x1);
-                vga_wseq(cinfo->regbase, CL_SEQR1F, 0x40 | (val & 0x3f));
-        } else {
-                vga_wseq(cinfo->regbase, CL_SEQR1F, val & 0x3f);
+        if (div) {
+                DPRINTK("Set %s as pixclock source.\n",
+                                        (div == 2) ? "MCLK/2" : "MCLK");
+                old1f |= 0x40;
+                old1e = vga_rseq(cinfo->regbase, CL_SEQR1E) & ~0x1;
+                if (div == 2)
+                        old1e |= 1;
+
+                vga_wseq(cinfo->regbase, CL_SEQR1E, old1e);
         }
+        vga_wseq(cinfo->regbase, CL_SEQR1F, old1f);
 }
 
 /*************************************************************************
@@ -950,6 +723,10 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         unsigned char tmp;
         int offset = 0, err;
         const struct cirrusfb_board_info_rec *bi;
+        int hdispend, hsyncstart, hsyncend, htotal;
+        int yres, vdispend, vsyncstart, vsyncend, vtotal;
+        long freq;
+        int nom, den, div;
 
         DPRINTK("ENTER\n");
         DPRINTK("Requested mode: %dx%dx%d\n",
@@ -967,76 +744,117 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
         bi = &cirrusfb_board_info[cinfo->btype];
 
+        hsyncstart = var->xres + var->right_margin;
+        hsyncend = hsyncstart + var->hsync_len;
+        htotal = (hsyncend + var->left_margin) / 8 - 5;
+        hdispend = var->xres / 8 - 1;
+        hsyncstart = hsyncstart / 8 + 1;
+        hsyncend = hsyncend / 8 + 1;
+
+        yres = var->yres;
+        vsyncstart = yres + var->lower_margin;
+        vsyncend = vsyncstart + var->vsync_len;
+        vtotal = vsyncend + var->upper_margin;
+        vdispend = yres - 1;
+
+        if (var->vmode & FB_VMODE_DOUBLE) {
+                yres *= 2;
+                vsyncstart *= 2;
+                vsyncend *= 2;
+                vtotal *= 2;
+        } else if (var->vmode & FB_VMODE_INTERLACED) {
+                yres = (yres + 1) / 2;
+                vsyncstart = (vsyncstart + 1) / 2;
+                vsyncend = (vsyncend + 1) / 2;
+                vtotal = (vtotal + 1) / 2;
+        }
+
+        vtotal -= 2;
+        vsyncstart -= 1;
+        vsyncend -= 1;
+
+        if (yres >= 1024) {
+                vtotal /= 2;
+                vsyncstart /= 2;
+                vsyncend /= 2;
+                vdispend /= 2;
+        }
+        if (regs.multiplexing) {
+                htotal /= 2;
+                hsyncstart /= 2;
+                hsyncend /= 2;
+                hdispend /= 2;
+        }
         /* unlock register VGA_CRTC_H_TOTAL..CRT7 */
         vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, 0x20);   /* previously: 0x00) */
 
         /* if debugging is enabled, all parameters get output before writing */
-        DPRINTK("CRT0: %ld\n", regs.HorizTotal);
-        vga_wcrt(regbase, VGA_CRTC_H_TOTAL, regs.HorizTotal);
+        DPRINTK("CRT0: %d\n", htotal);
+        vga_wcrt(regbase, VGA_CRTC_H_TOTAL, htotal);
 
-        DPRINTK("CRT1: %ld\n", regs.HorizDispEnd);
-        vga_wcrt(regbase, VGA_CRTC_H_DISP, regs.HorizDispEnd);
+        DPRINTK("CRT1: %d\n", hdispend);
+        vga_wcrt(regbase, VGA_CRTC_H_DISP, hdispend);
 
-        DPRINTK("CRT2: %ld\n", regs.HorizBlankStart);
-        vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, regs.HorizBlankStart);
+        DPRINTK("CRT2: %d\n", var->xres / 8);
+        vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, var->xres / 8);
 
         /*  + 128: Compatible read */
-        DPRINTK("CRT3: 128+%ld\n", regs.HorizBlankEnd % 32);
+        DPRINTK("CRT3: 128+%d\n", (htotal + 5) % 32);
         vga_wcrt(regbase, VGA_CRTC_H_BLANK_END,
-                 128 + (regs.HorizBlankEnd % 32));
+                 128 + ((htotal + 5) % 32));
 
-        DPRINTK("CRT4: %ld\n", regs.HorizSyncStart);
-        vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, regs.HorizSyncStart);
+        DPRINTK("CRT4: %d\n", hsyncstart);
+        vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, hsyncstart);
 
-        tmp = regs.HorizSyncEnd % 32;
-        if (regs.HorizBlankEnd & 32)
+        tmp = hsyncend % 32;
+        if ((htotal + 5) & 32)
                 tmp += 128;
         DPRINTK("CRT5: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_H_SYNC_END, tmp);
 
-        DPRINTK("CRT6: %ld\n", regs.VertTotal & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_TOTAL, (regs.VertTotal & 0xff));
+        DPRINTK("CRT6: %d\n", vtotal & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_TOTAL, vtotal & 0xff);
 
         tmp = 16;               /* LineCompare bit #9 */
-        if (regs.VertTotal & 256)
+        if (vtotal & 256)
                 tmp |= 1;
-        if (regs.VertDispEnd & 256)
+        if (vdispend & 256)
                 tmp |= 2;
-        if (regs.VertSyncStart & 256)
+        if (vsyncstart & 256)
                 tmp |= 4;
-        if (regs.VertBlankStart & 256)
+        if ((vdispend + 1) & 256)
                 tmp |= 8;
-        if (regs.VertTotal & 512)
+        if (vtotal & 512)
                 tmp |= 32;
-        if (regs.VertDispEnd & 512)
+        if (vdispend & 512)
                 tmp |= 64;
-        if (regs.VertSyncStart & 512)
+        if (vsyncstart & 512)
                 tmp |= 128;
         DPRINTK("CRT7: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_OVERFLOW, tmp);
 
         tmp = 0x40;             /* LineCompare bit #8 */
-        if (regs.VertBlankStart & 512)
+        if ((vdispend + 1) & 512)
                 tmp |= 0x20;
         if (var->vmode & FB_VMODE_DOUBLE)
                 tmp |= 0x80;
         DPRINTK("CRT9: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, tmp);
 
-        DPRINTK("CRT10: %ld\n", regs.VertSyncStart & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, regs.VertSyncStart & 0xff);
+        DPRINTK("CRT10: %d\n", vsyncstart & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, vsyncstart & 0xff);
 
-        DPRINTK("CRT11: 64+32+%ld\n", regs.VertSyncEnd % 16);
-        vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, regs.VertSyncEnd % 16 + 64 + 32);
+        DPRINTK("CRT11: 64+32+%d\n", vsyncend % 16);
+        vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, vsyncend % 16 + 64 + 32);
 
-        DPRINTK("CRT12: %ld\n", regs.VertDispEnd & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_DISP_END, regs.VertDispEnd & 0xff);
+        DPRINTK("CRT12: %d\n", vdispend & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_DISP_END, vdispend & 0xff);
 
-        DPRINTK("CRT15: %ld\n", regs.VertBlankStart & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, regs.VertBlankStart & 0xff);
+        DPRINTK("CRT15: %d\n", (vdispend + 1) & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, (vdispend + 1) & 0xff);
 
-        DPRINTK("CRT16: %ld\n", regs.VertBlankEnd & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, regs.VertBlankEnd & 0xff);
+        DPRINTK("CRT16: %d\n", vtotal & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, vtotal & 0xff);
 
         DPRINTK("CRT18: 0xff\n");
         vga_wcrt(regbase, VGA_CRTC_LINE_COMPARE, 0xff);
@@ -1044,38 +862,53 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         tmp = 0;
         if (var->vmode & FB_VMODE_INTERLACED)
                 tmp |= 1;
-        if (regs.HorizBlankEnd & 64)
+        if ((htotal + 5) & 64)
                 tmp |= 16;
-        if (regs.HorizBlankEnd & 128)
+        if ((htotal + 5) & 128)
                 tmp |= 32;
-        if (regs.VertBlankEnd & 256)
+        if (vtotal & 256)
                 tmp |= 64;
-        if (regs.VertBlankEnd & 512)
+        if (vtotal & 512)
                 tmp |= 128;
 
         DPRINTK("CRT1a: %d\n", tmp);
         vga_wcrt(regbase, CL_CRT1A, tmp);
 
+        freq = PICOS2KHZ(var->pixclock);
+        bestclock(freq, &nom, &den, &div);
+
         /* set VCLK0 */
         /* hardware RefClock: 14.31818 MHz */
         /* formula: VClk = (OSC * N) / (D * (1+P)) */
         /* Example: VClk = (14.31818 * 91) / (23 * (1+1)) = 28.325 MHz */
 
-        vga_wseq(regbase, CL_SEQRB, regs.nom);
-        tmp = regs.den << 1;
-        if (regs.div != 0)
-                tmp |= 1;
+        if (cinfo->btype == BT_ALPINE) {
+                /* if freq is close to mclk or mclk/2 select mclk
+                 * as clock source
+                 */
+                int divMCLK = cirrusfb_check_mclk(cinfo, freq);
+                if (divMCLK)  {
+                        nom = 0;
+                        cirrusfb_set_mclk_as_source(cinfo, divMCLK);
+                }
+        }
+        if (nom) {
+                vga_wseq(regbase, CL_SEQRB, nom);
+                tmp = den << 1;
+                if (div != 0)
+                        tmp |= 1;
 
-        /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
-        if ((cinfo->btype == BT_SD64) ||
-            (cinfo->btype == BT_ALPINE) ||
-            (cinfo->btype == BT_GD5480))
-                tmp |= 0x80;
+                /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
+                if ((cinfo->btype == BT_SD64) ||
+                    (cinfo->btype == BT_ALPINE) ||
+                    (cinfo->btype == BT_GD5480))
+                        tmp |= 0x80;
 
-        DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);
-        vga_wseq(regbase, CL_SEQR1B, tmp);
+                DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);
+                vga_wseq(regbase, CL_SEQR1B, tmp);
+        }
 
-        if (regs.VertRes >= 1024)
+        if (yres >= 1024)
                 /* 1280x1024 */
                 vga_wcrt(regbase, VGA_CRTC_MODE, 0xc7);
         else
@@ -1089,7 +922,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         /* don't know if it would hurt to also program this if no interlaced */
         /* mode is used, but I feel better this way.. :-) */
         if (var->vmode & FB_VMODE_INTERLACED)
-                vga_wcrt(regbase, VGA_CRTC_REGS, regs.HorizTotal / 2);
+                vga_wcrt(regbase, VGA_CRTC_REGS, htotal / 2);
         else
                 vga_wcrt(regbase, VGA_CRTC_REGS, 0x00); /* interlace control */
 
@@ -1263,7 +1096,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
                 case BT_ALPINE:
                         DPRINTK(" (for GD543x)\n");
-                        cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);
                         /* We already set SRF and SR1F */
                         break;
 
@@ -1335,11 +1167,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
                 case BT_ALPINE:
                         DPRINTK(" (for GD543x)\n");
-                        if (regs.HorizRes >= 1024)
-                                vga_wseq(regbase, CL_SEQR7, 0xa7);
-                        else
-                                vga_wseq(regbase, CL_SEQR7, 0xa3);
-                        cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);
+                        vga_wseq(regbase, CL_SEQR7, 0xa7);
                         break;
 
                 case BT_GD5480:
@@ -1383,7 +1211,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
          */
 
         else if (var->bits_per_pixel == 32) {
-                DPRINTK("cirrusfb: preparing for 24/32 bit deep display\n");
+                DPRINTK("cirrusfb: preparing for 32 bit deep display\n");
                 switch (cinfo->btype) {
                 case BT_SD64:
                         /* Extended Sequencer Mode: 256c col. mode */
@@ -1417,7 +1245,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 case BT_ALPINE:
                         DPRINTK(" (for GD543x)\n");
                         vga_wseq(regbase, CL_SEQR7, 0xa9);
-                        cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);
                         break;
 
                 case BT_GD5480:
@@ -1972,8 +1799,6 @@ static void init_vgachip(struct fb_info *info)
         /* misc... */
         WHDR(cinfo, 0); /* Hidden DAC register: - */
 
-        printk(KERN_DEBUG "cirrusfb: This board has %ld bytes of DRAM memory\n",
-                info->screen_size);
         DPRINTK("EXIT\n");
         return;
 }
@@ -2145,7 +1970,7 @@ static int release_io_ports;
  * based on the DRAM bandwidth bit and DRAM bank switching bit.  This
  * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
  * seem to have. */
-static unsigned int cirrusfb_get_memsize(u8 __iomem *regbase)
+static unsigned int __devinit cirrusfb_get_memsize(u8 __iomem *regbase)
 {
         unsigned long mem;
         unsigned char SRF;
@@ -2211,8 +2036,7 @@ static void get_pci_addrs(const struct pci_dev *pdev,
 
 static void cirrusfb_pci_unmap(struct fb_info *info)
 {
-        struct cirrusfb_info *cinfo = info->par;
-        struct pci_dev *pdev = cinfo->pdev;
+        struct pci_dev *pdev = to_pci_dev(info->device);
 
         iounmap(info->screen_base);
 #if 0 /* if system didn't claim this region, we would... */
@@ -2228,20 +2052,22 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
 static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
-        zorro_release_device(cinfo->zdev);
+        struct zorro_dev *zdev = to_zorro_dev(info->device);
+
+        zorro_release_device(zdev);
 
         if (cinfo->btype == BT_PICASSO4) {
                 cinfo->regbase -= 0x600000;
                 iounmap((void *)cinfo->regbase);
                 iounmap(info->screen_base);
         } else {
-                if (zorro_resource_start(cinfo->zdev) > 0x01000000)
+                if (zorro_resource_start(zdev) > 0x01000000)
                         iounmap(info->screen_base);
         }
 }
 #endif /* CONFIG_ZORRO */
 
-static int cirrusfb_set_fbinfo(struct fb_info *info)
+static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         struct fb_var_screeninfo *var = &info->var;
@@ -2258,7 +2084,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
         if (cinfo->btype == BT_GD5480) {
                 if (var->bits_per_pixel == 16)
                         info->screen_base += 1 * MB_;
-                if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
+                if (var->bits_per_pixel == 32)
                         info->screen_base += 2 * MB_;
         }
 
@@ -2285,7 +2111,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
         return 0;
 }
 
-static int cirrusfb_register(struct fb_info *info)
+static int __devinit cirrusfb_register(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         int err;
@@ -2301,23 +2127,27 @@ static int cirrusfb_register(struct fb_info *info)
         /* sanity checks */
         assert(btype != BT_NONE);
 
+        /* set all the vital stuff */
+        cirrusfb_set_fbinfo(info);
+
         DPRINTK("cirrusfb: (RAM start set to: 0x%p)\n", info->screen_base);
 
-        /* Make pretend we've set the var so our structures are in a "good" */
-        /* state, even though we haven't written the mode to the hw yet...  */
-        info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
+        err = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
+        if (!err) {
+                DPRINTK("wrong initial video mode\n");
+                err = -EINVAL;
+                goto err_dealloc_cmap;
+        }
+
         info->var.activate = FB_ACTIVATE_NOW;
 
         err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
         if (err < 0) {
                 /* should never happen */
                 DPRINTK("choking on default var... umm, no good.\n");
-                goto err_unmap_cirrusfb;
+                goto err_dealloc_cmap;
         }
 
-        /* set all the vital stuff */
-        cirrusfb_set_fbinfo(info);
-
         err = register_framebuffer(info);
         if (err < 0) {
                 printk(KERN_ERR "cirrusfb: could not register "
@@ -2330,7 +2160,6 @@ static int cirrusfb_register(struct fb_info *info)
 
 err_dealloc_cmap:
         fb_dealloc_cmap(&info->cmap);
-err_unmap_cirrusfb:
         cinfo->unmap(info);
         framebuffer_release(info);
         return err;
@@ -2353,8 +2182,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)
 }
 
 #ifdef CONFIG_PCI
-static int cirrusfb_pci_register(struct pci_dev *pdev,
-                                  const struct pci_device_id *ent)
+static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
+                                           const struct pci_device_id *ent)
 {
         struct cirrusfb_info *cinfo;
         struct fb_info *info;
@@ -2376,7 +2205,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
         }
 
         cinfo = info->par;
-        cinfo->pdev = pdev;
         cinfo->btype = btype = (enum cirrus_board) ent->driver_data;
 
         DPRINTK(" Found PCI device, base address 0 is 0x%x, btype set to %d\n",
@@ -2482,8 +2310,8 @@ static struct pci_driver cirrusfb_pci_driver = {
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static int cirrusfb_zorro_register(struct zorro_dev *z,
-                                   const struct zorro_device_id *ent)
+static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
+                                             const struct zorro_device_id *ent)
 {
         struct cirrusfb_info *cinfo;
         struct fb_info *info;
@@ -2512,7 +2340,6 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
         assert(z);
         assert(btype != BT_NONE);
 
-        cinfo->zdev = z;
         board_addr = zorro_resource_start(z);
         board_size = zorro_resource_len(z);
         info->screen_size = size;
@@ -2644,17 +2471,17 @@ static int __init cirrusfb_setup(char *options) {
                 return 0;
 
         while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!*this_opt) continue;
+                if (!*this_opt)
+                        continue;
 
                 DPRINTK("cirrusfb_setup: option '%s'\n", this_opt);
 
-                for (i = 0; i < NUM_TOTAL_MODES; i++) {
-                        sprintf(s, "mode:%s", cirrusfb_predefined[i].name);
-                        if (strcmp(this_opt, s) == 0)
-                                cirrusfb_def_mode = i;
-                }
                 if (!strcmp(this_opt, "noaccel"))
                         noaccel = 1;
+                else if (!strncmp(this_opt, "mode:", 5))
+                        mode_option = this_opt + 5;
+                else
+                        mode_option = this_opt;
         }
         return 0;
 }
@@ -2680,6 +2507,11 @@ static void __exit cirrusfb_exit(void)
 
 module_init(cirrusfb_init);
 
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
+module_param(noaccel, bool, 0);
+MODULE_PARM_DESC(noaccel, "Disable acceleration");
+
 #ifdef MODULE
 module_exit(cirrusfb_exit);
 #endif
@@ -3073,16 +2905,14 @@ static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
  * bestclock() - determine closest possible clock lower(?) than the
  * desired pixel clock
  **************************************************************************/
-static void bestclock(long freq, long *best, long *nom,
-                       long *den, long *div, long maxfreq)
+static void bestclock(long freq, int *nom, int *den, int *div)
 {
-        long n, h, d, f;
+        int n, d;
+        long h, diff;
 
-        assert(best != NULL);
         assert(nom != NULL);
         assert(den != NULL);
         assert(div != NULL);
-        assert(maxfreq > 0);
 
         *nom = 0;
         *den = 0;
@@ -3093,51 +2923,47 @@ static void bestclock(long freq, long *best, long *nom,
         if (freq < 8000)
                 freq = 8000;
 
-        if (freq > maxfreq)
-                freq = maxfreq;
-
-        *best = 0;
-        f = freq * 10;
+        diff = freq;
 
         for (n = 32; n < 128; n++) {
-                d = (143181 * n) / f;
+                int s = 0;
+
+                d = (14318 * n) / freq;
                 if ((d >= 7) && (d <= 63)) {
-                        if (d > 31)
-                                d = (d / 2) * 2;
-                        h = (14318 * n) / d;
-                        if (abs(h - freq) < abs(*best - freq)) {
-                                *best = h;
+                        int temp = d;
+
+                        if (temp > 31) {
+                                s = 1;
+                                temp >>= 1;
+                        }
+                        h = ((14318 * n) / temp) >> s;
+                        h = h > freq ? h - freq : freq - h;
+                        if (h < diff) {
+                                diff = h;
                                 *nom = n;
-                                if (d < 32) {
-                                        *den = d;
-                                        *div = 0;
-                                } else {
-                                        *den = d / 2;
-                                        *div = 1;
-                                }
+                                *den = temp;
+                                *div = s;
                         }
                 }
-                d = DIV_ROUND_UP(143181 * n, f);
+                d++;
                 if ((d >= 7) && (d <= 63)) {
-                        if (d > 31)
-                                d = (d / 2) * 2;
-                        h = (14318 * n) / d;
-                        if (abs(h - freq) < abs(*best - freq)) {
-                                *best = h;
+                        if (d > 31) {
+                                s = 1;
+                                d >>= 1;
+                        }
+                        h = ((14318 * n) / d) >> s;
+                        h = h > freq ? h - freq : freq - h;
+                        if (h < diff) {
+                                diff = h;
                                 *nom = n;
-                                if (d < 32) {
-                                        *den = d;
-                                        *div = 0;
-                                } else {
-                                        *den = d / 2;
-                                        *div = 1;
-                                }
+                                *den = d;
+                                *div = s;
                         }
                 }
         }
 
         DPRINTK("Best possible values for given frequency:\n");
-        DPRINTK("       best: %ld kHz  nom: %ld  den: %ld  div: %ld\n",
+        DPRINTK("       freq: %ld kHz  nom: %d  den: %d  div: %d\n",
                 freq, *nom, *den, *div);
 
         DPRINTK("EXIT\n");
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 9f8a389dc7ae..16f5db471ab5 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -27,12 +27,12 @@
 #include <linux/proc_fs.h>
 #include <linux/delay.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <linux/uaccess.h>
 
 #include <asm/hardware/clps7111.h>
-#include <asm/arch/syspld.h>
+#include <mach/syspld.h>
 
 struct fb_info  *cfb;
 
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
new file mode 100644
index 000000000000..7bad24ed04ef
--- /dev/null
+++ b/drivers/video/cobalt_lcdfb.c
@@ -0,0 +1,371 @@
+/*
+ *  Cobalt server LCD frame buffer driver.
+ *
+ *  Copyright (C) 2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/uaccess.h>
+#include <linux/platform_device.h>
+
+/*
+ * Cursor position address
+ * \X  0    1    2  ...  14   15
+ * Y+----+----+----+---+----+----+
+ * 0|0x00|0x01|0x02|...|0x0e|0x0f|
+ *  +----+----+----+---+----+----+
+ * 1|0x40|0x41|0x42|...|0x4e|0x4f|
+ *  +----+----+----+---+----+----+
+ */
+#define LCD_DATA_REG_OFFSET     0x10
+#define LCD_XRES_MAX            16
+#define LCD_YRES_MAX            2
+#define LCD_CHARS_MAX           32
+
+#define LCD_CLEAR               0x01
+#define LCD_CURSOR_MOVE_HOME    0x02
+#define LCD_RESET               0x06
+#define LCD_OFF                 0x08
+#define LCD_CURSOR_OFF          0x0c
+#define LCD_CURSOR_BLINK_OFF    0x0e
+#define LCD_CURSOR_ON           0x0f
+#define LCD_ON                  LCD_CURSOR_ON
+#define LCD_CURSOR_MOVE_LEFT    0x10
+#define LCD_CURSOR_MOVE_RIGHT   0x14
+#define LCD_DISPLAY_LEFT        0x18
+#define LCD_DISPLAY_RIGHT       0x1c
+#define LCD_PRERESET            0x3f    /* execute 4 times continuously */
+#define LCD_BUSY                0x80
+
+#define LCD_GRAPHIC_MODE        0x40
+#define LCD_TEXT_MODE           0x80
+#define LCD_CUR_POS_MASK        0x7f
+
+#define LCD_CUR_POS(x)          ((x) & LCD_CUR_POS_MASK)
+#define LCD_TEXT_POS(x)         ((x) | LCD_TEXT_MODE)
+
+static inline void lcd_write_control(struct fb_info *info, u8 control)
+{
+        writel((u32)control << 24, info->screen_base);
+}
+
+static inline u8 lcd_read_control(struct fb_info *info)
+{
+        return readl(info->screen_base) >> 24;
+}
+
+static inline void lcd_write_data(struct fb_info *info, u8 data)
+{
+        writel((u32)data << 24, info->screen_base + LCD_DATA_REG_OFFSET);
+}
+
+static inline u8 lcd_read_data(struct fb_info *info)
+{
+        return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24;
+}
+
+static int lcd_busy_wait(struct fb_info *info)
+{
+        u8 val = 0;
+        int timeout = 10, retval = 0;
+
+        do {
+                val = lcd_read_control(info);
+                val &= LCD_BUSY;
+                if (val != LCD_BUSY)
+                        break;
+
+                if (msleep_interruptible(1))
+                        return -EINTR;
+
+                timeout--;
+        } while (timeout);
+
+        if (val == LCD_BUSY)
+                retval = -EBUSY;
+
+        return retval;
+}
+
+static void lcd_clear(struct fb_info *info)
+{
+        int i;
+
+        for (i = 0; i < 4; i++) {
+                udelay(150);
+
+                lcd_write_control(info, LCD_PRERESET);
+        }
+
+        udelay(150);
+
+        lcd_write_control(info, LCD_CLEAR);
+
+        udelay(150);
+
+        lcd_write_control(info, LCD_RESET);
+}
+
+static struct fb_fix_screeninfo cobalt_lcdfb_fix __initdata = {
+        .id             = "cobalt-lcd",
+        .type           = FB_TYPE_TEXT,
+        .type_aux       = FB_AUX_TEXT_MDA,
+        .visual         = FB_VISUAL_MONO01,
+        .line_length    = LCD_XRES_MAX,
+        .accel          = FB_ACCEL_NONE,
+};
+
+static ssize_t cobalt_lcdfb_read(struct fb_info *info, char __user *buf,
+                                 size_t count, loff_t *ppos)
+{
+        char src[LCD_CHARS_MAX];
+        unsigned long pos;
+        int len, retval = 0;
+
+        pos = *ppos;
+        if (pos >= LCD_CHARS_MAX || count == 0)
+                return 0;
+
+        if (count > LCD_CHARS_MAX)
+                count = LCD_CHARS_MAX;
+
+        if (pos + count > LCD_CHARS_MAX)
+                count = LCD_CHARS_MAX - pos;
+
+        for (len = 0; len < count; len++) {
+                retval = lcd_busy_wait(info);
+                if (retval < 0)
+                        break;
+
+                lcd_write_control(info, LCD_TEXT_POS(pos));
+
+                retval = lcd_busy_wait(info);
+                if (retval < 0)
+                        break;
+
+                src[len] = lcd_read_data(info);
+                if (pos == 0x0f)
+                        pos = 0x40;
+                else
+                        pos++;
+        }
+
+        if (retval < 0 && signal_pending(current))
+                return -ERESTARTSYS;
+
+        if (copy_to_user(buf, src, len))
+                return -EFAULT;
+
+        *ppos += len;
+
+        return len;
+}
+
+static ssize_t cobalt_lcdfb_write(struct fb_info *info, const char __user *buf,
+                                  size_t count, loff_t *ppos)
+{
+        char dst[LCD_CHARS_MAX];
+        unsigned long pos;
+        int len, retval = 0;
+
+        pos = *ppos;
+        if (pos >= LCD_CHARS_MAX || count == 0)
+                return 0;
+
+        if (count > LCD_CHARS_MAX)
+                count = LCD_CHARS_MAX;
+
+        if (pos + count > LCD_CHARS_MAX)
+                count = LCD_CHARS_MAX - pos;
+
+        if (copy_from_user(dst, buf, count))
+                return -EFAULT;
+
+        for (len = 0; len < count; len++) {
+                retval = lcd_busy_wait(info);
+                if (retval < 0)
+                        break;
+
+                lcd_write_control(info, LCD_TEXT_POS(pos));
+
+                retval = lcd_busy_wait(info);
+                if (retval < 0)
+                        break;
+
+                lcd_write_data(info, dst[len]);
+                if (pos == 0x0f)
+                        pos = 0x40;
+                else
+                        pos++;
+        }
+
+        if (retval < 0 && signal_pending(current))
+                return -ERESTARTSYS;
+
+        *ppos += len;
+
+        return len;
+}
+
+static int cobalt_lcdfb_blank(int blank_mode, struct fb_info *info)
+{
+        int retval;
+
+        retval = lcd_busy_wait(info);
+        if (retval < 0)
+                return retval;
+
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                lcd_write_control(info, LCD_ON);
+                break;
+        default:
+                lcd_write_control(info, LCD_OFF);
+                break;
+        }
+
+        return 0;
+}
+
+static int cobalt_lcdfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        u32 x, y;
+        int retval;
+
+        switch (cursor->set) {
+        case FB_CUR_SETPOS:
+                x = cursor->image.dx;
+                y = cursor->image.dy;
+                if (x >= LCD_XRES_MAX || y >= LCD_YRES_MAX)
+                        return -EINVAL;
+
+                retval = lcd_busy_wait(info);
+                if (retval < 0)
+                        return retval;
+
+                lcd_write_control(info,
+                                  LCD_TEXT_POS(info->fix.line_length * y + x));
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        retval = lcd_busy_wait(info);
+        if (retval < 0)
+                return retval;
+
+        if (cursor->enable)
+                lcd_write_control(info, LCD_CURSOR_ON);
+        else
+                lcd_write_control(info, LCD_CURSOR_OFF);
+
+        return 0;
+}
+
+static struct fb_ops cobalt_lcd_fbops = {
+        .owner          = THIS_MODULE,
+        .fb_read        = cobalt_lcdfb_read,
+        .fb_write       = cobalt_lcdfb_write,
+        .fb_blank       = cobalt_lcdfb_blank,
+        .fb_cursor      = cobalt_lcdfb_cursor,
+};
+
+static int __init cobalt_lcdfb_probe(struct platform_device *dev)
+{
+        struct fb_info *info;
+        struct resource *res;
+        int retval;
+
+        info = framebuffer_alloc(0, &dev->dev);
+        if (!info)
+                return -ENOMEM;
+
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (!res) {
+                framebuffer_release(info);
+                return -EBUSY;
+        }
+
+        info->screen_size = res->end - res->start + 1;
+        info->screen_base = ioremap(res->start, info->screen_size);
+        info->fbops = &cobalt_lcd_fbops;
+        info->fix = cobalt_lcdfb_fix;
+        info->fix.smem_start = res->start;
+        info->fix.smem_len = info->screen_size;
+        info->pseudo_palette = NULL;
+        info->par = NULL;
+        info->flags = FBINFO_DEFAULT;
+
+        retval = register_framebuffer(info);
+        if (retval < 0) {
+                iounmap(info->screen_base);
+                framebuffer_release(info);
+                return retval;
+        }
+
+        platform_set_drvdata(dev, info);
+
+        lcd_clear(info);
+
+        printk(KERN_INFO "fb%d: Cobalt server LCD frame buffer device\n",
+                info->node);
+
+        return 0;
+}
+
+static int __devexit cobalt_lcdfb_remove(struct platform_device *dev)
+{
+        struct fb_info *info;
+
+        info = platform_get_drvdata(dev);
+        if (info) {
+                iounmap(info->screen_base);
+                unregister_framebuffer(info);
+                framebuffer_release(info);
+        }
+
+        return 0;
+}
+
+static struct platform_driver cobalt_lcdfb_driver = {
+        .probe  = cobalt_lcdfb_probe,
+        .remove = __devexit_p(cobalt_lcdfb_remove),
+        .driver = {
+                .name   = "cobalt-lcd",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init cobalt_lcdfb_init(void)
+{
+        return platform_driver_register(&cobalt_lcdfb_driver);
+}
+
+static void __exit cobalt_lcdfb_exit(void)
+{
+        platform_driver_unregister(&cobalt_lcdfb_driver);
+}
+
+module_init(cobalt_lcdfb_init);
+module_exit(cobalt_lcdfb_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Yoichi Yuasa");
+MODULE_DESCRIPTION("Cobalt server LCD frame buffer driver");
diff --git a/drivers/video/console/.gitignore b/drivers/video/console/.gitignore
new file mode 100644
index 000000000000..0c258b45439c
--- /dev/null
+++ b/drivers/video/console/.gitignore
@@ -0,0 +1,2 @@
+# conmakehash generated file
+promcon_tbl.c
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 06f87b04f207..2f50a80b413e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -43,22 +43,6 @@ config VGACON_SOFT_SCROLLBACK_SIZE
          buffer.  Each 64KB will give you approximately 16 80x25
          screenfuls of scrollback buffer
 
-config VIDEO_SELECT
-        bool "Video mode selection support"
-        depends on  X86 && VGA_CONSOLE
-        ---help---
-          This enables support for text mode selection on kernel startup. If
-          you want to take advantage of some high-resolution text mode your
-          card's BIOS offers, but the traditional Linux utilities like
-          SVGATextMode don't, you can say Y here and set the mode using the
-          "vga=" option from your boot loader (lilo or loadlin) or set
-          "vga=ask" which brings up a video mode menu on kernel startup. (Try
-          "man bootparam" or see the documentation of your boot loader about
-          how to pass options to the kernel.)
-
-          Read the file <file:Documentation/svga.txt> for more information
-          about the Video mode selection support. If unsure, say N.
-
 config MDA_CONSOLE
         depends on !M68K && !PARISC && ISA
         tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 97aff8db10bf..64b3d30027b8 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -107,9 +107,7 @@ static struct display fb_display[MAX_NR_CONSOLES];
 
 static signed char con2fb_map[MAX_NR_CONSOLES];
 static signed char con2fb_map_boot[MAX_NR_CONSOLES];
-#ifndef MODULE
-static int logo_height;
-#endif
+
 static int logo_lines;
 /* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
    enums.  */
@@ -607,6 +605,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
         struct fbcon_ops *ops = info->fbcon_par;
         int cnt, erase = vc->vc_video_erase_char, step;
         unsigned short *save = NULL, *r, *q;
+        int logo_height;
 
         if (info->flags & FBINFO_MODULE) {
                 logo_shown = FBCON_LOGO_DONTSHOW;
@@ -1312,6 +1311,9 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
         if (!height || !width)
                 return;
 
+        if (sy < vc->vc_top && vc->vc_top == logo_lines)
+                vc->vc_top = 0;
+
         /* Split blits that cross physical y_wrap boundary */
 
         y_break = p->vrows - p->yscroll;
@@ -1853,8 +1855,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
         struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
         struct display *p = &fb_display[vc->vc_num];
         int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;
-        unsigned short saved_ec;
-        int ret;
 
         if (fbcon_is_inactive(vc, info))
                 return -EINVAL;
@@ -1867,11 +1867,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
          *           whole screen (prevents flicker).
          */
 
-        saved_ec = vc->vc_video_erase_char;
-        vc->vc_video_erase_char = vc->vc_scrl_erase_char;
-
-        ret = 0;
-
         switch (dir) {
         case SM_UP:
                 if (count > vc->vc_rows)        /* Maximum realistic size */
@@ -1888,9 +1883,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         (b - count)),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
+                        return 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -1960,10 +1955,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         (b - count)),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
-                        break;
+                        return 1;
                 }
                 break;
 
@@ -1980,9 +1974,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         t),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
+                        return 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -2050,15 +2044,12 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         t),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
-                        break;
+                        return 1;
                 }
-                break;
         }
-        vc->vc_video_erase_char = saved_ec;
-        return ret;
+        return 0;
 }
 
 
@@ -2398,11 +2389,15 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
 
         if (!fbcon_is_inactive(vc, info)) {
                 if (ops->blank_state != blank) {
+                        int ret = 1;
+
                         ops->blank_state = blank;
                         fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
                         ops->cursor_flash = (!blank);
 
-                        if (fb_blank(info, blank))
+                        if (info->fbops->fb_blank)
+                                ret = info->fbops->fb_blank(blank, info);
+                        if (ret)
                                 fbcon_generic_blank(vc, info, blank);
                 }
 
@@ -2516,9 +2511,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                         c = vc->vc_video_erase_char;
                         vc->vc_video_erase_char =
                             ((c & 0xfe00) >> 1) | (c & 0xff);
-                        c = vc->vc_def_color;
-                        vc->vc_scrl_erase_char =
-                            ((c & 0xFE00) >> 1) | (c & 0xFF);
                         vc->vc_attr >>= 1;
                 }
         } else if (!vc->vc_hi_font_mask && cnt == 512) {
@@ -2549,14 +2541,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                         if (vc->vc_can_do_color) {
                                 vc->vc_video_erase_char =
                                     ((c & 0xff00) << 1) | (c & 0xff);
-                                c = vc->vc_def_color;
-                                vc->vc_scrl_erase_char =
-                                    ((c & 0xFF00) << 1) | (c & 0xFF);
                                 vc->vc_attr <<= 1;
-                        } else {
+                        } else
                                 vc->vc_video_erase_char = c & ~0x100;
-                                vc->vc_scrl_erase_char = c & ~0x100;
-                        }
                 }
 
         }
@@ -2990,8 +2977,8 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                 p = &fb_display[vc->vc_num];
                 set_blitting_type(vc, info);
                 var_to_display(p, &info->var, info);
-                cols = FBCON_SWAP(p->rotate, info->var.xres, info->var.yres);
-                rows = FBCON_SWAP(p->rotate, info->var.yres, info->var.xres);
+                cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
+                rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
                 cols /= vc->vc_font.width;
                 rows /= vc->vc_font.height;
                 vc_resize(vc, cols, rows);
@@ -3586,7 +3573,8 @@ static int __init fb_console_init(void)
 
         acquire_console_sem();
         fb_register_client(&fbcon_event_notifier);
-        fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), "fbcon");
+        fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
+                                     "fbcon");
 
         if (IS_ERR(fbcon_device)) {
                 printk(KERN_WARNING "Unable to create device "
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index 0135e0395456..89a346880ec0 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -110,7 +110,7 @@ static inline int mono_col(const struct fb_info *info)
         __u32 max_len;
         max_len = max(info->var.green.length, info->var.red.length);
         max_len = max(info->var.blue.length, max_len);
-        return ~(0xfff << (max_len & 0xff));
+        return (~(0xfff << max_len)) & 0xff;
 }
 
 static inline int attr_col_ec(int shift, struct vc_data *vc,
@@ -146,10 +146,8 @@ static inline int attr_col_ec(int shift, struct vc_data *vc,
         return is_fg ? fg : bg;
 }
 
-#define attr_bgcol_ec(bgshift,vc,info)          \
-        attr_col_ec(bgshift,vc,info,0);
-#define attr_fgcol_ec(fgshift,vc,info)          \
-        attr_col_ec(fgshift,vc,info,1);
+#define attr_bgcol_ec(bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0)
+#define attr_fgcol_ec(fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1)
 
 /* Font */
 #define REFCOUNT(fd)    (((int *)(fd))[-1])
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 38a296bbdfc9..dd3eaaad4441 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -71,13 +71,15 @@ static char *mda_type_name;
 
 /* console information */
 
-static int      mda_first_vc = 1;
+static int      mda_first_vc = 13;
 static int      mda_last_vc  = 16;
 
 static struct vc_data   *mda_display_fg = NULL;
 
 module_param(mda_first_vc, int, 0);
+MODULE_PARM_DESC(mda_first_vc, "First virtual console. Default: 13");
 module_param(mda_last_vc, int, 0);
+MODULE_PARM_DESC(mda_last_vc, "Last virtual console. Default: 16");
 
 /* MDA register values
  */
@@ -531,7 +533,7 @@ static void mdacon_cursor(struct vc_data *c, int mode)
 
 static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines)
 {
-        u16 eattr = mda_convert_attr(c->vc_scrl_erase_char);
+        u16 eattr = mda_convert_attr(c->vc_video_erase_char);
 
         if (!lines)
                 return 0;
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index a11cc2fdd4cd..491c1c1baf4c 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -170,12 +170,12 @@ static int sticon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
     switch (dir) {
     case SM_UP:
         sti_bmove(sti, t + count, 0, t, 0, b - t - count, conp->vc_cols);
-        sti_clear(sti, b - count, 0, count, conp->vc_cols, conp->vc_scrl_erase_char);
+        sti_clear(sti, b - count, 0, count, conp->vc_cols, conp->vc_video_erase_char);
         break;
 
     case SM_DOWN:
         sti_bmove(sti, t, 0, t + count, 0, b - t - count, conp->vc_cols);
-        sti_clear(sti, t, 0, count, conp->vc_cols, conp->vc_scrl_erase_char);
+        sti_clear(sti, t, 0, count, conp->vc_cols, conp->vc_video_erase_char);
         break;
     }
 
@@ -370,7 +370,7 @@ static const struct consw sti_con = {
 
 
 
-int __init sticonsole_init(void)
+static int __init sticonsole_init(void)
 {
     /* already initialized ? */
     if (sticon_sti)
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index e9ab657f0bb7..ef7870f5ea08 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -24,12 +24,13 @@
 #include <asm/hardware.h>
 #include <asm/parisc-device.h>
 #include <asm/cacheflush.h>
+#include <asm/grfioctl.h>
 
 #include "../sticore.h"
 
 #define STI_DRIVERVERSION "Version 0.9a"
 
-struct sti_struct *default_sti __read_mostly;
+static struct sti_struct *default_sti __read_mostly;
 
 /* number of STI ROMS found and their ptrs to each struct */
 static int num_sti_roms __read_mostly;
@@ -68,8 +69,7 @@ static const struct sti_init_flags default_init_flags = {
         .init_cmap_tx = 1,
 };
 
-int
-sti_init_graph(struct sti_struct *sti) 
+static int sti_init_graph(struct sti_struct *sti)
 {
         struct sti_init_inptr_ext inptr_ext = { 0, };
         struct sti_init_inptr inptr = {
@@ -100,8 +100,7 @@ static const struct sti_conf_flags default_conf_flags = {
         .wait   = STI_WAIT,
 };
 
-void
-sti_inq_conf(struct sti_struct *sti)
+static void sti_inq_conf(struct sti_struct *sti)
 {
         struct sti_conf_inptr inptr = { 0, };
         unsigned long flags;
@@ -237,8 +236,8 @@ static void sti_flush(unsigned long start, unsigned long end)
         flush_icache_range(start, end);
 }
 
-void __devinit
-sti_rom_copy(unsigned long base, unsigned long count, void *dest)
+static void __devinit sti_rom_copy(unsigned long base, unsigned long count,
+                                   void *dest)
 {
         unsigned long dest_start = (unsigned long) dest;
 
@@ -478,8 +477,8 @@ sti_init_glob_cfg(struct sti_struct *sti,
 }
 
 #ifdef CONFIG_FB
-struct sti_cooked_font * __devinit
-sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
+static struct sti_cooked_font __devinit
+*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 {
         const struct font_desc *fbfont;
         unsigned int size, bpc;
@@ -534,16 +533,16 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
         return cooked_font;
 }
 #else
-struct sti_cooked_font * __devinit
-sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
+static struct sti_cooked_font __devinit
+*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 {
         return NULL;
 }
 #endif
 
-struct sti_cooked_font * __devinit
-sti_select_font(struct sti_cooked_rom *rom,
-            int (*search_font_fnc) (struct sti_cooked_rom *,int,int) )
+static struct sti_cooked_font __devinit
+*sti_select_font(struct sti_cooked_rom *rom,
+                 int (*search_font_fnc)(struct sti_cooked_rom *, int, int))
 {
         struct sti_cooked_font *font;
         int i;
@@ -707,8 +706,7 @@ sti_get_bmode_rom (unsigned long address)
         return raw;
 }
 
-struct sti_rom * __devinit
-sti_get_wmode_rom (unsigned long address)
+static struct sti_rom __devinit *sti_get_wmode_rom(unsigned long address)
 {
         struct sti_rom *raw;
         unsigned long size;
@@ -723,11 +721,12 @@ sti_get_wmode_rom (unsigned long address)
         return raw;
 }
 
-int __devinit
-sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
+static int __devinit sti_read_rom(int wordmode, struct sti_struct *sti,
+                                  unsigned long address)
 {
         struct sti_cooked_rom *cooked;
         struct sti_rom *raw = NULL;
+        unsigned long revno;
 
         cooked = kmalloc(sizeof *cooked, GFP_KERNEL);
         if (!cooked)
@@ -770,9 +769,35 @@ sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
         sti->graphics_id[1] = raw->graphics_id[1];
         
         sti_dump_rom(raw);
-        
+
+        /* check if the ROM routines in this card are compatible */
+        if (wordmode || sti->graphics_id[1] != 0x09A02587)
+                goto ok;
+
+        revno = (raw->revno[0] << 8) | raw->revno[1];
+
+        switch (sti->graphics_id[0]) {
+        case S9000_ID_HCRX:
+                /* HyperA or HyperB ? */
+                if (revno == 0x8408 || revno == 0x840b)
+                        goto msg_not_supported;
+                break;
+        case CRT_ID_THUNDER:
+                if (revno == 0x8509)
+                        goto msg_not_supported;
+                break;
+        case CRT_ID_THUNDER2:
+                if (revno == 0x850c)
+                        goto msg_not_supported;
+        }
+ok:
         return 1;
 
+msg_not_supported:
+        printk(KERN_ERR "Sorry, this GSC/STI card is not yet supported.\n");
+        printk(KERN_ERR "Please see http://parisc-linux.org/faq/"
+                        "graphics-howto.html for more info.\n");
+        /* fall through */
 out_err:
         kfree(raw);
         kfree(cooked);
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index bd1f57b259d9..448d209a0bf2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -239,8 +239,7 @@ static void vgacon_restore_screen(struct vc_data *c)
 
 static int vgacon_scrolldelta(struct vc_data *c, int lines)
 {
-        int start, end, count, soff, diff;
-        void *d, *s;
+        int start, end, count, soff;
 
         if (!lines) {
                 c->vc_visible_origin = c->vc_origin;
@@ -287,29 +286,29 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
         if (count > c->vc_rows)
                 count = c->vc_rows;
 
-        diff = c->vc_rows - count;
+        if (count) {
+                int copysize;
 
-        d = (void *) c->vc_origin;
-        s = (void *) c->vc_screenbuf;
+                int diff = c->vc_rows - count;
+                void *d = (void *) c->vc_origin;
+                void *s = (void *) c->vc_screenbuf;
 
-        while (count--) {
-                scr_memcpyw(d, vgacon_scrollback + soff, c->vc_size_row);
-                d += c->vc_size_row;
-                soff += c->vc_size_row;
+                count *= c->vc_size_row;
+                /* how much memory to end of buffer left? */
+                copysize = min(count, vgacon_scrollback_size - soff);
+                scr_memcpyw(d, vgacon_scrollback + soff, copysize);
+                d += copysize;
+                count -= copysize;
 
-                if (soff >= vgacon_scrollback_size)
-                        soff = 0;
-        }
+                if (count) {
+                        scr_memcpyw(d, vgacon_scrollback, count);
+                        d += count;
+                }
 
-        if (diff == c->vc_rows) {
+                if (diff)
+                        scr_memcpyw(d, s, diff * c->vc_size_row);
+        } else
                 vgacon_cursor(c, CM_MOVE);
-        } else {
-                while (diff--) {
-                        scr_memcpyw(d, s, c->vc_size_row);
-                        d += c->vc_size_row;
-                        s += c->vc_size_row;
-                }
-        }
 
         return 1;
 }
@@ -1350,7 +1349,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                 } else
                         c->vc_origin += delta;
                 scr_memsetw((u16 *) (c->vc_origin + c->vc_screenbuf_size -
-                                     delta), c->vc_scrl_erase_char,
+                                     delta), c->vc_video_erase_char,
                             delta);
         } else {
                 if (oldo - delta < vga_vram_base) {
@@ -1363,7 +1362,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                 } else
                         c->vc_origin -= delta;
                 c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
-                scr_memsetw((u16 *) (c->vc_origin), c->vc_scrl_erase_char,
+                scr_memsetw((u16 *) (c->vc_origin), c->vc_video_erase_char,
                             delta);
         }
         c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index d0e4cb618269..41d62632dcdb 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1425,7 +1425,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
 
 #ifdef CONFIG_ARCH_SHARK
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static int __devinit cyberpro_vl_probe(void)
 {
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 6ef800bdf482..4830b1bf51e5 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -153,12 +153,9 @@ struct display_device *display_device_register(struct display_driver *driver,
                 mutex_unlock(&allocated_dsp_lock);
 
                 if (!ret) {
-                        new_dev->dev = device_create_drvdata(display_class,
-                                                             parent,
-                                                             MKDEV(0,0),
-                                                             new_dev,
-                                                             "display%d",
-                                                             new_dev->idx);
+                        new_dev->dev = device_create(display_class, parent,
+                                                     MKDEV(0, 0), new_dev,
+                                                     "display%d", new_dev->idx);
                         if (!IS_ERR(new_dev->dev)) {
                                 new_dev->parent = parent;
                                 new_dev->driver = driver;
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index bd779ae44b1e..daf9b81878a4 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -12,6 +12,7 @@
 #include <linux/fb.h>
 #include <linux/platform_device.h>
 #include <linux/screen_info.h>
+#include <linux/dmi.h>
 
 #include <video/vga.h>
 
@@ -33,6 +34,105 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {
         .visual                 = FB_VISUAL_TRUECOLOR,
 };
 
+enum {
+        M_I17,          /* 17-Inch iMac */
+        M_I20,          /* 20-Inch iMac */
+        M_I20_SR,       /* 20-Inch iMac (Santa Rosa) */
+        M_I24,          /* 24-Inch iMac */
+        M_MINI,         /* Mac Mini */
+        M_MB,           /* MacBook */
+        M_MB_2,         /* MacBook, 2nd rev. */
+        M_MB_3,         /* MacBook, 3rd rev. */
+        M_MB_SR,        /* MacBook, 2nd gen, (Santa Rosa) */
+        M_MBA,          /* MacBook Air */
+        M_MBP,          /* MacBook Pro */
+        M_MBP_2,        /* MacBook Pro 2nd gen */
+        M_MBP_SR,       /* MacBook Pro (Santa Rosa) */
+        M_MBP_4,        /* MacBook Pro, 4th gen */
+        M_UNKNOWN       /* placeholder */
+};
+
+static struct efifb_dmi_info {
+        char *optname;
+        unsigned long base;
+        int stride;
+        int width;
+        int height;
+} dmi_list[] = {
+        [M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900 },
+        [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
+        [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
+        [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
+        [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
+        [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
+        [M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
+        [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
+        [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
+        [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
+        [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
+        [M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
+};
+
+static int set_system(const struct dmi_system_id *id);
+
+#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)               \
+        { set_system, name, {                                   \
+                DMI_MATCH(DMI_BIOS_VENDOR, vendor),             \
+                DMI_MATCH(DMI_PRODUCT_NAME, name) },            \
+          &dmi_list[enumid] }
+
+static struct dmi_system_id __initdata dmi_system_table[] = {
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
+        {},
+};
+
+static int set_system(const struct dmi_system_id *id)
+{
+        struct efifb_dmi_info *info = id->driver_data;
+        if (info->base == 0)
+                return -ENODEV;
+
+        printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+                         "(%dx%d, stride %d)\n", id->ident,
+                         (void *)info->base, info->width, info->height,
+                         info->stride);
+
+        /* Trust the bootloader over the DMI tables */
+        if (screen_info.lfb_base == 0)
+                screen_info.lfb_base = info->base;
+        if (screen_info.lfb_linelength == 0)
+                screen_info.lfb_linelength = info->stride;
+        if (screen_info.lfb_width == 0)
+                screen_info.lfb_width = info->width;
+        if (screen_info.lfb_height == 0)
+                screen_info.lfb_height = info->height;
+
+        return 0;
+}
+
 static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
                            struct fb_info *info)
@@ -67,6 +167,38 @@ static struct fb_ops efifb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
+static int __init efifb_setup(char *options)
+{
+        char *this_opt;
+        int i;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt) continue;
+
+                for (i = 0; i < M_UNKNOWN; i++) {
+                        if (!strcmp(this_opt, dmi_list[i].optname) &&
+                                        dmi_list[i].base != 0) {
+                                screen_info.lfb_base = dmi_list[i].base;
+                                screen_info.lfb_linelength = dmi_list[i].stride;
+                                screen_info.lfb_width = dmi_list[i].width;
+                                screen_info.lfb_height = dmi_list[i].height;
+                        }
+                }
+                if (!strncmp(this_opt, "base:", 5))
+                        screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);
+                else if (!strncmp(this_opt, "stride:", 7))
+                        screen_info.lfb_linelength = simple_strtoul(this_opt+7, NULL, 0) * 4;
+                else if (!strncmp(this_opt, "height:", 7))
+                        screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);
+                else if (!strncmp(this_opt, "width:", 6))
+                        screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);
+        }
+        return 0;
+}
+
 static int __init efifb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
@@ -74,6 +206,26 @@ static int __init efifb_probe(struct platform_device *dev)
         unsigned int size_vmode;
         unsigned int size_remap;
         unsigned int size_total;
+        int request_succeeded = 0;
+
+        printk(KERN_INFO "efifb: probing for efifb\n");
+
+        if (!screen_info.lfb_depth)
+                screen_info.lfb_depth = 32;
+        if (!screen_info.pages)
+                screen_info.pages = 1;
+
+        /* just assume they're all unset if any are */
+        if (!screen_info.blue_size) {
+                screen_info.blue_size = 8;
+                screen_info.blue_pos = 0;
+                screen_info.green_size = 8;
+                screen_info.green_pos = 8;
+                screen_info.red_size = 8;
+                screen_info.red_pos = 16;
+                screen_info.rsvd_size = 8;
+                screen_info.rsvd_pos = 24;
+        }
 
         efifb_fix.smem_start = screen_info.lfb_base;
         efifb_defined.bits_per_pixel = screen_info.lfb_depth;
@@ -98,21 +250,25 @@ static int __init efifb_probe(struct platform_device *dev)
          *                 option to simply use size_total as that
          *                 wastes plenty of kernel address space. */
         size_remap  = size_vmode * 2;
-        if (size_remap < size_vmode)
-                size_remap = size_vmode;
         if (size_remap > size_total)
                 size_remap = size_total;
+        if (size_remap % PAGE_SIZE)
+                size_remap += PAGE_SIZE - (size_remap % PAGE_SIZE);
         efifb_fix.smem_len = size_remap;
 
-        if (!request_mem_region(efifb_fix.smem_start, size_total, "efifb"))
+        if (request_mem_region(efifb_fix.smem_start, size_remap, "efifb")) {
+                request_succeeded = 1;
+        } else {
                 /* We cannot make this fatal. Sometimes this comes from magic
                    spaces our resource handlers simply don't know about */
                 printk(KERN_WARNING
                        "efifb: cannot reserve video memory at 0x%lx\n",
                         efifb_fix.smem_start);
+        }
 
         info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
         if (!info) {
+                printk(KERN_ERR "efifb: cannot allocate framebuffer\n");
                 err = -ENOMEM;
                 goto err_release_mem;
         }
@@ -125,7 +281,7 @@ static int __init efifb_probe(struct platform_device *dev)
                                 "0x%x @ 0x%lx\n",
                         efifb_fix.smem_len, efifb_fix.smem_start);
                 err = -EIO;
-                goto err_unmap;
+                goto err_release_fb;
         }
 
         printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
@@ -178,25 +334,27 @@ static int __init efifb_probe(struct platform_device *dev)
         info->fix = efifb_fix;
         info->flags = FBINFO_FLAG_DEFAULT;
 
-        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-                err = -ENOMEM;
+        if ((err = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
+                printk(KERN_ERR "efifb: cannot allocate colormap\n");
                 goto err_unmap;
         }
-        if (register_framebuffer(info) < 0) {
-                err = -EINVAL;
+        if ((err = register_framebuffer(info)) < 0) {
+                printk(KERN_ERR "efifb: cannot register framebuffer\n");
                 goto err_fb_dealoc;
         }
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
-               info->node, info->fix.id);
+                info->node, info->fix.id);
         return 0;
 
 err_fb_dealoc:
         fb_dealloc_cmap(&info->cmap);
 err_unmap:
         iounmap(info->screen_base);
+err_release_fb:
         framebuffer_release(info);
 err_release_mem:
-        release_mem_region(efifb_fix.smem_start, size_total);
+        if (request_succeeded)
+                release_mem_region(efifb_fix.smem_start, size_total);
         return err;
 }
 
@@ -214,9 +372,22 @@ static struct platform_device efifb_device = {
 static int __init efifb_init(void)
 {
         int ret;
+        char *option = NULL;
 
         if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
                 return -ENODEV;
+        dmi_check_system(dmi_system_table);
+
+        if (fb_get_options("efifb", &option))
+                return -ENODEV;
+        efifb_setup(option);
+
+        /* We don't get linelength from UGA Draw Protocol, only from
+         * EFI Graphics Protocol.  So if it's not in DMI, and it's not
+         * passed in from the user, we really can't use the framebuffer.
+         */
+        if (!screen_info.lfb_linelength)
+                return -ENODEV;
 
         ret = platform_driver_register(&efifb_driver);
 
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index cc2810ef5de5..2735b79e52a1 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -71,7 +71,7 @@ struct epson1355_par {
 #if defined(CONFIG_ARM)
 
 # ifdef CONFIG_ARCH_CEIVA
-#  include <asm/arch/hardware.h>
+#  include <mach/hardware.h>
 #  define EPSON1355FB_BASE_PHYS (CEIVA_PHYS_SED1355)
 # endif
 
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 59df132cc375..4835bdc4e9f1 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = {
         .page_mkwrite   = fb_deferred_io_mkwrite,
 };
 
+static int fb_deferred_io_set_page_dirty(struct page *page)
+{
+        if (!PageDirty(page))
+                SetPageDirty(page);
+        return 0;
+}
+
+static const struct address_space_operations fb_deferred_io_aops = {
+        .set_page_dirty = fb_deferred_io_set_page_dirty,
+};
+
 static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
         vma->vm_ops = &fb_deferred_io_vm_ops;
@@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info)
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
+void fb_deferred_io_open(struct fb_info *info,
+                         struct inode *inode,
+                         struct file *file)
+{
+        file->f_mapping->a_ops = &fb_deferred_io_aops;
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_open);
+
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
         void *screen_base = (void __force *) info->screen_base;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 33ebdb198daf..cd5f20da738a 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -28,9 +28,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/console.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/err.h>
 #include <linux/device.h>
 #include <linux/efi.h>
@@ -837,20 +835,12 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         return (cnt) ? cnt : err;
 }
 
-#ifdef CONFIG_KMOD
-static void try_to_load(int fb)
-{
-        request_module("fb%d", fb);
-}
-#endif /* CONFIG_KMOD */
-
 int
 fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
 {
         struct fb_fix_screeninfo *fix = &info->fix;
-        int xoffset = var->xoffset;
-        int yoffset = var->yoffset;
-        int err = 0, yres = info->var.yres;
+        unsigned int yres = info->var.yres;
+        int err = 0;
 
         if (var->yoffset > 0) {
                 if (var->vmode & FB_VMODE_YWRAP) {
@@ -866,8 +856,8 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
                                  (var->xoffset % fix->xpanstep)))
                 err = -EINVAL;
 
-        if (err || !info->fbops->fb_pan_display || xoffset < 0 ||
-            yoffset < 0 || var->yoffset + yres > info->var.yres_virtual ||
+        if (err || !info->fbops->fb_pan_display ||
+            var->yoffset + yres > info->var.yres_virtual ||
             var->xoffset + info->var.xres > info->var.xres_virtual)
                 return -EINVAL;
 
@@ -980,6 +970,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                                 info->flags &= ~FBINFO_MISC_USEREVENT;
                                 event.info = info;
+                                event.data = &mode;
                                 fb_notifier_call_chain(evnt, &event);
                         }
                 }
@@ -1011,103 +1002,132 @@ fb_blank(struct fb_info *info, int blank)
         return ret;
 }
 
-static int 
-fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+static long
+fb_ioctl(struct file *file, unsigned int cmd,
          unsigned long arg)
 {
+        struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
-        struct fb_info *info = registered_fb[fbidx];
-        struct fb_ops *fb = info->fbops;
+        struct fb_info *info;
+        struct fb_ops *fb;
         struct fb_var_screeninfo var;
         struct fb_fix_screeninfo fix;
         struct fb_con2fbmap con2fb;
         struct fb_cmap_user cmap;
         struct fb_event event;
         void __user *argp = (void __user *)arg;
-        int i;
-        
-        if (!fb)
+        long ret = 0;
+
+        info = registered_fb[fbidx];
+        mutex_lock(&info->lock);
+        fb = info->fbops;
+
+        if (!fb) {
+                mutex_unlock(&info->lock);
                 return -ENODEV;
+        }
         switch (cmd) {
         case FBIOGET_VSCREENINFO:
-                return copy_to_user(argp, &info->var,
+                ret = copy_to_user(argp, &info->var,
                                     sizeof(var)) ? -EFAULT : 0;
+                break;
         case FBIOPUT_VSCREENINFO:
-                if (copy_from_user(&var, argp, sizeof(var)))
-                        return -EFAULT;
+                if (copy_from_user(&var, argp, sizeof(var))) {
+                        ret =  -EFAULT;
+                        break;
+                }
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
-                i = fb_set_var(info, &var);
+                ret = fb_set_var(info, &var);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                if (i) return i;
-                if (copy_to_user(argp, &var, sizeof(var)))
-                        return -EFAULT;
-                return 0;
+                if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
+                        ret = -EFAULT;
+                break;
         case FBIOGET_FSCREENINFO:
-                return copy_to_user(argp, &info->fix,
+                ret = copy_to_user(argp, &info->fix,
                                     sizeof(fix)) ? -EFAULT : 0;
+                break;
         case FBIOPUTCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        return -EFAULT;
-                return (fb_set_user_cmap(&cmap, info));
+                        ret = -EFAULT;
+                else
+                        ret = fb_set_user_cmap(&cmap, info);
+                break;
         case FBIOGETCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        return -EFAULT;
-                return fb_cmap_to_user(&info->cmap, &cmap);
+                        ret = -EFAULT;
+                else
+                        ret = fb_cmap_to_user(&info->cmap, &cmap);
+                break;
         case FBIOPAN_DISPLAY:
-                if (copy_from_user(&var, argp, sizeof(var)))
-                        return -EFAULT;
+                if (copy_from_user(&var, argp, sizeof(var))) {
+                        ret = -EFAULT;
+                        break;
+                }
                 acquire_console_sem();
-                i = fb_pan_display(info, &var);
+                ret = fb_pan_display(info, &var);
                 release_console_sem();
-                if (i)
-                        return i;
-                if (copy_to_user(argp, &var, sizeof(var)))
-                        return -EFAULT;
-                return 0;
+                if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
+                        ret = -EFAULT;
+                break;
         case FBIO_CURSOR:
-                return -EINVAL;
+                ret = -EINVAL;
+                break;
         case FBIOGET_CON2FBMAP:
                 if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
-                        return -EFAULT;
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                    return -EINVAL;
-                con2fb.framebuffer = -1;
-                event.info = info;
-                event.data = &con2fb;
-                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
-                return copy_to_user(argp, &con2fb,
+                        ret = -EFAULT;
+                else if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        ret = -EINVAL;
+                else {
+                        con2fb.framebuffer = -1;
+                        event.info = info;
+                        event.data = &con2fb;
+                        fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP,
+                                                                &event);
+                        ret = copy_to_user(argp, &con2fb,
                                     sizeof(con2fb)) ? -EFAULT : 0;
+                }
+                break;
         case FBIOPUT_CON2FBMAP:
-                if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
-                        return - EFAULT;
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                    return -EINVAL;
-                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
-                    return -EINVAL;
-#ifdef CONFIG_KMOD
-                if (!registered_fb[con2fb.framebuffer])
-                    try_to_load(con2fb.framebuffer);
-#endif /* CONFIG_KMOD */
+                if (copy_from_user(&con2fb, argp, sizeof(con2fb))) {
+                        ret = -EFAULT;
+                        break;
+                }
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) {
+                        ret = -EINVAL;
+                        break;
+                }
+                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) {
+                        ret = -EINVAL;
+                        break;
+                }
                 if (!registered_fb[con2fb.framebuffer])
-                    return -EINVAL;
+                        request_module("fb%d", con2fb.framebuffer);
+                if (!registered_fb[con2fb.framebuffer]) {
+                        ret = -EINVAL;
+                        break;
+                }
                 event.info = info;
                 event.data = &con2fb;
-                return fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
+                ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
                                               &event);
+                break;
         case FBIOBLANK:
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
-                i = fb_blank(info, arg);
+                ret = fb_blank(info, arg);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                return i;
+                break;;
         default:
                 if (fb->fb_ioctl == NULL)
-                        return -EINVAL;
-                return fb->fb_ioctl(info, cmd, arg);
+                        ret = -ENOTTY;
+                else
+                        ret = fb->fb_ioctl(info, cmd, arg);
         }
+        mutex_unlock(&info->lock);
+        return ret;
 }
 
 #ifdef CONFIG_COMPAT
@@ -1161,7 +1181,7 @@ static int fb_getput_cmap(struct inode *inode, struct file *file,
             put_user(compat_ptr(data), &cmap->transp))
                 return -EFAULT;
 
-        err = fb_ioctl(inode, file, cmd, (unsigned long) cmap);
+        err = fb_ioctl(file, cmd, (unsigned long) cmap);
 
         if (!err) {
                 if (copy_in_user(&cmap32->start,
@@ -1215,7 +1235,7 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
 
         old_fs = get_fs();
         set_fs(KERNEL_DS);
-        err = fb_ioctl(inode, file, cmd, (unsigned long) &fix);
+        err = fb_ioctl(file, cmd, (unsigned long) &fix);
         set_fs(old_fs);
 
         if (!err)
@@ -1233,7 +1253,7 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         struct fb_ops *fb = info->fbops;
         long ret = -ENOIOCTLCMD;
 
-        lock_kernel();
+        mutex_lock(&info->lock);
         switch(cmd) {
         case FBIOGET_VSCREENINFO:
         case FBIOPUT_VSCREENINFO:
@@ -1242,7 +1262,7 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case FBIOPUT_CON2FBMAP:
                 arg = (unsigned long) compat_ptr(arg);
         case FBIOBLANK:
-                ret = fb_ioctl(inode, file, cmd, arg);
+                ret = fb_ioctl(file, cmd, arg);
                 break;
 
         case FBIOGET_FSCREENINFO:
@@ -1259,7 +1279,7 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         ret = fb->fb_compat_ioctl(info, cmd, arg);
                 break;
         }
-        unlock_kernel();
+        mutex_unlock(&info->lock);
         return ret;
 }
 #endif
@@ -1281,13 +1301,13 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
                 return -ENODEV;
         if (fb->fb_mmap) {
                 int res;
-                lock_kernel();
+                mutex_lock(&info->lock);
                 res = fb->fb_mmap(info, vma);
-                unlock_kernel();
+                mutex_unlock(&info->lock);
                 return res;
         }
 
-        lock_kernel();
+        mutex_lock(&info->lock);
 
         /* frame buffer memory */
         start = info->fix.smem_start;
@@ -1296,13 +1316,13 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
                 /* memory mapped io */
                 off -= len;
                 if (info->var.accel_flags) {
-                        unlock_kernel();
+                        mutex_unlock(&info->lock);
                         return -EINVAL;
                 }
                 start = info->fix.mmio_start;
                 len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.mmio_len);
         }
-        unlock_kernel();
+        mutex_unlock(&info->lock);
         start &= PAGE_MASK;
         if ((vma->vm_end - vma->vm_start + off) > len)
                 return -EINVAL;
@@ -1326,15 +1346,13 @@ fb_open(struct inode *inode, struct file *file)
 
         if (fbidx >= FB_MAX)
                 return -ENODEV;
-        lock_kernel();
-#ifdef CONFIG_KMOD
-        if (!(info = registered_fb[fbidx]))
-                try_to_load(fbidx);
-#endif /* CONFIG_KMOD */
-        if (!(info = registered_fb[fbidx])) {
-                res = -ENODEV;
-                goto out;
-        }
+        info = registered_fb[fbidx];
+        if (!info)
+                request_module("fb%d", fbidx);
+        info = registered_fb[fbidx];
+        if (!info)
+                return -ENODEV;
+        mutex_lock(&info->lock);
         if (!try_module_get(info->fbops->owner)) {
                 res = -ENODEV;
                 goto out;
@@ -1345,8 +1363,12 @@ fb_open(struct inode *inode, struct file *file)
                 if (res)
                         module_put(info->fbops->owner);
         }
+#ifdef CONFIG_FB_DEFERRED_IO
+        if (info->fbdefio)
+                fb_deferred_io_open(info, inode, file);
+#endif
 out:
-        unlock_kernel();
+        mutex_unlock(&info->lock);
         return res;
 }
 
@@ -1355,11 +1377,11 @@ fb_release(struct inode *inode, struct file *file)
 {
         struct fb_info * const info = file->private_data;
 
-        lock_kernel();
+        mutex_lock(&info->lock);
         if (info->fbops->fb_release)
                 info->fbops->fb_release(info,1);
         module_put(info->fbops->owner);
-        unlock_kernel();
+        mutex_unlock(&info->lock);
         return 0;
 }
 
@@ -1367,7 +1389,7 @@ static const struct file_operations fb_fops = {
         .owner =        THIS_MODULE,
         .read =         fb_read,
         .write =        fb_write,
-        .ioctl =        fb_ioctl,
+        .unlocked_ioctl = fb_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = fb_compat_ioctl,
 #endif
@@ -1438,9 +1460,10 @@ register_framebuffer(struct fb_info *fb_info)
                 if (!registered_fb[i])
                         break;
         fb_info->node = i;
+        mutex_init(&fb_info->lock);
 
         fb_info->dev = device_create(fb_class, fb_info->device,
-                                     MKDEV(FB_MAJOR, i), "fb%d", i);
+                                     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
         if (IS_ERR(fb_info->dev)) {
                 /* Not fatal */
                 printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 052e18058498..5c1a2c01778f 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -564,7 +564,13 @@ static void get_detailed_timing(unsigned char *block,
                 mode->sync |= FB_SYNC_VERT_HIGH_ACT;
         mode->refresh = PIXEL_CLOCK/((H_ACTIVE + H_BLANKING) *
                                      (V_ACTIVE + V_BLANKING));
-        mode->vmode = 0;
+        if (INTERLACED) {
+                mode->yres *= 2;
+                mode->upper_margin *= 2;
+                mode->lower_margin *= 2;
+                mode->vsync_len *= 2;
+                mode->vmode |= FB_VMODE_INTERLACED;
+        }
         mode->flag = FB_MODE_IS_DETAILED;
 
         DPRINTK("      %d MHz ",  PIXEL_CLOCK/1000000);
@@ -879,7 +885,7 @@ int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
                 if (edid_is_timing_block(block)) {
                         var->xres = var->xres_virtual = H_ACTIVE;
                         var->yres = var->yres_virtual = V_ACTIVE;
-                        var->height = var->width = -1;
+                        var->height = var->width = 0;
                         var->right_margin = H_SYNC_OFFSET;
                         var->left_margin = (H_ACTIVE + H_BLANKING) -
                                 (H_ACTIVE + H_SYNC_OFFSET + H_SYNC_WIDTH);
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 7992b13ee68f..9dbb9646081f 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1042,7 +1042,7 @@ static int __devexit ffb_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id ffb_match[] = {
+static const struct of_device_id ffb_match[] = {
         {
                 .name = "SUNW,ffb",
         },
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 09d7e22c6fef..fb51197d1c98 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -279,58 +279,42 @@ static struct diu_hw dr = {
 
 static struct diu_pool pool;
 
-/*      To allocate memory for framebuffer. First try __get_free_pages(). If it
- *      fails, try rh_alloc. The reason is __get_free_pages() cannot allocate
- *      very large memory (more than 4MB). We don't want to allocate all memory
- *      in rheap since small memory allocation/deallocation will fragment the
- *      rheap and make the furture large allocation fail.
+/**
+ * fsl_diu_alloc - allocate memory for the DIU
+ * @size: number of bytes to allocate
+ * @param: returned physical address of memory
+ *
+ * This function allocates a physically-contiguous block of memory.
  */
-
-static void *fsl_diu_alloc(unsigned long size, phys_addr_t *phys)
+static void *fsl_diu_alloc(size_t size, phys_addr_t *phys)
 {
         void *virt;
 
-        pr_debug("size=%lu\n", size);
+        pr_debug("size=%zu\n", size);
 
-        virt = (void *)__get_free_pages(GFP_DMA | __GFP_ZERO, get_order(size));
+        virt = alloc_pages_exact(size, GFP_DMA | __GFP_ZERO);
         if (virt) {
                 *phys = virt_to_phys(virt);
-                pr_debug("virt %p, phys=%llx\n", virt, (uint64_t) *phys);
-                return virt;
+                pr_debug("virt=%p phys=%llx\n", virt,
+                        (unsigned long long)*phys);
         }
-        if (!diu_ops.diu_mem) {
-                printk(KERN_INFO "%s: no diu_mem."
-                        " To reserve more memory, put 'diufb=15M' "
-                        "in the command line\n", __func__);
-                return NULL;
-        }
-
-        virt = (void *)rh_alloc(&diu_ops.diu_rh_info, size, "DIU");
-        if (virt) {
-                *phys = virt_to_bus(virt);
-                memset(virt, 0, size);
-        }
-
-        pr_debug("rh virt=%p phys=%llx\n", virt, (unsigned long long)*phys);
 
         return virt;
 }
 
-static void fsl_diu_free(void *p, unsigned long size)
+/**
+ * fsl_diu_free - release DIU memory
+ * @virt: pointer returned by fsl_diu_alloc()
+ * @size: number of bytes allocated by fsl_diu_alloc()
+ *
+ * This function releases memory allocated by fsl_diu_alloc().
+ */
+static void fsl_diu_free(void *virt, size_t size)
 {
-        pr_debug("p=%p size=%lu\n", p, size);
-
-        if (!p)
-                return;
+        pr_debug("virt=%p size=%zu\n", virt, size);
 
-        if ((p >= diu_ops.diu_mem) &&
-            (p < (diu_ops.diu_mem + diu_ops.diu_size))) {
-                pr_debug("rh\n");
-                rh_free(&diu_ops.diu_rh_info, (unsigned long) p);
-        } else {
-                pr_debug("dma\n");
-                free_pages((unsigned long)p, get_order(size));
-        }
+        if (virt && size)
+                free_pages_exact(virt, size);
 }
 
 static int fsl_diu_enable_panel(struct fb_info *info)
@@ -495,6 +479,10 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
         base_plane_width = machine_data->fsl_diu_info[0]->var.xres;
         base_plane_height = machine_data->fsl_diu_info[0]->var.yres;
 
+        if (mfbi->x_aoi_d < 0)
+                mfbi->x_aoi_d = 0;
+        if (mfbi->y_aoi_d < 0)
+                mfbi->y_aoi_d = 0;
         switch (index) {
         case 0:
                 if (mfbi->x_aoi_d != 0)
@@ -794,6 +782,22 @@ static void unmap_video_memory(struct fb_info *info)
 }
 
 /*
+ * Using the fb_var_screeninfo in fb_info we set the aoi of this
+ * particular framebuffer. It is a light version of fsl_diu_set_par.
+ */
+static int fsl_diu_set_aoi(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct mfb_info *mfbi = info->par;
+        struct diu_ad *ad = mfbi->ad;
+
+        /* AOI should not be greater than display size */
+        ad->offset_xyi = cpu_to_le32((var->yoffset << 16) | var->xoffset);
+        ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d);
+        return 0;
+}
+
+/*
  * Using the fb_var_screeninfo in fb_info we set the resolution of this
  * particular framebuffer. This function alters the fb_fix_screeninfo stored
  * in fb_info. It does not alter var in fb_info since we are using that
@@ -833,11 +837,11 @@ static int fsl_diu_set_par(struct fb_info *info)
                 diu_ops.get_pixel_format(var->bits_per_pixel,
                                          machine_data->monitor_port);
         ad->addr    = cpu_to_le32(info->fix.smem_start);
-        ad->src_size_g_alpha = cpu_to_le32((var->yres << 12) |
-                                var->xres) | mfbi->g_alpha;
-        /* fix me. AOI should not be greater than display size */
+        ad->src_size_g_alpha = cpu_to_le32((var->yres_virtual << 12) |
+                                var->xres_virtual) | mfbi->g_alpha;
+        /* AOI should not be greater than display size */
         ad->aoi_size    = cpu_to_le32((var->yres << 16) | var->xres);
-        ad->offset_xyi = 0;
+        ad->offset_xyi = cpu_to_le32((var->yoffset << 16) | var->xoffset);
         ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d);
 
         /* Disable chroma keying function */
@@ -937,6 +941,8 @@ static int fsl_diu_pan_display(struct fb_var_screeninfo *var,
         else
                 info->var.vmode &= ~FB_VMODE_YWRAP;
 
+        fsl_diu_set_aoi(info);
+
         return 0;
 }
 
@@ -1005,7 +1011,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
                 pr_debug("set AOI display offset of index %d to (%d,%d)\n",
                                  mfbi->index, aoi_d.x_aoi_d, aoi_d.y_aoi_d);
                 fsl_diu_check_var(&info->var, info);
-                fsl_diu_set_par(info);
+                fsl_diu_set_aoi(info);
                 break;
         case MFB_GET_AOID:
                 aoi_d.x_aoi_d = mfbi->x_aoi_d;
@@ -1665,8 +1671,10 @@ static int __init fsl_diu_init(void)
         }
 
         prop = of_get_property(np, "d-cache-size", NULL);
-        if (prop == NULL)
+        if (prop == NULL) {
+                of_node_put(np);
                 return -ENODEV;
+        }
 
         /* Freescale PLRU requires 13/8 times the cache size to do a proper
            displacement flush
@@ -1675,8 +1683,10 @@ static int __init fsl_diu_init(void)
         coherence_data_size /= 8;
 
         prop = of_get_property(np, "d-cache-line-size", NULL);
-        if (prop == NULL)
+        if (prop == NULL) {
+                of_node_put(np);
                 return -ENODEV;
+        }
         d_cache_line_size = *prop;
 
         of_node_put(np);
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 2e552d5bbb5d..f89c3cce1e0c 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -87,6 +87,8 @@ static int gbe_revision;
 static int ypan, ywrap;
 
 static uint32_t pseudo_palette[16];
+static uint32_t gbe_cmap[256];
+static int gbe_turned_on; /* 0 turned off, 1 turned on */
 
 static char *mode_option __initdata = NULL;
 
@@ -208,6 +210,8 @@ void gbe_turn_off(void)
         int i;
         unsigned int val, x, y, vpixen_off;
 
+        gbe_turned_on = 0;
+
         /* check if pixel counter is on */
         val = gbe->vt_xy;
         if (GET_GBE_FIELD(VT_XY, FREEZE, val) == 1)
@@ -371,6 +375,22 @@ static void gbe_turn_on(void)
         }
         if (i == 10000)
                 printk(KERN_ERR "gbefb: turn on DMA timed out\n");
+
+        gbe_turned_on = 1;
+}
+
+static void gbe_loadcmap(void)
+{
+        int i, j;
+
+        for (i = 0; i < 256; i++) {
+                for (j = 0; j < 1000 && gbe->cm_fifo >= 63; j++)
+                        udelay(10);
+                if (j == 1000)
+                        printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+
+                gbe->cmap[i] = gbe_cmap[i];
+        }
 }
 
 /*
@@ -382,6 +402,7 @@ static int gbefb_blank(int blank, struct fb_info *info)
         switch (blank) {
         case FB_BLANK_UNBLANK:          /* unblank */
                 gbe_turn_on();
+                gbe_loadcmap();
                 break;
 
         case FB_BLANK_NORMAL:           /* blank */
@@ -796,16 +817,10 @@ static int gbefb_set_par(struct fb_info *info)
                 gbe->gmap[i] = (i << 24) | (i << 16) | (i << 8);
 
         /* Initialize the color map */
-        for (i = 0; i < 256; i++) {
-                int j;
-
-                for (j = 0; j < 1000 && gbe->cm_fifo >= 63; j++)
-                        udelay(10);
-                if (j == 1000)
-                        printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+        for (i = 0; i < 256; i++)
+                gbe_cmap[i] = (i << 8) | (i << 16) | (i << 24);
 
-                gbe->cmap[i] = (i << 8) | (i << 16) | (i << 24);
-        }
+        gbe_loadcmap();
 
         return 0;
 }
@@ -855,14 +870,17 @@ static int gbefb_setcolreg(unsigned regno, unsigned red, unsigned green,
         blue >>= 8;
 
         if (info->var.bits_per_pixel <= 8) {
-                /* wait for the color map FIFO to have a free entry */
-                for (i = 0; i < 1000 && gbe->cm_fifo >= 63; i++)
-                        udelay(10);
-                if (i == 1000) {
-                        printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
-                        return 1;
+                gbe_cmap[regno] = (red << 24) | (green << 16) | (blue << 8);
+                if (gbe_turned_on) {
+                        /* wait for the color map FIFO to have a free entry */
+                        for (i = 0; i < 1000 && gbe->cm_fifo >= 63; i++)
+                                udelay(10);
+                        if (i == 1000) {
+                                printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+                                return 1;
+                        }
+                        gbe->cmap[regno] = gbe_cmap[regno];
                 }
-                gbe->cmap[regno] = (red << 24) | (green << 16) | (blue << 8);
         } else if (regno < 16) {
                 switch (info->var.bits_per_pixel) {
                 case 15:
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
index 3b9416f4ee20..6a51448fd3f7 100644
--- a/drivers/video/geode/lxfb.h
+++ b/drivers/video/geode/lxfb.h
@@ -51,8 +51,6 @@ static inline unsigned int lx_get_pitch(unsigned int xres, int bpp)
 }
 
 void lx_set_mode(struct fb_info *);
-void lx_get_gamma(struct fb_info *, unsigned int *, int);
-void lx_set_gamma(struct fb_info *, unsigned int *, int);
 unsigned int lx_framebuffer_size(void);
 int lx_blank_display(struct fb_info *, int);
 void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index aaef9165ec9b..b1cd49c99356 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -517,25 +517,25 @@ void lx_set_palette_reg(struct fb_info *info, unsigned regno,
 int lx_blank_display(struct fb_info *info, int blank_mode)
 {
         struct lxfb_par *par = info->par;
-        u32 dcfg, fp_pm;
-        int blank, hsync, vsync, crt;
+        u32 dcfg, misc, fp_pm;
+        int blank, hsync, vsync;
 
         /* CRT power saving modes. */
         switch (blank_mode) {
         case FB_BLANK_UNBLANK:
-                blank = 0; hsync = 1; vsync = 1; crt = 1;
+                blank = 0; hsync = 1; vsync = 1;
                 break;
         case FB_BLANK_NORMAL:
-                blank = 1; hsync = 1; vsync = 1; crt = 1;
+                blank = 1; hsync = 1; vsync = 1;
                 break;
         case FB_BLANK_VSYNC_SUSPEND:
-                blank = 1; hsync = 1; vsync = 0; crt = 1;
+                blank = 1; hsync = 1; vsync = 0;
                 break;
         case FB_BLANK_HSYNC_SUSPEND:
-                blank = 1; hsync = 0; vsync = 1; crt = 1;
+                blank = 1; hsync = 0; vsync = 1;
                 break;
         case FB_BLANK_POWERDOWN:
-                blank = 1; hsync = 0; vsync = 0; crt = 0;
+                blank = 1; hsync = 0; vsync = 0;
                 break;
         default:
                 return -EINVAL;
@@ -545,15 +545,23 @@ int lx_blank_display(struct fb_info *info, int blank_mode)
         dcfg &= ~(VP_DCFG_DAC_BL_EN | VP_DCFG_HSYNC_EN | VP_DCFG_VSYNC_EN |
                         VP_DCFG_CRT_EN);
         if (!blank)
-                dcfg |= VP_DCFG_DAC_BL_EN;
+                dcfg |= VP_DCFG_DAC_BL_EN | VP_DCFG_CRT_EN;
         if (hsync)
                 dcfg |= VP_DCFG_HSYNC_EN;
         if (vsync)
                 dcfg |= VP_DCFG_VSYNC_EN;
-        if (crt)
-                dcfg |= VP_DCFG_CRT_EN;
+
         write_vp(par, VP_DCFG, dcfg);
 
+        misc = read_vp(par, VP_MISC);
+
+        if (vsync && hsync)
+                misc &= ~VP_MISC_DACPWRDN;
+        else
+                misc |= VP_MISC_DACPWRDN;
+
+        write_vp(par, VP_MISC, misc);
+
         /* Power on/off flat panel */
 
         if (par->output & OUTPUT_PANEL) {
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index c18880d9db1f..0129c044f6d6 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -551,7 +551,7 @@ static struct fb_ops hgafb_ops = {
          *  Initialization
          */
 
-static int __init hgafb_probe(struct device *device)
+static int __init hgafb_probe(struct platform_device *pdev)
 {
         struct fb_info *info;
 
@@ -565,7 +565,7 @@ static int __init hgafb_probe(struct device *device)
         printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n",
                 hga_type_name, hga_vram_len/1024);
 
-        info = framebuffer_alloc(0, NULL);
+        info = framebuffer_alloc(0, &pdev->dev);
         if (!info) {
                 iounmap(hga_vram);
                 return -ENOMEM;
@@ -593,13 +593,13 @@ static int __init hgafb_probe(struct device *device)
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
-        dev_set_drvdata(device, info);
+        platform_set_drvdata(pdev, info);
         return 0;
 }
 
-static int hgafb_remove(struct device *device)
+static int hgafb_remove(struct platform_device *pdev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(pdev);
 
         hga_txt_mode();
         hga_clear_screen();
@@ -620,16 +620,15 @@ static int hgafb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver hgafb_driver = {
-        .name = "hgafb",
-        .bus  = &platform_bus_type,
+static struct platform_driver hgafb_driver = {
         .probe = hgafb_probe,
         .remove = hgafb_remove,
+        .driver = {
+                .name = "hgafb",
+        },
 };
 
-static struct platform_device hgafb_device = {
-        .name = "hgafb",
-};
+static struct platform_device *hgafb_device;
 
 static int __init hgafb_init(void)
 {
@@ -638,12 +637,15 @@ static int __init hgafb_init(void)
         if (fb_get_options("hgafb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&hgafb_driver);
+        ret = platform_driver_register(&hgafb_driver);
 
         if (!ret) {
-                ret = platform_device_register(&hgafb_device);
-                if (ret)
-                        driver_unregister(&hgafb_driver);
+                hgafb_device = platform_device_register_simple("hgafb", 0, NULL, 0);
+
+                if (IS_ERR(hgafb_device)) {
+                        platform_driver_unregister(&hgafb_driver);
+                        ret = PTR_ERR(hgafb_device);
+                }
         }
 
         return ret;
@@ -651,8 +653,8 @@ static int __init hgafb_init(void)
 
 static void __exit hgafb_exit(void)
 {
-        platform_device_unregister(&hgafb_device);
-        driver_unregister(&hgafb_driver);
+        platform_device_unregister(hgafb_device);
+        platform_driver_unregister(&hgafb_driver);
 }
 
 /* -------------------------------------------------------------------------
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 392a8be6aa76..e6467cf9f19f 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -27,7 +27,7 @@
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/hd64461.h>
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 
 #define WIDTH 640
 
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
deleted file mode 100644
index 9366ef2bb5f7..000000000000
--- a/drivers/video/imacfb.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * framebuffer driver for Intel Based Mac's
- *
- * (c) 2006 Edgar Hucek <gimli@dark-green.com>
- * Original imac driver written by Gerd Knorr <kraxel@goldbach.in-berlin.de>
- *
- */
-
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fb.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#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/dmi.h>
-#include <linux/efi.h>
-
-#include <asm/io.h>
-
-#include <video/vga.h>
-
-typedef enum _MAC_TYPE {
-        M_I17,
-        M_I20,
-        M_MINI,
-        M_MACBOOK,
-        M_UNKNOWN
-} MAC_TYPE;
-
-/* --------------------------------------------------------------------- */
-
-static struct fb_var_screeninfo imacfb_defined __initdata = {
-        .activate               = FB_ACTIVATE_NOW,
-        .height                 = -1,
-        .width                  = -1,
-        .right_margin           = 32,
-        .upper_margin           = 16,
-        .lower_margin           = 4,
-        .vsync_len              = 4,
-        .vmode                  = FB_VMODE_NONINTERLACED,
-};
-
-static struct fb_fix_screeninfo imacfb_fix __initdata = {
-        .id                     = "IMAC VGA",
-        .type                   = FB_TYPE_PACKED_PIXELS,
-        .accel                  = FB_ACCEL_NONE,
-        .visual                 = FB_VISUAL_TRUECOLOR,
-};
-
-static int inverse;
-static int model                = M_UNKNOWN;
-static int manual_height;
-static int manual_width;
-
-static int set_system(const struct dmi_system_id *id)
-{
-        printk(KERN_INFO "imacfb: %s detected - set system to %ld\n",
-                id->ident, (long)id->driver_data);
-
-        model = (long)id->driver_data;
-
-        return 0;
-}
-
-static struct dmi_system_id __initdata dmi_system_table[] = {
-        { set_system, "iMac4,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
-        { set_system, "MacBookPro1,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
-        { set_system, "MacBook1,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},
-        { set_system, "Macmini1,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"Macmini1,1")}, (void *)M_MINI},
-        {},
-};
-
-#define DEFAULT_FB_MEM  1024*1024*16
-
-/* --------------------------------------------------------------------- */
-
-static int imacfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                            unsigned blue, unsigned transp,
-                            struct fb_info *info)
-{
-        /*
-         *  Set a single color register. The values supplied are
-         *  already rounded down to the hardware's capabilities
-         *  (according to the entries in the `var' structure). Return
-         *  != 0 for invalid regno.
-         */
-
-        if (regno >= info->cmap.len)
-                return 1;
-
-        if (regno < 16) {
-                red   >>= 8;
-                green >>= 8;
-                blue  >>= 8;
-                ((u32 *)(info->pseudo_palette))[regno] =
-                        (red   << info->var.red.offset)   |
-                        (green << info->var.green.offset) |
-                        (blue  << info->var.blue.offset);
-        }
-        return 0;
-}
-
-static struct fb_ops imacfb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_setcolreg   = imacfb_setcolreg,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
-};
-
-static int __init imacfb_setup(char *options)
-{
-        char *this_opt;
-
-        if (!options || !*options)
-                return 0;
-
-        while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!*this_opt) continue;
-
-                if (!strcmp(this_opt, "inverse"))
-                        inverse = 1;
-                else if (!strcmp(this_opt, "i17"))
-                        model = M_I17;
-                else if (!strcmp(this_opt, "i20"))
-                        model = M_I20;
-                else if (!strcmp(this_opt, "mini"))
-                        model = M_MINI;
-                else if (!strcmp(this_opt, "macbook"))
-                        model = M_MACBOOK;
-                else if (!strncmp(this_opt, "height:", 7))
-                        manual_height = simple_strtoul(this_opt+7, NULL, 0);
-                else if (!strncmp(this_opt, "width:", 6))
-                        manual_width = simple_strtoul(this_opt+6, NULL, 0);
-        }
-        return 0;
-}
-
-static int __init imacfb_probe(struct platform_device *dev)
-{
-        struct fb_info *info;
-        int err;
-        unsigned int size_vmode;
-        unsigned int size_remap;
-        unsigned int size_total;
-
-        screen_info.lfb_depth = 32;
-        screen_info.lfb_size = DEFAULT_FB_MEM / 0x10000;
-        screen_info.pages=1;
-        screen_info.blue_size = 8;
-        screen_info.blue_pos = 0;
-        screen_info.green_size = 8;
-        screen_info.green_pos = 8;
-        screen_info.red_size = 8;
-        screen_info.red_pos = 16;
-        screen_info.rsvd_size = 8;
-        screen_info.rsvd_pos = 24;
-
-        switch (model) {
-        case M_I17:
-                screen_info.lfb_width = 1440;
-                screen_info.lfb_height = 900;
-                screen_info.lfb_linelength = 1472 * 4;
-                screen_info.lfb_base = 0x80010000;
-                break;
-        case M_I20:
-                screen_info.lfb_width = 1680;
-                screen_info.lfb_height = 1050;
-                screen_info.lfb_linelength = 1728 * 4;
-                screen_info.lfb_base = 0x80010000;
-                break;
-        case M_MINI:
-                screen_info.lfb_width = 1024;
-                screen_info.lfb_height = 768;
-                screen_info.lfb_linelength = 2048 * 4;
-                screen_info.lfb_base = 0x80000000;
-                break;
-        case M_MACBOOK:
-                screen_info.lfb_width = 1280;
-                screen_info.lfb_height = 800;
-                screen_info.lfb_linelength = 2048 * 4;
-                screen_info.lfb_base = 0x80000000;
-                break;
-        }
-
-        /* if the user wants to manually specify height/width,
-           we will override the defaults */
-        /* TODO: eventually get auto-detection working */
-        if (manual_height > 0)
-                screen_info.lfb_height = manual_height;
-        if (manual_width > 0)
-                screen_info.lfb_width = manual_width;
-
-        imacfb_fix.smem_start = screen_info.lfb_base;
-        imacfb_defined.bits_per_pixel = screen_info.lfb_depth;
-        imacfb_defined.xres = screen_info.lfb_width;
-        imacfb_defined.yres = screen_info.lfb_height;
-        imacfb_fix.line_length = screen_info.lfb_linelength;
-
-        /*   size_vmode -- that is the amount of memory needed for the
-         *                 used video mode, i.e. the minimum amount of
-         *                 memory we need. */
-        size_vmode = imacfb_defined.yres * imacfb_fix.line_length;
-
-        /*   size_total -- all video memory we have. Used for
-         *                 entries, ressource allocation and bounds
-         *                 checking. */
-        size_total = screen_info.lfb_size * 65536;
-        if (size_total < size_vmode)
-                size_total = size_vmode;
-
-        /*   size_remap -- the amount of video memory we are going to
-         *                 use for imacfb.  With modern cards it is no
-         *                 option to simply use size_total as that
-         *                 wastes plenty of kernel address space. */
-        size_remap  = size_vmode * 2;
-        if (size_remap < size_vmode)
-                size_remap = size_vmode;
-        if (size_remap > size_total)
-                size_remap = size_total;
-        imacfb_fix.smem_len = size_remap;
-
-        if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {
-                printk(KERN_WARNING
-                       "imacfb: cannot reserve video memory at 0x%lx\n",
-                        imacfb_fix.smem_start);
-                /* We cannot make this fatal. Sometimes this comes from magic
-                   spaces our resource handlers simply don't know about */
-        }
-
-        info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
-        if (!info) {
-                err = -ENOMEM;
-                goto err_release_mem;
-        }
-        info->pseudo_palette = info->par;
-        info->par = NULL;
-
-        info->screen_base = ioremap(imacfb_fix.smem_start, imacfb_fix.smem_len);
-        if (!info->screen_base) {
-                printk(KERN_ERR "imacfb: abort, cannot ioremap video memory "
-                                "0x%x @ 0x%lx\n",
-                        imacfb_fix.smem_len, imacfb_fix.smem_start);
-                err = -EIO;
-                goto err_unmap;
-        }
-
-        printk(KERN_INFO "imacfb: framebuffer at 0x%lx, mapped to 0x%p, "
-               "using %dk, total %dk\n",
-               imacfb_fix.smem_start, info->screen_base,
-               size_remap/1024, size_total/1024);
-        printk(KERN_INFO "imacfb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
-               imacfb_defined.xres, imacfb_defined.yres,
-               imacfb_defined.bits_per_pixel, imacfb_fix.line_length,
-               screen_info.pages);
-
-        imacfb_defined.xres_virtual = imacfb_defined.xres;
-        imacfb_defined.yres_virtual = imacfb_fix.smem_len /
-                                        imacfb_fix.line_length;
-        printk(KERN_INFO "imacfb: scrolling: redraw\n");
-        imacfb_defined.yres_virtual = imacfb_defined.yres;
-
-        /* some dummy values for timing to make fbset happy */
-        imacfb_defined.pixclock     = 10000000 / imacfb_defined.xres *
-                                        1000 / imacfb_defined.yres;
-        imacfb_defined.left_margin  = (imacfb_defined.xres / 8) & 0xf8;
-        imacfb_defined.hsync_len    = (imacfb_defined.xres / 8) & 0xf8;
-
-        imacfb_defined.red.offset    = screen_info.red_pos;
-        imacfb_defined.red.length    = screen_info.red_size;
-        imacfb_defined.green.offset  = screen_info.green_pos;
-        imacfb_defined.green.length  = screen_info.green_size;
-        imacfb_defined.blue.offset   = screen_info.blue_pos;
-        imacfb_defined.blue.length   = screen_info.blue_size;
-        imacfb_defined.transp.offset = screen_info.rsvd_pos;
-        imacfb_defined.transp.length = screen_info.rsvd_size;
-
-        printk(KERN_INFO "imacfb: %s: "
-               "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
-               "Truecolor",
-               screen_info.rsvd_size,
-               screen_info.red_size,
-               screen_info.green_size,
-               screen_info.blue_size,
-               screen_info.rsvd_pos,
-               screen_info.red_pos,
-               screen_info.green_pos,
-               screen_info.blue_pos);
-
-        imacfb_fix.ypanstep  = 0;
-        imacfb_fix.ywrapstep = 0;
-
-        /* request failure does not faze us, as vgacon probably has this
-         * region already (FIXME) */
-        request_region(0x3c0, 32, "imacfb");
-
-        info->fbops = &imacfb_ops;
-        info->var = imacfb_defined;
-        info->fix = imacfb_fix;
-        info->flags = FBINFO_FLAG_DEFAULT;
-
-        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-                err = -ENOMEM;
-                goto err_unmap;
-        }
-        if (register_framebuffer(info)<0) {
-                err = -EINVAL;
-                goto err_fb_dealoc;
-        }
-        printk(KERN_INFO "fb%d: %s frame buffer device\n",
-               info->node, info->fix.id);
-        return 0;
-
-err_fb_dealoc:
-        fb_dealloc_cmap(&info->cmap);
-err_unmap:
-        iounmap(info->screen_base);
-        framebuffer_release(info);
-err_release_mem:
-        release_mem_region(imacfb_fix.smem_start, size_total);
-        return err;
-}
-
-static struct platform_driver imacfb_driver = {
-        .probe  = imacfb_probe,
-        .driver = {
-                .name   = "imacfb",
-        },
-};
-
-static struct platform_device imacfb_device = {
-        .name   = "imacfb",
-};
-
-static int __init imacfb_init(void)
-{
-        int ret;
-        char *option = NULL;
-
-        if (!efi_enabled)
-                return -ENODEV;
-        if (!dmi_check_system(dmi_system_table))
-                return -ENODEV;
-        if (model == M_UNKNOWN)
-                return -ENODEV;
-
-        if (fb_get_options("imacfb", &option))
-                return -ENODEV;
-
-        imacfb_setup(option);
-        ret = platform_driver_register(&imacfb_driver);
-
-        if (!ret) {
-                ret = platform_device_register(&imacfb_device);
-                if (ret)
-                        platform_driver_unregister(&imacfb_driver);
-        }
-        return ret;
-}
-module_init(imacfb_init);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 94e4d3ac1a05..ccd986140c95 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -24,6 +24,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -32,9 +33,9 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imxfb.h>
 
 /*
  * Complain if VAR is out of range.
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 3325fbd68ab3..a50bea614804 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -12,9 +12,9 @@
 #endif
 
 /*** Version/name ***/
-#define INTELFB_VERSION                 "0.9.5"
+#define INTELFB_VERSION                 "0.9.6"
 #define INTELFB_MODULE_NAME             "intelfb"
-#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM"
+#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/945GME/965G/965GM"
 
 
 /*** Debug/feature defines ***/
@@ -58,6 +58,7 @@
 #define PCI_DEVICE_ID_INTEL_915GM       0x2592
 #define PCI_DEVICE_ID_INTEL_945G        0x2772
 #define PCI_DEVICE_ID_INTEL_945GM       0x27A2
+#define PCI_DEVICE_ID_INTEL_945GME      0x27AE
 #define PCI_DEVICE_ID_INTEL_965G        0x29A2
 #define PCI_DEVICE_ID_INTEL_965GM       0x2A02
 
@@ -160,6 +161,7 @@ enum intel_chips {
         INTEL_915GM,
         INTEL_945G,
         INTEL_945GM,
+        INTEL_945GME,
         INTEL_965G,
         INTEL_965GM,
 };
@@ -363,6 +365,7 @@ struct intelfb_info {
                         ((dinfo)->chipset == INTEL_915GM) ||    \
                         ((dinfo)->chipset == INTEL_945G) ||     \
                         ((dinfo)->chipset == INTEL_945GM) ||    \
+                        ((dinfo)->chipset == INTEL_945GME) ||   \
                         ((dinfo)->chipset == INTEL_965G) ||     \
                         ((dinfo)->chipset == INTEL_965GM))
 
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
index fcf9fadbf572..5d896b81f4e0 100644
--- a/drivers/video/intelfb/intelfb_i2c.c
+++ b/drivers/video/intelfb/intelfb_i2c.c
@@ -171,6 +171,7 @@ void intelfb_create_i2c_busses(struct intelfb_info *dinfo)
                 /* has some LVDS + tv-out */
         case INTEL_945G:
         case INTEL_945GM:
+        case INTEL_945GME:
         case INTEL_965G:
         case INTEL_965GM:
                 /* SDVO ports have a single control bus - 2 devices */
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e44303f9bc52..a09e23649357 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -2,7 +2,7 @@
  * intelfb
  *
  * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
- * 945G/945GM/965G/965GM integrated graphics chips.
+ * 945G/945GM/945GME/965G/965GM integrated graphics chips.
  *
  * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
  *                   2004 Sylvain Meyer
@@ -102,6 +102,9 @@
  *
  *    04/2008 - Version 0.9.5
  *              Add support for 965G/965GM. (Maik Broemme <mbroemme@plusserver.de>)
+ *
+ *    08/2008 - Version 0.9.6
+ *              Add support for 945GME. (Phil Endecott <spam_from_intelfb@chezphil.org>)
  */
 
 #include <linux/module.h>
@@ -183,6 +186,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GM },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GME, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GME },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965G },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965GM },
         { 0, }
@@ -555,6 +559,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
             (ent->device == PCI_DEVICE_ID_INTEL_915GM) ||
             (ent->device == PCI_DEVICE_ID_INTEL_945G)  ||
             (ent->device == PCI_DEVICE_ID_INTEL_945GM) ||
+            (ent->device == PCI_DEVICE_ID_INTEL_945GME) ||
             (ent->device == PCI_DEVICE_ID_INTEL_965G) ||
             (ent->device == PCI_DEVICE_ID_INTEL_965GM)) {
 
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 8e6d6a4db0ad..8b26b27c2db6 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -143,6 +143,12 @@ int intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo)
                 dinfo->mobile = 1;
                 dinfo->pll_index = PLLS_I9xx;
                 return 0;
+        case PCI_DEVICE_ID_INTEL_945GME:
+                dinfo->name = "Intel(R) 945GME";
+                dinfo->chipset = INTEL_945GME;
+                dinfo->mobile = 1;
+                dinfo->pll_index = PLLS_I9xx;
+                return 0;
         case PCI_DEVICE_ID_INTEL_965G:
                 dinfo->name = "Intel(R) 965G";
                 dinfo->chipset = INTEL_965G;
@@ -186,6 +192,7 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
         case PCI_DEVICE_ID_INTEL_915GM:
         case PCI_DEVICE_ID_INTEL_945G:
         case PCI_DEVICE_ID_INTEL_945GM:
+        case PCI_DEVICE_ID_INTEL_945GME:
         case PCI_DEVICE_ID_INTEL_965G:
         case PCI_DEVICE_ID_INTEL_965GM:
                 /* 915, 945 and 965 chipsets support a 256MB aperture.
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 13fea61d6ae4..7c7e8c2da9d9 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -33,6 +33,7 @@ static int leo_blank(int, struct fb_info *);
 
 static int leo_mmap(struct fb_info *, struct vm_area_struct *);
 static int leo_ioctl(struct fb_info *, unsigned int, unsigned long);
+static int leo_pan_display(struct fb_var_screeninfo *, struct fb_info *);
 
 /*
  *  Frame buffer operations
@@ -42,6 +43,7 @@ static struct fb_ops leo_ops = {
         .owner                  = THIS_MODULE,
         .fb_setcolreg           = leo_setcolreg,
         .fb_blank               = leo_blank,
+        .fb_pan_display         = leo_pan_display,
         .fb_fillrect            = cfb_fillrect,
         .fb_copyarea            = cfb_copyarea,
         .fb_imageblit           = cfb_imageblit,
@@ -206,6 +208,60 @@ static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
         return;
 }
 
+static void leo_switch_from_graph(struct fb_info *info)
+{
+        struct leo_par *par = (struct leo_par *) info->par;
+        struct leo_ld_ss0 __iomem *ss = par->ld_ss0;
+        struct leo_cursor __iomem *cursor = par->cursor;
+        unsigned long flags;
+        u32 val;
+
+        spin_lock_irqsave(&par->lock, flags);
+
+        par->extent = ((info->var.xres - 1) |
+                       ((info->var.yres - 1) << 16));
+
+        sbus_writel(0xffffffff, &ss->wid);
+        sbus_writel(0xffff, &ss->wmask);
+        sbus_writel(0, &ss->vclipmin);
+        sbus_writel(par->extent, &ss->vclipmax);
+        sbus_writel(0, &ss->fg);
+        sbus_writel(0xff000000, &ss->planemask);
+        sbus_writel(0x310850, &ss->rop);
+        sbus_writel(0, &ss->widclip);
+        sbus_writel((info->var.xres-1) | ((info->var.yres-1) << 11),
+                    &par->lc_ss0_usr->extent);
+        sbus_writel(4, &par->lc_ss0_usr->addrspace);
+        sbus_writel(0x80000000, &par->lc_ss0_usr->fill);
+        sbus_writel(0, &par->lc_ss0_usr->fontt);
+        do {
+                val = sbus_readl(&par->lc_ss0_usr->csr);
+        } while (val & 0x20000000);
+
+        /* setup screen buffer for cfb_* functions */
+        sbus_writel(1, &ss->wid);
+        sbus_writel(0x00ffffff, &ss->planemask);
+        sbus_writel(0x310b90, &ss->rop);
+        sbus_writel(0, &par->lc_ss0_usr->addrspace);
+
+        /* hide cursor */
+        sbus_writel(sbus_readl(&cursor->cur_misc) & ~LEO_CUR_ENABLE, &cursor->cur_misc);
+
+        spin_unlock_irqrestore(&par->lock, flags);
+}
+
+static int leo_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        /* We just use this to catch switches out of
+         * graphics mode.
+         */
+        leo_switch_from_graph(info);
+
+        if (var->xoffset || var->yoffset || var->vmode)
+                return -EINVAL;
+        return 0;
+}
+
 /**
  *      leo_setcolreg - Optional function. Sets a color register.
  *      @regno: boolean, 0 copy local, 1 get_user() function
@@ -454,44 +510,6 @@ static void leo_init_wids(struct fb_info *info)
         leo_wid_put(info, &wl);
 }
 
-static void leo_switch_from_graph(struct fb_info *info)
-{
-        struct leo_par *par = (struct leo_par *) info->par;
-        struct leo_ld_ss0 __iomem *ss = par->ld_ss0;
-        unsigned long flags;
-        u32 val;
-
-        spin_lock_irqsave(&par->lock, flags);
-
-        par->extent = ((info->var.xres - 1) |
-                       ((info->var.yres - 1) << 16));
-
-        sbus_writel(0xffffffff, &ss->wid);
-        sbus_writel(0xffff, &ss->wmask);
-        sbus_writel(0, &ss->vclipmin);
-        sbus_writel(par->extent, &ss->vclipmax);
-        sbus_writel(0, &ss->fg);
-        sbus_writel(0xff000000, &ss->planemask);
-        sbus_writel(0x310850, &ss->rop);
-        sbus_writel(0, &ss->widclip);
-        sbus_writel((info->var.xres-1) | ((info->var.yres-1) << 11),
-                    &par->lc_ss0_usr->extent);
-        sbus_writel(4, &par->lc_ss0_usr->addrspace);
-        sbus_writel(0x80000000, &par->lc_ss0_usr->fill);
-        sbus_writel(0, &par->lc_ss0_usr->fontt);
-        do {
-                val = sbus_readl(&par->lc_ss0_usr->csr);
-        } while (val & 0x20000000);
-
-        /* setup screen buffer for cfb_* functions */
-        sbus_writel(1, &ss->wid);
-        sbus_writel(0x00ffffff, &ss->planemask);
-        sbus_writel(0x310b90, &ss->rop);
-        sbus_writel(0, &par->lc_ss0_usr->addrspace);
-
-        spin_unlock_irqrestore(&par->lock, flags);
-}
-
 static void leo_init_hw(struct fb_info *info)
 {
         struct leo_par *par = (struct leo_par *) info->par;
@@ -641,7 +659,7 @@ static int __devexit leo_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id leo_match[] = {
+static const struct of_device_id leo_match[] = {
         {
                 .name = "SUNW,leo",
         },
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index aa8c714d6245..b790ddff76f9 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -596,7 +596,7 @@ static struct fb_ops macfb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-void __init macfb_setup(char *options)
+static void __init macfb_setup(char *options)
 {
         char *this_opt;
         
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 75ee5a12e549..c14e3e2212b3 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -87,13 +87,7 @@ static int matroxfb_gpio_getscl(void* data) {
         return (matroxfb_read_gpio(b->minfo) & b->mask.clock) ? 1 : 0;
 }
 
-static struct i2c_adapter matrox_i2c_adapter_template =
-{
-        .owner =        THIS_MODULE,
-        .id =           I2C_HW_B_G400,
-};
-
-static struct i2c_algo_bit_data matrox_i2c_algo_template =
+static const struct i2c_algo_bit_data matrox_i2c_algo_template =
 {
         .setsda         = matroxfb_gpio_setsda,
         .setscl         = matroxfb_gpio_setscl,
@@ -112,7 +106,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
         b->minfo = minfo;
         b->mask.data = data;
         b->mask.clock = clock;
-        b->adapter = matrox_i2c_adapter_template;
+        b->adapter.owner = THIS_MODULE;
         snprintf(b->adapter.name, sizeof(b->adapter.name), name,
                 minfo->fbcon.node);
         i2c_set_adapdata(&b->adapter, b);
@@ -187,6 +181,17 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
                                   MAT_DATA, MAT_CLK, "MAVEN:fb%u", 0);
                 if (err)
                         printk(KERN_INFO "i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\n");
+                else {
+                        struct i2c_board_info maven_info = {
+                                I2C_BOARD_INFO("maven", 0x1b),
+                        };
+                        unsigned short const addr_list[2] = {
+                                0x1b, I2C_CLIENT_END
+                        };
+
+                        i2c_new_probed_device(&m2info->maven.adapter,
+                                              &maven_info, addr_list);
+                }
         }
         return m2info;
 fail_ddc1:;
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 54e82f35353d..8e7a275df50c 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1453,6 +1453,13 @@ static struct board {
                 MGA_G100,
                 &vbG100,
                 "MGA-G100 (AGP)"},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200EV_PCI,        0xFF,
+                0,                      0,
+                DEVF_G200,
+                230000,
+                MGA_G200,
+                &vbG200,
+                "MGA-G200eV (PCI)"},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_PCI,  0xFF,
                 0,                      0,
                 DEVF_G200,
@@ -2118,6 +2125,8 @@ static struct pci_device_id matroxfb_devices[] = {
                 PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G100_AGP,
                 PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200EV_PCI,
+                PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_PCI,
                 PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_AGP,
@@ -2536,7 +2545,7 @@ module_param(fh, int, 0);
 MODULE_PARM_DESC(fh, "Startup horizontal frequency, 0-999kHz, 1000-INF Hz");
 module_param(fv, int, 0);
 MODULE_PARM_DESC(fv, "Startup vertical frequency, 0-INF Hz\n"
-"You should specify \"fv:max_monitor_vsync,fh:max_monitor_hsync,maxclk:max_monitor_dotclock\"\n");
+"You should specify \"fv:max_monitor_vsync,fh:max_monitor_hsync,maxclk:max_monitor_dotclock\"");
 module_param(grayscale, int, 0);
 MODULE_PARM_DESC(grayscale, "Sets display into grayscale. Works perfectly with paletized videomode (4, 8bpp), some limitations apply to 16, 24 and 32bpp videomodes (default=nograyscale)");
 module_param(cross4MB, int, 0);
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 89da27bd5c49..042408a8c631 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -19,8 +19,6 @@
 #include <linux/matroxfb.h>
 #include <asm/div64.h>
 
-#define MAVEN_I2CID     (0x1B)
-
 #define MGATVO_B        1
 #define MGATVO_C        2
 
@@ -128,7 +126,7 @@ static int get_ctrl_id(__u32 v4l2_id) {
 
 struct maven_data {
         struct matrox_fb_info*          primary_head;
-        struct i2c_client               client;
+        struct i2c_client               *client;
         int                             version;
 };
 
@@ -974,7 +972,7 @@ static inline int maven_compute_timming(struct maven_data* md,
 
 static int maven_program_timming(struct maven_data* md,
                 const struct mavenregs* m) {
-        struct i2c_client* c = &md->client;
+        struct i2c_client *c = md->client;
 
         if (m->mode == MATROXFB_OUTPUT_MODE_MONITOR) {
                 LR(0x80);
@@ -1011,7 +1009,7 @@ static int maven_program_timming(struct maven_data* md,
 }
 
 static inline int maven_resync(struct maven_data* md) {
-        struct i2c_client* c = &md->client;
+        struct i2c_client *c = md->client;
         maven_set_reg(c, 0x95, 0x20);   /* start whole thing */
         return 0;
 }
@@ -1069,48 +1067,48 @@ static int maven_set_control (struct maven_data* md,
                   maven_compute_bwlevel(md, &blacklevel, &whitelevel);
                   blacklevel = (blacklevel >> 2) | ((blacklevel & 3) << 8);
                   whitelevel = (whitelevel >> 2) | ((whitelevel & 3) << 8);
-                  maven_set_reg_pair(&md->client, 0x0e, blacklevel);
-                  maven_set_reg_pair(&md->client, 0x1e, whitelevel);
+                  maven_set_reg_pair(md->client, 0x0e, blacklevel);
+                  maven_set_reg_pair(md->client, 0x1e, whitelevel);
                 }
                 break;
                 case V4L2_CID_SATURATION:
                 {
-                  maven_set_reg(&md->client, 0x20, p->value);
-                  maven_set_reg(&md->client, 0x22, p->value);
+                  maven_set_reg(md->client, 0x20, p->value);
+                  maven_set_reg(md->client, 0x22, p->value);
                 }
                 break;
                 case V4L2_CID_HUE:
                 {
-                  maven_set_reg(&md->client, 0x25, p->value);
+                  maven_set_reg(md->client, 0x25, p->value);
                 }
                 break;
                 case V4L2_CID_GAMMA:
                 {
                   const struct maven_gamma* g;
                   g = maven_compute_gamma(md);
-                  maven_set_reg(&md->client, 0x83, g->reg83);
-                  maven_set_reg(&md->client, 0x84, g->reg84);
-                  maven_set_reg(&md->client, 0x85, g->reg85);
-                  maven_set_reg(&md->client, 0x86, g->reg86);
-                  maven_set_reg(&md->client, 0x87, g->reg87);
-                  maven_set_reg(&md->client, 0x88, g->reg88);
-                  maven_set_reg(&md->client, 0x89, g->reg89);
-                  maven_set_reg(&md->client, 0x8a, g->reg8a);
-                  maven_set_reg(&md->client, 0x8b, g->reg8b);
+                  maven_set_reg(md->client, 0x83, g->reg83);
+                  maven_set_reg(md->client, 0x84, g->reg84);
+                  maven_set_reg(md->client, 0x85, g->reg85);
+                  maven_set_reg(md->client, 0x86, g->reg86);
+                  maven_set_reg(md->client, 0x87, g->reg87);
+                  maven_set_reg(md->client, 0x88, g->reg88);
+                  maven_set_reg(md->client, 0x89, g->reg89);
+                  maven_set_reg(md->client, 0x8a, g->reg8a);
+                  maven_set_reg(md->client, 0x8b, g->reg8b);
                 }
                 break;
                 case MATROXFB_CID_TESTOUT:
                 {
                         unsigned char val 
-                          = maven_get_reg(&md->client,0x8d);
+                          = maven_get_reg(md->client, 0x8d);
                         if (p->value) val |= 0x10;
                         else          val &= ~0x10;
-                        maven_set_reg(&md->client, 0x8d, val);
+                        maven_set_reg(md->client, 0x8d, val);
                 }
                 break;
                 case MATROXFB_CID_DEFLICKER:
                 {
-                  maven_set_reg(&md->client, 0x93, maven_compute_deflicker(md));
+                  maven_set_reg(md->client, 0x93, maven_compute_deflicker(md));
                 }
                 break;
         }
@@ -1189,6 +1187,7 @@ static int maven_init_client(struct i2c_client* clnt) {
         MINFO_FROM(container_of(clnt->adapter, struct i2c_bit_adapter, adapter)->minfo);
 
         md->primary_head = MINFO;
+        md->client = clnt;
         down_write(&ACCESS_FBINFO(altout.lock));
         ACCESS_FBINFO(outputs[1]).output = &maven_altout;
         ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src;
@@ -1232,14 +1231,11 @@ static int maven_shutdown_client(struct i2c_client* clnt) {
         return 0;
 }
 
-static const unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END };
-I2C_CLIENT_INSMOD;
-
-static struct i2c_driver maven_driver;
-
-static int maven_detect_client(struct i2c_adapter* adapter, int address, int kind) {
-        int err = 0;
-        struct i2c_client* new_client;
+static int maven_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
+{
+        struct i2c_adapter *adapter = client->adapter;
+        int err = -ENODEV;
         struct maven_data* data;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_WORD_DATA |
@@ -1250,50 +1246,37 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin
                 err = -ENOMEM;
                 goto ERROR0;
         }
-        new_client = &data->client;
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
-        new_client->adapter = adapter;
-        new_client->driver = &maven_driver;
-        new_client->flags = 0;
-        strlcpy(new_client->name, "maven", I2C_NAME_SIZE);
-        if ((err = i2c_attach_client(new_client)))
-                goto ERROR3;
-        err = maven_init_client(new_client);
+        i2c_set_clientdata(client, data);
+        err = maven_init_client(client);
         if (err)
                 goto ERROR4;
         return 0;
 ERROR4:;
-        i2c_detach_client(new_client);
-ERROR3:;
-        kfree(new_client);
+        kfree(data);
 ERROR0:;
         return err;
 }
 
-static int maven_attach_adapter(struct i2c_adapter* adapter) {
-        if (adapter->id == I2C_HW_B_G400)
-                return i2c_probe(adapter, &addr_data, &maven_detect_client);
-        return 0;
-}
-
-static int maven_detach_client(struct i2c_client* client) {
-        int err;
-
-        if ((err = i2c_detach_client(client)))
-                return err;
+static int maven_remove(struct i2c_client *client)
+{
         maven_shutdown_client(client);
         kfree(i2c_get_clientdata(client));
         return 0;
 }
 
+static const struct i2c_device_id maven_id[] = {
+        { "maven", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, maven_id);
+
 static struct i2c_driver maven_driver={
         .driver = {
                 .name   = "maven",
         },
-        .id             = I2C_DRIVERID_MGATVO,
-        .attach_adapter = maven_attach_adapter,
-        .detach_client  = maven_detach_client,
+        .probe          = maven_probe,
+        .remove         = maven_remove,
+        .id_table       = maven_id,
 };
 
 static int __init matroxfb_maven_init(void)
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index cc4c038a1b3f..df1f757a6161 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -40,29 +40,63 @@
 
 #include <asm/unaligned.h>
 
-
-#define DEBUG 1
-#ifdef DEBUG
-#define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
-#else
-#define DPRINTK(f, a...)
-#endif
-
-
 /* Display specific information */
 #define DPY_W 832
 #define DPY_H 622
 
+static int user_wfm_size;
+
 /* frame differs from image. frame includes non-visible pixels */
 struct epd_frame {
         int fw; /* frame width */
         int fh; /* frame height */
+        u16 config[4];
+        int wfm_size;
 };
 
 static struct epd_frame epd_frame_table[] = {
         {
-        .fw = 832,
-        .fh = 622
+                .fw = 832,
+                .fh = 622,
+                .config = {
+                        15 /* sdlew */
+                        | 2 << 8 /* sdosz */
+                        | 0 << 11 /* sdor */
+                        | 0 << 12 /* sdces */
+                        | 0 << 15, /* sdcer */
+                        42 /* gdspl */
+                        | 1 << 8 /* gdr1 */
+                        | 1 << 9 /* sdshr */
+                        | 0 << 15, /* gdspp */
+                        18 /* gdspw */
+                        | 0 << 15, /* dispc */
+                        599 /* vdlc */
+                        | 0 << 11 /* dsi */
+                        | 0 << 12, /* dsic */
+                },
+                .wfm_size = 47001,
+        },
+        {
+                .fw = 1088,
+                .fh = 791,
+                .config = {
+                        0x0104,
+                        0x031f,
+                        0x0088,
+                        0x02ff,
+                },
+                .wfm_size = 46770,
+        },
+        {
+                .fw = 1200,
+                .fh = 842,
+                .config = {
+                        0x0101,
+                        0x030e,
+                        0x0012,
+                        0x0280,
+                },
+                .wfm_size = 46770,
         },
 };
 
@@ -134,9 +168,8 @@ static u16 calc_img_cksum(u16 *start, int length)
 }
 
 /* here we decode the incoming waveform file and populate metromem */
-#define EXP_WFORM_SIZE 47001
-static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
-                                u8 *frame_count)
+static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,
+                                struct metronomefb_par *par)
 {
         int tta;
         int wmta;
@@ -148,26 +181,31 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
         int wfm_idx, owfm_idx;
         int mem_idx = 0;
         struct waveform_hdr *wfm_hdr;
+        u8 *metromem = par->metromem_wfm;
+        struct device *dev = par->info->dev;
 
-        if (size != EXP_WFORM_SIZE) {
-                printk(KERN_ERR "Error: unexpected size %d != %d\n", size,
-                                        EXP_WFORM_SIZE);
+        if (user_wfm_size)
+                epd_frame_table[par->dt].wfm_size = user_wfm_size;
+
+        if (size != epd_frame_table[par->dt].wfm_size) {
+                dev_err(dev, "Error: unexpected size %Zd != %d\n", size,
+                                        epd_frame_table[par->dt].wfm_size);
                 return -EINVAL;
         }
 
         wfm_hdr = (struct waveform_hdr *) mem;
 
         if (wfm_hdr->fvsn != 1) {
-                printk(KERN_ERR "Error: bad fvsn %x\n", wfm_hdr->fvsn);
+                dev_err(dev, "Error: bad fvsn %x\n", wfm_hdr->fvsn);
                 return -EINVAL;
         }
         if (wfm_hdr->luts != 0) {
-                printk(KERN_ERR "Error: bad luts %x\n", wfm_hdr->luts);
+                dev_err(dev, "Error: bad luts %x\n", wfm_hdr->luts);
                 return -EINVAL;
         }
         cksum = calc_cksum(32, 47, mem);
         if (cksum != wfm_hdr->wfm_cs) {
-                printk(KERN_ERR "Error: bad cksum %x != %x\n", cksum,
+                dev_err(dev, "Error: bad cksum %x != %x\n", cksum,
                                         wfm_hdr->wfm_cs);
                 return -EINVAL;
         }
@@ -175,7 +213,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
         wfm_hdr->trc += 1;
         for (i = 0; i < 5; i++) {
                 if (*(wfm_hdr->stuff2a + i) != 0) {
-                        printk(KERN_ERR "Error: unexpected value in padding\n");
+                        dev_err(dev, "Error: unexpected value in padding\n");
                         return -EINVAL;
                 }
         }
@@ -200,7 +238,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
                 return -EINVAL;
         cksum = calc_cksum(sizeof(*wfm_hdr), cksum_idx, mem);
         if (cksum != mem[cksum_idx]) {
-                printk(KERN_ERR "Error: bad temperature range table cksum"
+                dev_err(dev, "Error: bad temperature range table cksum"
                                 " %x != %x\n", cksum, mem[cksum_idx]);
                 return -EINVAL;
         }
@@ -212,7 +250,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
                 return -EINVAL;
         cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
         if (cksum != mem[cksum_idx]) {
-                printk(KERN_ERR "Error: bad mode table address cksum"
+                dev_err(dev, "Error: bad mode table address cksum"
                                 " %x != %x\n", cksum, mem[cksum_idx]);
                 return -EINVAL;
         }
@@ -224,7 +262,7 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
                 return -EINVAL;
         cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
         if (cksum != mem[cksum_idx]) {
-                printk(KERN_ERR "Error: bad temperature table address cksum"
+                dev_err(dev, "Error: bad temperature table address cksum"
                         " %x != %x\n", cksum, mem[cksum_idx]);
                 return -EINVAL;
         }
@@ -259,11 +297,11 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
                 return -EINVAL;
         cksum = calc_cksum(owfm_idx, cksum_idx, mem);
         if (cksum != mem[cksum_idx]) {
-                printk(KERN_ERR "Error: bad waveform data cksum"
+                dev_err(dev, "Error: bad waveform data cksum"
                                 " %x != %x\n", cksum, mem[cksum_idx]);
                 return -EINVAL;
         }
-        *frame_count = (mem_idx/64);
+        par->frame_count = (mem_idx/64);
 
         return 0;
 }
@@ -274,15 +312,12 @@ static int metronome_display_cmd(struct metronomefb_par *par)
         u16 cs;
         u16 opcode;
         static u8 borderval;
-        u8 *ptr;
 
         /* setup display command
         we can't immediately set the opcode since the controller
         will try parse the command before we've set it all up
         so we just set cs here and set the opcode at the end */
 
-        ptr = par->metromem;
-
         if (par->metromem_cmd->opcode == 0xCC40)
                 opcode = cs = 0xCC41;
         else
@@ -335,44 +370,17 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
 
 static int __devinit metronome_config_cmd(struct metronomefb_par *par)
 {
-        int i;
-        u16 cs;
-
         /* setup config command
         we can't immediately set the opcode since the controller
-        will try parse the command before we've set it all up
-        so we just set cs here and set the opcode at the end */
-
-        cs = 0xCC10;
-
-        /* set the 12 args ( 8 bytes ) for config. see spec for meanings */
-        i = 0;
-        par->metromem_cmd->args[i] =    15 /* sdlew */
-                                        | 2 << 8 /* sdosz */
-                                        | 0 << 11 /* sdor */
-                                        | 0 << 12 /* sdces */
-                                        | 0 << 15; /* sdcer */
-        cs += par->metromem_cmd->args[i++];
-
-        par->metromem_cmd->args[i] =    42 /* gdspl */
-                                        | 1 << 8 /* gdr1 */
-                                        | 1 << 9 /* sdshr */
-                                        | 0 << 15; /* gdspp */
-        cs += par->metromem_cmd->args[i++];
-
-        par->metromem_cmd->args[i] =    18 /* gdspw */
-                                        | 0 << 15; /* dispc */
-        cs += par->metromem_cmd->args[i++];
-
-        par->metromem_cmd->args[i] =    599 /* vdlc */
-                                        | 0 << 11 /* dsi */
-                                        | 0 << 12; /* dsic */
-        cs += par->metromem_cmd->args[i++];
+        will try parse the command before we've set it all up */
 
+        memcpy(par->metromem_cmd->args, epd_frame_table[par->dt].config,
+                sizeof(epd_frame_table[par->dt].config));
         /* the rest are 0 */
-        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+        memset((u8 *) (par->metromem_cmd->args + 4), 0, (32-4)*2);
 
-        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->csum = 0xCC10;
+        par->metromem_cmd->csum += calc_img_cksum(par->metromem_cmd->args, 4);
         par->metromem_cmd->opcode = 0xCC10; /* config cmd */
 
         return par->board->met_wait_event(par);
@@ -408,12 +416,9 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)
 {
         int res;
 
-        par->board->init_gpio_regs(par);
-
-        par->board->init_lcdc_regs(par);
-
-        /* now that lcd is setup, setup dma descriptor */
-        par->board->post_dma_setup(par);
+        res = par->board->setup_io(par);
+        if (res)
+                return res;
 
         res = metronome_powerup_cmd(par);
         if (res)
@@ -430,16 +435,16 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)
 
 static void metronomefb_dpy_update(struct metronomefb_par *par)
 {
+        int fbsize;
         u16 cksum;
         unsigned char *buf = (unsigned char __force *)par->info->screen_base;
 
+        fbsize = par->info->fix.smem_len;
         /* copy from vm to metromem */
-        memcpy(par->metromem_img, buf, DPY_W*DPY_H);
+        memcpy(par->metromem_img, buf, fbsize);
 
-        cksum = calc_img_cksum((u16 *) par->metromem_img,
-                                (epd_frame_table[0].fw * DPY_H)/2);
-        *((u16 *)(par->metromem_img) +
-                        (epd_frame_table[0].fw * DPY_H)/2) = cksum;
+        cksum = calc_img_cksum((u16 *) par->metromem_img, fbsize/2);
+        *((u16 *)(par->metromem_img) + fbsize/2) = cksum;
         metronome_display_cmd(par);
 }
 
@@ -574,8 +579,10 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         unsigned char *videomemory;
         struct metronomefb_par *par;
         const struct firmware *fw_entry;
-        int cmd_size, wfm_size, img_size, padding_size, totalsize;
         int i;
+        int panel_type;
+        int fw, fh;
+        int epd_dt_index;
 
         /* pick up board specific routines */
         board = dev->dev.platform_data;
@@ -586,96 +593,108 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         if (!try_module_get(board->owner))
                 return -ENODEV;
 
+        info = framebuffer_alloc(sizeof(struct metronomefb_par), &dev->dev);
+        if (!info)
+                goto err;
+
         /* we have two blocks of memory.
         info->screen_base which is vm, and is the fb used by apps.
         par->metromem which is physically contiguous memory and
         contains the display controller commands, waveform,
         processed image data and padding. this is the data pulled
-        by the device's LCD controller and pushed to Metronome */
+        by the device's LCD controller and pushed to Metronome.
+        the metromem memory is allocated by the board driver and
+        is provided to us */
+
+        panel_type = board->get_panel_type();
+        switch (panel_type) {
+        case 6:
+                epd_dt_index = 0;
+                break;
+        case 8:
+                epd_dt_index = 1;
+                break;
+        case 97:
+                epd_dt_index = 2;
+                break;
+        default:
+                dev_err(&dev->dev, "Unexpected panel type. Defaulting to 6\n");
+                epd_dt_index = 0;
+                break;
+        }
+
+        fw = epd_frame_table[epd_dt_index].fw;
+        fh = epd_frame_table[epd_dt_index].fh;
 
-        videomemorysize = (DPY_W*DPY_H);
+        /* we need to add a spare page because our csum caching scheme walks
+         * to the end of the page */
+        videomemorysize = PAGE_SIZE + (fw * fh);
         videomemory = vmalloc(videomemorysize);
         if (!videomemory)
-                return -ENOMEM;
+                goto err_fb_rel;
 
         memset(videomemory, 0, videomemorysize);
 
-        info = framebuffer_alloc(sizeof(struct metronomefb_par), &dev->dev);
-        if (!info)
-                goto err_vfree;
-
         info->screen_base = (char __force __iomem *)videomemory;
         info->fbops = &metronomefb_ops;
 
+        metronomefb_fix.line_length = fw;
+        metronomefb_var.xres = fw;
+        metronomefb_var.yres = fh;
+        metronomefb_var.xres_virtual = fw;
+        metronomefb_var.yres_virtual = fh;
         info->var = metronomefb_var;
         info->fix = metronomefb_fix;
         info->fix.smem_len = videomemorysize;
         par = info->par;
         par->info = info;
         par->board = board;
+        par->dt = epd_dt_index;
         init_waitqueue_head(&par->waitq);
 
         /* this table caches per page csum values. */
         par->csum_table = vmalloc(videomemorysize/PAGE_SIZE);
         if (!par->csum_table)
+                goto err_vfree;
+
+        /* the physical framebuffer that we use is setup by
+         * the platform device driver. It will provide us
+         * with cmd, wfm and image memory in a contiguous area. */
+        retval = board->setup_fb(par);
+        if (retval) {
+                dev_err(&dev->dev, "Failed to setup fb\n");
                 goto err_csum_table;
+        }
 
-        /* the metromem buffer is divided as follows:
-        command | CRC | padding
-        16kb waveform data | CRC | padding
-        image data | CRC
-        and an extra 256 bytes for dma descriptors
-        eg: IW=832 IH=622 WS=128
-        */
-
-        cmd_size = 1 * epd_frame_table[0].fw;
-        wfm_size = ((16*1024 + 2 + epd_frame_table[0].fw - 1)
-                        / epd_frame_table[0].fw) * epd_frame_table[0].fw;
-        img_size = epd_frame_table[0].fh * epd_frame_table[0].fw;
-        padding_size = 4 * epd_frame_table[0].fw;
-        totalsize = cmd_size + wfm_size + img_size + padding_size;
-        par->metromemsize = PAGE_ALIGN(totalsize + 256);
-        DPRINTK("desired memory size = %d\n", par->metromemsize);
-        dev->dev.coherent_dma_mask = 0xffffffffull;
-        par->metromem = dma_alloc_writecombine(&dev->dev, par->metromemsize,
-                                                &par->metromem_dma, GFP_KERNEL);
-        if (!par->metromem) {
-                printk(KERN_ERR
-                        "metronomefb: unable to allocate dma buffer\n");
-                goto err_vfree;
+        /* after this point we should have a framebuffer */
+        if ((!par->metromem_wfm) ||  (!par->metromem_img) ||
+                (!par->metromem_dma)) {
+                dev_err(&dev->dev, "fb access failure\n");
+                retval = -EINVAL;
+                goto err_csum_table;
         }
 
         info->fix.smem_start = par->metromem_dma;
-        par->metromem_cmd = (struct metromem_cmd *) par->metromem;
-        par->metromem_wfm = par->metromem + cmd_size;
-        par->metromem_img = par->metromem + cmd_size + wfm_size;
-        par->metromem_img_csum = (u16 *) (par->metromem_img +
-                                        (epd_frame_table[0].fw * DPY_H));
-        DPRINTK("img offset=0x%x\n", cmd_size + wfm_size);
-        par->metromem_desc = (struct metromem_desc *) (par->metromem + cmd_size
-                                        + wfm_size + img_size + padding_size);
-        par->metromem_desc_dma = par->metromem_dma + cmd_size + wfm_size
-                                 + img_size + padding_size;
 
         /* load the waveform in. assume mode 3, temp 31 for now
                 a) request the waveform file from userspace
                 b) process waveform and decode into metromem */
         retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev);
         if (retval < 0) {
-                printk(KERN_ERR "metronomefb: couldn't get waveform\n");
-                goto err_dma_free;
+                dev_err(&dev->dev, "Failed to get waveform\n");
+                goto err_csum_table;
         }
 
-        retval = load_waveform((u8 *) fw_entry->data, fw_entry->size,
-                                par->metromem_wfm, 3, 31, &par->frame_count);
+        retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, 3, 31,
+                                par);
         release_firmware(fw_entry);
         if (retval < 0) {
-                printk(KERN_ERR "metronomefb: couldn't process waveform\n");
-                goto err_dma_free;
+                dev_err(&dev->dev, "Failed processing waveform\n");
+                goto err_csum_table;
         }
 
         if (board->setup_irq(info))
-                goto err_dma_free;
+                goto err_csum_table;
 
         retval = metronome_init_regs(par);
         if (retval < 0)
@@ -688,8 +707,8 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
         retval = fb_alloc_cmap(&info->cmap, 8, 0);
         if (retval < 0) {
-                printk(KERN_ERR "Failed to allocate colormap\n");
-                goto err_fb_rel;
+                dev_err(&dev->dev, "Failed to allocate colormap\n");
+                goto err_free_irq;
         }
 
         /* set cmap */
@@ -704,7 +723,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
         platform_set_drvdata(dev, info);
 
-        printk(KERN_INFO
+        dev_dbg(&dev->dev,
                 "fb%d: Metronome frame buffer device, using %dK of video"
                 " memory\n", info->node, videomemorysize >> 10);
 
@@ -712,17 +731,15 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
 err_cmap:
         fb_dealloc_cmap(&info->cmap);
-err_fb_rel:
-        framebuffer_release(info);
 err_free_irq:
-        board->free_irq(info);
-err_dma_free:
-        dma_free_writecombine(&dev->dev, par->metromemsize, par->metromem,
-                                par->metromem_dma);
+        board->cleanup(par);
 err_csum_table:
         vfree(par->csum_table);
 err_vfree:
         vfree(videomemory);
+err_fb_rel:
+        framebuffer_release(info);
+err:
         module_put(board->owner);
         return retval;
 }
@@ -733,15 +750,15 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
 
         if (info) {
                 struct metronomefb_par *par = info->par;
+
+                unregister_framebuffer(info);
                 fb_deferred_io_cleanup(info);
-                dma_free_writecombine(&dev->dev, par->metromemsize,
-                                        par->metromem, par->metromem_dma);
                 fb_dealloc_cmap(&info->cmap);
+                par->board->cleanup(par);
                 vfree(par->csum_table);
-                unregister_framebuffer(info);
                 vfree((void __force *)info->screen_base);
-                par->board->free_irq(info);
                 module_put(par->board->owner);
+                dev_dbg(&dev->dev, "calling release\n");
                 framebuffer_release(info);
         }
         return 0;
@@ -766,6 +783,9 @@ static void __exit metronomefb_exit(void)
         platform_driver_unregister(&metronomefb_driver);
 }
 
+module_param(user_wfm_size, uint, 0);
+MODULE_PARM_DESC(user_wfm_size, "Set custom waveform size");
+
 module_init(metronomefb_init);
 module_exit(metronomefb_exit);
 
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 5246b0402d76..bfb802d26d5a 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -201,7 +201,6 @@ static int neoFindMode(int xres, int yres, int depth)
  *
  * Determine the closest clock frequency to the one requested.
  */
-#define REF_FREQ 0xe517         /* 14.31818 in 20.12 fixed point */
 #define MAX_N 127
 #define MAX_D 31
 #define MAX_F 1
@@ -211,27 +210,24 @@ static void neoCalcVCLK(const struct fb_info *info,
 {
         int n, d, f;
         int n_best = 0, d_best = 0, f_best = 0;
-        long f_best_diff = (0x7ffff << 12);     /* 20.12 */
-        long f_target = (freq << 12) / 1000;    /* 20.12 */
+        long f_best_diff = 0x7ffff;
 
         for (f = 0; f <= MAX_F; f++)
-                for (n = 0; n <= MAX_N; n++)
-                        for (d = 0; d <= MAX_D; d++) {
-                                long f_out;     /* 20.12 */
-                                long f_diff;    /* 20.12 */
-
-                                f_out =
-                                    ((((n + 1) << 12) / ((d +
-                                                          1) *
-                                                         (1 << f))) >> 12)
-                                    * REF_FREQ;
-                                f_diff = abs(f_out - f_target);
-                                if (f_diff < f_best_diff) {
+                for (d = 0; d <= MAX_D; d++)
+                        for (n = 0; n <= MAX_N; n++) {
+                                long f_out;
+                                long f_diff;
+
+                                f_out = ((14318 * (n + 1)) / (d + 1)) >> f;
+                                f_diff = abs(f_out - freq);
+                                if (f_diff <= f_best_diff) {
                                         f_best_diff = f_diff;
                                         n_best = n;
                                         d_best = d;
                                         f_best = f;
                                 }
+                                if (f_out > freq)
+                                        break;
                         }
 
         if (info->fix.accel == FB_ACCEL_NEOMAGIC_NM2200 ||
@@ -248,11 +244,11 @@ static void neoCalcVCLK(const struct fb_info *info,
         par->VCLK3Denominator = d_best;
 
 #ifdef NEOFB_DEBUG
-        printk("neoVCLK: f:%d NumLow=%d NumHi=%d Den=%d Df=%d\n",
-               f_target >> 12,
+        printk(KERN_DEBUG "neoVCLK: f:%ld NumLow=%d NumHi=%d Den=%d Df=%ld\n",
+               freq,
                par->VCLK3NumeratorLow,
                par->VCLK3NumeratorHigh,
-               par->VCLK3Denominator, f_best_diff >> 12);
+               par->VCLK3Denominator, f_best_diff);
 #endif
 }
 
@@ -263,15 +259,20 @@ static void neoCalcVCLK(const struct fb_info *info,
  */
 
 static int vgaHWInit(const struct fb_var_screeninfo *var,
-                     const struct fb_info *info,
-                     struct neofb_par *par, struct xtimings *timings)
+                     struct neofb_par *par)
 {
+        int hsync_end = var->xres + var->right_margin + var->hsync_len;
+        int htotal = (hsync_end + var->left_margin) >> 3;
+        int vsync_start = var->yres + var->lower_margin;
+        int vsync_end = vsync_start + var->vsync_len;
+        int vtotal = vsync_end + var->upper_margin;
+
         par->MiscOutReg = 0x23;
 
-        if (!(timings->sync & FB_SYNC_HOR_HIGH_ACT))
+        if (!(var->sync & FB_SYNC_HOR_HIGH_ACT))
                 par->MiscOutReg |= 0x40;
 
-        if (!(timings->sync & FB_SYNC_VERT_HIGH_ACT))
+        if (!(var->sync & FB_SYNC_VERT_HIGH_ACT))
                 par->MiscOutReg |= 0x80;
 
         /*
@@ -286,25 +287,25 @@ static int vgaHWInit(const struct fb_var_screeninfo *var,
         /*
          * CRTC Controller
          */
-        par->CRTC[0] = (timings->HTotal >> 3) - 5;
-        par->CRTC[1] = (timings->HDisplay >> 3) - 1;
-        par->CRTC[2] = (timings->HDisplay >> 3) - 1;
-        par->CRTC[3] = (((timings->HTotal >> 3) - 1) & 0x1F) | 0x80;
-        par->CRTC[4] = (timings->HSyncStart >> 3);
-        par->CRTC[5] = ((((timings->HTotal >> 3) - 1) & 0x20) << 2)
-            | (((timings->HSyncEnd >> 3)) & 0x1F);
-        par->CRTC[6] = (timings->VTotal - 2) & 0xFF;
-        par->CRTC[7] = (((timings->VTotal - 2) & 0x100) >> 8)
-            | (((timings->VDisplay - 1) & 0x100) >> 7)
-            | ((timings->VSyncStart & 0x100) >> 6)
-            | (((timings->VDisplay - 1) & 0x100) >> 5)
-            | 0x10 | (((timings->VTotal - 2) & 0x200) >> 4)
-            | (((timings->VDisplay - 1) & 0x200) >> 3)
-            | ((timings->VSyncStart & 0x200) >> 2);
+        par->CRTC[0] = htotal - 5;
+        par->CRTC[1] = (var->xres >> 3) - 1;
+        par->CRTC[2] = (var->xres >> 3) - 1;
+        par->CRTC[3] = ((htotal - 1) & 0x1F) | 0x80;
+        par->CRTC[4] = ((var->xres + var->right_margin) >> 3);
+        par->CRTC[5] = (((htotal - 1) & 0x20) << 2)
+            | (((hsync_end >> 3)) & 0x1F);
+        par->CRTC[6] = (vtotal - 2) & 0xFF;
+        par->CRTC[7] = (((vtotal - 2) & 0x100) >> 8)
+            | (((var->yres - 1) & 0x100) >> 7)
+            | ((vsync_start & 0x100) >> 6)
+            | (((var->yres - 1) & 0x100) >> 5)
+            | 0x10 | (((vtotal - 2) & 0x200) >> 4)
+            | (((var->yres - 1) & 0x200) >> 3)
+            | ((vsync_start & 0x200) >> 2);
         par->CRTC[8] = 0x00;
-        par->CRTC[9] = (((timings->VDisplay - 1) & 0x200) >> 4) | 0x40;
+        par->CRTC[9] = (((var->yres - 1) & 0x200) >> 4) | 0x40;
 
-        if (timings->dblscan)
+        if (var->vmode & FB_VMODE_DOUBLE)
                 par->CRTC[9] |= 0x80;
 
         par->CRTC[10] = 0x00;
@@ -313,13 +314,13 @@ static int vgaHWInit(const struct fb_var_screeninfo *var,
         par->CRTC[13] = 0x00;
         par->CRTC[14] = 0x00;
         par->CRTC[15] = 0x00;
-        par->CRTC[16] = timings->VSyncStart & 0xFF;
-        par->CRTC[17] = (timings->VSyncEnd & 0x0F) | 0x20;
-        par->CRTC[18] = (timings->VDisplay - 1) & 0xFF;
+        par->CRTC[16] = vsync_start & 0xFF;
+        par->CRTC[17] = (vsync_end & 0x0F) | 0x20;
+        par->CRTC[18] = (var->yres - 1) & 0xFF;
         par->CRTC[19] = var->xres_virtual >> 4;
         par->CRTC[20] = 0x00;
-        par->CRTC[21] = (timings->VDisplay - 1) & 0xFF;
-        par->CRTC[22] = (timings->VTotal - 1) & 0xFF;
+        par->CRTC[21] = (var->yres - 1) & 0xFF;
+        par->CRTC[22] = (vtotal - 1) & 0xFF;
         par->CRTC[23] = 0xC3;
         par->CRTC[24] = 0xFF;
 
@@ -425,11 +426,11 @@ static void vgaHWProtect(int on)
 {
         unsigned char tmp;
 
+        tmp = vga_rseq(NULL, 0x01);
         if (on) {
                 /*
                  * Turn off screen and disable sequencer.
                  */
-                tmp = vga_rseq(NULL, 0x01);
                 vga_wseq(NULL, 0x00, 0x01);             /* Synchronous Reset */
                 vga_wseq(NULL, 0x01, tmp | 0x20);       /* disable the display */
 
@@ -438,7 +439,6 @@ static void vgaHWProtect(int on)
                 /*
                  * Reenable sequencer, then turn on screen.
                  */
-                tmp = vga_rseq(NULL, 0x01);
                 vga_wseq(NULL, 0x01, tmp & ~0x20);      /* reenable display */
                 vga_wseq(NULL, 0x00, 0x03);             /* clear synchronousreset */
 
@@ -483,7 +483,8 @@ static inline int neo2200_sync(struct fb_info *info)
 {
         struct neofb_par *par = info->par;
 
-        while (readl(&par->neo2200->bltStat) & 1);
+        while (readl(&par->neo2200->bltStat) & 1)
+                cpu_relax();
         return 0;
 }
 
@@ -556,14 +557,12 @@ neofb_open(struct fb_info *info, int user)
 {
         struct neofb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
         if (!par->ref_count) {
                 memset(&par->state, 0, sizeof(struct vgastate));
                 par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS;
                 save_vga(&par->state);
         }
         par->ref_count++;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -573,16 +572,13 @@ neofb_release(struct fb_info *info, int user)
 {
         struct neofb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
-        if (!par->ref_count) {
-                mutex_unlock(&par->open_lock);
+        if (!par->ref_count)
                 return -EINVAL;
-        }
+
         if (par->ref_count == 1) {
                 restore_vga(&par->state);
         }
         par->ref_count--;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -591,34 +587,14 @@ static int
 neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
         struct neofb_par *par = info->par;
-        unsigned int pixclock = var->pixclock;
-        struct xtimings timings;
         int memlen, vramlen;
         int mode_ok = 0;
 
         DBG("neofb_check_var");
 
-        if (!pixclock)
-                pixclock = 10000;       /* 10ns = 100MHz */
-        timings.pixclock = 1000000000 / pixclock;
-        if (timings.pixclock < 1)
-                timings.pixclock = 1;
-
-        if (timings.pixclock > par->maxClock)
+        if (PICOS2KHZ(var->pixclock) > par->maxClock)
                 return -EINVAL;
 
-        timings.dblscan = var->vmode & FB_VMODE_DOUBLE;
-        timings.interlaced = var->vmode & FB_VMODE_INTERLACED;
-        timings.HDisplay = var->xres;
-        timings.HSyncStart = timings.HDisplay + var->right_margin;
-        timings.HSyncEnd = timings.HSyncStart + var->hsync_len;
-        timings.HTotal = timings.HSyncEnd + var->left_margin;
-        timings.VDisplay = var->yres;
-        timings.VSyncStart = timings.VDisplay + var->lower_margin;
-        timings.VSyncEnd = timings.VSyncStart + var->vsync_len;
-        timings.VTotal = timings.VSyncEnd + var->upper_margin;
-        timings.sync = var->sync;
-
         /* Is the mode larger than the LCD panel? */
         if (par->internal_display &&
             ((var->xres > par->NeoPanelWidth) ||
@@ -666,10 +642,10 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         var->blue.msb_right = 0;
         var->transp.msb_right = 0;
 
+        var->transp.offset = 0;
+        var->transp.length = 0;
         switch (var->bits_per_pixel) {
         case 8:         /* PSEUDOCOLOUR, 256 */
-                var->transp.offset = 0;
-                var->transp.length = 0;
                 var->red.offset = 0;
                 var->red.length = 8;
                 var->green.offset = 0;
@@ -679,8 +655,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 break;
 
         case 16:                /* DIRECTCOLOUR, 64k */
-                var->transp.offset = 0;
-                var->transp.length = 0;
                 var->red.offset = 11;
                 var->red.length = 5;
                 var->green.offset = 5;
@@ -690,8 +664,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 break;
 
         case 24:                /* TRUECOLOUR, 16m */
-                var->transp.offset = 0;
-                var->transp.length = 0;
                 var->red.offset = 16;
                 var->red.length = 8;
                 var->green.offset = 8;
@@ -722,8 +694,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         if (vramlen > 4 * 1024 * 1024)
                 vramlen = 4 * 1024 * 1024;
 
-        if (var->yres_virtual < var->yres)
-                var->yres_virtual = var->yres;
         if (var->xres_virtual < var->xres)
                 var->xres_virtual = var->xres;
 
@@ -740,8 +710,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
            if it was possible. We should return -EINVAL, but I disagree */
         if (var->yres_virtual < var->yres)
                 var->yres = var->yres_virtual;
-        if (var->xres_virtual < var->xres)
-                var->xres = var->xres_virtual;
         if (var->xoffset + var->xres > var->xres_virtual)
                 var->xoffset = var->xres_virtual - var->xres;
         if (var->yoffset + var->yres > var->yres_virtual)
@@ -759,11 +727,11 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 static int neofb_set_par(struct fb_info *info)
 {
         struct neofb_par *par = info->par;
-        struct xtimings timings;
         unsigned char temp;
         int i, clock_hi = 0;
         int lcd_stretch;
         int hoffset, voffset;
+        int vsync_start, vtotal;
 
         DBG("neofb_set_par");
 
@@ -771,28 +739,15 @@ static int neofb_set_par(struct fb_info *info)
 
         vgaHWProtect(1);        /* Blank the screen */
 
-        timings.dblscan = info->var.vmode & FB_VMODE_DOUBLE;
-        timings.interlaced = info->var.vmode & FB_VMODE_INTERLACED;
-        timings.HDisplay = info->var.xres;
-        timings.HSyncStart = timings.HDisplay + info->var.right_margin;
-        timings.HSyncEnd = timings.HSyncStart + info->var.hsync_len;
-        timings.HTotal = timings.HSyncEnd + info->var.left_margin;
-        timings.VDisplay = info->var.yres;
-        timings.VSyncStart = timings.VDisplay + info->var.lower_margin;
-        timings.VSyncEnd = timings.VSyncStart + info->var.vsync_len;
-        timings.VTotal = timings.VSyncEnd + info->var.upper_margin;
-        timings.sync = info->var.sync;
-        timings.pixclock = PICOS2KHZ(info->var.pixclock);
-
-        if (timings.pixclock < 1)
-                timings.pixclock = 1;
+        vsync_start = info->var.yres + info->var.lower_margin;
+        vtotal = vsync_start + info->var.vsync_len + info->var.upper_margin;
 
         /*
          * This will allocate the datastructure and initialize all of the
          * generic VGA registers.
          */
 
-        if (vgaHWInit(&info->var, info, par, &timings))
+        if (vgaHWInit(&info->var, par))
                 return -EINVAL;
 
         /*
@@ -831,10 +786,10 @@ static int neofb_set_par(struct fb_info *info)
         par->ExtCRTDispAddr = 0x10;
 
         /* Vertical Extension */
-        par->VerticalExt = (((timings.VTotal - 2) & 0x400) >> 10)
-            | (((timings.VDisplay - 1) & 0x400) >> 9)
-            | (((timings.VSyncStart) & 0x400) >> 8)
-            | (((timings.VSyncStart) & 0x400) >> 7);
+        par->VerticalExt = (((vtotal - 2) & 0x400) >> 10)
+            | (((info->var.yres - 1) & 0x400) >> 9)
+            | (((vsync_start) & 0x400) >> 8)
+            | (((vsync_start) & 0x400) >> 7);
 
         /* Fast write bursts on unless disabled. */
         if (par->pci_burst)
@@ -995,7 +950,7 @@ static int neofb_set_par(struct fb_info *info)
          * Calculate the VCLK that most closely matches the requested dot
          * clock.
          */
-        neoCalcVCLK(info, par, timings.pixclock);
+        neoCalcVCLK(info, par, PICOS2KHZ(info->var.pixclock));
 
         /* Since we program the clocks ourselves, always use VCLK3. */
         par->MiscOutReg |= 0x0C;
@@ -1217,8 +1172,11 @@ static int neofb_set_par(struct fb_info *info)
         return 0;
 }
 
-static void neofb_update_start(struct fb_info *info,
-                               struct fb_var_screeninfo *var)
+/*
+ *    Pan or Wrap the Display
+ */
+static int neofb_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
 {
         struct neofb_par *par = info->par;
         struct vgastate *state = &par->state;
@@ -1247,35 +1205,7 @@ static void neofb_update_start(struct fb_info *info,
         vga_wgfx(state->vgabase, 0x0E, (((Base >> 16) & 0x0f) | (oldExtCRTDispAddr & 0xf0)));
 
         neoLock(state);
-}
 
-/*
- *    Pan or Wrap the Display
- */
-static int neofb_pan_display(struct fb_var_screeninfo *var,
-                             struct fb_info *info)
-{
-        u_int y_bottom;
-
-        y_bottom = var->yoffset;
-
-        if (!(var->vmode & FB_VMODE_YWRAP))
-                y_bottom += var->yres;
-
-        if (var->xoffset > (var->xres_virtual - var->xres))
-                return -EINVAL;
-        if (y_bottom > info->var.yres_virtual)
-                return -EINVAL;
-
-        neofb_update_start(info, var);
-
-        info->var.xoffset = var->xoffset;
-        info->var.yoffset = var->yoffset;
-
-        if (var->vmode & FB_VMODE_YWRAP)
-                info->var.vmode |= FB_VMODE_YWRAP;
-        else
-                info->var.vmode &= ~FB_VMODE_YWRAP;
         return 0;
 }
 
@@ -1927,9 +1857,6 @@ static int __devinit neo_init_hw(struct fb_info *info)
         int maxClock = 65000;
         int CursorMem = 1024;
         int CursorOff = 0x100;
-        int linearSize = 1024;
-        int maxWidth = 1024;
-        int maxHeight = 1024;
 
         DBG("neo_init_hw");
 
@@ -1948,81 +1875,52 @@ static int __devinit neo_init_hw(struct fb_info *info)
         case FB_ACCEL_NEOMAGIC_NM2070:
                 videoRam = 896;
                 maxClock = 65000;
-                CursorMem = 2048;
-                CursorOff = 0x100;
-                linearSize = 1024;
-                maxWidth = 1024;
-                maxHeight = 1024;
                 break;
         case FB_ACCEL_NEOMAGIC_NM2090:
         case FB_ACCEL_NEOMAGIC_NM2093:
-                videoRam = 1152;
-                maxClock = 80000;
-                CursorMem = 2048;
-                CursorOff = 0x100;
-                linearSize = 2048;
-                maxWidth = 1024;
-                maxHeight = 1024;
-                break;
         case FB_ACCEL_NEOMAGIC_NM2097:
                 videoRam = 1152;
                 maxClock = 80000;
-                CursorMem = 1024;
-                CursorOff = 0x100;
-                linearSize = 2048;
-                maxWidth = 1024;
-                maxHeight = 1024;
                 break;
         case FB_ACCEL_NEOMAGIC_NM2160:
                 videoRam = 2048;
                 maxClock = 90000;
-                CursorMem = 1024;
-                CursorOff = 0x100;
-                linearSize = 2048;
-                maxWidth = 1024;
-                maxHeight = 1024;
                 break;
         case FB_ACCEL_NEOMAGIC_NM2200:
                 videoRam = 2560;
                 maxClock = 110000;
-                CursorMem = 1024;
-                CursorOff = 0x1000;
-                linearSize = 4096;
-                maxWidth = 1280;
-                maxHeight = 1024;       /* ???? */
-
-                par->neo2200 = (Neo2200 __iomem *) par->mmio_vbase;
                 break;
         case FB_ACCEL_NEOMAGIC_NM2230:
                 videoRam = 3008;
                 maxClock = 110000;
-                CursorMem = 1024;
-                CursorOff = 0x1000;
-                linearSize = 4096;
-                maxWidth = 1280;
-                maxHeight = 1024;       /* ???? */
-
-                par->neo2200 = (Neo2200 __iomem *) par->mmio_vbase;
                 break;
         case FB_ACCEL_NEOMAGIC_NM2360:
                 videoRam = 4096;
                 maxClock = 110000;
-                CursorMem = 1024;
-                CursorOff = 0x1000;
-                linearSize = 4096;
-                maxWidth = 1280;
-                maxHeight = 1024;       /* ???? */
-
-                par->neo2200 = (Neo2200 __iomem *) par->mmio_vbase;
                 break;
         case FB_ACCEL_NEOMAGIC_NM2380:
                 videoRam = 6144;
                 maxClock = 110000;
+                break;
+        }
+        switch (info->fix.accel) {
+        case FB_ACCEL_NEOMAGIC_NM2070:
+        case FB_ACCEL_NEOMAGIC_NM2090:
+        case FB_ACCEL_NEOMAGIC_NM2093:
+                CursorMem = 2048;
+                CursorOff = 0x100;
+                break;
+        case FB_ACCEL_NEOMAGIC_NM2097:
+        case FB_ACCEL_NEOMAGIC_NM2160:
+                CursorMem = 1024;
+                CursorOff = 0x100;
+                break;
+        case FB_ACCEL_NEOMAGIC_NM2200:
+        case FB_ACCEL_NEOMAGIC_NM2230:
+        case FB_ACCEL_NEOMAGIC_NM2360:
+        case FB_ACCEL_NEOMAGIC_NM2380:
                 CursorMem = 1024;
                 CursorOff = 0x1000;
-                linearSize = 8192;
-                maxWidth = 1280;
-                maxHeight = 1024;       /* ???? */
 
                 par->neo2200 = (Neo2200 __iomem *) par->mmio_vbase;
                 break;
@@ -2036,7 +1934,7 @@ static int __devinit neo_init_hw(struct fb_info *info)
 */
         par->maxClock = maxClock;
         par->cursorOff = CursorOff;
-        return ((videoRam * 1024));
+        return videoRam * 1024;
 }
 
 
@@ -2055,7 +1953,6 @@ static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const st
 
         info->fix.accel = id->driver_data;
 
-        mutex_init(&par->open_lock);
         par->pci_burst = !nopciburst;
         par->lcd_stretch = !nostretch;
         par->libretto = libretto;
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index d7b3dcc0dc43..e1d9eeb1aeaf 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -47,6 +47,7 @@ enum {
         cmap_M3B,               /* ATI Rage Mobility M3 Head B */
         cmap_radeon,            /* ATI Radeon */
         cmap_gxt2000,           /* IBM GXT2000 */
+        cmap_avivo,             /* ATI R5xx */
 };
 
 struct offb_par {
@@ -58,26 +59,36 @@ struct offb_par {
 
 struct offb_par default_par;
 
-    /*
-     *  Interface used by the world
-     */
-
-static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-                          u_int transp, struct fb_info *info);
-static int offb_blank(int blank, struct fb_info *info);
-
 #ifdef CONFIG_PPC32
 extern boot_infos_t *boot_infos;
 #endif
 
-static struct fb_ops offb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_setcolreg   = offb_setcolreg,
-        .fb_blank       = offb_blank,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
-};
+/* Definitions used by the Avivo palette hack */
+#define AVIVO_DC_LUT_RW_SELECT                  0x6480
+#define AVIVO_DC_LUT_RW_MODE                    0x6484
+#define AVIVO_DC_LUT_RW_INDEX                   0x6488
+#define AVIVO_DC_LUT_SEQ_COLOR                  0x648c
+#define AVIVO_DC_LUT_PWL_DATA                   0x6490
+#define AVIVO_DC_LUT_30_COLOR                   0x6494
+#define AVIVO_DC_LUT_READ_PIPE_SELECT           0x6498
+#define AVIVO_DC_LUT_WRITE_EN_MASK              0x649c
+#define AVIVO_DC_LUT_AUTOFILL                   0x64a0
+
+#define AVIVO_DC_LUTA_CONTROL                   0x64c0
+#define AVIVO_DC_LUTA_BLACK_OFFSET_BLUE         0x64c4
+#define AVIVO_DC_LUTA_BLACK_OFFSET_GREEN        0x64c8
+#define AVIVO_DC_LUTA_BLACK_OFFSET_RED          0x64cc
+#define AVIVO_DC_LUTA_WHITE_OFFSET_BLUE         0x64d0
+#define AVIVO_DC_LUTA_WHITE_OFFSET_GREEN        0x64d4
+#define AVIVO_DC_LUTA_WHITE_OFFSET_RED          0x64d8
+
+#define AVIVO_DC_LUTB_CONTROL                   0x6cc0
+#define AVIVO_DC_LUTB_BLACK_OFFSET_BLUE         0x6cc4
+#define AVIVO_DC_LUTB_BLACK_OFFSET_GREEN        0x6cc8
+#define AVIVO_DC_LUTB_BLACK_OFFSET_RED          0x6ccc
+#define AVIVO_DC_LUTB_WHITE_OFFSET_BLUE         0x6cd0
+#define AVIVO_DC_LUTB_WHITE_OFFSET_GREEN        0x6cd4
+#define AVIVO_DC_LUTB_WHITE_OFFSET_RED          0x6cd8
 
     /*
      *  Set a single color register. The values supplied are already
@@ -160,6 +171,17 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                 out_le32(((unsigned __iomem *) par->cmap_adr) + regno,
                          (red << 16 | green << 8 | blue));
                 break;
+        case cmap_avivo:
+                /* Write to both LUTs for now */
+                writel(1, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                writeb(regno, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+                writel(((red) << 22) | ((green) << 12) | ((blue) << 2),
+                       par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+                writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                writeb(regno, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+                writel(((red) << 22) | ((green) << 12) | ((blue) << 2),
+                       par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+                break;
         }
 
         return 0;
@@ -216,12 +238,59 @@ static int offb_blank(int blank, struct fb_info *info)
                                 out_le32(((unsigned __iomem *) par->cmap_adr) + i,
                                          0);
                                 break;
+                        case cmap_avivo:
+                                writel(1, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                                writeb(i, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+                                writel(0, par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+                                writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                                writeb(i, par->cmap_adr + AVIVO_DC_LUT_RW_INDEX);
+                                writel(0, par->cmap_adr + AVIVO_DC_LUT_30_COLOR);
+                                break;
                         }
         } else
                 fb_set_cmap(&info->cmap, info);
         return 0;
 }
 
+static int offb_set_par(struct fb_info *info)
+{
+        struct offb_par *par = (struct offb_par *) info->par;
+
+        /* On avivo, initialize palette control */
+        if (par->cmap_type == cmap_avivo) {
+                writel(0, par->cmap_adr + AVIVO_DC_LUTA_CONTROL);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTA_BLACK_OFFSET_BLUE);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTA_BLACK_OFFSET_GREEN);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTA_BLACK_OFFSET_RED);
+                writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTA_WHITE_OFFSET_BLUE);
+                writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTA_WHITE_OFFSET_GREEN);
+                writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTA_WHITE_OFFSET_RED);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTB_CONTROL);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTB_BLACK_OFFSET_BLUE);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTB_BLACK_OFFSET_GREEN);
+                writel(0, par->cmap_adr + AVIVO_DC_LUTB_BLACK_OFFSET_RED);
+                writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTB_WHITE_OFFSET_BLUE);
+                writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTB_WHITE_OFFSET_GREEN);
+                writel(0x0000ffff, par->cmap_adr + AVIVO_DC_LUTB_WHITE_OFFSET_RED);
+                writel(1, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_MODE);
+                writel(0x0000003f, par->cmap_adr + AVIVO_DC_LUT_WRITE_EN_MASK);
+                writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_SELECT);
+                writel(0, par->cmap_adr + AVIVO_DC_LUT_RW_MODE);
+                writel(0x0000003f, par->cmap_adr + AVIVO_DC_LUT_WRITE_EN_MASK);
+        }
+        return 0;
+}
+
+static struct fb_ops offb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_setcolreg   = offb_setcolreg,
+        .fb_set_par     = offb_set_par,
+        .fb_blank       = offb_blank,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
 
 static void __iomem *offb_map_reg(struct device_node *np, int index,
                                   unsigned long offset, unsigned long size)
@@ -245,6 +314,59 @@ static void __iomem *offb_map_reg(struct device_node *np, int index,
         return ioremap(taddr + offset, size);
 }
 
+static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp,
+                                    const char *name, unsigned long address)
+{
+        struct offb_par *par = (struct offb_par *) info->par;
+
+        if (dp && !strncmp(name, "ATY,Rage128", 11)) {
+                par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+                if (par->cmap_adr)
+                        par->cmap_type = cmap_r128;
+        } else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
+                          || !strncmp(name, "ATY,RageM3p12A", 14))) {
+                par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+                if (par->cmap_adr)
+                        par->cmap_type = cmap_M3A;
+        } else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {
+                par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+                if (par->cmap_adr)
+                        par->cmap_type = cmap_M3B;
+        } else if (dp && !strncmp(name, "ATY,Rage6", 9)) {
+                par->cmap_adr = offb_map_reg(dp, 1, 0, 0x1fff);
+                if (par->cmap_adr)
+                        par->cmap_type = cmap_radeon;
+        } else if (!strncmp(name, "ATY,", 4)) {
+                unsigned long base = address & 0xff000000UL;
+                par->cmap_adr =
+                        ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
+                par->cmap_data = par->cmap_adr + 1;
+                par->cmap_type = cmap_m64;
+        } else if (dp && (of_device_is_compatible(dp, "pci1014,b7") ||
+                          of_device_is_compatible(dp, "pci1014,21c"))) {
+                par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);
+                if (par->cmap_adr)
+                        par->cmap_type = cmap_gxt2000;
+        } else if (dp && !strncmp(name, "vga,Display-", 12)) {
+                /* Look for AVIVO initialized by SLOF */
+                struct device_node *pciparent = of_get_parent(dp);
+                const u32 *vid, *did;
+                vid = of_get_property(pciparent, "vendor-id", NULL);
+                did = of_get_property(pciparent, "device-id", NULL);
+                /* This will match most R5xx */
+                if (vid && did && *vid == 0x1002 &&
+                    ((*did >= 0x7100 && *did < 0x7800) ||
+                     (*did >= 0x9400))) {
+                        par->cmap_adr = offb_map_reg(pciparent, 2, 0, 0x10000);
+                        if (par->cmap_adr)
+                                par->cmap_type = cmap_avivo;
+                }
+                of_node_put(pciparent);
+        }
+        info->fix.visual = (par->cmap_type != cmap_unknown) ?
+                FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_STATIC_PSEUDOCOLOR;
+}
+
 static void __init offb_init_fb(const char *name, const char *full_name,
                                 int width, int height, int depth,
                                 int pitch, unsigned long address,
@@ -283,6 +405,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 
         fix = &info->fix;
         var = &info->var;
+        info->par = par;
 
         strcpy(fix->id, "OFfb ");
         strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb "));
@@ -298,39 +421,9 @@ static void __init offb_init_fb(const char *name, const char *full_name,
         fix->type_aux = 0;
 
         par->cmap_type = cmap_unknown;
-        if (depth == 8) {
-                if (dp && !strncmp(name, "ATY,Rage128", 11)) {
-                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
-                        if (par->cmap_adr)
-                                par->cmap_type = cmap_r128;
-                } else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
-                                  || !strncmp(name, "ATY,RageM3p12A", 14))) {
-                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
-                        if (par->cmap_adr)
-                                par->cmap_type = cmap_M3A;
-                } else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {
-                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
-                        if (par->cmap_adr)
-                                par->cmap_type = cmap_M3B;
-                } else if (dp && !strncmp(name, "ATY,Rage6", 9)) {
-                        par->cmap_adr = offb_map_reg(dp, 1, 0, 0x1fff);
-                        if (par->cmap_adr)
-                                par->cmap_type = cmap_radeon;
-                } else if (!strncmp(name, "ATY,", 4)) {
-                        unsigned long base = address & 0xff000000UL;
-                        par->cmap_adr =
-                            ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
-                        par->cmap_data = par->cmap_adr + 1;
-                        par->cmap_type = cmap_m64;
-                } else if (dp && (of_device_is_compatible(dp, "pci1014,b7") ||
-                                  of_device_is_compatible(dp, "pci1014,21c"))) {
-                        par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);
-                        if (par->cmap_adr)
-                                par->cmap_type = cmap_gxt2000;
-                }
-                fix->visual = (par->cmap_type != cmap_unknown) ?
-                        FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_STATIC_PSEUDOCOLOR;
-        } else
+        if (depth == 8)
+                offb_init_palette_hacks(info, dp, name, address);
+        else
                 fix->visual = FB_VISUAL_TRUECOLOR;
 
         var->xoffset = var->yoffset = 0;
@@ -395,7 +488,6 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 
         info->fbops = &offb_ops;
         info->screen_base = ioremap(address, fix->smem_len);
-        info->par = par;
         info->pseudo_palette = (void *) (info + 1);
         info->flags = FBINFO_DEFAULT | foreign_endian;
 
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c
index 4d8ad9cd0e19..9dfcf39d3367 100644
--- a/drivers/video/omap/blizzard.c
+++ b/drivers/video/omap/blizzard.c
@@ -26,9 +26,9 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/blizzard.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+#include <mach/blizzard.h>
 
 #include "dispc.h"
 
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index ab32ceb06178..dfb72f5e4c96 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -20,13 +20,14 @@
  */
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/sram.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/board.h>
+#include <mach/sram.h>
+#include <mach/omapfb.h>
+#include <mach/board.h>
 
 #include "dispc.h"
 
@@ -155,7 +156,7 @@ struct resmap {
 };
 
 static struct {
-        u32             base;
+        void __iomem    *base;
 
         struct omapfb_mem_desc  mem_desc;
         struct resmap           *res_map[DISPC_MEMTYPE_NUM];
@@ -211,9 +212,9 @@ static void enable_rfbi_mode(int enable)
         dispc_write_reg(DISPC_CONTROL, l);
 
         /* Set bypass mode in RFBI module */
-        l = __raw_readl(io_p2v(RFBI_CONTROL));
+        l = __raw_readl(IO_ADDRESS(RFBI_CONTROL));
         l |= enable ? 0 : (1 << 1);
-        __raw_writel(l, io_p2v(RFBI_CONTROL));
+        __raw_writel(l, IO_ADDRESS(RFBI_CONTROL));
 }
 
 static void set_lcd_data_lines(int data_lines)
@@ -1348,14 +1349,19 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
 
         memset(&dispc, 0, sizeof(dispc));
 
-        dispc.base = io_p2v(DISPC_BASE);
+        dispc.base = ioremap(DISPC_BASE, SZ_1K);
+        if (!dispc.base) {
+                dev_err(fbdev->dev, "can't ioremap DISPC\n");
+                return -ENOMEM;
+        }
+
         dispc.fbdev = fbdev;
         dispc.ext_mode = ext_mode;
 
         init_completion(&dispc.frame_done);
 
         if ((r = get_dss_clocks()) < 0)
-                return r;
+                goto fail0;
 
         enable_interface_clocks(1);
         enable_lcd_clocks(1);
@@ -1413,7 +1419,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
         }
 
         /* L3 firewall setting: enable access to OCM RAM */
-        __raw_writel(0x402000b0, io_p2v(0x680050a0));
+        __raw_writel(0x402000b0, IO_ADDRESS(0x680050a0));
 
         if ((r = alloc_palette_ram()) < 0)
                 goto fail2;
@@ -1463,7 +1469,8 @@ fail1:
         enable_lcd_clocks(0);
         enable_interface_clocks(0);
         put_dss_clocks();
-
+fail0:
+        iounmap(dispc.base);
         return r;
 }
 
@@ -1480,6 +1487,7 @@ static void omap_dispc_cleanup(void)
         free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
         enable_interface_clocks(0);
         put_dss_clocks();
+        iounmap(dispc.base);
 }
 
 const struct lcd_ctrl omap2_int_ctrl = {
diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h
index eb1512b56ce8..ef720a78f6d5 100644
--- a/drivers/video/omap/dispc.h
+++ b/drivers/video/omap/dispc.h
@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable);
 extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
 extern void omap_dispc_free_irq(void);
 
+extern const struct lcd_ctrl omap2_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index 1e642b7a20fe..f24df0b54e1c 100644
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -26,9 +26,9 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/hwa742.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+#include <mach/hwa742.h>
 
 #define HWA742_REV_CODE_REG       0x0
 #define HWA742_CONFIG_REG         0x2
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 31e978349a80..2486237ebba5 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/tps65010.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 #define MODULE_NAME     "omapfb-lcd_h3"
 
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c
index fd6f0eb16de1..6ff56430341b 100644
--- a/drivers/video/omap/lcd_h4.c
+++ b/drivers/video/omap/lcd_h4.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel)
         return 0;
 }
 
-struct lcd_panel h4_panel = {
+static struct lcd_panel h4_panel = {
         .name           = "h4",
         .config         = OMAP_LCDC_PANEL_TFT,
 
@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver h4_panel_driver = {
+static struct platform_driver h4_panel_driver = {
         .probe          = h4_panel_probe,
         .remove         = h4_panel_remove,
         .suspend        = h4_panel_suspend,
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c
index 551f385861d1..6953ed4b5820 100644
--- a/drivers/video/omap/lcd_inn1510.c
+++ b/drivers/video/omap/lcd_inn1510.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/omapfb.h>
+#include <mach/fpga.h>
+#include <mach/omapfb.h>
 
 static int innovator1510_panel_init(struct lcd_panel *panel,
                                     struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 5ef119c813e0..4c4f7ee6d733 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -22,8 +22,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 #define MODULE_NAME     "omapfb-lcd_h3"
 
@@ -32,43 +32,43 @@ static int innovator1610_panel_init(struct lcd_panel *panel,
 {
         int r = 0;
 
-        if (omap_request_gpio(14)) {
+        if (gpio_request(14, "lcd_en0")) {
                 pr_err(MODULE_NAME ": can't request GPIO 14\n");
                 r = -1;
                 goto exit;
         }
-        if (omap_request_gpio(15)) {
+        if (gpio_request(15, "lcd_en1")) {
                 pr_err(MODULE_NAME ": can't request GPIO 15\n");
-                omap_free_gpio(14);
+                gpio_free(14);
                 r = -1;
                 goto exit;
         }
         /* configure GPIO(14, 15) as outputs */
-        omap_set_gpio_direction(14, 0);
-        omap_set_gpio_direction(15, 0);
+        gpio_direction_output(14, 0);
+        gpio_direction_output(15, 0);
 exit:
         return r;
 }
 
 static void innovator1610_panel_cleanup(struct lcd_panel *panel)
 {
-        omap_free_gpio(15);
-        omap_free_gpio(14);
+        gpio_free(15);
+        gpio_free(14);
 }
 
 static int innovator1610_panel_enable(struct lcd_panel *panel)
 {
         /* set GPIO14 and GPIO15 high */
-        omap_set_gpio_dataout(14, 1);
-        omap_set_gpio_dataout(15, 1);
+        gpio_set_value(14, 1);
+        gpio_set_value(15, 1);
         return 0;
 }
 
 static void innovator1610_panel_disable(struct lcd_panel *panel)
 {
         /* set GPIO13, GPIO14 and GPIO15 low */
-        omap_set_gpio_dataout(14, 0);
-        omap_set_gpio_dataout(15, 0);
+        gpio_set_value(14, 0);
+        gpio_set_value(15, 0);
 }
 
 static unsigned long innovator1610_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index a38038840fd6..379c96d36da5 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -23,12 +23,13 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
+        /* gpio2 was allocated in board init */
         return 0;
 }
 
@@ -47,11 +48,8 @@ static int osk_panel_enable(struct lcd_panel *panel)
         /* Set PWL level */
         omap_writeb(0xFF, OMAP_PWL_ENABLE);
 
-        /* configure GPIO2 as output */
-        omap_set_gpio_direction(2, 0);
-
-        /* set GPIO2 high */
-        omap_set_gpio_dataout(2, 1);
+        /* set GPIO2 high (lcd power enabled) */
+        gpio_set_value(2, 1);
 
         return 0;
 }
@@ -65,7 +63,7 @@ static void osk_panel_disable(struct lcd_panel *panel)
         omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
 
         /* set GPIO2 low */
-        omap_set_gpio_dataout(2, 0);
+        gpio_set_value(2, 0);
 }
 
 static unsigned long osk_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c
index 52bdfdac42c9..218317366e6e 100644
--- a/drivers/video/omap/lcd_palmte.c
+++ b/drivers/video/omap/lcd_palmte.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/omapfb.h>
+#include <mach/fpga.h>
+#include <mach/omapfb.h>
 
 static int palmte_panel_init(struct lcd_panel *panel,
                                 struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c
index 4bb349f54356..57b0f6cf6a5a 100644
--- a/drivers/video/omap/lcd_palmtt.c
+++ b/drivers/video/omap/lcd_palmtt.c
@@ -29,8 +29,8 @@ GPIO13 - screen blanking
 #include <linux/module.h>
 #include <linux/io.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 static int palmtt_panel_init(struct lcd_panel *panel,
         struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c
index ea6170ddff35..d33d78b11723 100644
--- a/drivers/video/omap/lcd_palmz71.c
+++ b/drivers/video/omap/lcd_palmz71.c
@@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 static int palmz71_panel_init(struct lcd_panel *panel,
                               struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c
index c4f306a4e5c9..e55de201b8ff 100644
--- a/drivers/video/omap/lcd_sx1.c
+++ b/drivers/video/omap/lcd_sx1.c
@@ -23,10 +23,10 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/mux.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
+#include <mach/mcbsp.h>
+#include <mach/mux.h>
 
 /*
  * OMAP310 GPIO registers
@@ -81,21 +81,21 @@ static void epson_sendbyte(int flag, unsigned char byte)
         int i, shifter = 0x80;
 
         if (!flag)
-                omap_set_gpio_dataout(_A_LCD_SSC_A0, 0);
+                gpio_set_value(_A_LCD_SSC_A0, 0);
         mdelay(2);
-        omap_set_gpio_dataout(A_LCD_SSC_RD, 1);
+        gpio_set_value(A_LCD_SSC_RD, 1);
 
-        omap_set_gpio_dataout(A_LCD_SSC_SD, flag);
+        gpio_set_value(A_LCD_SSC_SD, flag);
 
         OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
         OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
         for (i = 0; i < 8; i++) {
                 OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
-                omap_set_gpio_dataout(A_LCD_SSC_SD, shifter & byte);
+                gpio_set_value(A_LCD_SSC_SD, shifter & byte);
                 OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
                 shifter >>= 1;
         }
-        omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);
+        gpio_set_value(_A_LCD_SSC_A0, 1);
 }
 
 static void init_system(void)
@@ -107,25 +107,18 @@ static void init_system(void)
 static void setup_GPIO(void)
 {
         /* new wave */
-        omap_request_gpio(A_LCD_SSC_RD);
-        omap_request_gpio(A_LCD_SSC_SD);
-        omap_request_gpio(_A_LCD_RESET);
-        omap_request_gpio(_A_LCD_SSC_CS);
-        omap_request_gpio(_A_LCD_SSC_A0);
-
-        /* set all GPIOs to output */
-        omap_set_gpio_direction(A_LCD_SSC_RD, 0);
-        omap_set_gpio_direction(A_LCD_SSC_SD, 0);
-        omap_set_gpio_direction(_A_LCD_RESET, 0);
-        omap_set_gpio_direction(_A_LCD_SSC_CS, 0);
-        omap_set_gpio_direction(_A_LCD_SSC_A0, 0);
-
-        /* set GPIO data */
-        omap_set_gpio_dataout(A_LCD_SSC_RD, 1);
-        omap_set_gpio_dataout(A_LCD_SSC_SD, 0);
-        omap_set_gpio_dataout(_A_LCD_RESET, 0);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);
+        gpio_request(A_LCD_SSC_RD, "lcd_ssc_rd");
+        gpio_request(A_LCD_SSC_SD, "lcd_ssc_sd");
+        gpio_request(_A_LCD_RESET, "lcd_reset");
+        gpio_request(_A_LCD_SSC_CS, "lcd_ssc_cs");
+        gpio_request(_A_LCD_SSC_A0, "lcd_ssc_a0");
+
+        /* set GPIOs to output, with initial data */
+        gpio_direction_output(A_LCD_SSC_RD, 1);
+        gpio_direction_output(A_LCD_SSC_SD, 0);
+        gpio_direction_output(_A_LCD_RESET, 0);
+        gpio_direction_output(_A_LCD_SSC_CS, 1);
+        gpio_direction_output(_A_LCD_SSC_A0, 1);
 }
 
 static void display_init(void)
@@ -139,61 +132,61 @@ static void display_init(void)
         mdelay(2);
 
         /* reset LCD */
-        omap_set_gpio_dataout(A_LCD_SSC_SD, 1);
+        gpio_set_value(A_LCD_SSC_SD, 1);
         epson_sendbyte(0, 0x25);
 
-        omap_set_gpio_dataout(_A_LCD_RESET, 0);
+        gpio_set_value(_A_LCD_RESET, 0);
         mdelay(10);
-        omap_set_gpio_dataout(_A_LCD_RESET, 1);
+        gpio_set_value(_A_LCD_RESET, 1);
 
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(2);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD, phase 1 */
         epson_sendbyte(0, 0xCA);
         for (i = 0; i < 10; i++)
                 epson_sendbyte(1, INIT_1[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 2 */
         epson_sendbyte(0, 0xCB);
         for (i = 0; i < 125; i++)
                 epson_sendbyte(1, INIT_2[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 2a */
         epson_sendbyte(0, 0xCC);
         for (i = 0; i < 14; i++)
                 epson_sendbyte(1, INIT_3[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 3 */
         epson_sendbyte(0, 0xBC);
         epson_sendbyte(1, 0x08);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 4 */
         epson_sendbyte(0, 0x07);
         epson_sendbyte(1, 0x05);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 5 */
         epson_sendbyte(0, 0x94);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 6 */
         epson_sendbyte(0, 0xC6);
         epson_sendbyte(1, 0x80);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(100); /* used to be 1000 */
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 7 */
         epson_sendbyte(0, 0x16);
@@ -201,8 +194,8 @@ static void display_init(void)
         epson_sendbyte(1, 0x00);
         epson_sendbyte(1, 0xB1);
         epson_sendbyte(1, 0x00);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 8 */
         epson_sendbyte(0, 0x76);
@@ -210,12 +203,12 @@ static void display_init(void)
         epson_sendbyte(1, 0x00);
         epson_sendbyte(1, 0xDB);
         epson_sendbyte(1, 0x00);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 9 */
         epson_sendbyte(0, 0xAF);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 }
 
 static int sx1_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
@@ -231,18 +224,18 @@ static void sx1_panel_disable(struct lcd_panel *panel)
 {
         printk(KERN_INFO "SX1: LCD panel disable\n");
         sx1_setmmipower(0);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 
         epson_sendbyte(0, 0x25);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         epson_sendbyte(0, 0xAE);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(100);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         epson_sendbyte(0, 0x95);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 }
 
 static int sx1_panel_enable(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index fb19ed4992db..6e2ea7518761 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -29,11 +29,13 @@
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
 
 #include <asm/mach-types.h>
 
+#include "lcdc.h"
+
 #define MODULE_NAME                     "lcdc"
 
 #define OMAP_LCDC_BASE                  0xfffec000
diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h
index adb731e5314a..845222270db3 100644
--- a/drivers/video/omap/lcdc.h
+++ b/drivers/video/omap/lcdc.h
@@ -4,4 +4,6 @@
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);
 void omap_lcdc_free_dma_callback(void);
 
+extern const struct lcd_ctrl omap1_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 14d0f7a11145..5a5e407dc45f 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -25,17 +25,20 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <linux/platform_device.h>
+#include <linux/mm.h>
 #include <linux/uaccess.h>
 
-#include <asm/mach-types.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+
+#include "lcdc.h"
+#include "dispc.h"
 
 #define MODULE_NAME     "omapfb"
 
 static unsigned int     def_accel;
 static unsigned long    def_vram[OMAPFB_PLANE_NUM];
-static int              def_vram_cnt;
+static unsigned int     def_vram_cnt;
 static unsigned long    def_vxres;
 static unsigned long    def_vyres;
 static unsigned int     def_rotate;
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {
  * LCD panel
  * ---------------------------------------------------------------------------
  */
-extern struct lcd_ctrl omap1_int_ctrl;
-extern struct lcd_ctrl omap2_int_ctrl;
 extern struct lcd_ctrl hwa742_ctrl;
 extern struct lcd_ctrl blizzard_ctrl;
 
-static struct lcd_ctrl *ctrls[] = {
+static const struct lcd_ctrl *ctrls[] = {
 #ifdef CONFIG_ARCH_OMAP1
         &omap1_int_ctrl,
 #else
@@ -740,7 +741,7 @@ static int omapfb_update_win(struct fb_info *fbi,
         int ret;
 
         omapfb_rqueue_lock(plane->fbdev);
-        ret = omapfb_update_window_async(fbi, win, NULL, 0);
+        ret = omapfb_update_window_async(fbi, win, NULL, NULL);
         omapfb_rqueue_unlock(plane->fbdev);
 
         return ret;
@@ -768,7 +769,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi)
         win.format = 0;
 
         omapfb_rqueue_lock(fbdev);
-        r = fbdev->ctrl->update_window(fbi, &win, NULL, 0);
+        r = fbdev->ctrl->update_window(fbi, &win, NULL, NULL);
         omapfb_rqueue_unlock(fbdev);
 
         return r;
@@ -1047,7 +1048,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
                 win.height = 2;
                 win.out_width = 2;
                 win.out_height = 2;
-                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0);
+                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, NULL);
         }
         omapfb_rqueue_unlock(fbdev);
 }
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 789cfd23c36b..a13c8dcad2a8 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -27,7 +27,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 #include "dispc.h"
 
@@ -59,7 +59,7 @@
 #define DISPC_CONTROL           0x0040
 
 static struct {
-        u32             base;
+        void __iomem    *base;
         void            (*lcdc_callback)(void *data);
         void            *lcdc_callback_data;
         unsigned long   l4_khz;
@@ -518,7 +518,11 @@ static int rfbi_init(struct omapfb_device *fbdev)
         int r;
 
         rfbi.fbdev = fbdev;
-        rfbi.base = io_p2v(RFBI_BASE);
+        rfbi.base = ioremap(RFBI_BASE, SZ_1K);
+        if (!rfbi.base) {
+                dev_err(fbdev->dev, "can't ioremap RFBI\n");
+                return -ENOMEM;
+        }
 
         if ((r = rfbi_get_clocks()) < 0)
                 return r;
@@ -566,6 +570,7 @@ static void rfbi_cleanup(void)
 {
         omap_dispc_free_irq();
         rfbi_put_clocks();
+        iounmap(rfbi.base);
 }
 
 const struct lcd_ctrl_extif omap2_ext_if = {
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 81dbcf53cf0e..a76946220249 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -24,8 +24,8 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
 
 #include "lcdc.h"
 
@@ -574,7 +574,12 @@ static int sossi_init(struct omapfb_device *fbdev)
         struct clk *dpll1out_ck;
         int r;
 
-        sossi.base = (void __iomem *)IO_ADDRESS(OMAP_SOSSI_BASE);
+        sossi.base = ioremap(OMAP_SOSSI_BASE, SZ_1K);
+        if (!sossi.base) {
+                dev_err(fbdev->dev, "can't ioremap SoSSI\n");
+                return -ENOMEM;
+        }
+
         sossi.fbdev = fbdev;
         spin_lock_init(&sossi.lock);
 
@@ -646,7 +651,7 @@ static int sossi_init(struct omapfb_device *fbdev)
         sossi_write_reg(SOSSI_INIT1_REG, l);
 
         if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq,
-                             IRQT_FALLING,
+                             IRQ_TYPE_EDGE_FALLING,
              "sossi_match", sossi.fbdev->dev)) < 0) {
                 dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n");
                 goto err;
@@ -665,6 +670,7 @@ static void sossi_cleanup(void)
 {
         omap_lcdc_free_dma_callback();
         clk_put(sossi.fck);
+        iounmap(sossi.base);
 }
 
 struct lcd_ctrl_extif omap1_ext_if = {
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 9e903454ffc1..7000f2cd5854 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -349,7 +349,7 @@ static int __devexit p9100_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id p9100_match[] = {
+static const struct of_device_id p9100_match[] = {
         {
                 .name = "p9100",
         },
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 3f1ca2adda3d..c6dd924976a4 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -1746,6 +1746,7 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev)
         release_mem_region(fix->mmio_start, fix->mmio_len);
 
         pci_set_drvdata(pdev, NULL);
+        fb_dealloc_cmap(&info->cmap);
         kfree(info->pixmap.addr);
         kfree(info);
 }
diff --git a/drivers/video/pnx4008/dum.h b/drivers/video/pnx4008/dum.h
index d80a614d89ed..1234d4375d92 100644
--- a/drivers/video/pnx4008/dum.h
+++ b/drivers/video/pnx4008/dum.h
@@ -12,7 +12,7 @@
 #ifndef __PNX008_DUM_H__
 #define __PNX008_DUM_H__
 
-#include <asm/arch/platform.h>
+#include <mach/platform.h>
 
 #define PNX4008_DUMCONF_VA_BASE         IO_ADDRESS(PNX4008_DUMCONF_BASE)
 #define PNX4008_DUM_MAIN_VA_BASE        IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE)
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c
index d23bf0d659b6..2aa09bce3944 100644
--- a/drivers/video/pnx4008/sdum.c
+++ b/drivers/video/pnx4008/sdum.c
@@ -30,7 +30,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <asm/uaccess.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #include "sdum.h"
 #include "fbcommon.h"
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index dc3af1c78c56..4b5d80771904 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -1297,6 +1297,7 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
 
 static struct ps3_system_bus_driver ps3fb_driver = {
         .match_id       = PS3_MATCH_ID_GRAPHICS,
+        .match_sub_id   = PS3_MATCH_SUB_ID_FB,
         .core.name      = DEVICE_NAME,
         .core.owner     = THIS_MODULE,
         .probe          = ps3fb_probe,
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 8c863a7f654b..0a0fd48a8566 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -58,18 +58,18 @@
 
 #ifdef CONFIG_SH_DREAMCAST
 #include <asm/machvec.h>
-#include <asm/mach/sysasic.h>
+#include <mach-dreamcast/mach/sysasic.h>
 #endif
 
 #ifdef CONFIG_SH_DMA
 #include <linux/pagemap.h>
-#include <asm/mach/dma.h>
+#include <mach/dma.h>
 #include <asm/dma.h>
 #endif
 
 #ifdef CONFIG_SH_STORE_QUEUES
 #include <linux/uaccess.h>
-#include <asm/cpu/sq.h>
+#include <cpu/sq.h>
 #endif
 
 #ifndef PCI_DEVICE_ID_NEC_NEON250
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index d0746261c957..97204497d9f7 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -40,17 +41,18 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/completion.h>
+#include <linux/mutex.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/bitfield.h>
-#include <asm/arch/pxafb.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/bitfield.h>
+#include <mach/pxafb.h>
 
 /*
  * Complain if VAR is out of range.
@@ -227,6 +229,22 @@ static int pxafb_bpp_to_lccr3(struct fb_var_screeninfo *var)
         case 4:  ret = LCCR3_4BPP; break;
         case 8:  ret = LCCR3_8BPP; break;
         case 16: ret = LCCR3_16BPP; break;
+        case 24:
+                switch (var->red.length + var->green.length +
+                                var->blue.length + var->transp.length) {
+                case 18: ret = LCCR3_18BPP_P | LCCR3_PDFOR_3; break;
+                case 19: ret = LCCR3_19BPP_P; break;
+                }
+                break;
+        case 32:
+                switch (var->red.length + var->green.length +
+                                var->blue.length + var->transp.length) {
+                case 18: ret = LCCR3_18BPP | LCCR3_PDFOR_3; break;
+                case 19: ret = LCCR3_19BPP; break;
+                case 24: ret = LCCR3_24BPP | LCCR3_PDFOR_3; break;
+                case 25: ret = LCCR3_25BPP; break;
+                }
+                break;
         }
         return ret;
 }
@@ -345,6 +363,41 @@ static int pxafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 var->green.offset = 5;  var->green.length = 6;
                 var->blue.offset  = 0;  var->blue.length  = 5;
                 var->transp.offset = var->transp.length = 0;
+        } else if (var->bits_per_pixel > 16) {
+                struct pxafb_mode_info *mode;
+
+                mode = pxafb_getmode(inf, var);
+                if (!mode)
+                        return -EINVAL;
+
+                switch (mode->depth) {
+                case 18: /* RGB666 */
+                        var->transp.offset = var->transp.length     = 0;
+                        var->red.offset    = 12; var->red.length    = 6;
+                        var->green.offset  = 6;  var->green.length  = 6;
+                        var->blue.offset   = 0;  var->blue.length   = 6;
+                        break;
+                case 19: /* RGBT666 */
+                        var->transp.offset = 18; var->transp.length = 1;
+                        var->red.offset    = 12; var->red.length    = 6;
+                        var->green.offset  = 6;  var->green.length  = 6;
+                        var->blue.offset   = 0;  var->blue.length   = 6;
+                        break;
+                case 24: /* RGB888 */
+                        var->transp.offset = var->transp.length     = 0;
+                        var->red.offset    = 16; var->red.length    = 8;
+                        var->green.offset  = 8;  var->green.length  = 8;
+                        var->blue.offset   = 0;  var->blue.length   = 8;
+                        break;
+                case 25: /* RGBT888 */
+                        var->transp.offset = 24; var->transp.length = 1;
+                        var->red.offset    = 16; var->red.length    = 8;
+                        var->green.offset  = 8;  var->green.length  = 8;
+                        var->blue.offset   = 0;  var->blue.length   = 8;
+                        break;
+                default:
+                        return -EINVAL;
+                }
         } else {
                 var->red.offset = var->green.offset = 0;
                 var->blue.offset = var->transp.offset = 0;
@@ -376,7 +429,7 @@ static int pxafb_set_par(struct fb_info *info)
         struct pxafb_info *fbi = (struct pxafb_info *)info;
         struct fb_var_screeninfo *var = &info->var;
 
-        if (var->bits_per_pixel == 16)
+        if (var->bits_per_pixel >= 16)
                 fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR;
         else if (!fbi->cmap_static)
                 fbi->fb.fix.visual = FB_VISUAL_PSEUDOCOLOR;
@@ -391,7 +444,7 @@ static int pxafb_set_par(struct fb_info *info)
 
         fbi->fb.fix.line_length = var->xres_virtual *
                                   var->bits_per_pixel / 8;
-        if (var->bits_per_pixel == 16)
+        if (var->bits_per_pixel >= 16)
                 fbi->palette_size = 0;
         else
                 fbi->palette_size = var->bits_per_pixel == 1 ?
@@ -404,7 +457,7 @@ static int pxafb_set_par(struct fb_info *info)
          */
         pxafb_set_truecolor(fbi->fb.fix.visual == FB_VISUAL_TRUECOLOR);
 
-        if (fbi->fb.var.bits_per_pixel == 16)
+        if (fbi->fb.var.bits_per_pixel >= 16)
                 fb_dealloc_cmap(&fbi->fb.cmap);
         else
                 fb_alloc_cmap(&fbi->fb.cmap, 1<<fbi->fb.var.bits_per_pixel, 0);
@@ -831,6 +884,8 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var,
                 case 4:
                 case 8:
                 case 16:
+                case 24:
+                case 32:
                         break;
                 default:
                         printk(KERN_ERR "%s: invalid bit depth %d\n",
@@ -968,10 +1023,17 @@ static void pxafb_setup_gpio(struct pxafb_info *fbi)
 
         for (gpio = 58; ldd_bits; gpio++, ldd_bits--)
                 pxa_gpio_mode(gpio | GPIO_ALT_FN_2_OUT);
+        /* 18 bit interface */
+        if (fbi->fb.var.bits_per_pixel > 16) {
+                pxa_gpio_mode(86 | GPIO_ALT_FN_2_OUT);
+                pxa_gpio_mode(87 | GPIO_ALT_FN_2_OUT);
+        }
         pxa_gpio_mode(GPIO74_LCD_FCLK_MD);
         pxa_gpio_mode(GPIO75_LCD_LCLK_MD);
         pxa_gpio_mode(GPIO76_LCD_PCLK_MD);
-        pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD);
+
+        if ((lccr0 & LCCR0_PAS) == 0)
+                pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD);
 }
 
 static void pxafb_enable_controller(struct pxafb_info *fbi)
@@ -1058,7 +1120,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state)
 {
         u_int old_state;
 
-        down(&fbi->ctrlr_sem);
+        mutex_lock(&fbi->ctrlr_lock);
 
         old_state = fbi->state;
 
@@ -1146,7 +1208,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state)
                 }
                 break;
         }
-        up(&fbi->ctrlr_sem);
+        mutex_unlock(&fbi->ctrlr_lock);
 }
 
 /*
@@ -1276,7 +1338,7 @@ static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
                 fbi->dma_buff_phys = fbi->map_dma;
                 fbi->palette_cpu = (u16 *) fbi->dma_buff->palette;
 
-                pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16));
+                pr_debug("pxafb: palette_mem_size = 0x%08x\n", fbi->palette_size*sizeof(u16));
 
 #ifdef CONFIG_FB_PXA_SMARTPANEL
                 fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff;
@@ -1340,6 +1402,8 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi,
         if (lcd_conn == LCD_MONO_STN_8BPP)
                 fbi->lccr0 |= LCCR0_DPD;
 
+        fbi->lccr0 |= (lcd_conn & LCD_ALTERNATE_MAPPING) ? LCCR0_LDDALT : 0;
+
         fbi->lccr3 = LCCR3_Acb((inf->lcd_conn >> 10) & 0xff);
         fbi->lccr3 |= (lcd_conn & LCD_BIAS_ACTIVE_LOW) ? LCCR3_OEP : 0;
         fbi->lccr3 |= (lcd_conn & LCD_PCLK_EDGE_FALL)  ? LCCR3_PCP : 0;
@@ -1399,7 +1463,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
 
         init_waitqueue_head(&fbi->ctrlr_wait);
         INIT_WORK(&fbi->task, pxafb_task);
-        init_MUTEX(&fbi->ctrlr_sem);
+        mutex_init(&fbi->ctrlr_lock);
         init_completion(&fbi->disable_done);
 #ifdef CONFIG_FB_PXA_SMARTPANEL
         init_completion(&fbi->command_done);
@@ -1613,53 +1677,63 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
 #define pxafb_setup_options()           (0)
 #endif
 
-static int __devinit pxafb_probe(struct platform_device *dev)
-{
-        struct pxafb_info *fbi;
-        struct pxafb_mach_info *inf;
-        struct resource *r;
-        int irq, ret;
-
-        dev_dbg(&dev->dev, "pxafb_probe\n");
-
-        inf = dev->dev.platform_data;
-        ret = -ENOMEM;
-        fbi = NULL;
-        if (!inf)
-                goto failed;
-
-        ret = pxafb_parse_options(&dev->dev, g_options);
-        if (ret < 0)
-                goto failed;
-
 #ifdef DEBUG_VAR
-        /* Check for various illegal bit-combinations. Currently only
-         * a warning is given. */
+/* Check for various illegal bit-combinations. Currently only
+ * a warning is given. */
+static void __devinit pxafb_check_options(struct device *dev,
+                                          struct pxafb_mach_info *inf)
+{
+        if (inf->lcd_conn)
+                return;
 
         if (inf->lccr0 & LCCR0_INVALID_CONFIG_MASK)
-                dev_warn(&dev->dev, "machine LCCR0 setting contains "
+                dev_warn(dev, "machine LCCR0 setting contains "
                                 "illegal bits: %08x\n",
                         inf->lccr0 & LCCR0_INVALID_CONFIG_MASK);
         if (inf->lccr3 & LCCR3_INVALID_CONFIG_MASK)
-                dev_warn(&dev->dev, "machine LCCR3 setting contains "
+                dev_warn(dev, "machine LCCR3 setting contains "
                                 "illegal bits: %08x\n",
                         inf->lccr3 & LCCR3_INVALID_CONFIG_MASK);
         if (inf->lccr0 & LCCR0_DPD &&
             ((inf->lccr0 & LCCR0_PAS) != LCCR0_Pas ||
              (inf->lccr0 & LCCR0_SDS) != LCCR0_Sngl ||
              (inf->lccr0 & LCCR0_CMS) != LCCR0_Mono))
-                dev_warn(&dev->dev, "Double Pixel Data (DPD) mode is "
+                dev_warn(dev, "Double Pixel Data (DPD) mode is "
                                 "only valid in passive mono"
                                 " single panel mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Act &&
             (inf->lccr0 & LCCR0_SDS) == LCCR0_Dual)
-                dev_warn(&dev->dev, "Dual panel only valid in passive mode\n");
+                dev_warn(dev, "Dual panel only valid in passive mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Pas &&
              (inf->modes->upper_margin || inf->modes->lower_margin))
-                dev_warn(&dev->dev, "Upper and lower margins must be 0 in "
+                dev_warn(dev, "Upper and lower margins must be 0 in "
                                 "passive mode\n");
+}
+#else
+#define pxafb_check_options(...)        do {} while (0)
 #endif
 
+static int __devinit pxafb_probe(struct platform_device *dev)
+{
+        struct pxafb_info *fbi;
+        struct pxafb_mach_info *inf;
+        struct resource *r;
+        int irq, ret;
+
+        dev_dbg(&dev->dev, "pxafb_probe\n");
+
+        inf = dev->dev.platform_data;
+        ret = -ENOMEM;
+        fbi = NULL;
+        if (!inf)
+                goto failed;
+
+        ret = pxafb_parse_options(&dev->dev, g_options);
+        if (ret < 0)
+                goto failed;
+
+        pxafb_check_options(&dev->dev, inf);
+
         dev_dbg(&dev->dev, "got a %dx%dx%d LCD\n",
                         inf->modes->xres,
                         inf->modes->yres,
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h
index 8238dc826429..31541b86f13d 100644
--- a/drivers/video/pxafb.h
+++ b/drivers/video/pxafb.h
@@ -106,7 +106,7 @@ struct pxafb_info {
 
         volatile u_char         state;
         volatile u_char         task_state;
-        struct semaphore        ctrlr_sem;
+        struct mutex            ctrlr_lock;
         wait_queue_head_t       ctrlr_wait;
         struct work_struct      task;
 
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index b829dc7c5edf..a7b01d2724b5 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -50,6 +50,11 @@
 #define dbg(fmt, args...) do { } while (0)
 #endif
 
+static const int __devinitconst s1d13xxxfb_revisions[] = {
+        S1D13506_CHIP_REV,      /* Rev.4 on HP Jornada 7xx S1D13506 */
+        S1D13806_CHIP_REV,      /* Rev.7 on .. */
+};
+
 /*
  * Here we define the default struct fb_fix_screeninfo
  */
@@ -538,6 +543,7 @@ s1d13xxxfb_probe(struct platform_device *pdev)
         struct fb_info *info;
         struct s1d13xxxfb_pdata *pdata = NULL;
         int ret = 0;
+        int i;
         u8 revision;
 
         dbg("probe called: device is %p\n", pdev);
@@ -607,10 +613,19 @@ s1d13xxxfb_probe(struct platform_device *pdev)
                 goto bail;
         }
 
-        revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE);
-        if ((revision >> 2) != S1D_CHIP_REV) {
-                printk(KERN_INFO PFX "chip not found: %i\n", (revision >> 2));
-                ret = -ENODEV;
+        revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE) >> 2;
+
+        ret = -ENODEV;
+
+        for (i = 0; i < ARRAY_SIZE(s1d13xxxfb_revisions); i++) {
+                if (revision == s1d13xxxfb_revisions[i])
+                        ret = 0;
+        }
+
+        if (!ret)
+                printk(KERN_INFO PFX "chip revision %i\n", revision);
+        else {
+                printk(KERN_INFO PFX "unknown chip revision %i\n", revision);
                 goto bail;
         }
 
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index f0598961c6b0..79cf0b1976aa 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -29,9 +29,9 @@
 #include <asm/div64.h>
 
 #include <asm/mach/map.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/fb.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/fb.h>
 
 #ifdef CONFIG_PM
 #include <linux/pm.h>
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 2972f112dbed..4dcec48a1d78 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -11,7 +11,6 @@
  * which is based on the code of neofb.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -903,13 +902,13 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         /* Prepare PCI device */
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(info->dev, "cannot enable PCI device\n");
+                dev_err(info->device, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "s3fb");
         if (rc < 0) {
-                dev_err(info->dev, "cannot reserve framebuffer region\n");
+                dev_err(info->device, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
@@ -921,7 +920,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for framebuffer failed\n");
+                dev_err(info->device, "iomap for framebuffer failed\n");
                 goto err_iomap;
         }
 
@@ -965,19 +964,19 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(info->dev, "mode %s not found\n", mode_option);
+                dev_err(info->device, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(info->dev, "cannot allocate colormap\n");
+                dev_err(info->device, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(info->dev, "cannot register framebuffer\n");
+                dev_err(info->device, "cannot register framebuffer\n");
                 goto err_reg_fb;
         }
 
@@ -1053,7 +1052,7 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct s3fb_info *par = info->par;
 
-        dev_info(info->dev, "suspend\n");
+        dev_info(info->device, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1085,7 +1084,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         struct s3fb_info *par = info->par;
         int err;
 
-        dev_info(info->dev, "resume\n");
+        dev_info(info->device, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1102,7 +1101,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         if (err) {
                 mutex_unlock(&(par->open_lock));
                 release_console_sem();
-                dev_err(info->dev, "error %d enabling device for resume\n", err);
+                dev_err(info->device, "error %d enabling device for resume\n", err);
                 return err;
         }
         pci_set_master(dev);
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index ab2b2110478b..c052bd4c0b06 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -167,6 +167,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -174,12 +175,13 @@
 #include <linux/cpufreq.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/mutex.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/assabet.h>
-#include <asm/arch/shannon.h>
+#include <mach/assabet.h>
+#include <mach/shannon.h>
 
 /*
  * debugging?
@@ -1107,7 +1109,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
 {
         u_int old_state;
 
-        down(&fbi->ctrlr_sem);
+        mutex_lock(&fbi->ctrlr_lock);
 
         old_state = fbi->state;
 
@@ -1192,7 +1194,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
                 }
                 break;
         }
-        up(&fbi->ctrlr_sem);
+        mutex_unlock(&fbi->ctrlr_lock);
 }
 
 /*
@@ -1444,7 +1446,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
 
         init_waitqueue_head(&fbi->ctrlr_wait);
         INIT_WORK(&fbi->task, sa1100fb_task);
-        init_MUTEX(&fbi->ctrlr_sem);
+        mutex_init(&fbi->ctrlr_lock);
 
         return fbi;
 }
diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
index f465b27ed860..86831db9a042 100644
--- a/drivers/video/sa1100fb.h
+++ b/drivers/video/sa1100fb.h
@@ -100,7 +100,7 @@ struct sa1100fb_info {
 
         volatile u_char         state;
         volatile u_char         task_state;
-        struct semaphore        ctrlr_sem;
+        struct mutex            ctrlr_lock;
         wait_queue_head_t       ctrlr_wait;
         struct work_struct      task;
 
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
new file mode 100644
index 000000000000..8d0212da4514
--- /dev/null
+++ b/drivers/video/sh7760fb.c
@@ -0,0 +1,659 @@
+/*
+ * SH7760/SH7763 LCDC Framebuffer driver.
+ *
+ * (c) 2006-2008 MSC Vertriebsges.m.b.H.,
+ *             Manuel Lauss <mano@roarinelk.homelinux.net>
+ * (c) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.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.
+ *
+ * PLEASE HAVE A LOOK AT Documentation/fb/sh7760fb.txt!
+ *
+ * Thanks to Siegfried Schaefer <s.schaefer at schaefer-edv.de>
+ *     for his original source and testing!
+ */
+
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/fb.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/sh7760fb.h>
+
+struct sh7760fb_par {
+        void __iomem *base;
+        int irq;
+
+        struct sh7760fb_platdata *pd;   /* display information */
+
+        dma_addr_t fbdma;       /* physical address */
+
+        int rot;                /* rotation enabled? */
+
+        u32 pseudo_palette[16];
+
+        struct platform_device *dev;
+        struct resource *ioarea;
+        struct completion vsync;        /* vsync irq event */
+};
+
+static irqreturn_t sh7760fb_irq(int irq, void *data)
+{
+        struct completion *c = data;
+
+        complete(c);
+
+        return IRQ_HANDLED;
+}
+
+static void sh7760fb_wait_vsync(struct fb_info *info)
+{
+        struct sh7760fb_par *par = info->par;
+
+        if (par->pd->novsync)
+                return;
+
+        iowrite16(ioread16(par->base + LDINTR) & ~VINT_CHECK,
+                  par->base + LDINTR);
+
+        if (par->irq < 0) {
+                /* poll for vert. retrace: status bit is sticky */
+                while (!(ioread16(par->base + LDINTR) & VINT_CHECK))
+                        cpu_relax();
+        } else {
+                /* a "wait_for_irq_event(par->irq)" would be extremely nice */
+                init_completion(&par->vsync);
+                enable_irq(par->irq);
+                wait_for_completion(&par->vsync);
+                disable_irq_nosync(par->irq);
+        }
+}
+
+/* wait_for_lps - wait until power supply has reached a certain state. */
+static int wait_for_lps(struct sh7760fb_par *par, int val)
+{
+        int i = 100;
+        while (--i && ((ioread16(par->base + LDPMMR) & 3) != val))
+                msleep(1);
+
+        if (i <= 0)
+                return -ETIMEDOUT;
+
+        return 0;
+}
+
+/* en/disable the LCDC */
+static int sh7760fb_blank(int blank, struct fb_info *info)
+{
+        struct sh7760fb_par *par = info->par;
+        struct sh7760fb_platdata *pd = par->pd;
+        unsigned short cntr = ioread16(par->base + LDCNTR);
+        unsigned short intr = ioread16(par->base + LDINTR);
+        int lps;
+
+        if (blank == FB_BLANK_UNBLANK) {
+                intr |= VINT_START;
+                cntr = LDCNTR_DON2 | LDCNTR_DON;
+                lps = 3;
+        } else {
+                intr &= ~VINT_START;
+                cntr = LDCNTR_DON2;
+                lps = 0;
+        }
+
+        if (pd->blank)
+                pd->blank(blank);
+
+        iowrite16(intr, par->base + LDINTR);
+        iowrite16(cntr, par->base + LDCNTR);
+
+        return wait_for_lps(par, lps);
+}
+
+/* set color registers */
+static int sh7760fb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+        struct sh7760fb_par *par = info->par;
+        u32 s = cmap->start;
+        u32 l = cmap->len;
+        u16 *r = cmap->red;
+        u16 *g = cmap->green;
+        u16 *b = cmap->blue;
+        u32 col, tmo;
+        int ret;
+
+        ret = 0;
+
+        sh7760fb_wait_vsync(info);
+
+        /* request palette access */
+        iowrite16(LDPALCR_PALEN, par->base + LDPALCR);
+
+        /* poll for access grant */
+        tmo = 100;
+        while (!(ioread16(par->base + LDPALCR) & LDPALCR_PALS) && (--tmo))
+                cpu_relax();
+
+        if (!tmo) {
+                ret = 1;
+                dev_dbg(info->dev, "no palette access!\n");
+                goto out;
+        }
+
+        while (l && (s < 256)) {
+                col = ((*r) & 0xff) << 16;
+                col |= ((*g) & 0xff) << 8;
+                col |= ((*b) & 0xff);
+                col &= SH7760FB_PALETTE_MASK;
+                iowrite32(col, par->base + LDPR(s));
+
+                if (s < 16)
+                        ((u32 *) (info->pseudo_palette))[s] = s;
+
+                s++;
+                l--;
+                r++;
+                g++;
+                b++;
+        }
+out:
+        iowrite16(0, par->base + LDPALCR);
+        return ret;
+}
+
+static void encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info,
+                       unsigned long stride)
+{
+        memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+        strcpy(fix->id, "sh7760-lcdc");
+
+        fix->smem_start = (unsigned long)info->screen_base;
+        fix->smem_len = info->screen_size;
+
+        fix->line_length = stride;
+}
+
+static int sh7760fb_get_color_info(struct device *dev,
+                                   u16 lddfr, int *bpp, int *gray)
+{
+        int lbpp, lgray;
+
+        lgray = lbpp = 0;
+
+        switch (lddfr & LDDFR_COLOR_MASK) {
+        case LDDFR_1BPP_MONO:
+                lgray = 1;
+                lbpp = 1;
+                break;
+        case LDDFR_2BPP_MONO:
+                lgray = 1;
+                lbpp = 2;
+                break;
+        case LDDFR_4BPP_MONO:
+                lgray = 1;
+        case LDDFR_4BPP:
+                lbpp = 4;
+                break;
+        case LDDFR_6BPP_MONO:
+                lgray = 1;
+        case LDDFR_8BPP:
+                lbpp = 8;
+                break;
+        case LDDFR_16BPP_RGB555:
+        case LDDFR_16BPP_RGB565:
+                lbpp = 16;
+                lgray = 0;
+                break;
+        default:
+                dev_dbg(dev, "unsupported LDDFR bit depth.\n");
+                return -EINVAL;
+        }
+
+        if (bpp)
+                *bpp = lbpp;
+        if (gray)
+                *gray = lgray;
+
+        return 0;
+}
+
+static int sh7760fb_check_var(struct fb_var_screeninfo *var,
+                              struct fb_info *info)
+{
+        struct fb_fix_screeninfo *fix = &info->fix;
+        struct sh7760fb_par *par = info->par;
+        int ret, bpp;
+
+        /* get color info from register value */
+        ret = sh7760fb_get_color_info(info->dev, par->pd->lddfr, &bpp, NULL);
+        if (ret)
+                return ret;
+
+        var->bits_per_pixel = bpp;
+
+        if ((var->grayscale) && (var->bits_per_pixel == 1))
+                fix->visual = FB_VISUAL_MONO10;
+        else if (var->bits_per_pixel >= 15)
+                fix->visual = FB_VISUAL_TRUECOLOR;
+        else
+                fix->visual = FB_VISUAL_PSEUDOCOLOR;
+
+        /* TODO: add some more validation here */
+        return 0;
+}
+
+/*
+ * sh7760fb_set_par - set videomode.
+ *
+ * NOTE: The rotation, grayscale and DSTN codepaths are
+ *     totally untested!
+ */
+static int sh7760fb_set_par(struct fb_info *info)
+{
+        struct sh7760fb_par *par = info->par;
+        struct fb_videomode *vm = par->pd->def_mode;
+        unsigned long sbase, dstn_off, ldsarl, stride;
+        unsigned short hsynp, hsynw, htcn, hdcn;
+        unsigned short vsynp, vsynw, vtln, vdln;
+        unsigned short lddfr, ldmtr;
+        int ret, bpp, gray;
+
+        par->rot = par->pd->rotate;
+
+        /* rotate only works with xres <= 320 */
+        if (par->rot && (vm->xres > 320)) {
+                dev_dbg(info->dev, "rotation disabled due to display size\n");
+                par->rot = 0;
+        }
+
+        /* calculate LCDC reg vals from display parameters */
+        hsynp = vm->right_margin + vm->xres;
+        hsynw = vm->hsync_len;
+        htcn = vm->left_margin + hsynp + hsynw;
+        hdcn = vm->xres;
+        vsynp = vm->lower_margin + vm->yres;
+        vsynw = vm->vsync_len;
+        vtln = vm->upper_margin + vsynp + vsynw;
+        vdln = vm->yres;
+
+        /* get color info from register value */
+        ret = sh7760fb_get_color_info(info->dev, par->pd->lddfr, &bpp, &gray);
+        if (ret)
+                return ret;
+
+        dev_dbg(info->dev, "%dx%d %dbpp %s (orientation %s)\n", hdcn,
+                vdln, bpp, gray ? "grayscale" : "color",
+                par->rot ? "rotated" : "normal");
+
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+        lddfr = par->pd->lddfr | (1 << 8);
+#else
+        lddfr = par->pd->lddfr & ~(1 << 8);
+#endif
+
+        ldmtr = par->pd->ldmtr;
+
+        if (!(vm->sync & FB_SYNC_HOR_HIGH_ACT))
+                ldmtr |= LDMTR_CL1POL;
+        if (!(vm->sync & FB_SYNC_VERT_HIGH_ACT))
+                ldmtr |= LDMTR_FLMPOL;
+
+        /* shut down LCDC before changing display parameters */
+        sh7760fb_blank(FB_BLANK_POWERDOWN, info);
+
+        iowrite16(par->pd->ldickr, par->base + LDICKR); /* pixclock */
+        iowrite16(ldmtr, par->base + LDMTR);    /* polarities */
+        iowrite16(lddfr, par->base + LDDFR);    /* color/depth */
+        iowrite16((par->rot ? 1 << 13 : 0), par->base + LDSMR); /* rotate */
+        iowrite16(par->pd->ldpmmr, par->base + LDPMMR); /* Power Management */
+        iowrite16(par->pd->ldpspr, par->base + LDPSPR); /* Power Supply Ctrl */
+
+        /* display resolution */
+        iowrite16(((htcn >> 3) - 1) | (((hdcn >> 3) - 1) << 8),
+                  par->base + LDHCNR);
+        iowrite16(vdln - 1, par->base + LDVDLNR);
+        iowrite16(vtln - 1, par->base + LDVTLNR);
+        /* h/v sync signals */
+        iowrite16((vsynp - 1) | ((vsynw - 1) << 12), par->base + LDVSYNR);
+        iowrite16(((hsynp >> 3) - 1) | (((hsynw >> 3) - 1) << 12),
+                  par->base + LDHSYNR);
+        /* AC modulation sig */
+        iowrite16(par->pd->ldaclnr, par->base + LDACLNR);
+
+        stride = (par->rot) ? vtln : hdcn;
+        if (!gray)
+                stride *= (bpp + 7) >> 3;
+        else {
+                if (bpp == 1)
+                        stride >>= 3;
+                else if (bpp == 2)
+                        stride >>= 2;
+                else if (bpp == 4)
+                        stride >>= 1;
+                /* 6 bpp == 8 bpp */
+        }
+
+        /* if rotated, stride must be power of 2 */
+        if (par->rot) {
+                unsigned long bit = 1 << 31;
+                while (bit) {
+                        if (stride & bit)
+                                break;
+                        bit >>= 1;
+                }
+                if (stride & ~bit)
+                        stride = bit << 1;      /* not P-o-2, round up */
+        }
+        iowrite16(stride, par->base + LDLAOR);
+
+        /* set display mem start address */
+        sbase = (unsigned long)par->fbdma;
+        if (par->rot)
+                sbase += (hdcn - 1) * stride;
+
+        iowrite32(sbase, par->base + LDSARU);
+
+        /*
+         * for DSTN need to set address for lower half.
+         * I (mlau) don't know which address to set it to,
+         * so I guessed at (stride * yres/2).
+         */
+        if (((ldmtr & 0x003f) >= LDMTR_DSTN_MONO_8) &&
+            ((ldmtr & 0x003f) <= LDMTR_DSTN_COLOR_16)) {
+
+                dev_dbg(info->dev, " ***** DSTN untested! *****\n");
+
+                dstn_off = stride;
+                if (par->rot)
+                        dstn_off *= hdcn >> 1;
+                else
+                        dstn_off *= vdln >> 1;
+
+                ldsarl = sbase + dstn_off;
+        } else
+                ldsarl = 0;
+
+        iowrite32(ldsarl, par->base + LDSARL);  /* mem for lower half of DSTN */
+
+        encode_fix(&info->fix, info, stride);
+        sh7760fb_check_var(&info->var, info);
+
+        sh7760fb_blank(FB_BLANK_UNBLANK, info); /* panel on! */
+
+        dev_dbg(info->dev, "hdcn  : %6d htcn  : %6d\n", hdcn, htcn);
+        dev_dbg(info->dev, "hsynw : %6d hsynp : %6d\n", hsynw, hsynp);
+        dev_dbg(info->dev, "vdln  : %6d vtln  : %6d\n", vdln, vtln);
+        dev_dbg(info->dev, "vsynw : %6d vsynp : %6d\n", vsynw, vsynp);
+        dev_dbg(info->dev, "clksrc: %6d clkdiv: %6d\n",
+                (par->pd->ldickr >> 12) & 3, par->pd->ldickr & 0x1f);
+        dev_dbg(info->dev, "ldpmmr: 0x%04x ldpspr: 0x%04x\n", par->pd->ldpmmr,
+                par->pd->ldpspr);
+        dev_dbg(info->dev, "ldmtr : 0x%04x lddfr : 0x%04x\n", ldmtr, lddfr);
+        dev_dbg(info->dev, "ldlaor: %ld\n", stride);
+        dev_dbg(info->dev, "ldsaru: 0x%08lx ldsarl: 0x%08lx\n", sbase, ldsarl);
+
+        return 0;
+}
+
+static struct fb_ops sh7760fb_ops = {
+        .owner = THIS_MODULE,
+        .fb_blank = sh7760fb_blank,
+        .fb_check_var = sh7760fb_check_var,
+        .fb_setcmap = sh7760fb_setcmap,
+        .fb_set_par = sh7760fb_set_par,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+};
+
+static void sh7760fb_free_mem(struct fb_info *info)
+{
+        struct sh7760fb_par *par = info->par;
+
+        if (!info->screen_base)
+                return;
+
+        dma_free_coherent(info->dev, info->screen_size,
+                          info->screen_base, par->fbdma);
+
+        par->fbdma = 0;
+        info->screen_base = NULL;
+        info->screen_size = 0;
+}
+
+/* allocate the framebuffer memory. This memory must be in Area3,
+ * (dictated by the DMA engine) and contiguous, at a 512 byte boundary.
+ */
+static int sh7760fb_alloc_mem(struct fb_info *info)
+{
+        struct sh7760fb_par *par = info->par;
+        void *fbmem;
+        unsigned long vram;
+        int ret, bpp;
+
+        if (info->screen_base)
+                return 0;
+
+        /* get color info from register value */
+        ret = sh7760fb_get_color_info(info->dev, par->pd->lddfr, &bpp, NULL);
+        if (ret) {
+                printk(KERN_ERR "colinfo\n");
+                return ret;
+        }
+
+        /* min VRAM: xres_min = 16, yres_min = 1, bpp = 1: 2byte -> 1 page
+           max VRAM: xres_max = 1024, yres_max = 1024, bpp = 16: 2MB */
+
+        vram = info->var.xres * info->var.yres;
+        if (info->var.grayscale) {
+                if (bpp == 1)
+                        vram >>= 3;
+                else if (bpp == 2)
+                        vram >>= 2;
+                else if (bpp == 4)
+                        vram >>= 1;
+        } else if (bpp > 8)
+                vram *= 2;
+        if ((vram < 1) || (vram > 1024 * 2048)) {
+                dev_dbg(info->dev, "too much VRAM required. Check settings\n");
+                return -ENODEV;
+        }
+
+        if (vram < PAGE_SIZE)
+                vram = PAGE_SIZE;
+
+        fbmem = dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL);
+
+        if (!fbmem)
+                return -ENOMEM;
+
+        if ((par->fbdma & SH7760FB_DMA_MASK) != SH7760FB_DMA_MASK) {
+                sh7760fb_free_mem(info);
+                dev_err(info->dev, "kernel gave me memory at 0x%08lx, which is"
+                        "unusable for the LCDC\n", (unsigned long)par->fbdma);
+                return -ENOMEM;
+        }
+
+        info->screen_base = fbmem;
+        info->screen_size = vram;
+
+        return 0;
+}
+
+static int __devinit sh7760fb_probe(struct platform_device *pdev)
+{
+        struct fb_info *info;
+        struct resource *res;
+        struct sh7760fb_par *par;
+        int ret;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (unlikely(res == NULL)) {
+                dev_err(&pdev->dev, "invalid resource\n");
+                return -EINVAL;
+        }
+
+        info = framebuffer_alloc(sizeof(struct sh7760fb_par), &pdev->dev);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->dev = pdev;
+
+        par->pd = pdev->dev.platform_data;
+        if (!par->pd) {
+                dev_dbg(info->dev, "no display setup data!\n");
+                ret = -ENODEV;
+                goto out_fb;
+        }
+
+        par->ioarea = request_mem_region(res->start,
+                                         (res->end - res->start), pdev->name);
+        if (!par->ioarea) {
+                dev_err(&pdev->dev, "mmio area busy\n");
+                ret = -EBUSY;
+                goto out_fb;
+        }
+
+        par->base = ioremap_nocache(res->start, res->end - res->start + 1);
+        if (!par->base) {
+                dev_err(&pdev->dev, "cannot remap\n");
+                ret = -ENODEV;
+                goto out_res;
+        }
+
+        iowrite16(0, par->base + LDINTR);       /* disable vsync irq */
+        par->irq = platform_get_irq(pdev, 0);
+        if (par->irq >= 0) {
+                ret = request_irq(par->irq, sh7760fb_irq, 0,
+                                  "sh7760-lcdc", &par->vsync);
+                if (ret) {
+                        dev_err(&pdev->dev, "cannot grab IRQ\n");
+                        par->irq = -ENXIO;
+                } else
+                        disable_irq_nosync(par->irq);
+        }
+
+        fb_videomode_to_var(&info->var, par->pd->def_mode);
+
+        ret = sh7760fb_alloc_mem(info);
+        if (ret) {
+                dev_dbg(info->dev, "framebuffer memory allocation failed!\n");
+                goto out_unmap;
+        }
+
+        info->pseudo_palette = par->pseudo_palette;
+
+        /* fixup color register bitpositions. These are fixed by hardware */
+        info->var.red.offset = 11;
+        info->var.red.length = 5;
+        info->var.red.msb_right = 0;
+
+        info->var.green.offset = 5;
+        info->var.green.length = 6;
+        info->var.green.msb_right = 0;
+
+        info->var.blue.offset = 0;
+        info->var.blue.length = 5;
+        info->var.blue.msb_right = 0;
+
+        info->var.transp.offset = 0;
+        info->var.transp.length = 0;
+        info->var.transp.msb_right = 0;
+
+        /* set the DON2 bit now, before cmap allocation, as it will randomize
+         * palette memory.
+         */
+        iowrite16(LDCNTR_DON2, par->base + LDCNTR);
+        info->fbops = &sh7760fb_ops;
+
+        ret = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (ret) {
+                dev_dbg(info->dev, "Unable to allocate cmap memory\n");
+                goto out_mem;
+        }
+
+        ret = register_framebuffer(info);
+        if (ret < 0) {
+                dev_dbg(info->dev, "cannot register fb!\n");
+                goto out_cmap;
+        }
+        platform_set_drvdata(pdev, info);
+
+        printk(KERN_INFO "%s: memory at phys 0x%08lx-0x%08lx, size %ld KiB\n",
+               pdev->name,
+               (unsigned long)par->fbdma,
+               (unsigned long)(par->fbdma + info->screen_size - 1),
+               info->screen_size >> 10);
+
+        return 0;
+
+out_cmap:
+        sh7760fb_blank(FB_BLANK_POWERDOWN, info);
+        fb_dealloc_cmap(&info->cmap);
+out_mem:
+        sh7760fb_free_mem(info);
+out_unmap:
+        if (par->irq >= 0)
+                free_irq(par->irq, &par->vsync);
+        iounmap(par->base);
+out_res:
+        release_resource(par->ioarea);
+        kfree(par->ioarea);
+out_fb:
+        framebuffer_release(info);
+        return ret;
+}
+
+static int __devexit sh7760fb_remove(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct sh7760fb_par *par = info->par;
+
+        sh7760fb_blank(FB_BLANK_POWERDOWN, info);
+        unregister_framebuffer(info);
+        fb_dealloc_cmap(&info->cmap);
+        sh7760fb_free_mem(info);
+        if (par->irq >= 0)
+                free_irq(par->irq, par);
+        iounmap(par->base);
+        release_resource(par->ioarea);
+        kfree(par->ioarea);
+        framebuffer_release(info);
+        platform_set_drvdata(dev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver sh7760_lcdc_driver = {
+        .driver = {
+                   .name = "sh7760-lcdc",
+                   .owner = THIS_MODULE,
+                   },
+        .probe = sh7760fb_probe,
+        .remove = __devexit_p(sh7760fb_remove),
+};
+
+static int __init sh7760fb_init(void)
+{
+        return platform_driver_register(&sh7760_lcdc_driver);
+}
+
+static void __exit sh7760fb_exit(void)
+{
+        platform_driver_unregister(&sh7760_lcdc_driver);
+}
+
+module_init(sh7760fb_init);
+module_exit(sh7760fb_exit);
+
+MODULE_AUTHOR("Nobuhiro Iwamatsu, Manuel Lauss");
+MODULE_DESCRIPTION("FBdev for SH7760/63 integrated LCD Controller");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
new file mode 100644
index 000000000000..efff672fd7b8
--- /dev/null
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -0,0 +1,737 @@
+/*
+ * SuperH Mobile LCDC Framebuffer
+ *
+ * Copyright (c) 2008 Magnus Damm
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <video/sh_mobile_lcdc.h>
+
+#define PALETTE_NR 16
+
+struct sh_mobile_lcdc_priv;
+struct sh_mobile_lcdc_chan {
+        struct sh_mobile_lcdc_priv *lcdc;
+        unsigned long *reg_offs;
+        unsigned long ldmt1r_value;
+        unsigned long enabled; /* ME and SE in LDCNT2R */
+        struct sh_mobile_lcdc_chan_cfg cfg;
+        u32 pseudo_palette[PALETTE_NR];
+        struct fb_info info;
+        dma_addr_t dma_handle;
+};
+
+struct sh_mobile_lcdc_priv {
+        void __iomem *base;
+#ifdef CONFIG_HAVE_CLK
+        struct clk *clk;
+#endif
+        unsigned long lddckr;
+        struct sh_mobile_lcdc_chan ch[2];
+};
+
+/* shared registers */
+#define _LDDCKR 0x410
+#define _LDDCKSTPR 0x414
+#define _LDINTR 0x468
+#define _LDSR 0x46c
+#define _LDCNT1R 0x470
+#define _LDCNT2R 0x474
+#define _LDDDSR 0x47c
+#define _LDDWD0R 0x800
+#define _LDDRDR 0x840
+#define _LDDWAR 0x900
+#define _LDDRAR 0x904
+
+/* per-channel registers */
+enum { LDDCKPAT1R, LDDCKPAT2R, LDMT1R, LDMT2R, LDMT3R, LDDFR, LDSM1R,
+       LDSA1R, LDMLSR, LDHCNR, LDHSYNR, LDVLNR, LDVSYNR, LDPMR };
+
+static unsigned long lcdc_offs_mainlcd[] = {
+        [LDDCKPAT1R] = 0x400,
+        [LDDCKPAT2R] = 0x404,
+        [LDMT1R] = 0x418,
+        [LDMT2R] = 0x41c,
+        [LDMT3R] = 0x420,
+        [LDDFR] = 0x424,
+        [LDSM1R] = 0x428,
+        [LDSA1R] = 0x430,
+        [LDMLSR] = 0x438,
+        [LDHCNR] = 0x448,
+        [LDHSYNR] = 0x44c,
+        [LDVLNR] = 0x450,
+        [LDVSYNR] = 0x454,
+        [LDPMR] = 0x460,
+};
+
+static unsigned long lcdc_offs_sublcd[] = {
+        [LDDCKPAT1R] = 0x408,
+        [LDDCKPAT2R] = 0x40c,
+        [LDMT1R] = 0x600,
+        [LDMT2R] = 0x604,
+        [LDMT3R] = 0x608,
+        [LDDFR] = 0x60c,
+        [LDSM1R] = 0x610,
+        [LDSA1R] = 0x618,
+        [LDMLSR] = 0x620,
+        [LDHCNR] = 0x624,
+        [LDHSYNR] = 0x628,
+        [LDVLNR] = 0x62c,
+        [LDVSYNR] = 0x630,
+        [LDPMR] = 0x63c,
+};
+
+#define START_LCDC      0x00000001
+#define LCDC_RESET      0x00000100
+#define DISPLAY_BEU     0x00000008
+#define LCDC_ENABLE     0x00000001
+
+static void lcdc_write_chan(struct sh_mobile_lcdc_chan *chan,
+                            int reg_nr, unsigned long data)
+{
+        iowrite32(data, chan->lcdc->base + chan->reg_offs[reg_nr]);
+}
+
+static unsigned long lcdc_read_chan(struct sh_mobile_lcdc_chan *chan,
+                                    int reg_nr)
+{
+        return ioread32(chan->lcdc->base + chan->reg_offs[reg_nr]);
+}
+
+static void lcdc_write(struct sh_mobile_lcdc_priv *priv,
+                       unsigned long reg_offs, unsigned long data)
+{
+        iowrite32(data, priv->base + reg_offs);
+}
+
+static unsigned long lcdc_read(struct sh_mobile_lcdc_priv *priv,
+                               unsigned long reg_offs)
+{
+        return ioread32(priv->base + reg_offs);
+}
+
+static void lcdc_wait_bit(struct sh_mobile_lcdc_priv *priv,
+                          unsigned long reg_offs,
+                          unsigned long mask, unsigned long until)
+{
+        while ((lcdc_read(priv, reg_offs) & mask) != until)
+                cpu_relax();
+}
+
+static int lcdc_chan_is_sublcd(struct sh_mobile_lcdc_chan *chan)
+{
+        return chan->cfg.chan == LCDC_CHAN_SUBLCD;
+}
+
+static void lcdc_sys_write_index(void *handle, unsigned long data)
+{
+        struct sh_mobile_lcdc_chan *ch = handle;
+
+        lcdc_write(ch->lcdc, _LDDWD0R, data | 0x10000000);
+        lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);
+        lcdc_write(ch->lcdc, _LDDWAR, 1 | (lcdc_chan_is_sublcd(ch) ? 2 : 0));
+}
+
+static void lcdc_sys_write_data(void *handle, unsigned long data)
+{
+        struct sh_mobile_lcdc_chan *ch = handle;
+
+        lcdc_write(ch->lcdc, _LDDWD0R, data | 0x11000000);
+        lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);
+        lcdc_write(ch->lcdc, _LDDWAR, 1 | (lcdc_chan_is_sublcd(ch) ? 2 : 0));
+}
+
+static unsigned long lcdc_sys_read_data(void *handle)
+{
+        struct sh_mobile_lcdc_chan *ch = handle;
+
+        lcdc_write(ch->lcdc, _LDDRDR, 0x01000000);
+        lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);
+        lcdc_write(ch->lcdc, _LDDRAR, 1 | (lcdc_chan_is_sublcd(ch) ? 2 : 0));
+        udelay(1);
+
+        return lcdc_read(ch->lcdc, _LDDRDR) & 0xffff;
+}
+
+struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
+        lcdc_sys_write_index,
+        lcdc_sys_write_data,
+        lcdc_sys_read_data,
+};
+
+static void sh_mobile_lcdc_start_stop(struct sh_mobile_lcdc_priv *priv,
+                                      int start)
+{
+        unsigned long tmp = lcdc_read(priv, _LDCNT2R);
+        int k;
+
+        /* start or stop the lcdc */
+        if (start)
+                lcdc_write(priv, _LDCNT2R, tmp | START_LCDC);
+        else
+                lcdc_write(priv, _LDCNT2R, tmp & ~START_LCDC);
+
+        /* wait until power is applied/stopped on all channels */
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++)
+                if (lcdc_read(priv, _LDCNT2R) & priv->ch[k].enabled)
+                        while (1) {
+                                tmp = lcdc_read_chan(&priv->ch[k], LDPMR) & 3;
+                                if (start && tmp == 3)
+                                        break;
+                                if (!start && tmp == 0)
+                                        break;
+                                cpu_relax();
+                        }
+
+        if (!start)
+                lcdc_write(priv, _LDDCKSTPR, 1); /* stop dotclock */
+}
+
+static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
+{
+        struct sh_mobile_lcdc_chan *ch;
+        struct fb_videomode *lcd_cfg;
+        struct sh_mobile_lcdc_board_cfg *board_cfg;
+        unsigned long tmp;
+        int k, m;
+        int ret = 0;
+
+        /* reset */
+        lcdc_write(priv, _LDCNT2R, lcdc_read(priv, _LDCNT2R) | LCDC_RESET);
+        lcdc_wait_bit(priv, _LDCNT2R, LCDC_RESET, 0);
+
+        /* enable LCDC channels */
+        tmp = lcdc_read(priv, _LDCNT2R);
+        tmp |= priv->ch[0].enabled;
+        tmp |= priv->ch[1].enabled;
+        lcdc_write(priv, _LDCNT2R, tmp);
+
+        /* read data from external memory, avoid using the BEU for now */
+        lcdc_write(priv, _LDCNT2R, lcdc_read(priv, _LDCNT2R) & ~DISPLAY_BEU);
+
+        /* stop the lcdc first */
+        sh_mobile_lcdc_start_stop(priv, 0);
+
+        /* configure clocks */
+        tmp = priv->lddckr;
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
+                ch = &priv->ch[k];
+
+                if (!priv->ch[k].enabled)
+                        continue;
+
+                m = ch->cfg.clock_divider;
+                if (!m)
+                        continue;
+
+                if (m == 1)
+                        m = 1 << 6;
+                tmp |= m << (lcdc_chan_is_sublcd(ch) ? 8 : 0);
+
+                lcdc_write_chan(ch, LDDCKPAT1R, 0x00000000);
+                lcdc_write_chan(ch, LDDCKPAT2R, (1 << (m/2)) - 1);
+        }
+
+        lcdc_write(priv, _LDDCKR, tmp);
+
+        /* start dotclock again */
+        lcdc_write(priv, _LDDCKSTPR, 0);
+        lcdc_wait_bit(priv, _LDDCKSTPR, ~0, 0);
+
+        /* interrupts are disabled */
+        lcdc_write(priv, _LDINTR, 0);
+
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
+                ch = &priv->ch[k];
+                lcd_cfg = &ch->cfg.lcd_cfg;
+
+                if (!ch->enabled)
+                        continue;
+
+                tmp = ch->ldmt1r_value;
+                tmp |= (lcd_cfg->sync & FB_SYNC_VERT_HIGH_ACT) ? 0 : 1 << 28;
+                tmp |= (lcd_cfg->sync & FB_SYNC_HOR_HIGH_ACT) ? 0 : 1 << 27;
+                tmp |= (ch->cfg.flags & LCDC_FLAGS_DWPOL) ? 1 << 26 : 0;
+                tmp |= (ch->cfg.flags & LCDC_FLAGS_DIPOL) ? 1 << 25 : 0;
+                tmp |= (ch->cfg.flags & LCDC_FLAGS_DAPOL) ? 1 << 24 : 0;
+                tmp |= (ch->cfg.flags & LCDC_FLAGS_HSCNT) ? 1 << 17 : 0;
+                tmp |= (ch->cfg.flags & LCDC_FLAGS_DWCNT) ? 1 << 16 : 0;
+                lcdc_write_chan(ch, LDMT1R, tmp);
+
+                /* setup SYS bus */
+                lcdc_write_chan(ch, LDMT2R, ch->cfg.sys_bus_cfg.ldmt2r);
+                lcdc_write_chan(ch, LDMT3R, ch->cfg.sys_bus_cfg.ldmt3r);
+
+                /* horizontal configuration */
+                tmp = lcd_cfg->xres + lcd_cfg->hsync_len;
+                tmp += lcd_cfg->left_margin;
+                tmp += lcd_cfg->right_margin;
+                tmp /= 8; /* HTCN */
+                tmp |= (lcd_cfg->xres / 8) << 16; /* HDCN */
+                lcdc_write_chan(ch, LDHCNR, tmp);
+
+                tmp = lcd_cfg->xres;
+                tmp += lcd_cfg->right_margin;
+                tmp /= 8; /* HSYNP */
+                tmp |= (lcd_cfg->hsync_len / 8) << 16; /* HSYNW */
+                lcdc_write_chan(ch, LDHSYNR, tmp);
+
+                /* power supply */
+                lcdc_write_chan(ch, LDPMR, 0);
+
+                /* vertical configuration */
+                tmp = lcd_cfg->yres + lcd_cfg->vsync_len;
+                tmp += lcd_cfg->upper_margin;
+                tmp += lcd_cfg->lower_margin; /* VTLN */
+                tmp |= lcd_cfg->yres << 16; /* VDLN */
+                lcdc_write_chan(ch, LDVLNR, tmp);
+
+                tmp = lcd_cfg->yres;
+                tmp += lcd_cfg->lower_margin; /* VSYNP */
+                tmp |= lcd_cfg->vsync_len << 16; /* VSYNW */
+                lcdc_write_chan(ch, LDVSYNR, tmp);
+
+                board_cfg = &ch->cfg.board_cfg;
+                if (board_cfg->setup_sys)
+                        ret = board_cfg->setup_sys(board_cfg->board_data, ch,
+                                                   &sh_mobile_lcdc_sys_bus_ops);
+                if (ret)
+                        return ret;
+        }
+
+        /* --- display_lcdc_data() --- */
+        lcdc_write(priv, _LDINTR, 0x00000f00);
+
+        /* word and long word swap */
+        lcdc_write(priv, _LDDDSR, lcdc_read(priv, _LDDDSR) | 6);
+
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
+                ch = &priv->ch[k];
+
+                if (!priv->ch[k].enabled)
+                        continue;
+
+                /* set bpp format in PKF[4:0] */
+                tmp = lcdc_read_chan(ch, LDDFR);
+                tmp &= ~(0x0001001f);
+                tmp |= (priv->ch[k].info.var.bits_per_pixel == 16) ? 3 : 0;
+                lcdc_write_chan(ch, LDDFR, tmp);
+
+                /* point out our frame buffer */
+                lcdc_write_chan(ch, LDSA1R, ch->info.fix.smem_start);
+
+                /* set line size */
+                lcdc_write_chan(ch, LDMLSR, ch->info.fix.line_length);
+
+                /* continuous read mode */
+                lcdc_write_chan(ch, LDSM1R, 0);
+        }
+
+        /* display output */
+        lcdc_write(priv, _LDCNT1R, LCDC_ENABLE);
+
+        /* start the lcdc */
+        sh_mobile_lcdc_start_stop(priv, 1);
+
+        /* tell the board code to enable the panel */
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
+                ch = &priv->ch[k];
+                board_cfg = &ch->cfg.board_cfg;
+                if (board_cfg->display_on)
+                        board_cfg->display_on(board_cfg->board_data);
+        }
+
+        return 0;
+}
+
+static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
+{
+        struct sh_mobile_lcdc_chan *ch;
+        struct sh_mobile_lcdc_board_cfg *board_cfg;
+        int k;
+
+        /* tell the board code to disable the panel */
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
+                ch = &priv->ch[k];
+                board_cfg = &ch->cfg.board_cfg;
+                if (board_cfg->display_off)
+                        board_cfg->display_off(board_cfg->board_data);
+        }
+
+        /* stop the lcdc */
+        sh_mobile_lcdc_start_stop(priv, 0);
+}
+
+static int sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch)
+{
+        int ifm, miftyp;
+
+        switch (ch->cfg.interface_type) {
+        case RGB8: ifm = 0; miftyp = 0; break;
+        case RGB9: ifm = 0; miftyp = 4; break;
+        case RGB12A: ifm = 0; miftyp = 5; break;
+        case RGB12B: ifm = 0; miftyp = 6; break;
+        case RGB16: ifm = 0; miftyp = 7; break;
+        case RGB18: ifm = 0; miftyp = 10; break;
+        case RGB24: ifm = 0; miftyp = 11; break;
+        case SYS8A: ifm = 1; miftyp = 0; break;
+        case SYS8B: ifm = 1; miftyp = 1; break;
+        case SYS8C: ifm = 1; miftyp = 2; break;
+        case SYS8D: ifm = 1; miftyp = 3; break;
+        case SYS9: ifm = 1; miftyp = 4; break;
+        case SYS12: ifm = 1; miftyp = 5; break;
+        case SYS16A: ifm = 1; miftyp = 7; break;
+        case SYS16B: ifm = 1; miftyp = 8; break;
+        case SYS16C: ifm = 1; miftyp = 9; break;
+        case SYS18: ifm = 1; miftyp = 10; break;
+        case SYS24: ifm = 1; miftyp = 11; break;
+        default: goto bad;
+        }
+
+        /* SUBLCD only supports SYS interface */
+        if (lcdc_chan_is_sublcd(ch)) {
+                if (ifm == 0)
+                        goto bad;
+                else
+                        ifm = 0;
+        }
+
+        ch->ldmt1r_value = (ifm << 12) | miftyp;
+        return 0;
+ bad:
+        return -EINVAL;
+}
+
+static int sh_mobile_lcdc_setup_clocks(struct device *dev, int clock_source,
+                                       struct sh_mobile_lcdc_priv *priv)
+{
+        char *str;
+        int icksel;
+
+        switch (clock_source) {
+        case LCDC_CLK_BUS: str = "bus_clk"; icksel = 0; break;
+        case LCDC_CLK_PERIPHERAL: str = "peripheral_clk"; icksel = 1; break;
+        case LCDC_CLK_EXTERNAL: str = NULL; icksel = 2; break;
+        default:
+                return -EINVAL;
+        }
+
+        priv->lddckr = icksel << 16;
+
+#ifdef CONFIG_HAVE_CLK
+        if (str) {
+                priv->clk = clk_get(dev, str);
+                if (IS_ERR(priv->clk)) {
+                        dev_err(dev, "cannot get clock %s\n", str);
+                        return PTR_ERR(priv->clk);
+                }
+
+                clk_enable(priv->clk);
+        }
+#endif
+
+        return 0;
+}
+
+static int sh_mobile_lcdc_setcolreg(u_int regno,
+                                    u_int red, u_int green, u_int blue,
+                                    u_int transp, struct fb_info *info)
+{
+        u32 *palette = info->pseudo_palette;
+
+        if (regno >= PALETTE_NR)
+                return -EINVAL;
+
+        /* only FB_VISUAL_TRUECOLOR supported */
+
+        red >>= 16 - info->var.red.length;
+        green >>= 16 - info->var.green.length;
+        blue >>= 16 - info->var.blue.length;
+        transp >>= 16 - info->var.transp.length;
+
+        palette[regno] = (red << info->var.red.offset) |
+          (green << info->var.green.offset) |
+          (blue << info->var.blue.offset) |
+          (transp << info->var.transp.offset);
+
+        return 0;
+}
+
+static struct fb_fix_screeninfo sh_mobile_lcdc_fix  = {
+        .id =           "SH Mobile LCDC",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_TRUECOLOR,
+        .accel =        FB_ACCEL_NONE,
+};
+
+static struct fb_ops sh_mobile_lcdc_ops = {
+        .fb_setcolreg   = sh_mobile_lcdc_setcolreg,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+static int sh_mobile_lcdc_set_bpp(struct fb_var_screeninfo *var, int bpp)
+{
+        switch (bpp) {
+        case 16: /* PKF[4:0] = 00011 - RGB 565 */
+                var->red.offset = 11;
+                var->red.length = 5;
+                var->green.offset = 5;
+                var->green.length = 6;
+                var->blue.offset = 0;
+                var->blue.length = 5;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                break;
+
+        case 32: /* PKF[4:0] = 00000 - RGB 888
+                  * sh7722 pdf says 00RRGGBB but reality is GGBB00RR
+                  * this may be because LDDDSR has word swap enabled..
+                  */
+                var->red.offset = 0;
+                var->red.length = 8;
+                var->green.offset = 24;
+                var->green.length = 8;
+                var->blue.offset = 16;
+                var->blue.length = 8;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        var->bits_per_pixel = bpp;
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
+        var->transp.msb_right = 0;
+        return 0;
+}
+
+static int sh_mobile_lcdc_remove(struct platform_device *pdev);
+
+static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
+{
+        struct fb_info *info;
+        struct sh_mobile_lcdc_priv *priv;
+        struct sh_mobile_lcdc_info *pdata;
+        struct sh_mobile_lcdc_chan_cfg *cfg;
+        struct resource *res;
+        int error;
+        void *buf;
+        int i, j;
+
+        if (!pdev->dev.platform_data) {
+                dev_err(&pdev->dev, "no platform data defined\n");
+                error = -EINVAL;
+                goto err0;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "cannot find IO resource\n");
+                error = -ENOENT;
+                goto err0;
+        }
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                dev_err(&pdev->dev, "cannot allocate device data\n");
+                error = -ENOMEM;
+                goto err0;
+        }
+
+        platform_set_drvdata(pdev, priv);
+        pdata = pdev->dev.platform_data;
+
+        j = 0;
+        for (i = 0; i < ARRAY_SIZE(pdata->ch); i++) {
+                priv->ch[j].lcdc = priv;
+                memcpy(&priv->ch[j].cfg, &pdata->ch[i], sizeof(pdata->ch[i]));
+
+                error = sh_mobile_lcdc_check_interface(&priv->ch[i]);
+                if (error) {
+                        dev_err(&pdev->dev, "unsupported interface type\n");
+                        goto err1;
+                }
+
+                switch (pdata->ch[i].chan) {
+                case LCDC_CHAN_MAINLCD:
+                        priv->ch[j].enabled = 1 << 1;
+                        priv->ch[j].reg_offs = lcdc_offs_mainlcd;
+                        j++;
+                        break;
+                case LCDC_CHAN_SUBLCD:
+                        priv->ch[j].enabled = 1 << 2;
+                        priv->ch[j].reg_offs = lcdc_offs_sublcd;
+                        j++;
+                        break;
+                }
+        }
+
+        if (!j) {
+                dev_err(&pdev->dev, "no channels defined\n");
+                error = -EINVAL;
+                goto err1;
+        }
+
+        error = sh_mobile_lcdc_setup_clocks(&pdev->dev,
+                                            pdata->clock_source, priv);
+        if (error) {
+                dev_err(&pdev->dev, "unable to setup clocks\n");
+                goto err1;
+        }
+
+        priv->base = ioremap_nocache(res->start, (res->end - res->start) + 1);
+
+        for (i = 0; i < j; i++) {
+                info = &priv->ch[i].info;
+                cfg = &priv->ch[i].cfg;
+
+                info->fbops = &sh_mobile_lcdc_ops;
+                info->var.xres = info->var.xres_virtual = cfg->lcd_cfg.xres;
+                info->var.yres = info->var.yres_virtual = cfg->lcd_cfg.yres;
+                info->var.width = cfg->lcd_size_cfg.width;
+                info->var.height = cfg->lcd_size_cfg.height;
+                info->var.activate = FB_ACTIVATE_NOW;
+                error = sh_mobile_lcdc_set_bpp(&info->var, cfg->bpp);
+                if (error)
+                        break;
+
+                info->fix = sh_mobile_lcdc_fix;
+                info->fix.line_length = cfg->lcd_cfg.xres * (cfg->bpp / 8);
+                info->fix.smem_len = info->fix.line_length * cfg->lcd_cfg.yres;
+
+                buf = dma_alloc_coherent(&pdev->dev, info->fix.smem_len,
+                                         &priv->ch[i].dma_handle, GFP_KERNEL);
+                if (!buf) {
+                        dev_err(&pdev->dev, "unable to allocate buffer\n");
+                        error = -ENOMEM;
+                        break;
+                }
+
+                info->pseudo_palette = &priv->ch[i].pseudo_palette;
+                info->flags = FBINFO_FLAG_DEFAULT;
+
+                error = fb_alloc_cmap(&info->cmap, PALETTE_NR, 0);
+                if (error < 0) {
+                        dev_err(&pdev->dev, "unable to allocate cmap\n");
+                        dma_free_coherent(&pdev->dev, info->fix.smem_len,
+                                          buf, priv->ch[i].dma_handle);
+                        break;
+                }
+
+                memset(buf, 0, info->fix.smem_len);
+                info->fix.smem_start = priv->ch[i].dma_handle;
+                info->screen_base = buf;
+                info->device = &pdev->dev;
+        }
+
+        if (error)
+                goto err1;
+
+        error = sh_mobile_lcdc_start(priv);
+        if (error) {
+                dev_err(&pdev->dev, "unable to start hardware\n");
+                goto err1;
+        }
+
+        for (i = 0; i < j; i++) {
+                error = register_framebuffer(&priv->ch[i].info);
+                if (error < 0)
+                        goto err1;
+        }
+
+        for (i = 0; i < j; i++) {
+                info = &priv->ch[i].info;
+                dev_info(info->dev,
+                         "registered %s/%s as %dx%d %dbpp.\n",
+                         pdev->name,
+                         (priv->ch[i].cfg.chan == LCDC_CHAN_MAINLCD) ?
+                         "mainlcd" : "sublcd",
+                         (int) priv->ch[i].cfg.lcd_cfg.xres,
+                         (int) priv->ch[i].cfg.lcd_cfg.yres,
+                         priv->ch[i].cfg.bpp);
+        }
+
+        return 0;
+ err1:
+        sh_mobile_lcdc_remove(pdev);
+ err0:
+        return error;
+}
+
+static int sh_mobile_lcdc_remove(struct platform_device *pdev)
+{
+        struct sh_mobile_lcdc_priv *priv = platform_get_drvdata(pdev);
+        struct fb_info *info;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(priv->ch); i++)
+                if (priv->ch[i].info.dev)
+                        unregister_framebuffer(&priv->ch[i].info);
+
+        sh_mobile_lcdc_stop(priv);
+
+        for (i = 0; i < ARRAY_SIZE(priv->ch); i++) {
+                info = &priv->ch[i].info;
+
+                if (!info->device)
+                        continue;
+
+                dma_free_coherent(&pdev->dev, info->fix.smem_len,
+                                  info->screen_base, priv->ch[i].dma_handle);
+                fb_dealloc_cmap(&info->cmap);
+        }
+
+#ifdef CONFIG_HAVE_CLK
+        if (priv->clk) {
+                clk_disable(priv->clk);
+                clk_put(priv->clk);
+        }
+#endif
+
+        if (priv->base)
+                iounmap(priv->base);
+
+        kfree(priv);
+        return 0;
+}
+
+static struct platform_driver sh_mobile_lcdc_driver = {
+        .driver         = {
+                .name           = "sh_mobile_lcdc_fb",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = sh_mobile_lcdc_probe,
+        .remove         = sh_mobile_lcdc_remove,
+};
+
+static int __init sh_mobile_lcdc_init(void)
+{
+        return platform_driver_register(&sh_mobile_lcdc_driver);
+}
+
+static void __exit sh_mobile_lcdc_exit(void)
+{
+        platform_driver_unregister(&sh_mobile_lcdc_driver);
+}
+
+module_init(sh_mobile_lcdc_init);
+module_exit(sh_mobile_lcdc_exit);
+
+MODULE_DESCRIPTION("SuperH Mobile LCDC Framebuffer driver");
+MODULE_AUTHOR("Magnus Damm <damm@opensource.se>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index f40a680df86f..b96005c39c67 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -73,7 +73,6 @@
 #ifdef SIS_CP
 #undef SIS_CP
 #endif
-#include <linux/version.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <linux/fb.h>
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h
index 7708e1e1d99e..51d99222375d 100644
--- a/drivers/video/sis/init301.h
+++ b/drivers/video/sis/init301.h
@@ -67,7 +67,6 @@
 #ifdef SIS_CP
 #undef SIS_CP
 #endif
-#include <linux/version.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <linux/fb.h>
diff --git a/drivers/video/sis/initextlfb.c b/drivers/video/sis/initextlfb.c
index 47a33501549d..99c04a4855d1 100644
--- a/drivers/video/sis/initextlfb.c
+++ b/drivers/video/sis/initextlfb.c
@@ -30,7 +30,6 @@
 #include "vgatypes.h"
 #include "vstruct.h"
 
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/fb.h>
 
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index c1492782cb18..6ff8f988a1a7 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -87,7 +87,6 @@
 /**********************************************************************/
 
 #ifdef SIS_LINUX_KERNEL
-#include <linux/version.h>
 
 #ifdef CONFIG_FB_SIS_300
 #define SIS300
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index a14e82211037..7c5710e3fb56 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -24,8 +24,6 @@
 #ifndef _SIS_H_
 #define _SIS_H_
 
-#include <linux/version.h>
-
 #include "osdef.h"
 #include <video/sisfb.h>
 
@@ -42,16 +40,6 @@
 #define SIS_NEW_CONFIG_COMPAT
 #endif  /* CONFIG_COMPAT */
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
-#define SIS_IOTYPE1 void __iomem
-#define SIS_IOTYPE2 __iomem
-#define SISINITSTATIC static
-#else
-#define SIS_IOTYPE1 unsigned char
-#define SIS_IOTYPE2
-#define SISINITSTATIC
-#endif
-
 #undef SISFBDEBUG
 
 #ifdef SISFBDEBUG
@@ -505,8 +493,8 @@ struct sis_video_info {
 
         unsigned long   UMAsize, LFBsize;
 
-        SIS_IOTYPE1     *video_vbase;
-        SIS_IOTYPE1     *mmio_vbase;
+        void __iomem    *video_vbase;
+        void __iomem    *mmio_vbase;
 
         unsigned char   *bios_abase;
 
@@ -533,8 +521,8 @@ struct sis_video_info {
         int             sisfb_nocrt2rate;
 
         u32             heapstart;              /* offset  */
-        SIS_IOTYPE1     *sisfb_heap_start;      /* address */
-        SIS_IOTYPE1     *sisfb_heap_end;        /* address */
+        void __iomem    *sisfb_heap_start;      /* address */
+        void __iomem    *sisfb_heap_end;        /* address */
         u32             sisfb_heap_size;
         int             havenoheap;
 
@@ -612,7 +600,7 @@ struct sis_video_info {
         u8              detectedpdca;
         u8              detectedlcda;
 
-        SIS_IOTYPE1     *hwcursor_vbase;
+        void __iomem    *hwcursor_vbase;
 
         int             chronteltype;
         int             tvxpos, tvypos;
diff --git a/drivers/video/sis/sis_accel.c b/drivers/video/sis/sis_accel.c
index 7addf91d2fea..ceb434c95c0d 100644
--- a/drivers/video/sis/sis_accel.c
+++ b/drivers/video/sis/sis_accel.c
@@ -28,7 +28,6 @@
  *                      for more information and updates)
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/fb.h>
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index b9343844cd1f..346d6458cf76 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -33,7 +33,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -41,13 +40,7 @@
 #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>
@@ -1167,11 +1160,7 @@ sisfb_set_mode(struct sis_video_info *ivideo, int clrscrn)
         unsigned short modeno = ivideo->mode_no;
 
         /* >=2.6.12's fbcon clears the screen anyway */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
-        if(!clrscrn) modeno |= 0x80;
-#else
         modeno |= 0x80;
-#endif
 
         outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
 
@@ -1436,11 +1425,8 @@ sisfb_set_par(struct fb_info *info)
         if((err = sisfb_do_set_var(&info->var, 1, info)))
                 return err;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-        sisfb_get_fix(&info->fix, info->currcon, info);
-#else
         sisfb_get_fix(&info->fix, -1, info);
-#endif
+
         return 0;
 }
 
@@ -1676,14 +1662,8 @@ sisfb_blank(int blank, struct fb_info *info)
 
 /* ----------- FBDev related routines for all series ---------- */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 static int      sisfb_ioctl(struct fb_info *info, unsigned int cmd,
                             unsigned long arg)
-#else
-static int      sisfb_ioctl(struct inode *inode, struct file *file,
-                                unsigned int cmd, unsigned long arg,
-                                struct fb_info *info)
-#endif
 {
         struct sis_video_info   *ivideo = (struct sis_video_info *)info->par;
         struct sis_memreq       sismemreq;
@@ -3986,8 +3966,7 @@ sisfb_handle_command(struct sis_video_info *ivideo, struct sisfb_cmd *sisfb_comm
 }
 
 #ifndef MODULE
-SISINITSTATIC int __init
-sisfb_setup(char *options)
+static int __init sisfb_setup(char *options)
 {
         char *this_opt;
 
@@ -4086,9 +4065,9 @@ sisfb_setup(char *options)
 #endif
 
 static int __devinit
-sisfb_check_rom(SIS_IOTYPE1 *rom_base, struct sis_video_info *ivideo)
+sisfb_check_rom(void __iomem *rom_base, struct sis_video_info *ivideo)
 {
-        SIS_IOTYPE1 *rom;
+        void __iomem *rom;
         int romptr;
 
         if((readb(rom_base) != 0x55) || (readb(rom_base + 1) != 0xaa))
@@ -4117,10 +4096,9 @@ static unsigned char * __devinit
 sisfb_find_rom(struct pci_dev *pdev)
 {
         struct sis_video_info *ivideo = pci_get_drvdata(pdev);
-        SIS_IOTYPE1 *rom_base;
+        void __iomem *rom_base;
         unsigned char *myrombase = NULL;
         u32 temp;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
         size_t romsize;
 
         /* First, try the official pci ROM functions (except
@@ -4151,7 +4129,6 @@ sisfb_find_rom(struct pci_dev *pdev)
         }
 
         if(myrombase) return myrombase;
-#endif
 
         /* Otherwise do it the conventional way. */
 
@@ -4225,7 +4202,7 @@ sisfb_post_map_vram(struct sis_video_info *ivideo, unsigned int *mapsize,
 static int __devinit
 sisfb_post_300_buswidth(struct sis_video_info *ivideo)
 {
-        SIS_IOTYPE1 *FBAddress = ivideo->video_vbase;
+        void __iomem *FBAddress = ivideo->video_vbase;
         unsigned short temp;
         unsigned char reg;
         int i, j;
@@ -4273,7 +4250,7 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
                         int PseudoRankCapacity, int PseudoAdrPinCount,
                         unsigned int mapsize)
 {
-        SIS_IOTYPE1 *FBAddr = ivideo->video_vbase;
+        void __iomem *FBAddr = ivideo->video_vbase;
         unsigned short sr14;
         unsigned int k, RankCapacity, PageCapacity, BankNumHigh, BankNumMid;
         unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage;
@@ -5829,7 +5806,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         ivideo->engineok = 0;
 
         ivideo->sisfb_was_boot_device = 0;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
+
         if(pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW) {
                 if(ivideo->sisvga_enabled)
                         ivideo->sisfb_was_boot_device = 1;
@@ -5840,7 +5817,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                 "as the primary VGA device\n");
                 }
         }
-#endif
 
         ivideo->sisfb_parm_mem = sisfb_parm_mem;
         ivideo->sisfb_accel = sisfb_accel;
@@ -6010,7 +5986,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ivideo->modeprechange = reg & 0x7f;
         } else if(ivideo->sisvga_enabled) {
 #if defined(__i386__) || defined(__x86_64__)
-                unsigned char SIS_IOTYPE2 *tt = ioremap(0x400, 0x100);
+                unsigned char __iomem *tt = ioremap(0x400, 0x100);
                 if(tt) {
                         ivideo->modeprechange = readb(tt + 0x49);
                         iounmap(tt);
@@ -6503,7 +6479,7 @@ static struct pci_driver sisfb_driver = {
         .remove         = __devexit_p(sisfb_remove)
 };
 
-SISINITSTATIC int __init sisfb_init(void)
+static int __init sisfb_init(void)
 {
 #ifndef MODULE
         char *options = NULL;
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h
index 3e3b7fa05d6c..9540e977270e 100644
--- a/drivers/video/sis/sis_main.h
+++ b/drivers/video/sis/sis_main.h
@@ -665,11 +665,11 @@ static struct _customttable {
 
 /* Interface used by the world */
 #ifndef MODULE
-SISINITSTATIC int sisfb_setup(char *options);
+static int sisfb_setup(char *options);
 #endif
 
 /* Interface to the low level console driver */
-SISINITSTATIC int sisfb_init(void);
+static int sisfb_init(void);
 
 /* fbdev routines */
 static int      sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,
diff --git a/drivers/video/sis/vgatypes.h b/drivers/video/sis/vgatypes.h
index b532fbd2b04c..81a22eaabfde 100644
--- a/drivers/video/sis/vgatypes.h
+++ b/drivers/video/sis/vgatypes.h
@@ -53,10 +53,6 @@
 #ifndef _VGATYPES_H_
 #define _VGATYPES_H_
 
-#ifdef SIS_LINUX_KERNEL
-#include <linux/version.h>
-#endif
-
 #define SISIOMEMTYPE
 
 #ifdef SIS_LINUX_KERNEL
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 62321458f71a..df5336561d13 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -675,13 +675,13 @@ static struct fb_ops xxxfb_ops = {
      *  Initialization
      */
 
-/* static int __init xxfb_probe (struct device *device) -- for platform devs */
+/* static int __init xxfb_probe (struct platform_device *pdev) -- for platform devs */
 static int __devinit xxxfb_probe(struct pci_dev *dev,
                               const struct pci_device_id *ent)
 {
     struct fb_info *info;
     struct xxx_par *par;
-    struct device* device = &dev->dev; /* for pci drivers */
+    struct device *device = &dev->dev; /* or &pdev->dev */
     int cmap_len, retval;       
    
     /*
@@ -824,18 +824,18 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
         return -EINVAL;
     printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
            info->fix.id);
-    pci_set_drvdata(dev, info); /* or dev_set_drvdata(device, info) */
+    pci_set_drvdata(dev, info); /* or platform_set_drvdata(pdev, info) */
     return 0;
 }
 
     /*
      *  Cleanup
      */
-/* static void __devexit xxxfb_remove(struct device *device) */
+/* static void __devexit xxxfb_remove(struct platform_device *pdev) */
 static void __devexit xxxfb_remove(struct pci_dev *dev)
 {
         struct fb_info *info = pci_get_drvdata(dev);
-        /* or dev_get_drvdata(device); */
+        /* or platform_get_drvdata(pdev); */
 
         if (info) {
                 unregister_framebuffer(info);
@@ -961,18 +961,17 @@ static int xxxfb_resume(struct platform_dev *dev)
 #define xxxfb_resume NULL
 #endif /* CONFIG_PM */
 
-static struct device_driver xxxfb_driver = {
-        .name = "xxxfb",
-        .bus  = &platform_bus_type,
+static struct platform_device_driver xxxfb_driver = {
         .probe = xxxfb_probe,
         .remove = xxxfb_remove,
         .suspend = xxxfb_suspend, /* optional but recommended */
         .resume = xxxfb_resume,   /* optional but recommended */
+        .driver = {
+                .name = "xxxfb",
+        },
 };
 
-static struct platform_device xxxfb_device = {
-        .name = "xxxfb",
-};
+static struct platform_device *xxxfb_device;
 
 #ifndef MODULE
     /*
@@ -1002,12 +1001,16 @@ static int __init xxxfb_init(void)
                 return -ENODEV;
         xxxfb_setup(option);
 #endif
-        ret = driver_register(&xxxfb_driver);
+        ret = platform_driver_register(&xxxfb_driver);
 
         if (!ret) {
-                ret = platform_device_register(&xxxfb_device);
-                if (ret)
-                        driver_unregister(&xxxfb_driver);
+                xxxfb_device = platform_device_register_simple("xxxfb", 0,
+                                                                NULL, 0);
+
+                if (IS_ERR(xxxfb_device)) {
+                        platform_driver_unregister(&xxxfb_driver);
+                        ret = PTR_ERR(xxxfb_device);
+                }
         }
 
         return ret;
@@ -1015,8 +1018,8 @@ static int __init xxxfb_init(void)
 
 static void __exit xxxfb_exit(void)
 {
-        platform_device_unregister(&xxxfb_device);
-        driver_unregister(&xxxfb_driver);
+        platform_device_unregister(xxxfb_device);
+        platform_driver_unregister(&xxxfb_driver);
 }
 #endif /* CONFIG_PCI */
 
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 15d4a768b1f6..f94ae84a58cd 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -48,10 +48,15 @@ enum sm501_controller {
         HEAD_PANEL      = 1,
 };
 
-/* SM501 memory address */
+/* SM501 memory address.
+ *
+ * This structure is used to track memory usage within the SM501 framebuffer
+ * allocation. The sm_addr field is stored as an offset as it is often used
+ * against both the physical and mapped addresses.
+ */
 struct sm501_mem {
         unsigned long    size;
-        unsigned long    sm_addr;
+        unsigned long    sm_addr;       /* offset from base of sm501 fb. */
         void __iomem    *k_addr;
 };
 
@@ -142,31 +147,68 @@ static inline void sm501fb_sync_regs(struct sm501fb_info *info)
 static int sm501_alloc_mem(struct sm501fb_info *inf, struct sm501_mem *mem,
                            unsigned int why, size_t size)
 {
-        unsigned int ptr = 0;
+        struct sm501fb_par *par;
+        struct fb_info *fbi;
+        unsigned int ptr;
+        unsigned int end;
 
         switch (why) {
         case SM501_MEMF_CURSOR:
                 ptr = inf->fbmem_len - size;
-                inf->fbmem_len = ptr;
+                inf->fbmem_len = ptr;   /* adjust available memory. */
                 break;
 
         case SM501_MEMF_PANEL:
                 ptr = inf->fbmem_len - size;
-                if (ptr < inf->fb[0]->fix.smem_len)
+                fbi = inf->fb[HEAD_CRT];
+
+                /* round down, some programs such as directfb do not draw
+                 * 0,0 correctly unless the start is aligned to a page start.
+                 */
+
+                if (ptr > 0)
+                        ptr &= ~(PAGE_SIZE - 1);
+
+                if (fbi && ptr < fbi->fix.smem_len)
+                        return -ENOMEM;
+
+                if (ptr < 0)
                         return -ENOMEM;
 
                 break;
 
         case SM501_MEMF_CRT:
                 ptr = 0;
+
+                /* check to see if we have panel memory allocated
+                 * which would put an limit on available memory. */
+
+                fbi = inf->fb[HEAD_PANEL];
+                if (fbi) {
+                        par = fbi->par;
+                        end = par->screen.k_addr ? par->screen.sm_addr : inf->fbmem_len;
+                } else
+                        end = inf->fbmem_len;
+
+                if ((ptr + size) > end)
+                        return -ENOMEM;
+
                 break;
 
         case SM501_MEMF_ACCEL:
-                ptr = inf->fb[0]->fix.smem_len;
+                fbi = inf->fb[HEAD_CRT];
+                ptr = fbi ? fbi->fix.smem_len : 0;
+
+                fbi = inf->fb[HEAD_PANEL];
+                if (fbi) {
+                        par = fbi->par;
+                        end = par->screen.sm_addr;
+                } else
+                        end = inf->fbmem_len;
 
-                if ((ptr + size) >
-                    (inf->fb[1]->fix.smem_start - inf->fbmem_res->start))
+                if ((ptr + size) > end)
                         return -ENOMEM;
+
                 break;
 
         default:
@@ -663,15 +705,25 @@ static void sm501fb_panel_power(struct sm501fb_info *fbi, int to)
                 sm501fb_sync_regs(fbi);
                 mdelay(10);
 
+                /* VBIASEN */
+
                 if (!(pd->flags & SM501FB_FLAG_PANEL_NO_VBIASEN)) {
-                        control |= SM501_DC_PANEL_CONTROL_BIAS; /* VBIASEN */
+                        if (pd->flags & SM501FB_FLAG_PANEL_INV_VBIASEN)
+                                control &= ~SM501_DC_PANEL_CONTROL_BIAS;
+                        else
+                                control |= SM501_DC_PANEL_CONTROL_BIAS;
+
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
                         mdelay(10);
                 }
 
                 if (!(pd->flags & SM501FB_FLAG_PANEL_NO_FPEN)) {
-                        control |= SM501_DC_PANEL_CONTROL_FPEN;
+                        if (pd->flags & SM501FB_FLAG_PANEL_INV_FPEN)
+                                control &= ~SM501_DC_PANEL_CONTROL_FPEN;
+                        else
+                                control |= SM501_DC_PANEL_CONTROL_FPEN;
+
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
                         mdelay(10);
@@ -679,14 +731,22 @@ static void sm501fb_panel_power(struct sm501fb_info *fbi, int to)
         } else if (!to && (control & SM501_DC_PANEL_CONTROL_VDD) != 0) {
                 /* disable panel power */
                 if (!(pd->flags & SM501FB_FLAG_PANEL_NO_FPEN)) {
-                        control &= ~SM501_DC_PANEL_CONTROL_FPEN;
+                        if (pd->flags & SM501FB_FLAG_PANEL_INV_FPEN)
+                                control |= SM501_DC_PANEL_CONTROL_FPEN;
+                        else
+                                control &= ~SM501_DC_PANEL_CONTROL_FPEN;
+
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
                         mdelay(10);
                 }
 
                 if (!(pd->flags & SM501FB_FLAG_PANEL_NO_VBIASEN)) {
-                        control &= ~SM501_DC_PANEL_CONTROL_BIAS;
+                        if (pd->flags & SM501FB_FLAG_PANEL_INV_VBIASEN)
+                                control |= SM501_DC_PANEL_CONTROL_BIAS;
+                        else
+                                control &= ~SM501_DC_PANEL_CONTROL_BIAS;
+
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
                         mdelay(10);
@@ -1210,39 +1270,6 @@ static struct fb_ops sm501fb_ops_pnl = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-/* sm501fb_info_alloc
- *
- * creates and initialises an sm501fb_info structure
-*/
-
-static struct sm501fb_info *sm501fb_info_alloc(struct fb_info *fbinfo_crt,
-                                               struct fb_info *fbinfo_pnl)
-{
-        struct sm501fb_info *info;
-        struct sm501fb_par  *par;
-
-        info = kzalloc(sizeof(struct sm501fb_info), GFP_KERNEL);
-        if (info) {
-                /* set the references back */
-
-                par = fbinfo_crt->par;
-                par->info = info;
-                par->head = HEAD_CRT;
-                fbinfo_crt->pseudo_palette = &par->pseudo_palette;
-
-                par = fbinfo_pnl->par;
-                par->info = info;
-                par->head = HEAD_PANEL;
-                fbinfo_pnl->pseudo_palette = &par->pseudo_palette;
-
-                /* store the two fbs into our info */
-                info->fb[HEAD_CRT] = fbinfo_crt;
-                info->fb[HEAD_PANEL] = fbinfo_pnl;
-        }
-
-        return info;
-}
-
 /* sm501_init_cursor
  *
  * initialise hw cursor parameters
@@ -1250,10 +1277,16 @@ static struct sm501fb_info *sm501fb_info_alloc(struct fb_info *fbinfo_crt,
 
 static int sm501_init_cursor(struct fb_info *fbi, unsigned int reg_base)
 {
-        struct sm501fb_par *par = fbi->par;
-        struct sm501fb_info *info = par->info;
+        struct sm501fb_par *par;
+        struct sm501fb_info *info;
         int ret;
 
+        if (fbi == NULL)
+                return 0;
+
+        par = fbi->par;
+        info = par->info;
+
         par->cursor_regs = info->regs + reg_base;
 
         ret = sm501_alloc_mem(info, &par->cursor, SM501_MEMF_CURSOR, 1024);
@@ -1281,13 +1314,10 @@ static int sm501fb_start(struct sm501fb_info *info,
                          struct platform_device *pdev)
 {
         struct resource *res;
-        struct device *dev;
+        struct device *dev = &pdev->dev;
         int k;
         int ret;
 
-        info->dev = dev = &pdev->dev;
-        platform_set_drvdata(pdev, info);
-
         info->irq = ret = platform_get_irq(pdev, 0);
         if (ret < 0) {
                 /* we currently do not use the IRQ */
@@ -1390,11 +1420,6 @@ static void sm501fb_stop(struct sm501fb_info *info)
         kfree(info->regs_res);
 }
 
-static void sm501fb_info_release(struct sm501fb_info *info)
-{
-        kfree(info);
-}
-
 static int sm501fb_init_fb(struct fb_info *fb,
                            enum sm501_controller head,
                            const char *fbname)
@@ -1539,36 +1564,93 @@ static struct sm501_platdata_fb sm501fb_def_pdata = {
 static char driver_name_crt[] = "sm501fb-crt";
 static char driver_name_pnl[] = "sm501fb-panel";
 
-static int __init sm501fb_probe(struct platform_device *pdev)
+static int __devinit sm501fb_probe_one(struct sm501fb_info *info,
+                                       enum sm501_controller head)
 {
-        struct sm501fb_info *info;
-        struct device       *dev = &pdev->dev;
-        struct fb_info      *fbinfo_crt;
-        struct fb_info      *fbinfo_pnl;
-        int                  ret;
+        unsigned char *name = (head == HEAD_CRT) ? "crt" : "panel";
+        struct sm501_platdata_fbsub *pd;
+        struct sm501fb_par *par;
+        struct fb_info *fbi;
 
-        /* allocate our framebuffers */
+        pd = (head == HEAD_CRT) ? info->pdata->fb_crt : info->pdata->fb_pnl;
+
+        /* Do not initialise if we've not been given any platform data */
+        if (pd == NULL) {
+                dev_info(info->dev, "no data for fb %s (disabled)\n", name);
+                return 0;
+        }
 
-        fbinfo_crt = framebuffer_alloc(sizeof(struct sm501fb_par), dev);
-        if (fbinfo_crt == NULL) {
-                dev_err(dev, "cannot allocate crt framebuffer\n");
+        fbi = framebuffer_alloc(sizeof(struct sm501fb_par), info->dev);
+        if (fbi == NULL) {
+                dev_err(info->dev, "cannot allocate %s framebuffer\n", name);
                 return -ENOMEM;
         }
 
-        fbinfo_pnl = framebuffer_alloc(sizeof(struct sm501fb_par), dev);
-        if (fbinfo_pnl == NULL) {
-                dev_err(dev, "cannot allocate panel framebuffer\n");
-                ret = -ENOMEM;
-                goto fbinfo_crt_alloc_fail;
+        par = fbi->par;
+        par->info = info;
+        par->head = head;
+        fbi->pseudo_palette = &par->pseudo_palette;
+
+        info->fb[head] = fbi;
+
+        return 0;
+}
+
+/* Free up anything allocated by sm501fb_init_fb */
+
+static void sm501_free_init_fb(struct sm501fb_info *info,
+                                enum sm501_controller head)
+{
+        struct fb_info *fbi = info->fb[head];
+
+        fb_dealloc_cmap(&fbi->cmap);
+}
+
+static int __devinit sm501fb_start_one(struct sm501fb_info *info,
+                                       enum sm501_controller head,
+                                       const char *drvname)
+{
+        struct fb_info *fbi = info->fb[head];
+        int ret;
+
+        if (!fbi)
+                return 0;
+
+        ret = sm501fb_init_fb(info->fb[head], head, drvname);
+        if (ret) {
+                dev_err(info->dev, "cannot initialise fb %s\n", drvname);
+                return ret;
+        }
+
+        ret = register_framebuffer(info->fb[head]);
+        if (ret) {
+                dev_err(info->dev, "failed to register fb %s\n", drvname);
+                sm501_free_init_fb(info, head);
+                return ret;
         }
 
-        info = sm501fb_info_alloc(fbinfo_crt, fbinfo_pnl);
-        if (info == NULL) {
-                dev_err(dev, "cannot allocate par\n");
-                ret = -ENOMEM;
-                goto sm501fb_alloc_fail;
+        dev_info(info->dev, "fb%d: %s frame buffer\n", fbi->node, fbi->fix.id);
+
+        return 0;
+}
+
+static int __devinit sm501fb_probe(struct platform_device *pdev)
+{
+        struct sm501fb_info *info;
+        struct device *dev = &pdev->dev;
+        int ret;
+
+        /* allocate our framebuffers */
+
+        info = kzalloc(sizeof(struct sm501fb_info), GFP_KERNEL);
+        if (!info) {
+                dev_err(dev, "failed to allocate state\n");
+                return -ENOMEM;
         }
 
+        info->dev = dev = &pdev->dev;
+        platform_set_drvdata(pdev, info);
+
         if (dev->parent->platform_data) {
                 struct sm501_platdata *pd = dev->parent->platform_data;
                 info->pdata = pd->fb;
@@ -1579,90 +1661,88 @@ static int __init sm501fb_probe(struct platform_device *pdev)
                 info->pdata = &sm501fb_def_pdata;
         }
 
-        /* start the framebuffers */
+        /* probe for the presence of each panel */
 
-        ret = sm501fb_start(info, pdev);
-        if (ret) {
-                dev_err(dev, "cannot initialise SM501\n");
-                goto sm501fb_start_fail;
+        ret = sm501fb_probe_one(info, HEAD_CRT);
+        if (ret < 0) {
+                dev_err(dev, "failed to probe CRT\n");
+                goto err_alloc;
         }
 
-        /* CRT framebuffer setup */
+        ret = sm501fb_probe_one(info, HEAD_PANEL);
+        if (ret < 0) {
+                dev_err(dev, "failed to probe PANEL\n");
+                goto err_probed_crt;
+        }
 
-        ret = sm501fb_init_fb(fbinfo_crt, HEAD_CRT, driver_name_crt);
-        if (ret) {
-                dev_err(dev, "cannot initialise CRT fb\n");
-                goto sm501fb_start_fail;
+        if (info->fb[HEAD_PANEL] == NULL &&
+            info->fb[HEAD_CRT] == NULL) {
+                dev_err(dev, "no framebuffers found\n");
+                goto err_alloc;
         }
 
-        /* Panel framebuffer setup */
+        /* get the resources for both of the framebuffers */
 
-        ret = sm501fb_init_fb(fbinfo_pnl, HEAD_PANEL, driver_name_pnl);
+        ret = sm501fb_start(info, pdev);
         if (ret) {
-                dev_err(dev, "cannot initialise Panel fb\n");
-                goto sm501fb_start_fail;
+                dev_err(dev, "cannot initialise SM501\n");
+                goto err_probed_panel;
         }
 
-        /* register framebuffers */
-
-        ret = register_framebuffer(fbinfo_crt);
-        if (ret < 0) {
-                dev_err(dev, "failed to register CRT fb (%d)\n", ret);
-                goto register_crt_fail;
+        ret = sm501fb_start_one(info, HEAD_CRT, driver_name_crt);
+        if (ret) {
+                dev_err(dev, "failed to start CRT\n");
+                goto err_started;
         }
 
-        ret = register_framebuffer(fbinfo_pnl);
-        if (ret < 0) {
-                dev_err(dev, "failed to register panel fb (%d)\n", ret);
-                goto register_pnl_fail;
+        ret = sm501fb_start_one(info, HEAD_PANEL, driver_name_pnl);
+        if (ret) {
+                dev_err(dev, "failed to start Panel\n");
+                goto err_started_crt;
         }
 
-        dev_info(dev, "fb%d: %s frame buffer device\n",
-                 fbinfo_crt->node, fbinfo_crt->fix.id);
-
-        dev_info(dev, "fb%d: %s frame buffer device\n",
-               fbinfo_pnl->node, fbinfo_pnl->fix.id);
-
         /* create device files */
 
         ret = device_create_file(dev, &dev_attr_crt_src);
         if (ret)
-                goto crtsrc_fail;
+                goto err_started_panel;
 
         ret = device_create_file(dev, &dev_attr_fbregs_pnl);
         if (ret)
-                goto fbregs_pnl_fail;
+                goto err_attached_crtsrc_file;
 
         ret = device_create_file(dev, &dev_attr_fbregs_crt);
         if (ret)
-                goto fbregs_crt_fail;
+                goto err_attached_pnlregs_file;
 
         /* we registered, return ok */
         return 0;
 
- fbregs_crt_fail:
+err_attached_pnlregs_file:
         device_remove_file(dev, &dev_attr_fbregs_pnl);
 
- fbregs_pnl_fail:
+err_attached_crtsrc_file:
         device_remove_file(dev, &dev_attr_crt_src);
 
- crtsrc_fail:
-        unregister_framebuffer(fbinfo_pnl);
+err_started_panel:
+        unregister_framebuffer(info->fb[HEAD_PANEL]);
+        sm501_free_init_fb(info, HEAD_PANEL);
 
- register_pnl_fail:
-        unregister_framebuffer(fbinfo_crt);
+err_started_crt:
+        unregister_framebuffer(info->fb[HEAD_CRT]);
+        sm501_free_init_fb(info, HEAD_CRT);
 
- register_crt_fail:
+err_started:
         sm501fb_stop(info);
 
- sm501fb_start_fail:
-        sm501fb_info_release(info);
+err_probed_panel:
+        framebuffer_release(info->fb[HEAD_PANEL]);
 
- sm501fb_alloc_fail:
-        framebuffer_release(fbinfo_pnl);
+err_probed_crt:
+        framebuffer_release(info->fb[HEAD_CRT]);
 
- fbinfo_crt_alloc_fail:
-        framebuffer_release(fbinfo_crt);
+err_alloc:
+        kfree(info);
 
         return ret;
 }
@@ -1681,11 +1761,14 @@ static int sm501fb_remove(struct platform_device *pdev)
         device_remove_file(&pdev->dev, &dev_attr_fbregs_pnl);
         device_remove_file(&pdev->dev, &dev_attr_crt_src);
 
+        sm501_free_init_fb(info, HEAD_CRT);
+        sm501_free_init_fb(info, HEAD_PANEL);
+
         unregister_framebuffer(fbinfo_crt);
         unregister_framebuffer(fbinfo_pnl);
 
         sm501fb_stop(info);
-        sm501fb_info_release(info);
+        kfree(info);
 
         framebuffer_release(fbinfo_pnl);
         framebuffer_release(fbinfo_crt);
diff --git a/drivers/video/sticore.h b/drivers/video/sticore.h
index 1a9a60c74be3..7fe5be4bc70e 100644
--- a/drivers/video/sticore.h
+++ b/drivers/video/sticore.h
@@ -352,8 +352,6 @@ struct sti_struct *sti_get_rom(unsigned int index); /* 0: default sti */
 
 /* functions to call the STI ROM directly */
 
-int  sti_init_graph(struct sti_struct *sti);
-void sti_inq_conf(struct sti_struct *sti);
 void sti_putc(struct sti_struct *sti, int c, int y, int x);
 void sti_set(struct sti_struct *sti, int src_y, int src_x,
              int height, int width, u8 color);
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 598d35eff935..166481402412 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1078,8 +1078,7 @@ static struct fb_ops stifb_ops = {
  *  Initialization
  */
 
-int __init
-stifb_init_fb(struct sti_struct *sti, int bpp_pref)
+static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
 {
         struct fb_fix_screeninfo *fix;
         struct fb_var_screeninfo *var;
@@ -1315,8 +1314,7 @@ static int stifb_disabled __initdata;
 int __init
 stifb_setup(char *options);
 
-int __init
-stifb_init(void)
+static int __init stifb_init(void)
 {
         struct sti_struct *sti;
         struct sti_struct *def_sti;
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 2a03f78bbb0d..643afbfe8277 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -505,7 +505,7 @@ static int __devexit tcx_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id tcx_match[] = {
+static const struct of_device_id tcx_match[] = {
         {
                 .name = "SUNW,tcx",
         },
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index ea9f19d25597..14bd3f3680b8 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base,
 #define VOODOO5_MAX_PIXCLOCK 350000
 
 static struct fb_fix_screeninfo tdfx_fix __devinitdata = {
-        .id =           "3Dfx",
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
         .ypanstep =     1,
@@ -426,7 +425,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id)
         if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) {
                 /* Banshee/Voodoo3 */
                 chip_size = 2;
-                if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE))
+                if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE))
                         chip_size = 1;
         } else {
                 /* Voodoo4/5 */
@@ -836,16 +835,12 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var,
         struct tdfx_par *par = info->par;
         u32 addr = var->yoffset * info->fix.line_length;
 
-        if (nopan || var->xoffset || (var->yoffset > var->yres_virtual))
-                return -EINVAL;
-        if ((var->yoffset + var->yres > var->yres_virtual && nowrap))
+        if (nopan || var->xoffset)
                 return -EINVAL;
 
         banshee_make_room(par, 1);
         tdfx_outl(par, VIDDESKSTART, addr);
 
-        info->var.xoffset = var->xoffset;
-        info->var.yoffset = var->yoffset;
         return 0;
 }
 
@@ -1200,57 +1195,58 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
                 return -ENOMEM;
 
         default_par = info->par;
+        info->fix = tdfx_fix;
 
         /* Configure the default fb_fix_screeninfo first */
         switch (pdev->device) {
         case PCI_DEVICE_ID_3DFX_BANSHEE:
-                strcat(tdfx_fix.id, " Banshee");
+                strcpy(info->fix.id, "3Dfx Banshee");
                 default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO3:
-                strcat(tdfx_fix.id, " Voodoo3");
+                strcpy(info->fix.id, "3Dfx Voodoo3");
                 default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO5:
-                strcat(tdfx_fix.id, " Voodoo5");
+                strcpy(info->fix.id, "3Dfx Voodoo5");
                 default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;
                 break;
         }
 
-        tdfx_fix.mmio_start = pci_resource_start(pdev, 0);
-        tdfx_fix.mmio_len = pci_resource_len(pdev, 0);
-        if (!request_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len,
+        info->fix.mmio_start = pci_resource_start(pdev, 0);
+        info->fix.mmio_len = pci_resource_len(pdev, 0);
+        if (!request_mem_region(info->fix.mmio_start, info->fix.mmio_len,
                                 "tdfx regbase")) {
                 printk(KERN_ERR "tdfxfb: Can't reserve regbase\n");
                 goto out_err;
         }
 
         default_par->regbase_virt =
-                ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
+                ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
         if (!default_par->regbase_virt) {
                 printk(KERN_ERR "fb: Can't remap %s register area.\n",
-                                tdfx_fix.id);
+                                info->fix.id);
                 goto out_err_regbase;
         }
 
-        tdfx_fix.smem_start = pci_resource_start(pdev, 1);
-        tdfx_fix.smem_len = do_lfb_size(default_par, pdev->device);
-        if (!tdfx_fix.smem_len) {
-                printk(KERN_ERR "fb: Can't count %s memory.\n", tdfx_fix.id);
+        info->fix.smem_start = pci_resource_start(pdev, 1);
+        info->fix.smem_len = do_lfb_size(default_par, pdev->device);
+        if (!info->fix.smem_len) {
+                printk(KERN_ERR "fb: Can't count %s memory.\n", info->fix.id);
                 goto out_err_regbase;
         }
 
-        if (!request_mem_region(tdfx_fix.smem_start,
+        if (!request_mem_region(info->fix.smem_start,
                                 pci_resource_len(pdev, 1), "tdfx smem")) {
                 printk(KERN_ERR "tdfxfb: Can't reserve smem\n");
                 goto out_err_regbase;
         }
 
-        info->screen_base = ioremap_nocache(tdfx_fix.smem_start,
-                                            tdfx_fix.smem_len);
+        info->screen_base = ioremap_nocache(info->fix.smem_start,
+                                            info->fix.smem_len);
         if (!info->screen_base) {
                 printk(KERN_ERR "fb: Can't remap %s framebuffer.\n",
-                                tdfx_fix.id);
+                                info->fix.id);
                 goto out_err_screenbase;
         }
 
@@ -1262,20 +1258,19 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
                 goto out_err_screenbase;
         }
 
-        printk(KERN_INFO "fb: %s memory = %dK\n", tdfx_fix.id,
-                        tdfx_fix.smem_len >> 10);
+        printk(KERN_INFO "fb: %s memory = %dK\n", info->fix.id,
+                        info->fix.smem_len >> 10);
 
         default_par->mtrr_handle = -1;
         if (!nomtrr)
                 default_par->mtrr_handle =
-                        mtrr_add(tdfx_fix.smem_start, tdfx_fix.smem_len,
+                        mtrr_add(info->fix.smem_start, info->fix.smem_len,
                                  MTRR_TYPE_WRCOMB, 1);
 
-        tdfx_fix.ypanstep       = nopan ? 0 : 1;
-        tdfx_fix.ywrapstep      = nowrap ? 0 : 1;
+        info->fix.ypanstep      = nopan ? 0 : 1;
+        info->fix.ywrapstep     = nowrap ? 0 : 1;
 
         info->fbops             = &tdfxfb_ops;
-        info->fix               = tdfx_fix;
         info->pseudo_palette    = default_par->palette;
         info->flags             = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 #ifdef CONFIG_FB_3DFX_ACCEL
@@ -1328,14 +1323,14 @@ out_err_iobase:
 out_err_screenbase:
         if (info->screen_base)
                 iounmap(info->screen_base);
-        release_mem_region(tdfx_fix.smem_start, pci_resource_len(pdev, 1));
+        release_mem_region(info->fix.smem_start, pci_resource_len(pdev, 1));
 out_err_regbase:
         /*
          * Cleanup after anything that was remapped/allocated.
          */
         if (default_par->regbase_virt)
                 iounmap(default_par->regbase_virt);
-        release_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
+        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
 out_err:
         framebuffer_release(info);
         return -ENXIO;
@@ -1426,6 +1421,8 @@ MODULE_LICENSE("GPL");
 module_param(hwcursor, int, 0644);
 MODULE_PARM_DESC(hwcursor, "Enable hardware cursor "
                         "(1=enable, 0=disable, default=1)");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
 #ifdef CONFIG_MTRR
 module_param(nomtrr, bool, 0);
 MODULE_PARM_DESC(nomtrr, "Disable MTRR support (default: enabled)");
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
new file mode 100644
index 000000000000..2a380011e9ba
--- /dev/null
+++ b/drivers/video/tmiofb.c
@@ -0,0 +1,1050 @@
+/*
+ * Frame Buffer Device for Toshiba Mobile IO(TMIO) controller
+ *
+ * Copyright(C) 2005-2006 Chris Humbert
+ * Copyright(C) 2005 Dirk Opfer
+ * Copytight(C) 2007,2008 Dmitry Baryshkov
+ *
+ * Based on:
+ *      drivers/video/w100fb.c
+ *      code written by Sharp/Lineo for 2.4 kernels
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+/* Why should fb driver call console functions? because acquire_console_sem() */
+#include <linux/console.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tmio.h>
+#include <linux/uaccess.h>
+
+/*
+ * accelerator commands
+ */
+#define TMIOFB_ACC_CSADR(x)     (0x00000000 | ((x) & 0x001ffffe))
+#define TMIOFB_ACC_CHPIX(x)     (0x01000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_CVPIX(x)     (0x02000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PSADR(x)     (0x03000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_PHPIX(x)     (0x04000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PVPIX(x)     (0x05000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PHOFS(x)     (0x06000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PVOFS(x)     (0x07000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_POADR(x)     (0x08000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_RSTR(x)      (0x09000000 | ((x) & 0x000000ff))
+#define TMIOFB_ACC_TCLOR(x)     (0x0A000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_FILL(x)      (0x0B000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_DSADR(x)     (0x0C000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_SSADR(x)     (0x0D000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_DHPIX(x)     (0x0E000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_DVPIX(x)     (0x0F000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_SHPIX(x)     (0x10000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_SVPIX(x)     (0x11000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_LBINI(x)     (0x12000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_LBK2(x)      (0x13000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SHBINI(x)    (0x14000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SHBK2(x)     (0x15000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SVBINI(x)    (0x16000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SVBK2(x)     (0x17000000 | ((x) & 0x0000ffff))
+
+#define TMIOFB_ACC_CMGO         0x20000000
+#define TMIOFB_ACC_CMGO_CEND    0x00000001
+#define TMIOFB_ACC_CMGO_INT     0x00000002
+#define TMIOFB_ACC_CMGO_CMOD    0x00000010
+#define TMIOFB_ACC_CMGO_CDVRV   0x00000020
+#define TMIOFB_ACC_CMGO_CDHRV   0x00000040
+#define TMIOFB_ACC_CMGO_RUND    0x00008000
+#define TMIOFB_ACC_SCGO         0x21000000
+#define TMIOFB_ACC_SCGO_CEND    0x00000001
+#define TMIOFB_ACC_SCGO_INT     0x00000002
+#define TMIOFB_ACC_SCGO_ROP3    0x00000004
+#define TMIOFB_ACC_SCGO_TRNS    0x00000008
+#define TMIOFB_ACC_SCGO_DVRV    0x00000010
+#define TMIOFB_ACC_SCGO_DHRV    0x00000020
+#define TMIOFB_ACC_SCGO_SVRV    0x00000040
+#define TMIOFB_ACC_SCGO_SHRV    0x00000080
+#define TMIOFB_ACC_SCGO_DSTXY   0x00008000
+#define TMIOFB_ACC_SBGO         0x22000000
+#define TMIOFB_ACC_SBGO_CEND    0x00000001
+#define TMIOFB_ACC_SBGO_INT     0x00000002
+#define TMIOFB_ACC_SBGO_DVRV    0x00000010
+#define TMIOFB_ACC_SBGO_DHRV    0x00000020
+#define TMIOFB_ACC_SBGO_SVRV    0x00000040
+#define TMIOFB_ACC_SBGO_SHRV    0x00000080
+#define TMIOFB_ACC_SBGO_SBMD    0x00000100
+#define TMIOFB_ACC_FLGO         0x23000000
+#define TMIOFB_ACC_FLGO_CEND    0x00000001
+#define TMIOFB_ACC_FLGO_INT     0x00000002
+#define TMIOFB_ACC_FLGO_ROP3    0x00000004
+#define TMIOFB_ACC_LDGO         0x24000000
+#define TMIOFB_ACC_LDGO_CEND    0x00000001
+#define TMIOFB_ACC_LDGO_INT     0x00000002
+#define TMIOFB_ACC_LDGO_ROP3    0x00000004
+#define TMIOFB_ACC_LDGO_ENDPX   0x00000008
+#define TMIOFB_ACC_LDGO_LVRV    0x00000010
+#define TMIOFB_ACC_LDGO_LHRV    0x00000020
+#define TMIOFB_ACC_LDGO_LDMOD   0x00000040
+
+/* a FIFO is always allocated, even if acceleration is not used */
+#define TMIOFB_FIFO_SIZE        512
+
+/*
+ * LCD Host Controller Configuration Register
+ *
+ * This iomem area supports only 16-bit IO.
+ */
+#define CCR_CMD                 0x04 /* Command                         */
+#define CCR_REVID               0x08 /* Revision ID                     */
+#define CCR_BASEL               0x10 /* LCD Control Reg Base Addr Low   */
+#define CCR_BASEH               0x12 /* LCD Control Reg Base Addr High  */
+#define CCR_UGCC                0x40 /* Unified Gated Clock Control     */
+#define CCR_GCC                 0x42 /* Gated Clock Control             */
+#define CCR_USC                 0x50 /* Unified Software Clear          */
+#define CCR_VRAMRTC             0x60 /* VRAM Timing Control             */
+                                /* 0x61 VRAM Refresh Control            */
+#define CCR_VRAMSAC             0x62 /* VRAM Access Control             */
+                                /* 0x63 VRAM Status                     */
+#define CCR_VRAMBC              0x64 /* VRAM Block Control              */
+
+/*
+ * LCD Control Register
+ *
+ * This iomem area supports only 16-bit IO.
+ */
+#define LCR_UIS                 0x000 /* Unified Interrupt Status       */
+#define LCR_VHPN                0x008 /* VRAM Horizontal Pixel Number   */
+#define LCR_CFSAL               0x00a /* Command FIFO Start Address Low */
+#define LCR_CFSAH               0x00c /* Command FIFO Start Address High */
+#define LCR_CFS                 0x00e /* Command FIFO Size              */
+#define LCR_CFWS                0x010 /* Command FIFO Writeable Size    */
+#define LCR_BBIE                0x012 /* BitBLT Interrupt Enable        */
+#define LCR_BBISC               0x014 /* BitBLT Interrupt Status and Clear */
+#define LCR_CCS                 0x016 /* Command Count Status           */
+#define LCR_BBES                0x018 /* BitBLT Execution Status        */
+#define LCR_CMDL                0x01c /* Command Low                    */
+#define LCR_CMDH                0x01e /* Command High                   */
+#define LCR_CFC                 0x022 /* Command FIFO Clear             */
+#define LCR_CCIFC               0x024 /* CMOS Camera IF Control         */
+#define LCR_HWT                 0x026 /* Hardware Test                  */
+#define LCR_LCDCCRC             0x100 /* LCDC Clock and Reset Control   */
+#define LCR_LCDCC               0x102 /* LCDC Control                   */
+#define LCR_LCDCOPC             0x104 /* LCDC Output Pin Control        */
+#define LCR_LCDIS               0x108 /* LCD Interrupt Status           */
+#define LCR_LCDIM               0x10a /* LCD Interrupt Mask             */
+#define LCR_LCDIE               0x10c /* LCD Interrupt Enable           */
+#define LCR_GDSAL               0x122 /* Graphics Display Start Address Low */
+#define LCR_GDSAH               0x124 /* Graphics Display Start Address High */
+#define LCR_VHPCL               0x12a /* VRAM Horizontal Pixel Count Low */
+#define LCR_VHPCH               0x12c /* VRAM Horizontal Pixel Count High */
+#define LCR_GM                  0x12e /* Graphic Mode(VRAM access enable) */
+#define LCR_HT                  0x140 /* Horizontal Total               */
+#define LCR_HDS                 0x142 /* Horizontal Display Start       */
+#define LCR_HSS                 0x144 /* H-Sync Start                   */
+#define LCR_HSE                 0x146 /* H-Sync End                     */
+#define LCR_HNP                 0x14c /* Horizontal Number of Pixels    */
+#define LCR_VT                  0x150 /* Vertical Total                 */
+#define LCR_VDS                 0x152 /* Vertical Display Start         */
+#define LCR_VSS                 0x154 /* V-Sync Start                   */
+#define LCR_VSE                 0x156 /* V-Sync End                     */
+#define LCR_CDLN                0x160 /* Current Display Line Number    */
+#define LCR_ILN                 0x162 /* Interrupt Line Number          */
+#define LCR_SP                  0x164 /* Sync Polarity                  */
+#define LCR_MISC                0x166 /* MISC(RGB565 mode)              */
+#define LCR_VIHSS               0x16a /* Video Interface H-Sync Start   */
+#define LCR_VIVS                0x16c /* Video Interface Vertical Start */
+#define LCR_VIVE                0x16e /* Video Interface Vertical End   */
+#define LCR_VIVSS               0x170 /* Video Interface V-Sync Start   */
+#define LCR_VCCIS               0x17e /* Video / CMOS Camera Interface Select */
+#define LCR_VIDWSAL             0x180 /* VI Data Write Start Address Low */
+#define LCR_VIDWSAH             0x182 /* VI Data Write Start Address High */
+#define LCR_VIDRSAL             0x184 /* VI Data Read Start Address Low */
+#define LCR_VIDRSAH             0x186 /* VI Data Read Start Address High */
+#define LCR_VIPDDST             0x188 /* VI Picture Data Display Start Timing */
+#define LCR_VIPDDET             0x186 /* VI Picture Data Display End Timing */
+#define LCR_VIE                 0x18c /* Video Interface Enable         */
+#define LCR_VCS                 0x18e /* Video/Camera Select            */
+#define LCR_VPHWC               0x194 /* Video Picture Horizontal Wait Count */
+#define LCR_VPHS                0x196 /* Video Picture Horizontal Size  */
+#define LCR_VPVWC               0x198 /* Video Picture Vertical Wait Count */
+#define LCR_VPVS                0x19a /* Video Picture Vertical Size    */
+#define LCR_PLHPIX              0x1a0 /* PLHPIX                         */
+#define LCR_XS                  0x1a2 /* XStart                         */
+#define LCR_XCKHW               0x1a4 /* XCK High Width                 */
+#define LCR_STHS                0x1a8 /* STH Start                      */
+#define LCR_VT2                 0x1aa /* Vertical Total                 */
+#define LCR_YCKSW               0x1ac /* YCK Start Wait                 */
+#define LCR_YSTS                0x1ae /* YST Start                      */
+#define LCR_PPOLS               0x1b0 /* #PPOL Start                    */
+#define LCR_PRECW               0x1b2 /* PREC Width                     */
+#define LCR_VCLKHW              0x1b4 /* VCLK High Width                */
+#define LCR_OC                  0x1b6 /* Output Control                 */
+
+static char *mode_option __devinitdata;
+
+struct tmiofb_par {
+        u32                             pseudo_palette[16];
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        wait_queue_head_t               wait_acc;
+        bool                            use_polling;
+#endif
+
+        void __iomem                    *ccr;
+        void __iomem                    *lcr;
+};
+
+/*--------------------------------------------------------------------------*/
+
+/*
+ * reasons for an interrupt:
+ *      uis     bbisc   lcdis
+ *      0100    0001    accelerator command completed
+ *      2000    0001    vsync start
+ *      2000    0002    display start
+ *      2000    0004    line number match(0x1ff mask???)
+ */
+static irqreturn_t tmiofb_irq(int irq, void *__info)
+{
+        struct fb_info *info = __info;
+        struct tmiofb_par *par = info->par;
+        unsigned int bbisc = tmio_ioread16(par->lcr + LCR_BBISC);
+
+
+        /*
+         * We were in polling mode and now we got correct irq.
+         * Switch back to IRQ-based sync of command FIFO
+         */
+        if (unlikely(par->use_polling && irq != -1)) {
+                printk(KERN_INFO "tmiofb: switching to waitq\n");
+                par->use_polling = false;
+        }
+
+        tmio_iowrite16(bbisc, par->lcr + LCR_BBISC);
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        if (bbisc & 1)
+                wake_up(&par->wait_acc);
+#endif
+
+        return IRQ_HANDLED;
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
+/*
+ * Turns off the LCD controller and LCD host controller.
+ */
+static int tmiofb_hw_stop(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+
+        tmio_iowrite16(0, par->ccr + CCR_UGCC);
+        tmio_iowrite16(0, par->lcr + LCR_GM);
+        data->lcd_set_power(dev, 0);
+        tmio_iowrite16(0x0010, par->lcr + LCR_LCDCCRC);
+
+        return 0;
+}
+
+/*
+ * Initializes the LCD host controller.
+ */
+static int tmiofb_hw_init(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+        const struct resource *nlcr = &cell->resources[0];
+        const struct resource *vram = &cell->resources[2];
+        unsigned long base;
+
+        if (nlcr == NULL || vram == NULL)
+                return -EINVAL;
+
+        base = nlcr->start;
+
+        tmio_iowrite16(0x003a, par->ccr + CCR_UGCC);
+        tmio_iowrite16(0x003a, par->ccr + CCR_GCC);
+        tmio_iowrite16(0x3f00, par->ccr + CCR_USC);
+
+        msleep(2); /* wait for device to settle */
+
+        tmio_iowrite16(0x0000, par->ccr + CCR_USC);
+        tmio_iowrite16(base >> 16, par->ccr + CCR_BASEH);
+        tmio_iowrite16(base, par->ccr + CCR_BASEL);
+        tmio_iowrite16(0x0002, par->ccr + CCR_CMD); /* base address enable */
+        tmio_iowrite16(0x40a8, par->ccr + CCR_VRAMRTC); /* VRAMRC, VRAMTC */
+        tmio_iowrite16(0x0018, par->ccr + CCR_VRAMSAC); /* VRAMSTS, VRAMAC */
+        tmio_iowrite16(0x0002, par->ccr + CCR_VRAMBC);
+        msleep(2); /* wait for device to settle */
+        tmio_iowrite16(0x000b, par->ccr + CCR_VRAMBC);
+
+        base = vram->start + info->screen_size;
+        tmio_iowrite16(base >> 16, par->lcr + LCR_CFSAH);
+        tmio_iowrite16(base, par->lcr + LCR_CFSAL);
+        tmio_iowrite16(TMIOFB_FIFO_SIZE - 1, par->lcr + LCR_CFS);
+        tmio_iowrite16(1, par->lcr + LCR_CFC);
+        tmio_iowrite16(1, par->lcr + LCR_BBIE);
+        tmio_iowrite16(0, par->lcr + LCR_CFWS);
+
+        return 0;
+}
+
+/*
+ * Sets the LCD controller's output resolution and pixel clock
+ */
+static void tmiofb_hw_mode(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct fb_videomode *mode = info->mode;
+        struct tmiofb_par *par = info->par;
+        unsigned int i;
+
+        tmio_iowrite16(0, par->lcr + LCR_GM);
+        data->lcd_set_power(dev, 0);
+        tmio_iowrite16(0x0010, par->lcr + LCR_LCDCCRC);
+        data->lcd_mode(dev, mode);
+        data->lcd_set_power(dev, 1);
+
+        tmio_iowrite16(info->fix.line_length, par->lcr + LCR_VHPN);
+        tmio_iowrite16(0, par->lcr + LCR_GDSAH);
+        tmio_iowrite16(0, par->lcr + LCR_GDSAL);
+        tmio_iowrite16(info->fix.line_length >> 16, par->lcr + LCR_VHPCH);
+        tmio_iowrite16(info->fix.line_length, par->lcr + LCR_VHPCL);
+        tmio_iowrite16(i = 0, par->lcr + LCR_HSS);
+        tmio_iowrite16(i += mode->hsync_len, par->lcr + LCR_HSE);
+        tmio_iowrite16(i += mode->left_margin, par->lcr + LCR_HDS);
+        tmio_iowrite16(i += mode->xres + mode->right_margin, par->lcr + LCR_HT);
+        tmio_iowrite16(mode->xres, par->lcr + LCR_HNP);
+        tmio_iowrite16(i = 0, par->lcr + LCR_VSS);
+        tmio_iowrite16(i += mode->vsync_len, par->lcr + LCR_VSE);
+        tmio_iowrite16(i += mode->upper_margin, par->lcr + LCR_VDS);
+        tmio_iowrite16(i += mode->yres, par->lcr + LCR_ILN);
+        tmio_iowrite16(i += mode->lower_margin, par->lcr + LCR_VT);
+        tmio_iowrite16(3, par->lcr + LCR_MISC); /* RGB565 mode */
+        tmio_iowrite16(1, par->lcr + LCR_GM); /* VRAM enable */
+        tmio_iowrite16(0x4007, par->lcr + LCR_LCDCC);
+        tmio_iowrite16(3, par->lcr + LCR_SP);  /* sync polarity */
+
+        tmio_iowrite16(0x0010, par->lcr + LCR_LCDCCRC);
+        msleep(5); /* wait for device to settle */
+        tmio_iowrite16(0x0014, par->lcr + LCR_LCDCCRC); /* STOP_CKP */
+        msleep(5); /* wait for device to settle */
+        tmio_iowrite16(0x0015, par->lcr + LCR_LCDCCRC); /* STOP_CKP|SOFT_RESET*/
+        tmio_iowrite16(0xfffa, par->lcr + LCR_VCS);
+}
+
+/*--------------------------------------------------------------------------*/
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+static int __must_check
+tmiofb_acc_wait(struct fb_info *info, unsigned int ccs)
+{
+        struct tmiofb_par *par = info->par;
+        /*
+         * This code can be called whith interrupts disabled.
+         * So instead of relaying on irq to trigger the event,
+         * poll the state till the necessary command is executed.
+         */
+        if (irqs_disabled() || par->use_polling) {
+                int i = 0;
+                while (tmio_ioread16(par->lcr + LCR_CCS) > ccs) {
+                        udelay(1);
+                        i++;
+                        if (i > 10000) {
+                                pr_err("tmiofb: timeout waiting for %d\n",
+                                                ccs);
+                                return -ETIMEDOUT;
+                        }
+                        tmiofb_irq(-1, info);
+                }
+        } else {
+                if (!wait_event_interruptible_timeout(par->wait_acc,
+                                tmio_ioread16(par->lcr + LCR_CCS) <= ccs,
+                                1000)) {
+                        pr_err("tmiofb: timeout waiting for %d\n", ccs);
+                        return -ETIMEDOUT;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * Writes an accelerator command to the accelerator's FIFO.
+ */
+static int
+tmiofb_acc_write(struct fb_info *info, const u32 *cmd, unsigned int count)
+{
+        struct tmiofb_par *par = info->par;
+        int ret;
+
+        ret = tmiofb_acc_wait(info, TMIOFB_FIFO_SIZE - count);
+        if (ret)
+                return ret;
+
+        for (; count; count--, cmd++) {
+                tmio_iowrite16(*cmd >> 16, par->lcr + LCR_CMDH);
+                tmio_iowrite16(*cmd, par->lcr + LCR_CMDL);
+        }
+
+        return ret;
+}
+
+/*
+ * Wait for the accelerator to finish its operations before writing
+ * to the framebuffer for consistent display output.
+ */
+static int tmiofb_sync(struct fb_info *fbi)
+{
+        struct tmiofb_par *par = fbi->par;
+
+        int ret;
+        int i = 0;
+
+        ret = tmiofb_acc_wait(fbi, 0);
+
+        while (tmio_ioread16(par->lcr + LCR_BBES) & 2) { /* blit active */
+                udelay(1);
+                i++ ;
+                if (i > 10000) {
+                        printk(KERN_ERR "timeout waiting for blit to end!\n");
+                        return -ETIMEDOUT;
+                }
+        }
+
+        return ret;
+}
+
+static void
+tmiofb_fillrect(struct fb_info *fbi, const struct fb_fillrect *rect)
+{
+        const u32 cmd[] = {
+                TMIOFB_ACC_DSADR((rect->dy * fbi->mode->xres + rect->dx) * 2),
+                TMIOFB_ACC_DHPIX(rect->width - 1),
+                TMIOFB_ACC_DVPIX(rect->height - 1),
+                TMIOFB_ACC_FILL(rect->color),
+                TMIOFB_ACC_FLGO,
+        };
+
+        if (fbi->state != FBINFO_STATE_RUNNING ||
+            fbi->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_fillrect(fbi, rect);
+                return;
+        }
+
+        tmiofb_acc_write(fbi, cmd, ARRAY_SIZE(cmd));
+}
+
+static void
+tmiofb_copyarea(struct fb_info *fbi, const struct fb_copyarea *area)
+{
+        const u32 cmd[] = {
+                TMIOFB_ACC_DSADR((area->dy * fbi->mode->xres + area->dx) * 2),
+                TMIOFB_ACC_DHPIX(area->width - 1),
+                TMIOFB_ACC_DVPIX(area->height - 1),
+                TMIOFB_ACC_SSADR((area->sy * fbi->mode->xres + area->sx) * 2),
+                TMIOFB_ACC_SCGO,
+        };
+
+        if (fbi->state != FBINFO_STATE_RUNNING ||
+            fbi->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_copyarea(fbi, area);
+                return;
+        }
+
+        tmiofb_acc_write(fbi, cmd, ARRAY_SIZE(cmd));
+}
+#endif
+
+static void tmiofb_clearscreen(struct fb_info *info)
+{
+        const struct fb_fillrect rect = {
+                .dx     = 0,
+                .dy     = 0,
+                .width  = info->mode->xres,
+                .height = info->mode->yres,
+                .color  = 0,
+                .rop    = ROP_COPY,
+        };
+
+        info->fbops->fb_fillrect(info, &rect);
+}
+
+static int tmiofb_vblank(struct fb_info *fbi, struct fb_vblank *vblank)
+{
+        struct tmiofb_par *par = fbi->par;
+        struct fb_videomode *mode = fbi->mode;
+        unsigned int vcount = tmio_ioread16(par->lcr + LCR_CDLN);
+        unsigned int vds = mode->vsync_len + mode->upper_margin;
+
+        vblank->vcount = vcount;
+        vblank->flags = FB_VBLANK_HAVE_VBLANK | FB_VBLANK_HAVE_VCOUNT
+                                                | FB_VBLANK_HAVE_VSYNC;
+
+        if (vcount < mode->vsync_len)
+                vblank->flags |= FB_VBLANK_VSYNCING;
+
+        if (vcount < vds || vcount > vds + mode->yres)
+                vblank->flags |= FB_VBLANK_VBLANKING;
+
+        return 0;
+}
+
+
+static int tmiofb_ioctl(struct fb_info *fbi,
+                unsigned int cmd, unsigned long arg)
+{
+        switch (cmd) {
+        case FBIOGET_VBLANK: {
+                struct fb_vblank vblank = {0};
+                void __user *argp = (void __user *) arg;
+
+                tmiofb_vblank(fbi, &vblank);
+                if (copy_to_user(argp, &vblank, sizeof vblank))
+                        return -EFAULT;
+                return 0;
+        }
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        case FBIO_TMIO_ACC_SYNC:
+                tmiofb_sync(fbi);
+                return 0;
+
+        case FBIO_TMIO_ACC_WRITE: {
+                u32 __user *argp = (void __user *) arg;
+                u32 len;
+                u32 acc[16];
+
+                if (get_user(len, argp))
+                        return -EFAULT;
+                if (len > ARRAY_SIZE(acc))
+                        return -EINVAL;
+                if (copy_from_user(acc, argp + 1, sizeof(u32) * len))
+                        return -EFAULT;
+
+                return tmiofb_acc_write(fbi, acc, len);
+        }
+#endif
+        }
+
+        return -ENOTTY;
+}
+
+/*--------------------------------------------------------------------------*/
+
+/* Select the smallest mode that allows the desired resolution to be
+ * displayed.  If desired, the x and y parameters can be rounded up to
+ * match the selected mode.
+ */
+static struct fb_videomode *
+tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
+{
+        struct mfd_cell *cell =
+                info->device->platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct fb_videomode *best = NULL;
+        int i;
+
+        for (i = 0; i < data->num_modes; i++) {
+                struct fb_videomode *mode = data->modes + i;
+
+                if (mode->xres >= var->xres && mode->yres >= var->yres
+                                && (!best || (mode->xres < best->xres
+                                           && mode->yres < best->yres)))
+                        best = mode;
+        }
+
+        return best;
+}
+
+static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+
+        struct fb_videomode *mode;
+        struct mfd_cell *cell =
+                info->device->platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+
+        mode = tmiofb_find_mode(info, var);
+        if (!mode || var->bits_per_pixel > 16)
+                return -EINVAL;
+
+        fb_videomode_to_var(var, mode);
+
+        var->xres_virtual = mode->xres;
+        var->yres_virtual = info->screen_size / (mode->xres * 2);
+
+        if (var->yres_virtual < var->yres)
+                return -EINVAL;
+
+        var->xoffset = 0;
+        var->yoffset = 0;
+        var->bits_per_pixel = 16;
+        var->grayscale = 0;
+        var->red.offset = 11;
+        var->red.length = 5;
+        var->green.offset = 5;
+        var->green.length = 6;
+        var->blue.offset = 0;
+        var->blue.length = 5;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->nonstd = 0;
+        var->height = data->height; /* mm */
+        var->width = data->width; /* mm */
+        var->rotate = 0;
+        return 0;
+}
+
+static int tmiofb_set_par(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct fb_videomode *mode;
+
+        mode = tmiofb_find_mode(info, var);
+        if (!mode)
+                return -EINVAL;
+
+        info->mode = mode;
+        info->fix.line_length = info->mode->xres *
+                        var->bits_per_pixel / 8;
+
+        tmiofb_hw_mode(to_platform_device(info->device));
+        tmiofb_clearscreen(info);
+        return 0;
+}
+
+static int tmiofb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                           unsigned blue, unsigned transp,
+                           struct fb_info *info)
+{
+        struct tmiofb_par *par = info->par;
+
+        if (regno < ARRAY_SIZE(par->pseudo_palette)) {
+                par->pseudo_palette[regno] =
+                        ((red & 0xf800)) |
+                        ((green & 0xfc00) >>  5) |
+                        ((blue & 0xf800) >> 11);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static int tmiofb_blank(int blank, struct fb_info *info)
+{
+        /*
+         * everything is done in lcd/bl drivers.
+         * this is purely to make sysfs happy and work.
+         */
+        return 0;
+}
+
+static struct fb_ops tmiofb_ops = {
+        .owner          = THIS_MODULE,
+
+        .fb_ioctl       = tmiofb_ioctl,
+        .fb_check_var   = tmiofb_check_var,
+        .fb_set_par     = tmiofb_set_par,
+        .fb_setcolreg   = tmiofb_setcolreg,
+        .fb_blank       = tmiofb_blank,
+        .fb_imageblit   = cfb_imageblit,
+#ifdef CONFIG_FB_TMIO_ACCELL
+        .fb_sync        = tmiofb_sync,
+        .fb_fillrect    = tmiofb_fillrect,
+        .fb_copyarea    = tmiofb_copyarea,
+#else
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+#endif
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __devinit tmiofb_probe(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
+        struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);
+        int irq = platform_get_irq(dev, 0);
+        struct fb_info *info;
+        struct tmiofb_par *par;
+        int retval;
+
+        /*
+         * This is the only way ATM to disable the fb
+         */
+        if (data == NULL) {
+                dev_err(&dev->dev, "NULL platform data!\n");
+                return -EINVAL;
+        }
+
+        info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev);
+
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        init_waitqueue_head(&par->wait_acc);
+
+        par->use_polling = true;
+
+        info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA
+                        | FBINFO_HWACCEL_FILLRECT;
+#else
+        info->flags = FBINFO_DEFAULT;
+#endif
+
+        info->fbops = &tmiofb_ops;
+
+        strcpy(info->fix.id, "tmio-fb");
+        info->fix.smem_start = vram->start;
+        info->fix.smem_len = resource_size(vram);
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_TRUECOLOR;
+        info->fix.mmio_start = lcr->start;
+        info->fix.mmio_len = resource_size(lcr);
+        info->fix.accel = FB_ACCEL_NONE;
+        info->screen_size = info->fix.smem_len - (4 * TMIOFB_FIFO_SIZE);
+        info->pseudo_palette = par->pseudo_palette;
+
+        par->ccr = ioremap(ccr->start, resource_size(ccr));
+        if (!par->ccr) {
+                retval = -ENOMEM;
+                goto err_ioremap_ccr;
+        }
+
+        par->lcr = ioremap(info->fix.mmio_start, info->fix.mmio_len);
+        if (!par->lcr) {
+                retval = -ENOMEM;
+                goto err_ioremap_lcr;
+        }
+
+        info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
+        if (!info->screen_base) {
+                retval = -ENOMEM;
+                goto err_ioremap_vram;
+        }
+
+        retval = request_irq(irq, &tmiofb_irq, IRQF_DISABLED,
+                                        dev->dev.bus_id, info);
+
+        if (retval)
+                goto err_request_irq;
+
+        platform_set_drvdata(dev, info);
+
+        retval = fb_find_mode(&info->var, info, mode_option,
+                        data->modes, data->num_modes,
+                        data->modes, 16);
+        if (!retval) {
+                retval = -EINVAL;
+                goto err_find_mode;
+        }
+
+        if (cell->enable) {
+                retval = cell->enable(dev);
+                if (retval)
+                        goto err_enable;
+        }
+
+        retval = tmiofb_hw_init(dev);
+        if (retval)
+                goto err_hw_init;
+
+        fb_videomode_to_modelist(data->modes, data->num_modes,
+                                 &info->modelist);
+
+        retval = register_framebuffer(info);
+        if (retval < 0)
+                goto err_register_framebuffer;
+
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+                                info->node, info->fix.id);
+
+        return 0;
+
+err_register_framebuffer:
+/*err_set_par:*/
+        tmiofb_hw_stop(dev);
+err_hw_init:
+        if (cell->disable)
+                cell->disable(dev);
+err_enable:
+err_find_mode:
+        platform_set_drvdata(dev, NULL);
+        free_irq(irq, info);
+err_request_irq:
+        iounmap(info->screen_base);
+err_ioremap_vram:
+        iounmap(par->lcr);
+err_ioremap_lcr:
+        iounmap(par->ccr);
+err_ioremap_ccr:
+        framebuffer_release(info);
+        return retval;
+}
+
+static int __devexit tmiofb_remove(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        int irq = platform_get_irq(dev, 0);
+        struct tmiofb_par *par;
+
+        if (info) {
+                par = info->par;
+                unregister_framebuffer(info);
+
+                tmiofb_hw_stop(dev);
+
+                if (cell->disable)
+                        cell->disable(dev);
+
+                platform_set_drvdata(dev, NULL);
+
+                free_irq(irq, info);
+
+                iounmap(info->screen_base);
+                iounmap(par->lcr);
+                iounmap(par->ccr);
+
+                framebuffer_release(info);
+        }
+
+        return 0;
+}
+
+#ifdef DEBUG
+static void tmiofb_dump_regs(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+
+        printk(KERN_DEBUG "lhccr:\n");
+#define CCR_PR(n)       printk(KERN_DEBUG "\t" #n " = \t%04x\n",\
+                tmio_ioread16(par->ccr + CCR_ ## n));
+        CCR_PR(CMD);
+        CCR_PR(REVID);
+        CCR_PR(BASEL);
+        CCR_PR(BASEH);
+        CCR_PR(UGCC);
+        CCR_PR(GCC);
+        CCR_PR(USC);
+        CCR_PR(VRAMRTC);
+        CCR_PR(VRAMSAC);
+        CCR_PR(VRAMBC);
+#undef CCR_PR
+
+        printk(KERN_DEBUG "lcr: \n");
+#define LCR_PR(n)       printk(KERN_DEBUG "\t" #n " = \t%04x\n",\
+                tmio_ioread16(par->lcr + LCR_ ## n));
+        LCR_PR(UIS);
+        LCR_PR(VHPN);
+        LCR_PR(CFSAL);
+        LCR_PR(CFSAH);
+        LCR_PR(CFS);
+        LCR_PR(CFWS);
+        LCR_PR(BBIE);
+        LCR_PR(BBISC);
+        LCR_PR(CCS);
+        LCR_PR(BBES);
+        LCR_PR(CMDL);
+        LCR_PR(CMDH);
+        LCR_PR(CFC);
+        LCR_PR(CCIFC);
+        LCR_PR(HWT);
+        LCR_PR(LCDCCRC);
+        LCR_PR(LCDCC);
+        LCR_PR(LCDCOPC);
+        LCR_PR(LCDIS);
+        LCR_PR(LCDIM);
+        LCR_PR(LCDIE);
+        LCR_PR(GDSAL);
+        LCR_PR(GDSAH);
+        LCR_PR(VHPCL);
+        LCR_PR(VHPCH);
+        LCR_PR(GM);
+        LCR_PR(HT);
+        LCR_PR(HDS);
+        LCR_PR(HSS);
+        LCR_PR(HSE);
+        LCR_PR(HNP);
+        LCR_PR(VT);
+        LCR_PR(VDS);
+        LCR_PR(VSS);
+        LCR_PR(VSE);
+        LCR_PR(CDLN);
+        LCR_PR(ILN);
+        LCR_PR(SP);
+        LCR_PR(MISC);
+        LCR_PR(VIHSS);
+        LCR_PR(VIVS);
+        LCR_PR(VIVE);
+        LCR_PR(VIVSS);
+        LCR_PR(VCCIS);
+        LCR_PR(VIDWSAL);
+        LCR_PR(VIDWSAH);
+        LCR_PR(VIDRSAL);
+        LCR_PR(VIDRSAH);
+        LCR_PR(VIPDDST);
+        LCR_PR(VIPDDET);
+        LCR_PR(VIE);
+        LCR_PR(VCS);
+        LCR_PR(VPHWC);
+        LCR_PR(VPHS);
+        LCR_PR(VPVWC);
+        LCR_PR(VPVS);
+        LCR_PR(PLHPIX);
+        LCR_PR(XS);
+        LCR_PR(XCKHW);
+        LCR_PR(STHS);
+        LCR_PR(VT2);
+        LCR_PR(YCKSW);
+        LCR_PR(YSTS);
+        LCR_PR(PPOLS);
+        LCR_PR(PRECW);
+        LCR_PR(VCLKHW);
+        LCR_PR(OC);
+#undef LCR_PR
+}
+#endif
+
+#ifdef CONFIG_PM
+static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+        struct mfd_cell *cell = dev->dev.platform_data;
+        int retval = 0;
+
+        acquire_console_sem();
+
+        fb_set_suspend(info, 1);
+
+        if (info->fbops->fb_sync)
+                info->fbops->fb_sync(info);
+
+
+        /*
+         * The fb should be usable even if interrupts are disabled (and they are
+         * during suspend/resume). Switch temporary to forced polling.
+         */
+        printk(KERN_INFO "tmiofb: switching to polling\n");
+        par->use_polling = true;
+        tmiofb_hw_stop(dev);
+
+        if (cell->suspend)
+                retval = cell->suspend(dev);
+
+        release_console_sem();
+
+        return retval;
+}
+
+static int tmiofb_resume(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct mfd_cell *cell = dev->dev.platform_data;
+        int retval;
+
+        acquire_console_sem();
+
+        if (cell->resume) {
+                retval = cell->resume(dev);
+                if (retval)
+                        goto out;
+        }
+
+        tmiofb_irq(-1, info);
+
+        tmiofb_hw_init(dev);
+
+        tmiofb_hw_mode(dev);
+
+        fb_set_suspend(info, 0);
+out:
+        release_console_sem();
+        return retval;
+}
+#else
+#define tmiofb_suspend  NULL
+#define tmiofb_resume   NULL
+#endif
+
+static struct platform_driver tmiofb_driver = {
+        .driver.name    = "tmio-fb",
+        .driver.owner   = THIS_MODULE,
+        .probe          = tmiofb_probe,
+        .remove         = __devexit_p(tmiofb_remove),
+        .suspend        = tmiofb_suspend,
+        .resume         = tmiofb_resume,
+};
+
+/*--------------------------------------------------------------------------*/
+
+#ifndef MODULE
+static void __init tmiofb_setup(char *options)
+{
+        char *this_opt;
+
+        if (!options || !*options)
+                return;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt)
+                        continue;
+                /*
+                 * FIXME
+                 */
+        }
+}
+#endif
+
+static int __init tmiofb_init(void)
+{
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("tmiofb", &option))
+                return -ENODEV;
+        tmiofb_setup(option);
+#endif
+        return platform_driver_register(&tmiofb_driver);
+}
+
+static void __exit tmiofb_cleanup(void)
+{
+        platform_driver_unregister(&tmiofb_driver);
+}
+
+module_init(tmiofb_init);
+module_exit(tmiofb_cleanup);
+
+MODULE_DESCRIPTION("TMIO framebuffer driver");
+MODULE_AUTHOR("Chris Humbert, Dirk Opfer, Dmitry Baryshkov");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index beefab2992c0..479b2e79ad68 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1,5 +1,5 @@
 /*
- * Frame buffer driver for Trident Blade and Image series
+ * Frame buffer driver for Trident TGUI, Blade and Image series
  *
  * Copyright 2001, 2002 - Jani Monoses   <jani@iv.ro>
  *
@@ -13,7 +13,6 @@
  *      code, suggestions
  * TODO:
  *      timing value tweaking so it looks good on every monitor in every mode
- *      TGUI acceleration
  */
 
 #include <linux/module.h>
@@ -22,25 +21,26 @@
 #include <linux/pci.h>
 
 #include <linux/delay.h>
+#include <video/vga.h>
 #include <video/trident.h>
 
-#define VERSION         "0.7.8-NEWAPI"
-
 struct tridentfb_par {
         void __iomem *io_virt;  /* iospace virtual memory address */
+        u32 pseudo_pal[16];
+        int chip_id;
+        int flatpanel;
+        void (*init_accel) (struct tridentfb_par *, int, int);
+        void (*wait_engine) (struct tridentfb_par *);
+        void (*fill_rect)
+                (struct tridentfb_par *par, u32, u32, u32, u32, u32, u32);
+        void (*copy_rect)
+                (struct tridentfb_par *par, u32, u32, u32, u32, u32, u32);
+        void (*image_blit)
+                (struct tridentfb_par *par, const char*,
+                 u32, u32, u32, u32, u32, u32);
+        unsigned char eng_oper; /* engine operation... */
 };
 
-static unsigned char eng_oper;  /* engine operation... */
-static struct fb_ops tridentfb_ops;
-
-static struct tridentfb_par default_par;
-
-/* FIXME:kmalloc these 3 instead */
-static struct fb_info fb_info;
-static u32 pseudo_pal[16];
-
-static struct fb_var_screeninfo default_var;
-
 static struct fb_fix_screeninfo tridentfb_fix = {
         .id = "Trident",
         .type = FB_TYPE_PACKED_PIXELS,
@@ -49,27 +49,22 @@ static struct fb_fix_screeninfo tridentfb_fix = {
         .accel = FB_ACCEL_NONE,
 };
 
-static int chip_id;
-
-static int defaultaccel;
-static int displaytype;
-
 /* defaults which are normally overriden by user values */
 
 /* video mode */
-static char *mode_option __devinitdata = "640x480";
-static int bpp = 8;
+static char *mode_option __devinitdata = "640x480-8@60";
+static int bpp __devinitdata = 8;
 
-static int noaccel;
+static int noaccel __devinitdata;
 
 static int center;
 static int stretch;
 
-static int fp;
-static int crt;
+static int fp __devinitdata;
+static int crt __devinitdata;
 
-static int memsize;
-static int memdiff;
+static int memsize __devinitdata;
+static int memdiff __devinitdata;
 static int nativex;
 
 module_param(mode_option, charp, 0);
@@ -84,25 +79,53 @@ module_param(memsize, int, 0);
 module_param(memdiff, int, 0);
 module_param(nativex, int, 0);
 module_param(fp, int, 0);
+MODULE_PARM_DESC(fp, "Define if flatpanel is connected");
 module_param(crt, int, 0);
+MODULE_PARM_DESC(crt, "Define if CRT is connected");
+
+static inline int is_oldclock(int id)
+{
+        return  (id == TGUI9440) ||
+                (id == TGUI9660) ||
+                (id == CYBER9320);
+}
+
+static inline int is_oldprotect(int id)
+{
+        return  is_oldclock(id) ||
+                (id == PROVIDIA9685) ||
+                (id == CYBER9382) ||
+                (id == CYBER9385);
+}
+
+static inline int is_blade(int id)
+{
+        return  (id == BLADE3D) ||
+                (id == CYBERBLADEE4) ||
+                (id == CYBERBLADEi7) ||
+                (id == CYBERBLADEi7D) ||
+                (id == CYBERBLADEi1) ||
+                (id == CYBERBLADEi1D) ||
+                (id == CYBERBLADEAi1) ||
+                (id == CYBERBLADEAi1D);
+}
 
-static int chip3D;
-static int chipcyber;
+static inline int is_xp(int id)
+{
+        return  (id == CYBERBLADEXPAi1) ||
+                (id == CYBERBLADEXPm8) ||
+                (id == CYBERBLADEXPm16);
+}
 
-static int is3Dchip(int id)
+static inline int is3Dchip(int id)
 {
-        return ((id == BLADE3D) || (id == CYBERBLADEE4) ||
-                (id == CYBERBLADEi7) || (id == CYBERBLADEi7D) ||
+        return  is_blade(id) || is_xp(id) ||
                 (id == CYBER9397) || (id == CYBER9397DVD) ||
                 (id == CYBER9520) || (id == CYBER9525DVD) ||
-                (id == IMAGE975) || (id == IMAGE985) ||
-                (id == CYBERBLADEi1) || (id == CYBERBLADEi1D) ||
-                (id == CYBERBLADEAi1) || (id == CYBERBLADEAi1D) ||
-                (id == CYBERBLADEXPm8) || (id == CYBERBLADEXPm16) ||
-                (id == CYBERBLADEXPAi1));
+                (id == IMAGE975) || (id == IMAGE985);
 }
 
-static int iscyber(int id)
+static inline int iscyber(int id)
 {
         switch (id) {
         case CYBER9388:
@@ -122,12 +145,7 @@ static int iscyber(int id)
                 return 1;
 
         case CYBER9320:
-        case TGUI9660:
-        case IMAGE975:
-        case IMAGE985:
-        case BLADE3D:
         case CYBERBLADEi7:      /* VIA MPV4 integrated version */
-
         default:
                 /* case CYBERBLDAEXPm8:  Strange */
                 /* case CYBERBLDAEXPm16: Strange */
@@ -135,147 +153,110 @@ static int iscyber(int id)
         }
 }
 
-#define CRT 0x3D0               /* CRTC registers offset for color display */
-
-#ifndef TRIDENT_MMIO
-        #define TRIDENT_MMIO 1
-#endif
-
-#if TRIDENT_MMIO
-        #define t_outb(val, reg)        writeb(val,((struct tridentfb_par *)(fb_info.par))->io_virt + reg)
-        #define t_inb(reg)      readb(((struct tridentfb_par*)(fb_info.par))->io_virt + reg)
-#else
-        #define t_outb(val, reg) outb(val, reg)
-        #define t_inb(reg) inb(reg)
-#endif
+static inline void t_outb(struct tridentfb_par *p, u8 val, u16 reg)
+{
+        fb_writeb(val, p->io_virt + reg);
+}
 
+static inline u8 t_inb(struct tridentfb_par *p, u16 reg)
+{
+        return fb_readb(p->io_virt + reg);
+}
 
-static struct accel_switch {
-        void (*init_accel) (int, int);
-        void (*wait_engine) (void);
-        void (*fill_rect) (u32, u32, u32, u32, u32, u32);
-        void (*copy_rect) (u32, u32, u32, u32, u32, u32);
-} *acc;
+static inline void writemmr(struct tridentfb_par *par, u16 r, u32 v)
+{
+        fb_writel(v, par->io_virt + r);
+}
 
-#define writemmr(r, v)  writel(v, ((struct tridentfb_par *)fb_info.par)->io_virt + r)
-#define readmmr(r)      readl(((struct tridentfb_par *)fb_info.par)->io_virt + r)
+static inline u32 readmmr(struct tridentfb_par *par, u16 r)
+{
+        return fb_readl(par->io_virt + r);
+}
 
 /*
  * Blade specific acceleration.
  */
 
 #define point(x, y) ((y) << 16 | (x))
-#define STA     0x2120
-#define CMD     0x2144
-#define ROP     0x2148
-#define CLR     0x2160
-#define SR1     0x2100
-#define SR2     0x2104
-#define DR1     0x2108
-#define DR2     0x210C
-
-#define ROP_S   0xCC
-
-static void blade_init_accel(int pitch, int bpp)
+
+static void blade_init_accel(struct tridentfb_par *par, int pitch, int bpp)
 {
         int v1 = (pitch >> 3) << 20;
-        int tmp = 0, v2;
-        switch (bpp) {
-        case 8:
-                tmp = 0;
-                break;
-        case 15:
-                tmp = 5;
-                break;
-        case 16:
-                tmp = 1;
-                break;
-        case 24:
-        case 32:
-                tmp = 2;
-                break;
-        }
-        v2 = v1 | (tmp << 29);
-        writemmr(0x21C0, v2);
-        writemmr(0x21C4, v2);
-        writemmr(0x21B8, v2);
-        writemmr(0x21BC, v2);
-        writemmr(0x21D0, v1);
-        writemmr(0x21D4, v1);
-        writemmr(0x21C8, v1);
-        writemmr(0x21CC, v1);
-        writemmr(0x216C, 0);
+        int tmp = bpp == 24 ? 2 : (bpp >> 4);
+        int v2 = v1 | (tmp << 29);
+
+        writemmr(par, 0x21C0, v2);
+        writemmr(par, 0x21C4, v2);
+        writemmr(par, 0x21B8, v2);
+        writemmr(par, 0x21BC, v2);
+        writemmr(par, 0x21D0, v1);
+        writemmr(par, 0x21D4, v1);
+        writemmr(par, 0x21C8, v1);
+        writemmr(par, 0x21CC, v1);
+        writemmr(par, 0x216C, 0);
 }
 
-static void blade_wait_engine(void)
+static void blade_wait_engine(struct tridentfb_par *par)
 {
-        while (readmmr(STA) & 0xFA800000) ;
+        while (readmmr(par, STATUS) & 0xFA800000)
+                cpu_relax();
 }
 
-static void blade_fill_rect(u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
+static void blade_fill_rect(struct tridentfb_par *par,
+                            u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
 {
-        writemmr(CLR, c);
-        writemmr(ROP, rop ? 0x66 : ROP_S);
-        writemmr(CMD, 0x20000000 | 1 << 19 | 1 << 4 | 2 << 2);
+        writemmr(par, COLOR, c);
+        writemmr(par, ROP, rop ? ROP_X : ROP_S);
+        writemmr(par, CMD, 0x20000000 | 1 << 19 | 1 << 4 | 2 << 2);
 
-        writemmr(DR1, point(x, y));
-        writemmr(DR2, point(x + w - 1, y + h - 1));
+        writemmr(par, DST1, point(x, y));
+        writemmr(par, DST2, point(x + w - 1, y + h - 1));
 }
 
-static void blade_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
+static void blade_image_blit(struct tridentfb_par *par, const char *data,
+                             u32 x, u32 y, u32 w, u32 h, u32 c, u32 b)
+{
+        unsigned size = ((w + 31) >> 5) * h;
+
+        writemmr(par, COLOR, c);
+        writemmr(par, BGCOLOR, b);
+        writemmr(par, CMD, 0xa0000000 | 3 << 19);
+
+        writemmr(par, DST1, point(x, y));
+        writemmr(par, DST2, point(x + w - 1, y + h - 1));
+
+        memcpy(par->io_virt + 0x10000, data, 4 * size);
+}
+
+static void blade_copy_rect(struct tridentfb_par *par,
+                            u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
 {
-        u32 s1, s2, d1, d2;
         int direction = 2;
-        s1 = point(x1, y1);
-        s2 = point(x1 + w - 1, y1 + h - 1);
-        d1 = point(x2, y2);
-        d2 = point(x2 + w - 1, y2 + h - 1);
+        u32 s1 = point(x1, y1);
+        u32 s2 = point(x1 + w - 1, y1 + h - 1);
+        u32 d1 = point(x2, y2);
+        u32 d2 = point(x2 + w - 1, y2 + h - 1);
 
         if ((y1 > y2) || ((y1 == y2) && (x1 > x2)))
                 direction = 0;
 
-        writemmr(ROP, ROP_S);
-        writemmr(CMD, 0xE0000000 | 1 << 19 | 1 << 4 | 1 << 2 | direction);
+        writemmr(par, ROP, ROP_S);
+        writemmr(par, CMD, 0xE0000000 | 1 << 19 | 1 << 4 | 1 << 2 | direction);
 
-        writemmr(SR1, direction ? s2 : s1);
-        writemmr(SR2, direction ? s1 : s2);
-        writemmr(DR1, direction ? d2 : d1);
-        writemmr(DR2, direction ? d1 : d2);
+        writemmr(par, SRC1, direction ? s2 : s1);
+        writemmr(par, SRC2, direction ? s1 : s2);
+        writemmr(par, DST1, direction ? d2 : d1);
+        writemmr(par, DST2, direction ? d1 : d2);
 }
 
-static struct accel_switch accel_blade = {
-        blade_init_accel,
-        blade_wait_engine,
-        blade_fill_rect,
-        blade_copy_rect,
-};
-
 /*
  * BladeXP specific acceleration functions
  */
 
-#define ROP_P 0xF0
-#define masked_point(x, y) ((y & 0xffff)<<16|(x & 0xffff))
-
-static void xp_init_accel(int pitch, int bpp)
+static void xp_init_accel(struct tridentfb_par *par, int pitch, int bpp)
 {
-        int tmp = 0, v1;
-        unsigned char x = 0;
-
-        switch (bpp) {
-        case 8:
-                x = 0;
-                break;
-        case 16:
-                x = 1;
-                break;
-        case 24:
-                x = 3;
-                break;
-        case 32:
-                x = 2;
-                break;
-        }
+        unsigned char x = bpp == 24 ? 3 : (bpp >> 4);
+        int v1 = pitch << (bpp == 24 ? 20 : (18 + x));
 
         switch (pitch << (bpp >> 3)) {
         case 8192:
@@ -293,42 +274,21 @@ static void xp_init_accel(int pitch, int bpp)
                 break;
         }
 
-        t_outb(x, 0x2125);
-
-        eng_oper = x | 0x40;
-
-        switch (bpp) {
-        case 8:
-                tmp = 18;
-                break;
-        case 15:
-        case 16:
-                tmp = 19;
-                break;
-        case 24:
-        case 32:
-                tmp = 20;
-                break;
-        }
+        t_outb(par, x, 0x2125);
 
-        v1 = pitch << tmp;
+        par->eng_oper = x | 0x40;
 
-        writemmr(0x2154, v1);
-        writemmr(0x2150, v1);
-        t_outb(3, 0x2126);
+        writemmr(par, 0x2154, v1);
+        writemmr(par, 0x2150, v1);
+        t_outb(par, 3, 0x2126);
 }
 
-static void xp_wait_engine(void)
+static void xp_wait_engine(struct tridentfb_par *par)
 {
-        int busy;
-        int count, timeout;
-
-        count = 0;
-        timeout = 0;
-        for (;;) {
-                busy = t_inb(STA) & 0x80;
-                if (busy != 0x80)
-                        return;
+        int count = 0;
+        int timeout = 0;
+
+        while (t_inb(par, STATUS) & 0x80) {
                 count++;
                 if (count == 10000000) {
                         /* Timeout */
@@ -336,30 +296,31 @@ static void xp_wait_engine(void)
                         timeout++;
                         if (timeout == 8) {
                                 /* Reset engine */
-                                t_outb(0x00, 0x2120);
+                                t_outb(par, 0x00, STATUS);
                                 return;
                         }
                 }
+                cpu_relax();
         }
 }
 
-static void xp_fill_rect(u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
+static void xp_fill_rect(struct tridentfb_par *par,
+                         u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
 {
-        writemmr(0x2127, ROP_P);
-        writemmr(0x2158, c);
-        writemmr(0x2128, 0x4000);
-        writemmr(0x2140, masked_point(h, w));
-        writemmr(0x2138, masked_point(y, x));
-        t_outb(0x01, 0x2124);
-        t_outb(eng_oper, 0x2125);
+        writemmr(par, 0x2127, ROP_P);
+        writemmr(par, 0x2158, c);
+        writemmr(par, DRAWFL, 0x4000);
+        writemmr(par, OLDDIM, point(h, w));
+        writemmr(par, OLDDST, point(y, x));
+        t_outb(par, 0x01, OLDCMD);
+        t_outb(par, par->eng_oper, 0x2125);
 }
 
-static void xp_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
+static void xp_copy_rect(struct tridentfb_par *par,
+                         u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
 {
-        int direction;
         u32 x1_tmp, x2_tmp, y1_tmp, y2_tmp;
-
-        direction = 0x0004;
+        int direction = 0x0004;
 
         if ((x1 < x2) && (y1 == y2)) {
                 direction |= 0x0200;
@@ -379,103 +340,152 @@ static void xp_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
                 y2_tmp = y2;
         }
 
-        writemmr(0x2128, direction);
-        t_outb(ROP_S, 0x2127);
-        writemmr(0x213C, masked_point(y1_tmp, x1_tmp));
-        writemmr(0x2138, masked_point(y2_tmp, x2_tmp));
-        writemmr(0x2140, masked_point(h, w));
-        t_outb(0x01, 0x2124);
+        writemmr(par, DRAWFL, direction);
+        t_outb(par, ROP_S, 0x2127);
+        writemmr(par, OLDSRC, point(y1_tmp, x1_tmp));
+        writemmr(par, OLDDST, point(y2_tmp, x2_tmp));
+        writemmr(par, OLDDIM, point(h, w));
+        t_outb(par, 0x01, OLDCMD);
 }
 
-static struct accel_switch accel_xp = {
-        xp_init_accel,
-        xp_wait_engine,
-        xp_fill_rect,
-        xp_copy_rect,
-};
-
 /*
  * Image specific acceleration functions
  */
-static void image_init_accel(int pitch, int bpp)
+static void image_init_accel(struct tridentfb_par *par, int pitch, int bpp)
 {
-        int tmp = 0;
-        switch (bpp) {
-        case 8:
-                tmp = 0;
-                break;
-        case 15:
-                tmp = 5;
-                break;
-        case 16:
-                tmp = 1;
-                break;
-        case 24:
-        case 32:
-                tmp = 2;
-                break;
-        }
-        writemmr(0x2120, 0xF0000000);
-        writemmr(0x2120, 0x40000000 | tmp);
-        writemmr(0x2120, 0x80000000);
-        writemmr(0x2144, 0x00000000);
-        writemmr(0x2148, 0x00000000);
-        writemmr(0x2150, 0x00000000);
-        writemmr(0x2154, 0x00000000);
-        writemmr(0x2120, 0x60000000 | (pitch << 16) | pitch);
-        writemmr(0x216C, 0x00000000);
-        writemmr(0x2170, 0x00000000);
-        writemmr(0x217C, 0x00000000);
-        writemmr(0x2120, 0x10000000);
-        writemmr(0x2130, (2047 << 16) | 2047);
+        int tmp = bpp == 24 ? 2: (bpp >> 4);
+
+        writemmr(par, 0x2120, 0xF0000000);
+        writemmr(par, 0x2120, 0x40000000 | tmp);
+        writemmr(par, 0x2120, 0x80000000);
+        writemmr(par, 0x2144, 0x00000000);
+        writemmr(par, 0x2148, 0x00000000);
+        writemmr(par, 0x2150, 0x00000000);
+        writemmr(par, 0x2154, 0x00000000);
+        writemmr(par, 0x2120, 0x60000000 | (pitch << 16) | pitch);
+        writemmr(par, 0x216C, 0x00000000);
+        writemmr(par, 0x2170, 0x00000000);
+        writemmr(par, 0x217C, 0x00000000);
+        writemmr(par, 0x2120, 0x10000000);
+        writemmr(par, 0x2130, (2047 << 16) | 2047);
 }
 
-static void image_wait_engine(void)
+static void image_wait_engine(struct tridentfb_par *par)
 {
-        while (readmmr(0x2164) & 0xF0000000) ;
+        while (readmmr(par, 0x2164) & 0xF0000000)
+                cpu_relax();
 }
 
-static void image_fill_rect(u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
+static void image_fill_rect(struct tridentfb_par *par,
+                            u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
 {
-        writemmr(0x2120, 0x80000000);
-        writemmr(0x2120, 0x90000000 | ROP_S);
+        writemmr(par, 0x2120, 0x80000000);
+        writemmr(par, 0x2120, 0x90000000 | ROP_S);
 
-        writemmr(0x2144, c);
+        writemmr(par, 0x2144, c);
 
-        writemmr(DR1, point(x, y));
-        writemmr(DR2, point(x + w - 1, y + h - 1));
+        writemmr(par, DST1, point(x, y));
+        writemmr(par, DST2, point(x + w - 1, y + h - 1));
 
-        writemmr(0x2124, 0x80000000 | 3 << 22 | 1 << 10 | 1 << 9);
+        writemmr(par, 0x2124, 0x80000000 | 3 << 22 | 1 << 10 | 1 << 9);
 }
 
-static void image_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
+static void image_copy_rect(struct tridentfb_par *par,
+                            u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
 {
-        u32 s1, s2, d1, d2;
-        int direction = 2;
-        s1 = point(x1, y1);
-        s2 = point(x1 + w - 1, y1 + h - 1);
-        d1 = point(x2, y2);
-        d2 = point(x2 + w - 1, y2 + h - 1);
+        int direction = 0x4;
+        u32 s1 = point(x1, y1);
+        u32 s2 = point(x1 + w - 1, y1 + h - 1);
+        u32 d1 = point(x2, y2);
+        u32 d2 = point(x2 + w - 1, y2 + h - 1);
 
         if ((y1 > y2) || ((y1 == y2) && (x1 > x2)))
                 direction = 0;
 
-        writemmr(0x2120, 0x80000000);
-        writemmr(0x2120, 0x90000000 | ROP_S);
+        writemmr(par, 0x2120, 0x80000000);
+        writemmr(par, 0x2120, 0x90000000 | ROP_S);
 
-        writemmr(SR1, direction ? s2 : s1);
-        writemmr(SR2, direction ? s1 : s2);
-        writemmr(DR1, direction ? d2 : d1);
-        writemmr(DR2, direction ? d1 : d2);
-        writemmr(0x2124, 0x80000000 | 1 << 22 | 1 << 10 | 1 << 7 | direction);
+        writemmr(par, SRC1, direction ? s2 : s1);
+        writemmr(par, SRC2, direction ? s1 : s2);
+        writemmr(par, DST1, direction ? d2 : d1);
+        writemmr(par, DST2, direction ? d1 : d2);
+        writemmr(par, 0x2124,
+                 0x80000000 | 1 << 22 | 1 << 10 | 1 << 7 | direction);
 }
 
-static struct accel_switch accel_image = {
-        image_init_accel,
-        image_wait_engine,
-        image_fill_rect,
-        image_copy_rect,
-};
+/*
+ * TGUI 9440/96XX acceleration
+ */
+
+static void tgui_init_accel(struct tridentfb_par *par, int pitch, int bpp)
+{
+        unsigned char x = bpp == 24 ? 3 : (bpp >> 4);
+
+        /* disable clipping */
+        writemmr(par, 0x2148, 0);
+        writemmr(par, 0x214C, point(4095, 2047));
+
+        switch ((pitch * bpp) / 8) {
+        case 8192:
+        case 512:
+                x |= 0x00;
+                break;
+        case 1024:
+                x |= 0x04;
+                break;
+        case 2048:
+                x |= 0x08;
+                break;
+        case 4096:
+                x |= 0x0C;
+                break;
+        }
+
+        fb_writew(x, par->io_virt + 0x2122);
+}
+
+static void tgui_fill_rect(struct tridentfb_par *par,
+                           u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
+{
+        t_outb(par, ROP_P, 0x2127);
+        writemmr(par, OLDCLR, c);
+        writemmr(par, DRAWFL, 0x4020);
+        writemmr(par, OLDDIM, point(w - 1, h - 1));
+        writemmr(par, OLDDST, point(x, y));
+        t_outb(par, 1, OLDCMD);
+}
+
+static void tgui_copy_rect(struct tridentfb_par *par,
+                           u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
+{
+        int flags = 0;
+        u16 x1_tmp, x2_tmp, y1_tmp, y2_tmp;
+
+        if ((x1 < x2) && (y1 == y2)) {
+                flags |= 0x0200;
+                x1_tmp = x1 + w - 1;
+                x2_tmp = x2 + w - 1;
+        } else {
+                x1_tmp = x1;
+                x2_tmp = x2;
+        }
+
+        if (y1 < y2) {
+                flags |= 0x0100;
+                y1_tmp = y1 + h - 1;
+                y2_tmp = y2 + h - 1;
+        } else {
+                y1_tmp = y1;
+                y2_tmp = y2;
+        }
+
+        writemmr(par, DRAWFL, 0x4 | flags);
+        t_outb(par, ROP_S, 0x2127);
+        writemmr(par, OLDSRC, point(x1_tmp, y1_tmp));
+        writemmr(par, OLDDST, point(x2_tmp, y2_tmp));
+        writemmr(par, OLDDIM, point(w - 1, h - 1));
+        t_outb(par, 1, OLDCMD);
+}
 
 /*
  * Accel functions called by the upper layers
@@ -484,129 +494,162 @@ static struct accel_switch accel_image = {
 static void tridentfb_fillrect(struct fb_info *info,
                                const struct fb_fillrect *fr)
 {
-        int bpp = info->var.bits_per_pixel;
-        int col = 0;
+        struct tridentfb_par *par = info->par;
+        int col;
 
-        switch (bpp) {
-        default:
-        case 8:
-                col |= fr->color;
+        if (info->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_fillrect(info, fr);
+                return;
+        }
+        if (info->var.bits_per_pixel == 8) {
+                col = fr->color;
                 col |= col << 8;
                 col |= col << 16;
-                break;
-        case 16:
+        } else
                 col = ((u32 *)(info->pseudo_palette))[fr->color];
-                break;
-        case 32:
-                col = ((u32 *)(info->pseudo_palette))[fr->color];
-                break;
+
+        par->wait_engine(par);
+        par->fill_rect(par, fr->dx, fr->dy, fr->width,
+                       fr->height, col, fr->rop);
+}
+
+static void tridentfb_imageblit(struct fb_info *info,
+                                const struct fb_image *img)
+{
+        struct tridentfb_par *par = info->par;
+        int col, bgcol;
+
+        if ((info->flags & FBINFO_HWACCEL_DISABLED) || img->depth != 1) {
+                cfb_imageblit(info, img);
+                return;
+        }
+        if (info->var.bits_per_pixel == 8) {
+                col = img->fg_color;
+                col |= col << 8;
+                col |= col << 16;
+                bgcol = img->bg_color;
+                bgcol |= bgcol << 8;
+                bgcol |= bgcol << 16;
+        } else {
+                col = ((u32 *)(info->pseudo_palette))[img->fg_color];
+                bgcol = ((u32 *)(info->pseudo_palette))[img->bg_color];
         }
 
-        acc->fill_rect(fr->dx, fr->dy, fr->width, fr->height, col, fr->rop);
-        acc->wait_engine();
+        par->wait_engine(par);
+        if (par->image_blit)
+                par->image_blit(par, img->data, img->dx, img->dy,
+                                img->width, img->height, col, bgcol);
+        else
+                cfb_imageblit(info, img);
 }
+
 static void tridentfb_copyarea(struct fb_info *info,
                                const struct fb_copyarea *ca)
 {
-        acc->copy_rect(ca->sx, ca->sy, ca->dx, ca->dy, ca->width, ca->height);
-        acc->wait_engine();
+        struct tridentfb_par *par = info->par;
+
+        if (info->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_copyarea(info, ca);
+                return;
+        }
+        par->wait_engine(par);
+        par->copy_rect(par, ca->sx, ca->sy, ca->dx, ca->dy,
+                       ca->width, ca->height);
+}
+
+static int tridentfb_sync(struct fb_info *info)
+{
+        struct tridentfb_par *par = info->par;
+
+        if (!(info->flags & FBINFO_HWACCEL_DISABLED))
+                par->wait_engine(par);
+        return 0;
 }
-#else /* !CONFIG_FB_TRIDENT_ACCEL */
+#else
 #define tridentfb_fillrect cfb_fillrect
 #define tridentfb_copyarea cfb_copyarea
+#define tridentfb_imageblit cfb_imageblit
 #endif /* CONFIG_FB_TRIDENT_ACCEL */
 
-
 /*
  * Hardware access functions
  */
 
-static inline unsigned char read3X4(int reg)
+static inline unsigned char read3X4(struct tridentfb_par *par, int reg)
 {
-        struct tridentfb_par *par = (struct tridentfb_par *)fb_info.par;
-        writeb(reg, par->io_virt + CRT + 4);
-        return readb(par->io_virt + CRT + 5);
+        return vga_mm_rcrt(par->io_virt, reg);
 }
 
-static inline void write3X4(int reg, unsigned char val)
+static inline void write3X4(struct tridentfb_par *par, int reg,
+                            unsigned char val)
 {
-        struct tridentfb_par *par = (struct tridentfb_par *)fb_info.par;
-        writeb(reg, par->io_virt + CRT + 4);
-        writeb(val, par->io_virt + CRT + 5);
+        vga_mm_wcrt(par->io_virt, reg, val);
 }
 
-static inline unsigned char read3C4(int reg)
+static inline unsigned char read3CE(struct tridentfb_par *par,
+                                    unsigned char reg)
 {
-        t_outb(reg, 0x3C4);
-        return t_inb(0x3C5);
+        return vga_mm_rgfx(par->io_virt, reg);
 }
 
-static inline void write3C4(int reg, unsigned char val)
+static inline void writeAttr(struct tridentfb_par *par, int reg,
+                             unsigned char val)
 {
-        t_outb(reg, 0x3C4);
-        t_outb(val, 0x3C5);
+        fb_readb(par->io_virt + VGA_IS1_RC);    /* flip-flop to index */
+        vga_mm_wattr(par->io_virt, reg, val);
 }
 
-static inline unsigned char read3CE(int reg)
+static inline void write3CE(struct tridentfb_par *par, int reg,
+                            unsigned char val)
 {
-        t_outb(reg, 0x3CE);
-        return t_inb(0x3CF);
+        vga_mm_wgfx(par->io_virt, reg, val);
 }
 
-static inline void writeAttr(int reg, unsigned char val)
-{
-        readb(((struct tridentfb_par *)fb_info.par)->io_virt + CRT + 0x0A);     /* flip-flop to index */
-        t_outb(reg, 0x3C0);
-        t_outb(val, 0x3C0);
-}
-
-static inline void write3CE(int reg, unsigned char val)
-{
-        t_outb(reg, 0x3CE);
-        t_outb(val, 0x3CF);
-}
-
-static void enable_mmio(void)
+static void enable_mmio(struct tridentfb_par *par)
 {
         /* Goto New Mode */
-        outb(0x0B, 0x3C4);
-        inb(0x3C5);
+        vga_io_rseq(0x0B);
 
         /* Unprotect registers */
-        outb(NewMode1, 0x3C4);
-        outb(0x80, 0x3C5);
+        vga_io_wseq(NewMode1, 0x80);
+        if (!is_oldprotect(par->chip_id))
+                vga_io_wseq(Protection, 0x92);
 
         /* Enable MMIO */
         outb(PCIReg, 0x3D4);
         outb(inb(0x3D5) | 0x01, 0x3D5);
 }
 
-static void disable_mmio(void)
+static void disable_mmio(struct tridentfb_par *par)
 {
         /* Goto New Mode */
-        t_outb(0x0B, 0x3C4);
-        t_inb(0x3C5);
+        vga_mm_rseq(par->io_virt, 0x0B);
 
         /* Unprotect registers */
-        t_outb(NewMode1, 0x3C4);
-        t_outb(0x80, 0x3C5);
+        vga_mm_wseq(par->io_virt, NewMode1, 0x80);
+        if (!is_oldprotect(par->chip_id))
+                vga_mm_wseq(par->io_virt, Protection, 0x92);
 
         /* Disable MMIO */
-        t_outb(PCIReg, 0x3D4);
-        t_outb(t_inb(0x3D5) & ~0x01, 0x3D5);
+        t_outb(par, PCIReg, 0x3D4);
+        t_outb(par, t_inb(par, 0x3D5) & ~0x01, 0x3D5);
 }
 
-#define crtc_unlock()   write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
+static inline void crtc_unlock(struct tridentfb_par *par)
+{
+        write3X4(par, VGA_CRTC_V_SYNC_END,
+                 read3X4(par, VGA_CRTC_V_SYNC_END) & 0x7F);
+}
 
 /*  Return flat panel's maximum x resolution */
-static int __devinit get_nativex(void)
+static int __devinit get_nativex(struct tridentfb_par *par)
 {
         int x, y, tmp;
 
         if (nativex)
                 return nativex;
 
-        tmp = (read3CE(VertStretch) >> 4) & 3;
+        tmp = (read3CE(par, VertStretch) >> 4) & 3;
 
         switch (tmp) {
         case 0:
@@ -632,77 +675,92 @@ static int __devinit get_nativex(void)
 }
 
 /* Set pitch */
-static void set_lwidth(int width)
+static inline void set_lwidth(struct tridentfb_par *par, int width)
 {
-        write3X4(Offset, width & 0xFF);
-        write3X4(AddColReg,
-                 (read3X4(AddColReg) & 0xCF) | ((width & 0x300) >> 4));
+        write3X4(par, VGA_CRTC_OFFSET, width & 0xFF);
+        write3X4(par, AddColReg,
+                 (read3X4(par, AddColReg) & 0xCF) | ((width & 0x300) >> 4));
 }
 
 /* For resolutions smaller than FP resolution stretch */
-static void screen_stretch(void)
+static void screen_stretch(struct tridentfb_par *par)
 {
-        if (chip_id != CYBERBLADEXPAi1)
-                write3CE(BiosReg, 0);
+        if (par->chip_id != CYBERBLADEXPAi1)
+                write3CE(par, BiosReg, 0);
         else
-                write3CE(BiosReg, 8);
-        write3CE(VertStretch, (read3CE(VertStretch) & 0x7C) | 1);
-        write3CE(HorStretch, (read3CE(HorStretch) & 0x7C) | 1);
+                write3CE(par, BiosReg, 8);
+        write3CE(par, VertStretch, (read3CE(par, VertStretch) & 0x7C) | 1);
+        write3CE(par, HorStretch, (read3CE(par, HorStretch) & 0x7C) | 1);
 }
 
 /* For resolutions smaller than FP resolution center */
-static void screen_center(void)
+static inline void screen_center(struct tridentfb_par *par)
 {
-        write3CE(VertStretch, (read3CE(VertStretch) & 0x7C) | 0x80);
-        write3CE(HorStretch, (read3CE(HorStretch) & 0x7C) | 0x80);
+        write3CE(par, VertStretch, (read3CE(par, VertStretch) & 0x7C) | 0x80);
+        write3CE(par, HorStretch, (read3CE(par, HorStretch) & 0x7C) | 0x80);
 }
 
 /* Address of first shown pixel in display memory */
-static void set_screen_start(int base)
+static void set_screen_start(struct tridentfb_par *par, int base)
 {
-        write3X4(StartAddrLow, base & 0xFF);
-        write3X4(StartAddrHigh, (base & 0xFF00) >> 8);
-        write3X4(CRTCModuleTest,
-                 (read3X4(CRTCModuleTest) & 0xDF) | ((base & 0x10000) >> 11));
-        write3X4(CRTHiOrd,
-                 (read3X4(CRTHiOrd) & 0xF8) | ((base & 0xE0000) >> 17));
+        u8 tmp;
+        write3X4(par, VGA_CRTC_START_LO, base & 0xFF);
+        write3X4(par, VGA_CRTC_START_HI, (base & 0xFF00) >> 8);
+        tmp = read3X4(par, CRTCModuleTest) & 0xDF;
+        write3X4(par, CRTCModuleTest, tmp | ((base & 0x10000) >> 11));
+        tmp = read3X4(par, CRTHiOrd) & 0xF8;
+        write3X4(par, CRTHiOrd, tmp | ((base & 0xE0000) >> 17));
 }
 
 /* Set dotclock frequency */
-static void set_vclk(unsigned long freq)
+static void set_vclk(struct tridentfb_par *par, unsigned long freq)
 {
         int m, n, k;
-        unsigned long f, fi, d, di;
-        unsigned char lo = 0, hi = 0;
+        unsigned long fi, d, di;
+        unsigned char best_m = 0, best_n = 0, best_k = 0;
+        unsigned char hi, lo;
+        unsigned char shift = !is_oldclock(par->chip_id) ? 2 : 1;
 
         d = 20000;
-        for (k = 2; k >= 0; k--)
-                for (m = 0; m < 63; m++)
-                        for (n = 0; n < 128; n++) {
+        for (k = shift; k >= 0; k--)
+                for (m = 1; m < 32; m++) {
+                        n = ((m + 2) << shift) - 8;
+                        for (n = (n < 0 ? 0 : n); n < 122; n++) {
                                 fi = ((14318l * (n + 8)) / (m + 2)) >> k;
-                                if ((di = abs(fi - freq)) < d) {
+                                di = abs(fi - freq);
+                                if (di < d || (di == d && k == best_k)) {
                                         d = di;
-                                        f = fi;
-                                        lo = n;
-                                        hi = (k << 6) | m;
+                                        best_n = n;
+                                        best_m = m;
+                                        best_k = k;
                                 }
                                 if (fi > freq)
                                         break;
                         }
-        if (chip3D) {
-                write3C4(ClockHigh, hi);
-                write3C4(ClockLow, lo);
+                }
+
+        if (is_oldclock(par->chip_id)) {
+                lo = best_n | (best_m << 7);
+                hi = (best_m >> 1) | (best_k << 4);
         } else {
-                outb(lo, 0x43C8);
-                outb(hi, 0x43C9);
+                lo = best_n;
+                hi = best_m | (best_k << 6);
+        }
+
+        if (is3Dchip(par->chip_id)) {
+                vga_mm_wseq(par->io_virt, ClockHigh, hi);
+                vga_mm_wseq(par->io_virt, ClockLow, lo);
+        } else {
+                t_outb(par, lo, 0x43C8);
+                t_outb(par, hi, 0x43C9);
         }
         debug("VCLK = %X %X\n", hi, lo);
 }
 
 /* Set number of lines for flat panels*/
-static void set_number_of_lines(int lines)
+static void set_number_of_lines(struct tridentfb_par *par, int lines)
 {
-        int tmp = read3CE(CyberEnhance) & 0x8F;
+        int tmp = read3CE(par, CyberEnhance) & 0x8F;
         if (lines > 1024)
                 tmp |= 0x50;
         else if (lines > 768)
@@ -711,24 +769,24 @@ static void set_number_of_lines(int lines)
                 tmp |= 0x20;
         else if (lines > 480)
                 tmp |= 0x10;
-        write3CE(CyberEnhance, tmp);
+        write3CE(par, CyberEnhance, tmp);
 }
 
 /*
  * If we see that FP is active we assume we have one.
- * Otherwise we have a CRT display.User can override.
+ * Otherwise we have a CRT display. User can override.
  */
-static unsigned int __devinit get_displaytype(void)
+static int __devinit is_flatpanel(struct tridentfb_par *par)
 {
         if (fp)
-                return DISPLAY_FP;
-        if (crt || !chipcyber)
-                return DISPLAY_CRT;
-        return (read3CE(FPConfig) & 0x10) ? DISPLAY_FP : DISPLAY_CRT;
+                return 1;
+        if (crt || !iscyber(par->chip_id))
+                return 0;
+        return (read3CE(par, FPConfig) & 0x10) ? 1 : 0;
 }
 
 /* Try detecting the video memory size */
-static unsigned int __devinit get_memsize(void)
+static unsigned int __devinit get_memsize(struct tridentfb_par *par)
 {
         unsigned char tmp, tmp2;
         unsigned int k;
@@ -737,12 +795,12 @@ static unsigned int __devinit get_memsize(void)
         if (memsize)
                 k = memsize * Kb;
         else
-                switch (chip_id) {
+                switch (par->chip_id) {
                 case CYBER9525DVD:
                         k = 2560 * Kb;
                         break;
                 default:
-                        tmp = read3X4(SPR) & 0x0F;
+                        tmp = read3X4(par, SPR) & 0x0F;
                         switch (tmp) {
 
                         case 0x01:
@@ -774,7 +832,7 @@ static unsigned int __devinit get_memsize(void)
                                 break;
                         case 0x0E:              /* XP */
 
-                                tmp2 = read3C4(0xC1);
+                                tmp2 = vga_mm_rseq(par->io_virt, 0xC1);
                                 switch (tmp2) {
                                 case 0x00:
                                         k = 20 * Mb;
@@ -812,26 +870,67 @@ static unsigned int __devinit get_memsize(void)
 static int tridentfb_check_var(struct fb_var_screeninfo *var,
                                struct fb_info *info)
 {
+        struct tridentfb_par *par = info->par;
         int bpp = var->bits_per_pixel;
+        int line_length;
+        int ramdac = 230000; /* 230MHz for most 3D chips */
         debug("enter\n");
 
         /* check color depth */
         if (bpp == 24)
                 bpp = var->bits_per_pixel = 32;
+        if (bpp != 8 && bpp != 16 && bpp != 32)
+                return -EINVAL;
+        if (par->chip_id == TGUI9440 && bpp == 32)
+                return -EINVAL;
         /* check whether resolution fits on panel and in memory */
-        if (flatpanel && nativex && var->xres > nativex)
+        if (par->flatpanel && nativex && var->xres > nativex)
+                return -EINVAL;
+        /* various resolution checks */
+        var->xres = (var->xres + 7) & ~0x7;
+        if (var->xres > var->xres_virtual)
+                var->xres_virtual = var->xres;
+        if (var->yres > var->yres_virtual)
+                var->yres_virtual = var->yres;
+        if (var->xres_virtual > 4095 || var->yres > 2048)
                 return -EINVAL;
-        if (var->xres * var->yres_virtual * bpp / 8 > info->fix.smem_len)
+        /* prevent from position overflow for acceleration */
+        if (var->yres_virtual > 0xffff)
+                return -EINVAL;
+        line_length = var->xres_virtual * bpp / 8;
+
+        if (!is3Dchip(par->chip_id) &&
+            !(info->flags & FBINFO_HWACCEL_DISABLED)) {
+                /* acceleration requires line length to be power of 2 */
+                if (line_length <= 512)
+                        var->xres_virtual = 512 * 8 / bpp;
+                else if (line_length <= 1024)
+                        var->xres_virtual = 1024 * 8 / bpp;
+                else if (line_length <= 2048)
+                        var->xres_virtual = 2048 * 8 / bpp;
+                else if (line_length <= 4096)
+                        var->xres_virtual = 4096 * 8 / bpp;
+                else if (line_length <= 8192)
+                        var->xres_virtual = 8192 * 8 / bpp;
+                else
+                        return -EINVAL;
+
+                line_length = var->xres_virtual * bpp / 8;
+        }
+
+        /* datasheet specifies how to set panning only up to 4 MB */
+        if (line_length * (var->yres_virtual - var->yres) > (4 << 20))
+                var->yres_virtual = ((4 << 20) / line_length) + var->yres;
+
+        if (line_length * var->yres_virtual > info->fix.smem_len)
                 return -EINVAL;
 
         switch (bpp) {
         case 8:
                 var->red.offset = 0;
-                var->green.offset = 0;
-                var->blue.offset = 0;
-                var->red.length = 6;
-                var->green.length = 6;
-                var->blue.length = 6;
+                var->red.length = 8;
+                var->green = var->red;
+                var->blue = var->red;
                 break;
         case 16:
                 var->red.offset = 11;
@@ -852,6 +951,33 @@ static int tridentfb_check_var(struct fb_var_screeninfo *var,
         default:
                 return -EINVAL;
         }
+
+        if (is_xp(par->chip_id))
+                ramdac = 350000;
+
+        switch (par->chip_id) {
+        case TGUI9440:
+                ramdac = (bpp >= 16) ? 45000 : 90000;
+                break;
+        case CYBER9320:
+        case TGUI9660:
+                ramdac = 135000;
+                break;
+        case PROVIDIA9685:
+        case CYBER9388:
+        case CYBER9382:
+        case CYBER9385:
+                ramdac = 170000;
+                break;
+        }
+
+        /* The clock is doubled for 32 bpp */
+        if (bpp == 32)
+                ramdac /= 2;
+
+        if (PICOS2KHZ(var->pixclock) > ramdac)
+                return -EINVAL;
+
         debug("exit\n");
 
         return 0;
@@ -862,25 +988,31 @@ static int tridentfb_check_var(struct fb_var_screeninfo *var,
 static int tridentfb_pan_display(struct fb_var_screeninfo *var,
                                  struct fb_info *info)
 {
+        struct tridentfb_par *par = info->par;
         unsigned int offset;
 
         debug("enter\n");
-        offset = (var->xoffset + (var->yoffset * var->xres))
+        offset = (var->xoffset + (var->yoffset * var->xres_virtual))
                 * var->bits_per_pixel / 32;
-        info->var.xoffset = var->xoffset;
-        info->var.yoffset = var->yoffset;
-        set_screen_start(offset);
+        set_screen_start(par, offset);
         debug("exit\n");
         return 0;
 }
 
-#define shadowmode_on()  write3CE(CyberControl, read3CE(CyberControl) | 0x81)
-#define shadowmode_off() write3CE(CyberControl, read3CE(CyberControl) & 0x7E)
+static inline void shadowmode_on(struct tridentfb_par *par)
+{
+        write3CE(par, CyberControl, read3CE(par, CyberControl) | 0x81);
+}
+
+static inline void shadowmode_off(struct tridentfb_par *par)
+{
+        write3CE(par, CyberControl, read3CE(par, CyberControl) & 0x7E);
+}
 
 /* Set the hardware to the requested video mode */
 static int tridentfb_set_par(struct fb_info *info)
 {
-        struct tridentfb_par *par = (struct tridentfb_par *)(info->par);
+        struct tridentfb_par *par = info->par;
         u32 htotal, hdispend, hsyncstart, hsyncend, hblankstart, hblankend;
         u32 vtotal, vdispend, vsyncstart, vsyncend, vblankstart, vblankend;
         struct fb_var_screeninfo *var = &info->var;
@@ -891,58 +1023,73 @@ static int tridentfb_set_par(struct fb_info *info)
         debug("enter\n");
         hdispend = var->xres / 8 - 1;
         hsyncstart = (var->xres + var->right_margin) / 8;
-        hsyncend = var->hsync_len / 8;
-        htotal =
-                (var->xres + var->left_margin + var->right_margin +
-                 var->hsync_len) / 8 - 10;
+        hsyncend = (var->xres + var->right_margin + var->hsync_len) / 8;
+        htotal = (var->xres + var->left_margin + var->right_margin +
+                  var->hsync_len) / 8 - 5;
         hblankstart = hdispend + 1;
-        hblankend = htotal + 5;
+        hblankend = htotal + 3;
 
         vdispend = var->yres - 1;
         vsyncstart = var->yres + var->lower_margin;
-        vsyncend = var->vsync_len;
-        vtotal = var->upper_margin + vsyncstart + vsyncend - 2;
-        vblankstart = var->yres;
-        vblankend = vtotal + 2;
+        vsyncend = vsyncstart + var->vsync_len;
+        vtotal = var->upper_margin + vsyncend - 2;
+        vblankstart = vdispend + 1;
+        vblankend = vtotal;
+
+        if (info->var.vmode & FB_VMODE_INTERLACED) {
+                vtotal /= 2;
+                vdispend /= 2;
+                vsyncstart /= 2;
+                vsyncend /= 2;
+                vblankstart /= 2;
+                vblankend /= 2;
+        }
 
-        crtc_unlock();
-        write3CE(CyberControl, 8);
+        enable_mmio(par);
+        crtc_unlock(par);
+        write3CE(par, CyberControl, 8);
+        tmp = 0xEB;
+        if (var->sync & FB_SYNC_HOR_HIGH_ACT)
+                tmp &= ~0x40;
+        if (var->sync & FB_SYNC_VERT_HIGH_ACT)
+                tmp &= ~0x80;
 
-        if (flatpanel && var->xres < nativex) {
+        if (par->flatpanel && var->xres < nativex) {
                 /*
                  * on flat panels with native size larger
                  * than requested resolution decide whether
                  * we stretch or center
                  */
-                t_outb(0xEB, 0x3C2);
+                t_outb(par, tmp | 0xC0, VGA_MIS_W);
 
-                shadowmode_on();
+                shadowmode_on(par);
 
                 if (center)
-                        screen_center();
+                        screen_center(par);
                 else if (stretch)
-                        screen_stretch();
+                        screen_stretch(par);
 
         } else {
-                t_outb(0x2B, 0x3C2);
-                write3CE(CyberControl, 8);
+                t_outb(par, tmp, VGA_MIS_W);
+                write3CE(par, CyberControl, 8);
         }
 
         /* vertical timing values */
-        write3X4(CRTVTotal, vtotal & 0xFF);
-        write3X4(CRTVDispEnd, vdispend & 0xFF);
-        write3X4(CRTVSyncStart, vsyncstart & 0xFF);
-        write3X4(CRTVSyncEnd, (vsyncend & 0x0F));
-        write3X4(CRTVBlankStart, vblankstart & 0xFF);
-        write3X4(CRTVBlankEnd, 0 /* p->vblankend & 0xFF */ );
+        write3X4(par, VGA_CRTC_V_TOTAL, vtotal & 0xFF);
+        write3X4(par, VGA_CRTC_V_DISP_END, vdispend & 0xFF);
+        write3X4(par, VGA_CRTC_V_SYNC_START, vsyncstart & 0xFF);
+        write3X4(par, VGA_CRTC_V_SYNC_END, (vsyncend & 0x0F));
+        write3X4(par, VGA_CRTC_V_BLANK_START, vblankstart & 0xFF);
+        write3X4(par, VGA_CRTC_V_BLANK_END, vblankend & 0xFF);
 
         /* horizontal timing values */
-        write3X4(CRTHTotal, htotal & 0xFF);
-        write3X4(CRTHDispEnd, hdispend & 0xFF);
-        write3X4(CRTHSyncStart, hsyncstart & 0xFF);
-        write3X4(CRTHSyncEnd, (hsyncend & 0x1F) | ((hblankend & 0x20) << 2));
-        write3X4(CRTHBlankStart, hblankstart & 0xFF);
-        write3X4(CRTHBlankEnd, 0 /* (p->hblankend & 0x1F) */ );
+        write3X4(par, VGA_CRTC_H_TOTAL, htotal & 0xFF);
+        write3X4(par, VGA_CRTC_H_DISP, hdispend & 0xFF);
+        write3X4(par, VGA_CRTC_H_SYNC_START, hsyncstart & 0xFF);
+        write3X4(par, VGA_CRTC_H_SYNC_END,
+                 (hsyncend & 0x1F) | ((hblankend & 0x20) << 2));
+        write3X4(par, VGA_CRTC_H_BLANK_START, hblankstart & 0xFF);
+        write3X4(par, VGA_CRTC_H_BLANK_END, hblankend & 0x1F);
 
         /* higher bits of vertical timing values */
         tmp = 0x10;
@@ -954,39 +1101,43 @@ static int tridentfb_set_par(struct fb_info *info)
         if (vtotal & 0x200) tmp |= 0x20;
         if (vdispend & 0x200) tmp |= 0x40;
         if (vsyncstart & 0x200) tmp |= 0x80;
-        write3X4(CRTOverflow, tmp);
+        write3X4(par, VGA_CRTC_OVERFLOW, tmp);
 
-        tmp = read3X4(CRTHiOrd) | 0x08; /* line compare bit 10 */
+        tmp = read3X4(par, CRTHiOrd) & 0x07;
+        tmp |= 0x08;    /* line compare bit 10 */
         if (vtotal & 0x400) tmp |= 0x80;
         if (vblankstart & 0x400) tmp |= 0x40;
         if (vsyncstart & 0x400) tmp |= 0x20;
         if (vdispend & 0x400) tmp |= 0x10;
-        write3X4(CRTHiOrd, tmp);
+        write3X4(par, CRTHiOrd, tmp);
 
-        tmp = 0;
-        if (htotal & 0x800) tmp |= 0x800 >> 11;
-        if (hblankstart & 0x800) tmp |= 0x800 >> 7;
-        write3X4(HorizOverflow, tmp);
+        tmp = (htotal >> 8) & 0x01;
+        tmp |= (hdispend >> 7) & 0x02;
+        tmp |= (hsyncstart >> 5) & 0x08;
+        tmp |= (hblankstart >> 4) & 0x10;
+        write3X4(par, HorizOverflow, tmp);
 
         tmp = 0x40;
         if (vblankstart & 0x200) tmp |= 0x20;
 //FIXME if (info->var.vmode & FB_VMODE_DOUBLE) tmp |= 0x80;  /* double scan for 200 line modes */
-        write3X4(CRTMaxScanLine, tmp);
+        write3X4(par, VGA_CRTC_MAX_SCAN, tmp);
 
-        write3X4(CRTLineCompare, 0xFF);
-        write3X4(CRTPRowScan, 0);
-        write3X4(CRTModeControl, 0xC3);
+        write3X4(par, VGA_CRTC_LINE_COMPARE, 0xFF);
+        write3X4(par, VGA_CRTC_PRESET_ROW, 0);
+        write3X4(par, VGA_CRTC_MODE, 0xC3);
 
-        write3X4(LinearAddReg, 0x20);   /* enable linear addressing */
+        write3X4(par, LinearAddReg, 0x20);      /* enable linear addressing */
 
         tmp = (info->var.vmode & FB_VMODE_INTERLACED) ? 0x84 : 0x80;
-        write3X4(CRTCModuleTest, tmp);  /* enable access extended memory */
-
-        write3X4(GraphEngReg, 0x80);    /* enable GE for text acceleration */
+        /* enable access extended memory */
+        write3X4(par, CRTCModuleTest, tmp);
+        tmp = read3CE(par, MiscIntContReg) & ~0x4;
+        if (info->var.vmode & FB_VMODE_INTERLACED)
+                tmp |= 0x4;
+        write3CE(par, MiscIntContReg, tmp);
 
-#ifdef CONFIG_FB_TRIDENT_ACCEL
-        acc->init_accel(info->var.xres, bpp);
-#endif
+        /* enable GE for text acceleration */
+        write3X4(par, GraphEngReg, 0x80);
 
         switch (bpp) {
         case 8:
@@ -1003,57 +1154,59 @@ static int tridentfb_set_par(struct fb_info *info)
                 break;
         }
 
-        write3X4(PixelBusReg, tmp);
+        write3X4(par, PixelBusReg, tmp);
 
-        tmp = 0x10;
-        if (chipcyber)
+        tmp = read3X4(par, DRAMControl);
+        if (!is_oldprotect(par->chip_id))
+                tmp |= 0x10;
+        if (iscyber(par->chip_id))
                 tmp |= 0x20;
-        write3X4(DRAMControl, tmp);     /* both IO, linear enable */
-
-        write3X4(InterfaceSel, read3X4(InterfaceSel) | 0x40);
-        write3X4(Performance, 0x92);
-        write3X4(PCIReg, 0x07);         /* MMIO & PCI read and write burst enable */
+        write3X4(par, DRAMControl, tmp);        /* both IO, linear enable */
+
+        write3X4(par, InterfaceSel, read3X4(par, InterfaceSel) | 0x40);
+        if (!is_xp(par->chip_id))
+                write3X4(par, Performance, read3X4(par, Performance) | 0x10);
+        /* MMIO & PCI read and write burst enable */
+        if (par->chip_id != TGUI9440 && par->chip_id != IMAGE975)
+                write3X4(par, PCIReg, read3X4(par, PCIReg) | 0x06);
+
+        vga_mm_wseq(par->io_virt, 0, 3);
+        vga_mm_wseq(par->io_virt, 1, 1); /* set char clock 8 dots wide */
+        /* enable 4 maps because needed in chain4 mode */
+        vga_mm_wseq(par->io_virt, 2, 0x0F);
+        vga_mm_wseq(par->io_virt, 3, 0);
+        vga_mm_wseq(par->io_virt, 4, 0x0E); /* memory mode enable bitmaps ?? */
 
         /* convert from picoseconds to kHz */
         vclk = PICOS2KHZ(info->var.pixclock);
-        if (bpp == 32)
+
+        /* divide clock by 2 if 32bpp chain4 mode display and CPU path */
+        tmp = read3CE(par, MiscExtFunc) & 0xF0;
+        if (bpp == 32 || (par->chip_id == TGUI9440 && bpp == 16)) {
+                tmp |= 8;
                 vclk *= 2;
-        set_vclk(vclk);
-
-        write3C4(0, 3);
-        write3C4(1, 1);         /* set char clock 8 dots wide */
-        write3C4(2, 0x0F);      /* enable 4 maps because needed in chain4 mode */
-        write3C4(3, 0);
-        write3C4(4, 0x0E);      /* memory mode enable bitmaps ?? */
-
-        write3CE(MiscExtFunc, (bpp == 32) ? 0x1A : 0x12);       /* divide clock by 2 if 32bpp */
-                                                        /* chain4 mode display and CPU path */
-        write3CE(0x5, 0x40);    /* no CGA compat, allow 256 col */
-        write3CE(0x6, 0x05);    /* graphics mode */
-        write3CE(0x7, 0x0F);    /* planes? */
-
-        if (chip_id == CYBERBLADEXPAi1) {
-                /* This fixes snow-effect in 32 bpp */
-                write3X4(CRTHSyncStart, 0x84);
         }
+        set_vclk(par, vclk);
+        write3CE(par, MiscExtFunc, tmp | 0x12);
+        write3CE(par, 0x5, 0x40);       /* no CGA compat, allow 256 col */
+        write3CE(par, 0x6, 0x05);       /* graphics mode */
+        write3CE(par, 0x7, 0x0F);       /* planes? */
 
-        writeAttr(0x10, 0x41);  /* graphics mode and support 256 color modes */
-        writeAttr(0x12, 0x0F);  /* planes */
-        writeAttr(0x13, 0);     /* horizontal pel panning */
+        /* graphics mode and support 256 color modes */
+        writeAttr(par, 0x10, 0x41);
+        writeAttr(par, 0x12, 0x0F);     /* planes */
+        writeAttr(par, 0x13, 0);        /* horizontal pel panning */
 
         /* colors */
         for (tmp = 0; tmp < 0x10; tmp++)
-                writeAttr(tmp, tmp);
-        readb(par->io_virt + CRT + 0x0A);       /* flip-flop to index */
-        t_outb(0x20, 0x3C0);                    /* enable attr */
+                writeAttr(par, tmp, tmp);
+        fb_readb(par->io_virt + VGA_IS1_RC);    /* flip-flop to index */
+        t_outb(par, 0x20, VGA_ATT_W);           /* enable attr */
 
         switch (bpp) {
         case 8:
                 tmp = 0;
                 break;
-        case 15:
-                tmp = 0x10;
-                break;
         case 16:
                 tmp = 0x30;
                 break;
@@ -1063,19 +1216,23 @@ static int tridentfb_set_par(struct fb_info *info)
                 break;
         }
 
-        t_inb(0x3C8);
-        t_inb(0x3C6);
-        t_inb(0x3C6);
-        t_inb(0x3C6);
-        t_inb(0x3C6);
-        t_outb(tmp, 0x3C6);
-        t_inb(0x3C8);
-
-        if (flatpanel)
-                set_number_of_lines(info->var.yres);
-        set_lwidth(info->var.xres * bpp / (4 * 16));
+        t_inb(par, VGA_PEL_IW);
+        t_inb(par, VGA_PEL_MSK);
+        t_inb(par, VGA_PEL_MSK);
+        t_inb(par, VGA_PEL_MSK);
+        t_inb(par, VGA_PEL_MSK);
+        t_outb(par, tmp, VGA_PEL_MSK);
+        t_inb(par, VGA_PEL_IW);
+
+        if (par->flatpanel)
+                set_number_of_lines(par, info->var.yres);
+        info->fix.line_length = info->var.xres_virtual * bpp / 8;
+        set_lwidth(par, info->fix.line_length / 8);
+
+        if (!(info->flags & FBINFO_HWACCEL_DISABLED))
+                par->init_accel(par, info->var.xres_virtual, bpp);
+
         info->fix.visual = (bpp == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
-        info->fix.line_length = info->var.xres * (bpp >> 3);
         info->cmap.len = (bpp == 8) ? 256 : 16;
         debug("exit\n");
         return 0;
@@ -1087,17 +1244,18 @@ static int tridentfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                                struct fb_info *info)
 {
         int bpp = info->var.bits_per_pixel;
+        struct tridentfb_par *par = info->par;
 
         if (regno >= info->cmap.len)
                 return 1;
 
         if (bpp == 8) {
-                t_outb(0xFF, 0x3C6);
-                t_outb(regno, 0x3C8);
+                t_outb(par, 0xFF, VGA_PEL_MSK);
+                t_outb(par, regno, VGA_PEL_IW);
 
-                t_outb(red >> 10, 0x3C9);
-                t_outb(green >> 10, 0x3C9);
-                t_outb(blue >> 10, 0x3C9);
+                t_outb(par, red >> 10, VGA_PEL_D);
+                t_outb(par, green >> 10, VGA_PEL_D);
+                t_outb(par, blue >> 10, VGA_PEL_D);
 
         } else if (regno < 16) {
                 if (bpp == 16) {        /* RGB 565 */
@@ -1108,28 +1266,28 @@ static int tridentfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                         col |= col << 16;
                         ((u32 *)(info->pseudo_palette))[regno] = col;
                 } else if (bpp == 32)           /* ARGB 8888 */
-                        ((u32*)info->pseudo_palette)[regno] =
+                        ((u32 *)info->pseudo_palette)[regno] =
                                 ((transp & 0xFF00) << 16)       |
                                 ((red & 0xFF00) << 8)           |
                                 ((green & 0xFF00))              |
                                 ((blue & 0xFF00) >> 8);
         }
 
-/*      debug("exit\n"); */
         return 0;
 }
 
-/* Try blanking the screen.For flat panels it does nothing */
+/* Try blanking the screen. For flat panels it does nothing */
 static int tridentfb_blank(int blank_mode, struct fb_info *info)
 {
         unsigned char PMCont, DPMSCont;
+        struct tridentfb_par *par = info->par;
 
         debug("enter\n");
-        if (flatpanel)
+        if (par->flatpanel)
                 return 0;
-        t_outb(0x04, 0x83C8); /* Read DPMS Control */
-        PMCont = t_inb(0x83C6) & 0xFC;
-        DPMSCont = read3CE(PowerStatus) & 0xFC;
+        t_outb(par, 0x04, 0x83C8); /* Read DPMS Control */
+        PMCont = t_inb(par, 0x83C6) & 0xFC;
+        DPMSCont = read3CE(par, PowerStatus) & 0xFC;
         switch (blank_mode) {
         case FB_BLANK_UNBLANK:
                 /* Screen: On, HSync: On, VSync: On */
@@ -1155,9 +1313,9 @@ static int tridentfb_blank(int blank_mode, struct fb_info *info)
                 break;
         }
 
-        write3CE(PowerStatus, DPMSCont);
-        t_outb(4, 0x83C8);
-        t_outb(PMCont, 0x83C6);
+        write3CE(par, PowerStatus, DPMSCont);
+        t_outb(par, 4, 0x83C8);
+        t_outb(par, PMCont, 0x83C6);
 
         debug("exit\n");
 
@@ -1174,33 +1332,46 @@ static struct fb_ops tridentfb_ops = {
         .fb_set_par = tridentfb_set_par,
         .fb_fillrect = tridentfb_fillrect,
         .fb_copyarea = tridentfb_copyarea,
-        .fb_imageblit = cfb_imageblit,
+        .fb_imageblit = tridentfb_imageblit,
+#ifdef CONFIG_FB_TRIDENT_ACCEL
+        .fb_sync = tridentfb_sync,
+#endif
 };
 
-static int __devinit trident_pci_probe(struct pci_dev * dev,
-                                       const struct pci_device_id * id)
+static int __devinit trident_pci_probe(struct pci_dev *dev,
+                                       const struct pci_device_id *id)
 {
         int err;
         unsigned char revision;
+        struct fb_info *info;
+        struct tridentfb_par *default_par;
+        int chip3D;
+        int chip_id;
 
         err = pci_enable_device(dev);
         if (err)
                 return err;
 
-        chip_id = id->device;
+        info = framebuffer_alloc(sizeof(struct tridentfb_par), &dev->dev);
+        if (!info)
+                return -ENOMEM;
+        default_par = info->par;
 
-        if (chip_id == CYBERBLADEi1)
-                output("*** Please do use cyblafb, Cyberblade/i1 support "
-                       "will soon be removed from tridentfb!\n");
+        chip_id = id->device;
 
+#ifndef CONFIG_FB_TRIDENT_ACCEL
+        noaccel = 1;
+#endif
 
         /* If PCI id is 0x9660 then further detect chip type */
 
         if (chip_id == TGUI9660) {
-                outb(RevisionID, 0x3C4);
-                revision = inb(0x3C5);
+                revision = vga_io_rseq(RevisionID);
 
                 switch (revision) {
+                case 0x21:
+                        chip_id = PROVIDIA9685;
+                        break;
                 case 0x22:
                 case 0x23:
                         chip_id = CYBER9397;
@@ -1229,123 +1400,170 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
         }
 
         chip3D = is3Dchip(chip_id);
-        chipcyber = iscyber(chip_id);
 
         if (is_xp(chip_id)) {
-                acc = &accel_xp;
+                default_par->init_accel = xp_init_accel;
+                default_par->wait_engine = xp_wait_engine;
+                default_par->fill_rect = xp_fill_rect;
+                default_par->copy_rect = xp_copy_rect;
+                tridentfb_fix.accel = FB_ACCEL_TRIDENT_BLADEXP;
         } else if (is_blade(chip_id)) {
-                acc = &accel_blade;
-        } else {
-                acc = &accel_image;
+                default_par->init_accel = blade_init_accel;
+                default_par->wait_engine = blade_wait_engine;
+                default_par->fill_rect = blade_fill_rect;
+                default_par->copy_rect = blade_copy_rect;
+                default_par->image_blit = blade_image_blit;
+                tridentfb_fix.accel = FB_ACCEL_TRIDENT_BLADE3D;
+        } else if (chip3D) {                    /* 3DImage family left */
+                default_par->init_accel = image_init_accel;
+                default_par->wait_engine = image_wait_engine;
+                default_par->fill_rect = image_fill_rect;
+                default_par->copy_rect = image_copy_rect;
+                tridentfb_fix.accel = FB_ACCEL_TRIDENT_3DIMAGE;
+        } else {                                /* TGUI 9440/96XX family */
+                default_par->init_accel = tgui_init_accel;
+                default_par->wait_engine = xp_wait_engine;
+                default_par->fill_rect = tgui_fill_rect;
+                default_par->copy_rect = tgui_copy_rect;
+                tridentfb_fix.accel = FB_ACCEL_TRIDENT_TGUI;
         }
 
-        /* acceleration is on by default for 3D chips */
-        defaultaccel = chip3D && !noaccel;
-
-        fb_info.par = &default_par;
+        default_par->chip_id = chip_id;
 
         /* setup MMIO region */
         tridentfb_fix.mmio_start = pci_resource_start(dev, 1);
-        tridentfb_fix.mmio_len = chip3D ? 0x20000 : 0x10000;
+        tridentfb_fix.mmio_len = pci_resource_len(dev, 1);
 
-        if (!request_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len, "tridentfb")) {
+        if (!request_mem_region(tridentfb_fix.mmio_start,
+                                tridentfb_fix.mmio_len, "tridentfb")) {
                 debug("request_region failed!\n");
+                framebuffer_release(info);
                 return -1;
         }
 
-        default_par.io_virt = ioremap_nocache(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
+        default_par->io_virt = ioremap_nocache(tridentfb_fix.mmio_start,
+                                               tridentfb_fix.mmio_len);
 
-        if (!default_par.io_virt) {
+        if (!default_par->io_virt) {
                 debug("ioremap failed\n");
                 err = -1;
                 goto out_unmap1;
         }
 
-        enable_mmio();
+        enable_mmio(default_par);
 
         /* setup framebuffer memory */
         tridentfb_fix.smem_start = pci_resource_start(dev, 0);
-        tridentfb_fix.smem_len = get_memsize();
+        tridentfb_fix.smem_len = get_memsize(default_par);
 
-        if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) {
+        if (!request_mem_region(tridentfb_fix.smem_start,
+                                tridentfb_fix.smem_len, "tridentfb")) {
                 debug("request_mem_region failed!\n");
-                disable_mmio();
+                disable_mmio(info->par);
                 err = -1;
                 goto out_unmap1;
         }
 
-        fb_info.screen_base = ioremap_nocache(tridentfb_fix.smem_start,
-                                              tridentfb_fix.smem_len);
+        info->screen_base = ioremap_nocache(tridentfb_fix.smem_start,
+                                            tridentfb_fix.smem_len);
 
-        if (!fb_info.screen_base) {
+        if (!info->screen_base) {
                 debug("ioremap failed\n");
                 err = -1;
                 goto out_unmap2;
         }
 
-        output("%s board found\n", pci_name(dev));
-        displaytype = get_displaytype();
+        default_par->flatpanel = is_flatpanel(default_par);
 
-        if (flatpanel)
-                nativex = get_nativex();
+        if (default_par->flatpanel)
+                nativex = get_nativex(default_par);
 
-        fb_info.fix = tridentfb_fix;
-        fb_info.fbops = &tridentfb_ops;
+        info->fix = tridentfb_fix;
+        info->fbops = &tridentfb_ops;
+        info->pseudo_palette = default_par->pseudo_pal;
 
+        info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
+        if (!noaccel && default_par->init_accel) {
+                info->flags &= ~FBINFO_HWACCEL_DISABLED;
+                info->flags |= FBINFO_HWACCEL_COPYAREA;
+                info->flags |= FBINFO_HWACCEL_FILLRECT;
+        } else
+                info->flags |= FBINFO_HWACCEL_DISABLED;
 
-        fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
-#ifdef CONFIG_FB_TRIDENT_ACCEL
-        fb_info.flags |= FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT;
-#endif
-        fb_info.pseudo_palette = pseudo_pal;
+        info->pixmap.addr = kmalloc(4096, GFP_KERNEL);
+        if (!info->pixmap.addr) {
+                err = -ENOMEM;
+                goto out_unmap2;
+        }
+
+        info->pixmap.size = 4096;
+        info->pixmap.buf_align = 4;
+        info->pixmap.scan_align = 1;
+        info->pixmap.access_align = 32;
+        info->pixmap.flags = FB_PIXMAP_SYSTEM;
 
-        if (!fb_find_mode(&default_var, &fb_info,
+        if (default_par->image_blit) {
+                info->flags |= FBINFO_HWACCEL_IMAGEBLIT;
+                info->pixmap.scan_align = 4;
+        }
+
+        if (noaccel) {
+                printk(KERN_DEBUG "disabling acceleration\n");
+                info->flags |= FBINFO_HWACCEL_DISABLED;
+                info->pixmap.scan_align = 1;
+        }
+
+        if (!fb_find_mode(&info->var, info,
                           mode_option, NULL, 0, NULL, bpp)) {
                 err = -EINVAL;
                 goto out_unmap2;
         }
-        err = fb_alloc_cmap(&fb_info.cmap, 256, 0);
+        err = fb_alloc_cmap(&info->cmap, 256, 0);
         if (err < 0)
                 goto out_unmap2;
 
-        if (defaultaccel && acc)
-                default_var.accel_flags |= FB_ACCELF_TEXT;
-        else
-                default_var.accel_flags &= ~FB_ACCELF_TEXT;
-        default_var.activate |= FB_ACTIVATE_NOW;
-        fb_info.var = default_var;
-        fb_info.device = &dev->dev;
-        if (register_framebuffer(&fb_info) < 0) {
-                printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n");
-                fb_dealloc_cmap(&fb_info.cmap);
+        info->var.activate |= FB_ACTIVATE_NOW;
+        info->device = &dev->dev;
+        if (register_framebuffer(info) < 0) {
+                printk(KERN_ERR "tridentfb: could not register framebuffer\n");
+                fb_dealloc_cmap(&info->cmap);
                 err = -EINVAL;
                 goto out_unmap2;
         }
         output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
-           fb_info.node, fb_info.fix.id, default_var.xres,
-           default_var.yres, default_var.bits_per_pixel);
+           info->node, info->fix.id, info->var.xres,
+           info->var.yres, info->var.bits_per_pixel);
+
+        pci_set_drvdata(dev, info);
         return 0;
 
 out_unmap2:
-        if (fb_info.screen_base)
-                iounmap(fb_info.screen_base);
+        kfree(info->pixmap.addr);
+        if (info->screen_base)
+                iounmap(info->screen_base);
         release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
-        disable_mmio();
+        disable_mmio(info->par);
 out_unmap1:
-        if (default_par.io_virt)
-                iounmap(default_par.io_virt);
+        if (default_par->io_virt)
+                iounmap(default_par->io_virt);
         release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
+        framebuffer_release(info);
         return err;
 }
 
 static void __devexit trident_pci_remove(struct pci_dev *dev)
 {
-        struct tridentfb_par *par = (struct tridentfb_par*)fb_info.par;
-        unregister_framebuffer(&fb_info);
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct tridentfb_par *par = info->par;
+
+        unregister_framebuffer(info);
         iounmap(par->io_virt);
-        iounmap(fb_info.screen_base);
+        iounmap(info->screen_base);
         release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
         release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
+        pci_set_drvdata(dev, NULL);
+        kfree(info->pixmap.addr);
+        framebuffer_release(info);
 }
 
 /* List of boards that we are trying to support */
@@ -1358,6 +1576,7 @@ static struct pci_device_id trident_devices[] = {
         {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_TRIDENT, CYBERBLADEE4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_TRIDENT, TGUI9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_TRIDENT, TGUI9660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_TRIDENT, IMAGE975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_TRIDENT, IMAGE985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -1399,9 +1618,9 @@ static int __init tridentfb_setup(char *options)
                 if (!strncmp(opt, "noaccel", 7))
                         noaccel = 1;
                 else if (!strncmp(opt, "fp", 2))
-                        displaytype = DISPLAY_FP;
+                        fp = 1;
                 else if (!strncmp(opt, "crt", 3))
-                        displaytype = DISPLAY_CRT;
+                        fp = 0;
                 else if (!strncmp(opt, "bpp=", 4))
                         bpp = simple_strtoul(opt + 4, NULL, 0);
                 else if (!strncmp(opt, "center", 6))
@@ -1430,7 +1649,6 @@ static int __init tridentfb_init(void)
                 return -ENODEV;
         tridentfb_setup(option);
 #endif
-        output("Trident framebuffer %s initializing\n", VERSION);
         return pci_register_driver(&tridentfb_pci_driver);
 }
 
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index cdbb56edb6cb..6c2d37fdd3b9 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -516,10 +516,12 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
 
                 err = uvesafb_exec(task);
                 if (err || (task->t.regs.eax & 0xffff) != 0x004f) {
-                        printk(KERN_ERR "uvesafb: Getting mode info block "
+                        printk(KERN_WARNING "uvesafb: Getting mode info block "
                                 "for mode 0x%x failed (eax=0x%x, err=%d)\n",
                                 *mode, (u32)task->t.regs.eax, err);
-                        return -EINVAL;
+                        mode++;
+                        par->vbe_modes_cnt--;
+                        continue;
                 }
 
                 mib = task->buf;
@@ -548,7 +550,10 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
                         mib->depth = mib->bits_per_pixel;
         }
 
-        return 0;
+        if (par->vbe_modes_cnt > 0)
+                return 0;
+        else
+                return -EINVAL;
 }
 
 /*
@@ -2054,8 +2059,8 @@ MODULE_PARM_DESC(maxhf,
 module_param(maxvf, ushort, 0);
 MODULE_PARM_DESC(maxvf,
         "Maximum vertical frequency [Hz], overrides EDID data");
-module_param_named(mode, mode_option, charp, 0);
-MODULE_PARM_DESC(mode,
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option,
         "Specify initial video mode as \"<xres>x<yres>[-<bpp>][@<refresh>]\"");
 module_param(vbemode, ushort, 0);
 MODULE_PARM_DESC(vbemode,
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
index c4aba59d4809..7491abfcf1fc 100644
--- a/drivers/video/vermilion/vermilion.h
+++ b/drivers/video/vermilion/vermilion.h
@@ -30,7 +30,6 @@
 #define _VERMILION_H_
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/pci.h>
 #include <asm/atomic.h>
 #include <linux/mutex.h>
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 072638a9528a..93fe08d6c78f 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -443,19 +443,29 @@ static int vfb_mmap(struct fb_info *info,
 }
 
 #ifndef MODULE
+/*
+ * The virtual framebuffer driver is only enabled if explicitly
+ * requested by passing 'video=vfb:' (or any actual options).
+ */
 static int __init vfb_setup(char *options)
 {
         char *this_opt;
 
+        vfb_enable = 0;
+
+        if (!options)
+                return 1;
+
         vfb_enable = 1;
 
-        if (!options || !*options)
+        if (!*options)
                 return 1;
 
         while ((this_opt = strsep(&options, ",")) != NULL) {
                 if (!*this_opt)
                         continue;
-                if (!strncmp(this_opt, "disable", 7))
+                /* Test disable for backwards compatibility */
+                if (!strcmp(this_opt, "disable"))
                         vfb_enable = 0;
         }
         return 1;
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 9b3c5923365e..5b2938903ac2 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -26,18 +26,6 @@
 #include <asm/io.h>
 #include <video/vga.h>
 
-#define GRAPHICS_ADDR_REG VGA_GFX_I     /* Graphics address register. */
-#define GRAPHICS_DATA_REG VGA_GFX_D     /* Graphics data register. */
-
-#define SET_RESET_INDEX         VGA_GFX_SR_VALUE        /* Set/Reset Register index. */
-#define ENABLE_SET_RESET_INDEX  VGA_GFX_SR_ENABLE       /* Enable Set/Reset Register index. */
-#define DATA_ROTATE_INDEX       VGA_GFX_DATA_ROTATE     /* Data Rotate Register index. */
-#define GRAPHICS_MODE_INDEX     VGA_GFX_MODE            /* Graphics Mode Register index. */
-#define BIT_MASK_INDEX          VGA_GFX_BIT_MASK        /* Bit Mask Register index. */
-
-#define dac_reg (VGA_PEL_IW)
-#define dac_val (VGA_PEL_D)
-
 #define VGA_FB_PHYS 0xA0000
 #define VGA_FB_PHYS_LEN 65536
 
@@ -70,7 +58,6 @@ struct vga16fb_par {
                 unsigned char   ClockingMode;     /* Seq-Controller:01h */
         } vga_state;
         struct vgastate state;
-        struct mutex open_lock;
         unsigned int ref_count;
         int palette_blanked, vesa_blanked, mode, isVGA;
         u8 misc, pel_msk, vss, clkdiv;
@@ -108,7 +95,7 @@ static struct fb_fix_screeninfo vga16fb_fix __initdata = {
         .visual         = FB_VISUAL_PSEUDOCOLOR,
         .xpanstep       = 8,
         .ypanstep       = 1,
-        .line_length    = 640/8,
+        .line_length    = 640 / 8,
         .accel          = FB_ACCEL_NONE
 };
 
@@ -135,23 +122,22 @@ static inline int setmode(int mode)
 {
         int oldmode;
         
-        vga_io_w(GRAPHICS_ADDR_REG, GRAPHICS_MODE_INDEX);
-        oldmode = vga_io_r(GRAPHICS_DATA_REG);
-        vga_io_w(GRAPHICS_DATA_REG, mode);
+        oldmode = vga_io_rgfx(VGA_GFX_MODE);
+        vga_io_w(VGA_GFX_D, mode);
         return oldmode;
 }
 
 /* Select the Bit Mask Register and return its value. */
 static inline int selectmask(void)
 {
-        return vga_io_rgfx(BIT_MASK_INDEX);
+        return vga_io_rgfx(VGA_GFX_BIT_MASK);
 }
 
 /* Set the value of the Bit Mask Register.  It must already have been
    selected with selectmask(). */
 static inline void setmask(int mask)
 {
-        vga_io_w(GRAPHICS_DATA_REG, mask);
+        vga_io_w(VGA_GFX_D, mask);
 }
 
 /* Set the Data Rotate Register and return its old value. 
@@ -161,9 +147,8 @@ static inline int setop(int op)
 {
         int oldop;
         
-        vga_io_w(GRAPHICS_ADDR_REG, DATA_ROTATE_INDEX);
-        oldop = vga_io_r(GRAPHICS_DATA_REG);
-        vga_io_w(GRAPHICS_DATA_REG, op);
+        oldop = vga_io_rgfx(VGA_GFX_DATA_ROTATE);
+        vga_io_w(VGA_GFX_D, op);
         return oldop;
 }
 
@@ -173,9 +158,8 @@ static inline int setsr(int sr)
 {
         int oldsr;
 
-        vga_io_w(GRAPHICS_ADDR_REG, ENABLE_SET_RESET_INDEX);
-        oldsr = vga_io_r(GRAPHICS_DATA_REG);
-        vga_io_w(GRAPHICS_DATA_REG, sr);
+        oldsr = vga_io_rgfx(VGA_GFX_SR_ENABLE);
+        vga_io_w(VGA_GFX_D, sr);
         return oldsr;
 }
 
@@ -184,22 +168,21 @@ static inline int setcolor(int color)
 {
         int oldcolor;
 
-        vga_io_w(GRAPHICS_ADDR_REG, SET_RESET_INDEX);
-        oldcolor = vga_io_r(GRAPHICS_DATA_REG);
-        vga_io_w(GRAPHICS_DATA_REG, color);
+        oldcolor = vga_io_rgfx(VGA_GFX_SR_VALUE);
+        vga_io_w(VGA_GFX_D, color);
         return oldcolor;
 }
 
 /* Return the value in the Graphics Address Register. */
 static inline int getindex(void)
 {
-        return vga_io_r(GRAPHICS_ADDR_REG);
+        return vga_io_r(VGA_GFX_I);
 }
 
 /* Set the value in the Graphics Address Register. */
 static inline void setindex(int index)
 {
-        vga_io_w(GRAPHICS_ADDR_REG, index);
+        vga_io_w(VGA_GFX_I, index);
 }
 
 static void vga16fb_pan_var(struct fb_info *info, 
@@ -302,7 +285,6 @@ static int vga16fb_open(struct fb_info *info, int user)
 {
         struct vga16fb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
         if (!par->ref_count) {
                 memset(&par->state, 0, sizeof(struct vgastate));
                 par->state.flags = VGA_SAVE_FONTS | VGA_SAVE_MODE |
@@ -310,7 +292,6 @@ static int vga16fb_open(struct fb_info *info, int user)
                 save_vga(&par->state);
         }
         par->ref_count++;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -319,15 +300,12 @@ static int vga16fb_release(struct fb_info *info, int user)
 {
         struct vga16fb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
-        if (!par->ref_count) {
-                mutex_unlock(&par->open_lock);
+        if (!par->ref_count)
                 return -EINVAL;
-        }
+
         if (par->ref_count == 1)
                 restore_vga(&par->state);
         par->ref_count--;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -672,10 +650,10 @@ static void ega16_setpalette(int regno, unsigned red, unsigned green, unsigned b
 
 static void vga16_setpalette(int regno, unsigned red, unsigned green, unsigned blue)
 {
-        outb(regno,       dac_reg);
-        outb(red   >> 10, dac_val);
-        outb(green >> 10, dac_val);
-        outb(blue  >> 10, dac_val);
+        outb(regno,       VGA_PEL_IW);
+        outb(red   >> 10, VGA_PEL_D);
+        outb(green >> 10, VGA_PEL_D);
+        outb(blue  >> 10, VGA_PEL_D);
 }
 
 static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green,
@@ -719,28 +697,15 @@ static int vga16fb_pan_display(struct fb_var_screeninfo *var,
    blanking code was originally by Huang shi chao, and modified by
    Christoph Rimek (chrimek@toppoint.de) and todd j. derr
    (tjd@barefoot.org) for Linux. */
-#define attrib_port             VGA_ATC_IW
-#define seq_port_reg            VGA_SEQ_I
-#define seq_port_val            VGA_SEQ_D
-#define gr_port_reg             VGA_GFX_I
-#define gr_port_val             VGA_GFX_D
-#define video_misc_rd           VGA_MIS_R
-#define video_misc_wr           VGA_MIS_W
-#define vga_video_port_reg      VGA_CRT_IC
-#define vga_video_port_val      VGA_CRT_DC
 
 static void vga_vesa_blank(struct vga16fb_par *par, int mode)
 {
-        unsigned char SeqCtrlIndex;
-        unsigned char CrtCtrlIndex;
+        unsigned char SeqCtrlIndex = vga_io_r(VGA_SEQ_I);
+        unsigned char CrtCtrlIndex = vga_io_r(VGA_CRT_IC);
         
-        //cli();
-        SeqCtrlIndex = vga_io_r(seq_port_reg);
-        CrtCtrlIndex = vga_io_r(vga_video_port_reg);
-
         /* save original values of VGA controller registers */
         if(!par->vesa_blanked) {
-                par->vga_state.CrtMiscIO = vga_io_r(video_misc_rd);
+                par->vga_state.CrtMiscIO = vga_io_r(VGA_MIS_R);
                 //sti();
 
                 par->vga_state.HorizontalTotal = vga_io_rcrt(0x00);     /* HorizontalTotal */
@@ -756,12 +721,11 @@ static void vga_vesa_blank(struct vga16fb_par *par, int mode)
 
         /* assure that video is enabled */
         /* "0x20" is VIDEO_ENABLE_bit in register 01 of sequencer */
-        //cli();
         vga_io_wseq(0x01, par->vga_state.ClockingMode | 0x20);
 
         /* test for vertical retrace in process.... */
         if ((par->vga_state.CrtMiscIO & 0x80) == 0x80)
-                vga_io_w(video_misc_wr, par->vga_state.CrtMiscIO & 0xef);
+                vga_io_w(VGA_MIS_W, par->vga_state.CrtMiscIO & 0xef);
 
         /*
          * Set <End of vertical retrace> to minimum (0) and
@@ -769,12 +733,10 @@ static void vga_vesa_blank(struct vga16fb_par *par, int mode)
          * Result: turn off vertical sync (VSync) pulse.
          */
         if (mode & FB_BLANK_VSYNC_SUSPEND) {
-                outb_p(0x10,vga_video_port_reg);        /* StartVertRetrace */
-                outb_p(0xff,vga_video_port_val);        /* maximum value */
-                outb_p(0x11,vga_video_port_reg);        /* EndVertRetrace */
-                outb_p(0x40,vga_video_port_val);        /* minimum (bits 0..3)  */
-                outb_p(0x07,vga_video_port_reg);        /* Overflow */
-                outb_p(par->vga_state.Overflow | 0x84,vga_video_port_val); /* bits 9,10 of vert. retrace */
+                vga_io_wcrt(VGA_CRTC_V_SYNC_START, 0xff);
+                vga_io_wcrt(VGA_CRTC_V_SYNC_END, 0x40);
+                /* bits 9,10 of vert. retrace */
+                vga_io_wcrt(VGA_CRTC_OVERFLOW, par->vga_state.Overflow | 0x84);
         }
 
         if (mode & FB_BLANK_HSYNC_SUSPEND) {
@@ -783,29 +745,22 @@ static void vga_vesa_blank(struct vga16fb_par *par, int mode)
                  *  <Start of horizontal Retrace> to maximum
                  * Result: turn off horizontal sync (HSync) pulse.
                  */
-                outb_p(0x04,vga_video_port_reg);        /* StartHorizRetrace */
-                outb_p(0xff,vga_video_port_val);        /* maximum */
-                outb_p(0x05,vga_video_port_reg);        /* EndHorizRetrace */
-                outb_p(0x00,vga_video_port_val);        /* minimum (0) */
+                vga_io_wcrt(VGA_CRTC_H_SYNC_START, 0xff);
+                vga_io_wcrt(VGA_CRTC_H_SYNC_END, 0x00);
         }
 
         /* restore both index registers */
-        outb_p(SeqCtrlIndex,seq_port_reg);
-        outb_p(CrtCtrlIndex,vga_video_port_reg);
-        //sti();
+        outb_p(SeqCtrlIndex, VGA_SEQ_I);
+        outb_p(CrtCtrlIndex, VGA_CRT_IC);
 }
 
 static void vga_vesa_unblank(struct vga16fb_par *par)
 {
-        unsigned char SeqCtrlIndex;
-        unsigned char CrtCtrlIndex;
+        unsigned char SeqCtrlIndex = vga_io_r(VGA_SEQ_I);
+        unsigned char CrtCtrlIndex = vga_io_r(VGA_CRT_IC);
         
-        //cli();
-        SeqCtrlIndex = vga_io_r(seq_port_reg);
-        CrtCtrlIndex = vga_io_r(vga_video_port_reg);
-
         /* restore original values of VGA controller registers */
-        vga_io_w(video_misc_wr, par->vga_state.CrtMiscIO);
+        vga_io_w(VGA_MIS_W, par->vga_state.CrtMiscIO);
 
         /* HorizontalTotal */
         vga_io_wcrt(0x00, par->vga_state.HorizontalTotal);
@@ -827,9 +782,8 @@ static void vga_vesa_unblank(struct vga16fb_par *par)
         vga_io_wseq(0x01, par->vga_state.ClockingMode);
 
         /* restore index/control registers */
-        vga_io_w(seq_port_reg, SeqCtrlIndex);
-        vga_io_w(vga_video_port_reg, CrtCtrlIndex);
-        //sti();
+        vga_io_w(VGA_SEQ_I, SeqCtrlIndex);
+        vga_io_w(VGA_CRT_IC, CrtCtrlIndex);
 }
 
 static void vga_pal_blank(void)
@@ -837,10 +791,10 @@ static void vga_pal_blank(void)
         int i;
 
         for (i=0; i<16; i++) {
-                outb_p (i, dac_reg) ;
-                outb_p (0, dac_val) ;
-                outb_p (0, dac_val) ;
-                outb_p (0, dac_val) ;
+                outb_p(i, VGA_PEL_IW);
+                outb_p(0, VGA_PEL_D);
+                outb_p(0, VGA_PEL_D);
+                outb_p(0, VGA_PEL_D);
         }
 }
 
@@ -1087,12 +1041,15 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
         width = x2 - dx;
         height = y2 - dy;
 
+        if (sx + dx < old_dx || sy + dy < old_dy)
+                return;
+
         /* update sx1,sy1 */
         sx += (dx - old_dx);
         sy += (dy - old_dy);
 
         /* the source must be completely inside the virtual screen */
-        if (sx < 0 || sy < 0 || (sx + width) > vxres || (sy + height) > vyres)
+        if (sx + width > vxres || sy + height > vyres)
                 return;
 
         switch (info->fix.type) {
@@ -1363,7 +1320,6 @@ static int __init vga16fb_probe(struct platform_device *dev)
         printk(KERN_INFO "vga16fb: mapped to 0x%p\n", info->screen_base);
         par = info->par;
 
-        mutex_init(&par->open_lock);
         par->isVGA = screen_info.orig_video_isVGA;
         par->palette_blanked = 0;
         par->vesa_blanked = 0;
@@ -1482,6 +1438,7 @@ static void __exit vga16fb_exit(void)
         platform_driver_unregister(&vga16fb_driver);
 }
 
+MODULE_DESCRIPTION("Legacy VGA framebuffer device driver");
 MODULE_LICENSE("GPL");
 module_init(vga16fb_init);
 module_exit(vga16fb_exit);
diff --git a/drivers/video/via/Makefile b/drivers/video/via/Makefile
new file mode 100644
index 000000000000..e533b4b6aba4
--- /dev/null
+++ b/drivers/video/via/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the VIA framebuffer driver (for Linux Kernel 2.6)
+#
+
+obj-$(CONFIG_FB_VIA) += viafb.o
+
+viafb-y :=viafbdev.o hw.o iface.o  via_i2c.o dvi.o lcd.o ioctl.o accel.o via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.o
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
new file mode 100644
index 000000000000..632523ff1fb7
--- /dev/null
+++ b/drivers/video/via/accel.c
@@ -0,0 +1,279 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#include "global.h"
+
+void viafb_init_accel(void)
+{
+        viaparinfo->fbmem_free -= CURSOR_SIZE;
+        viaparinfo->cursor_start = viaparinfo->fbmem_free;
+        viaparinfo->fbmem_used += CURSOR_SIZE;
+
+        /* Reverse 8*1024 memory space for cursor image */
+        viaparinfo->fbmem_free -= (CURSOR_SIZE + VQ_SIZE);
+        viaparinfo->VQ_start = viaparinfo->fbmem_free;
+        viaparinfo->VQ_end = viaparinfo->VQ_start + VQ_SIZE - 1;
+        viaparinfo->fbmem_used += (CURSOR_SIZE + VQ_SIZE); }
+
+void viafb_init_2d_engine(void)
+{
+        u32 dwVQStartAddr, dwVQEndAddr;
+        u32 dwVQLen, dwVQStartL, dwVQEndL, dwVQStartEndH;
+
+        /* init 2D engine regs to reset 2D engine */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_GEMODE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DSTPOS);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DIMENSION);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_PATADDR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_FGCOLOR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_BGCOLOR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CLIPTL);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CLIPBR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_OFFSET);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_KEYCONTROL);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DSTBASE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_PITCH);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_MONOPAT1);
+
+        /* Init AGP and VQ regs */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M900:
+                writel(0x00100000, viaparinfo->io_virt + VIA_REG_CR_TRANSET);
+                writel(0x680A0000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                writel(0x02000000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                break;
+
+        default:
+                writel(0x00100000, viaparinfo->io_virt + VIA_REG_TRANSET);
+                writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x00333004, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x60000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x61000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x62000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x63000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x64000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x7D000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+
+                writel(0xFE020000, viaparinfo->io_virt + VIA_REG_TRANSET);
+                writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                break;
+        }
+        if (viaparinfo->VQ_start != 0) {
+                /* Enable VQ */
+                dwVQStartAddr = viaparinfo->VQ_start;
+                dwVQEndAddr = viaparinfo->VQ_end;
+
+                dwVQStartL = 0x50000000 | (dwVQStartAddr & 0xFFFFFF);
+                dwVQEndL = 0x51000000 | (dwVQEndAddr & 0xFFFFFF);
+                dwVQStartEndH = 0x52000000 |
+                        ((dwVQStartAddr & 0xFF000000) >> 24) |
+                        ((dwVQEndAddr & 0xFF000000) >> 16);
+                dwVQLen = 0x53000000 | (VQ_SIZE >> 3);
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                        dwVQStartL |= 0x20000000;
+                        dwVQEndL |= 0x20000000;
+                        dwVQStartEndH |= 0x20000000;
+                        dwVQLen |= 0x20000000;
+                        break;
+                default:
+                        break;
+                }
+
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                        writel(0x00100000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSET);
+                        writel(dwVQStartEndH,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(dwVQStartL,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(dwVQEndL,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(dwVQLen,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(0x74301001,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(0x00000000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        break;
+                default:
+                        writel(0x00FE0000,
+                                viaparinfo->io_virt + VIA_REG_TRANSET);
+                        writel(0x080003FE,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0A00027C,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0B000260,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0C000274,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0D000264,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0E000000,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0F000020,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x1000027E,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x110002FE,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x200F0060,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+
+                        writel(0x00000006,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x40008C0F,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x44000000,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x45080C04,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x46800408,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+
+                        writel(dwVQStartEndH,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(dwVQStartL,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(dwVQEndL,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(dwVQLen,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        break;
+                }
+        } else {
+                /* Disable VQ */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                        writel(0x00100000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSET);
+                        writel(0x74301000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        break;
+                default:
+                        writel(0x00FE0000,
+                                viaparinfo->io_virt + VIA_REG_TRANSET);
+                        writel(0x00000004,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x40008C0F,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x44000000,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x45080C04,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x46800408,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        break;
+                }
+        }
+
+        viafb_set_2d_color_depth(viaparinfo->bpp);
+
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DSTBASE);
+
+        writel(VIA_PITCH_ENABLE |
+                   (((viaparinfo->hres *
+                      viaparinfo->bpp >> 3) >> 3) | (((viaparinfo->hres *
+                                                   viaparinfo->
+                                                   bpp >> 3) >> 3) << 16)),
+                                        viaparinfo->io_virt + VIA_REG_PITCH);
+}
+
+void viafb_set_2d_color_depth(int bpp)
+{
+        u32 dwGEMode;
+
+        dwGEMode = readl(viaparinfo->io_virt + 0x04) & 0xFFFFFCFF;
+
+        switch (bpp) {
+        case 16:
+                dwGEMode |= VIA_GEM_16bpp;
+                break;
+        case 32:
+                dwGEMode |= VIA_GEM_32bpp;
+                break;
+        default:
+                dwGEMode |= VIA_GEM_8bpp;
+                break;
+        }
+
+        /* Set BPP and Pitch */
+        writel(dwGEMode, viaparinfo->io_virt + VIA_REG_GEMODE);
+}
+
+void viafb_hw_cursor_init(void)
+{
+        /* Set Cursor Image Base Address */
+        writel(viaparinfo->cursor_start,
+                viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
+}
+
+void viafb_show_hw_cursor(struct fb_info *info, int Status)
+{
+        u32 temp;
+        u32 iga_path = ((struct viafb_par *)(info->par))->iga_path;
+
+        temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+        switch (Status) {
+        case HW_Cursor_ON:
+                temp |= 0x1;
+                break;
+        case HW_Cursor_OFF:
+                temp &= 0xFFFFFFFE;
+                break;
+        }
+        switch (iga_path) {
+        case IGA2:
+                temp |= 0x80000000;
+                break;
+        case IGA1:
+        default:
+                temp &= 0x7FFFFFFF;
+        }
+        writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+}
+
+int viafb_wait_engine_idle(void)
+{
+        int loop = 0;
+
+        while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &
+                        VIA_VR_QUEUE_BUSY) && (loop++ < MAXLOOP))
+                cpu_relax();
+
+        while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &
+                    (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&
+                    (loop++ < MAXLOOP))
+                cpu_relax();
+
+        return loop >= MAXLOOP;
+}
diff --git a/drivers/video/via/accel.h b/drivers/video/via/accel.h
new file mode 100644
index 000000000000..29bf854e8ccf
--- /dev/null
+++ b/drivers/video/via/accel.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ACCEL_H__
+#define __ACCEL_H__
+
+#define FB_ACCEL_VIA_UNICHROME  50
+
+/* MMIO Base Address Definition */
+#define MMIO_VGABASE                0x8000
+#define MMIO_CR_READ                (MMIO_VGABASE + 0x3D4)
+#define MMIO_CR_WRITE               (MMIO_VGABASE + 0x3D5)
+#define MMIO_SR_READ                (MMIO_VGABASE + 0x3C4)
+#define MMIO_SR_WRITE               (MMIO_VGABASE + 0x3C5)
+
+/* HW Cursor Status Define */
+#define HW_Cursor_ON    0
+#define HW_Cursor_OFF   1
+
+#define CURSOR_SIZE     (8 * 1024)
+#define VQ_SIZE         (256 * 1024)
+
+#define VIA_MMIO_BLTBASE        0x200000
+#define VIA_MMIO_BLTSIZE        0x200000
+
+/* Defines for 2D registers */
+#define VIA_REG_GECMD           0x000
+#define VIA_REG_GEMODE          0x004
+#define VIA_REG_SRCPOS          0x008
+#define VIA_REG_DSTPOS          0x00C
+/* width and height */
+#define VIA_REG_DIMENSION       0x010
+#define VIA_REG_PATADDR         0x014
+#define VIA_REG_FGCOLOR         0x018
+#define VIA_REG_BGCOLOR         0x01C
+/* top and left of clipping */
+#define VIA_REG_CLIPTL          0x020
+/* bottom and right of clipping */
+#define VIA_REG_CLIPBR          0x024
+#define VIA_REG_OFFSET          0x028
+/* color key control */
+#define VIA_REG_KEYCONTROL      0x02C
+#define VIA_REG_SRCBASE         0x030
+#define VIA_REG_DSTBASE         0x034
+/* pitch of src and dst */
+#define VIA_REG_PITCH           0x038
+#define VIA_REG_MONOPAT0        0x03C
+#define VIA_REG_MONOPAT1        0x040
+/* from 0x100 to 0x1ff */
+#define VIA_REG_COLORPAT        0x100
+
+/* VIA_REG_PITCH(0x38): Pitch Setting */
+#define VIA_PITCH_ENABLE        0x80000000
+
+/* defines for VIA HW cursor registers */
+#define VIA_REG_CURSOR_MODE     0x2D0
+#define VIA_REG_CURSOR_POS      0x2D4
+#define VIA_REG_CURSOR_ORG      0x2D8
+#define VIA_REG_CURSOR_BG       0x2DC
+#define VIA_REG_CURSOR_FG       0x2E0
+
+/* VIA_REG_GEMODE(0x04): GE mode */
+#define VIA_GEM_8bpp            0x00000000
+#define VIA_GEM_16bpp           0x00000100
+#define VIA_GEM_32bpp           0x00000300
+
+/* VIA_REG_GECMD(0x00): 2D Engine Command  */
+#define VIA_GEC_NOOP            0x00000000
+#define VIA_GEC_BLT             0x00000001
+#define VIA_GEC_LINE            0x00000005
+
+/* Rotate Command */
+#define VIA_GEC_ROT             0x00000008
+
+#define VIA_GEC_SRC_XY          0x00000000
+#define VIA_GEC_SRC_LINEAR      0x00000010
+#define VIA_GEC_DST_XY          0x00000000
+#define VIA_GEC_DST_LINRAT      0x00000020
+
+#define VIA_GEC_SRC_FB          0x00000000
+#define VIA_GEC_SRC_SYS         0x00000040
+#define VIA_GEC_DST_FB          0x00000000
+#define VIA_GEC_DST_SYS         0x00000080
+
+/* source is mono */
+#define VIA_GEC_SRC_MONO        0x00000100
+/* pattern is mono */
+#define VIA_GEC_PAT_MONO        0x00000200
+/* mono src is opaque */
+#define VIA_GEC_MSRC_OPAQUE     0x00000000
+/* mono src is transparent */
+#define VIA_GEC_MSRC_TRANS      0x00000400
+/* pattern is in frame buffer */
+#define VIA_GEC_PAT_FB          0x00000000
+/* pattern is from reg setting */
+#define VIA_GEC_PAT_REG         0x00000800
+
+#define VIA_GEC_CLIP_DISABLE    0x00000000
+#define VIA_GEC_CLIP_ENABLE     0x00001000
+
+#define VIA_GEC_FIXCOLOR_PAT    0x00002000
+
+#define VIA_GEC_INCX            0x00000000
+#define VIA_GEC_DECY            0x00004000
+#define VIA_GEC_INCY            0x00000000
+#define VIA_GEC_DECX            0x00008000
+/* mono pattern is opaque */
+#define VIA_GEC_MPAT_OPAQUE     0x00000000
+/* mono pattern is transparent */
+#define VIA_GEC_MPAT_TRANS      0x00010000
+
+#define VIA_GEC_MONO_UNPACK     0x00000000
+#define VIA_GEC_MONO_PACK       0x00020000
+#define VIA_GEC_MONO_DWORD      0x00000000
+#define VIA_GEC_MONO_WORD       0x00040000
+#define VIA_GEC_MONO_BYTE       0x00080000
+
+#define VIA_GEC_LASTPIXEL_ON    0x00000000
+#define VIA_GEC_LASTPIXEL_OFF   0x00100000
+#define VIA_GEC_X_MAJOR         0x00000000
+#define VIA_GEC_Y_MAJOR         0x00200000
+#define VIA_GEC_QUICK_START     0x00800000
+
+/* defines for VIA 3D registers */
+#define VIA_REG_STATUS          0x400
+#define VIA_REG_CR_TRANSET      0x41C
+#define VIA_REG_CR_TRANSPACE    0x420
+#define VIA_REG_TRANSET         0x43C
+#define VIA_REG_TRANSPACE       0x440
+
+/* VIA_REG_STATUS(0x400): Engine Status */
+
+/* Command Regulator is busy */
+#define VIA_CMD_RGTR_BUSY       0x00000080
+/* 2D Engine is busy */
+#define VIA_2D_ENG_BUSY         0x00000002
+/* 3D Engine is busy */
+#define VIA_3D_ENG_BUSY         0x00000001
+/* Virtual Queue is busy */
+#define VIA_VR_QUEUE_BUSY       0x00020000
+
+#define MAXLOOP                 0xFFFFFF
+
+void viafb_init_accel(void);
+void viafb_init_2d_engine(void);
+void set_2d_color_depth(int);
+void viafb_hw_cursor_init(void);
+void viafb_show_hw_cursor(struct fb_info *info, int Status); int
+viafb_wait_engine_idle(void); void viafb_set_2d_color_depth(int bpp);
+
+#endif /* __ACCEL_H__ */
diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h
new file mode 100644
index 000000000000..dde95edc387a
--- /dev/null
+++ b/drivers/video/via/chip.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __CHIP_H__
+#define __CHIP_H__
+
+#include "global.h"
+
+/***************************************/
+/* Definition Graphic Chip Information */
+/***************************************/
+
+#define     PCI_VIA_VENDOR_ID       0x1106
+
+/* Define VIA Graphic Chip Name */
+#define     UNICHROME_CLE266        1
+#define     UNICHROME_CLE266_DID    0x3122
+#define     CLE266_REVISION_AX      0x0A
+#define     CLE266_REVISION_CX      0x0C
+
+#define     UNICHROME_K400          2
+#define     UNICHROME_K400_DID      0x7205
+
+#define     UNICHROME_K800          3
+#define     UNICHROME_K800_DID      0x3108
+
+#define     UNICHROME_PM800         4
+#define     UNICHROME_PM800_DID     0x3118
+
+#define     UNICHROME_CN700         5
+#define     UNICHROME_CN700_DID     0x3344
+
+#define     UNICHROME_CX700         6
+#define     UNICHROME_CX700_DID     0x3157
+#define     CX700_REVISION_700      0x0
+#define     CX700_REVISION_700M     0x1
+#define     CX700_REVISION_700M2    0x2
+
+#define     UNICHROME_CN750         7
+#define     UNICHROME_CN750_DID     0x3225
+
+#define     UNICHROME_K8M890        8
+#define     UNICHROME_K8M890_DID    0x3230
+
+#define     UNICHROME_P4M890        9
+#define     UNICHROME_P4M890_DID    0x3343
+
+#define     UNICHROME_P4M900        10
+#define     UNICHROME_P4M900_DID    0x3371
+
+#define     UNICHROME_VX800         11
+#define     UNICHROME_VX800_DID     0x1122
+
+/**************************************************/
+/* Definition TMDS Trasmitter Information         */
+/**************************************************/
+
+/* Definition TMDS Trasmitter Index */
+#define     NON_TMDS_TRANSMITTER    0x00
+#define     VT1632_TMDS             0x01
+#define     INTEGRATED_TMDS         0x42
+
+/* Definition TMDS Trasmitter I2C Slave Address */
+#define     VT1632_TMDS_I2C_ADDR    0x10
+
+/**************************************************/
+/* Definition LVDS Trasmitter Information         */
+/**************************************************/
+
+/* Definition LVDS Trasmitter Index */
+#define     NON_LVDS_TRANSMITTER    0x00
+#define     VT1631_LVDS             0x01
+#define     VT1636_LVDS             0x0E
+#define     INTEGRATED_LVDS         0x41
+
+/* Definition Digital Transmitter Mode */
+#define     TX_DATA_12_BITS         0x01
+#define     TX_DATA_24_BITS         0x02
+#define     TX_DATA_DDR_MODE        0x04
+#define     TX_DATA_SDR_MODE        0x08
+
+/* Definition LVDS Trasmitter I2C Slave Address */
+#define     VT1631_LVDS_I2C_ADDR    0x70
+#define     VT3271_LVDS_I2C_ADDR    0x80
+#define     VT1636_LVDS_I2C_ADDR    0x80
+
+struct tmds_chip_information {
+        int tmds_chip_name;
+        int tmds_chip_slave_addr;
+        int dvi_panel_id;
+        int data_mode;
+        int output_interface;
+        int i2c_port;
+        int device_type;
+};
+
+struct lvds_chip_information {
+        int lvds_chip_name;
+        int lvds_chip_slave_addr;
+        int data_mode;
+        int output_interface;
+        int i2c_port;
+};
+
+struct chip_information {
+        int gfx_chip_name;
+        int gfx_chip_revision;
+        int chip_on_slot;
+        struct tmds_chip_information tmds_chip_info;
+        struct lvds_chip_information lvds_chip_info;
+        struct lvds_chip_information lvds_chip_info2;
+};
+
+struct crt_setting_information {
+        int iga_path;
+        int h_active;
+        int v_active;
+        int bpp;
+        int refresh_rate;
+};
+
+struct tmds_setting_information {
+        int iga_path;
+        int h_active;
+        int v_active;
+        int bpp;
+        int refresh_rate;
+        int get_dvi_size_method;
+        int max_pixel_clock;
+        int dvi_panel_size;
+        int dvi_panel_hres;
+        int dvi_panel_vres;
+        int native_size;
+};
+
+struct lvds_setting_information {
+        int iga_path;
+        int h_active;
+        int v_active;
+        int bpp;
+        int refresh_rate;
+        int get_lcd_size_method;
+        int lcd_panel_id;
+        int lcd_panel_size;
+        int lcd_panel_hres;
+        int lcd_panel_vres;
+        int display_method;
+        int device_lcd_dualedge;
+        int LCDDithering;
+        int lcd_mode;
+        u32 vclk;               /*panel mode clock value */
+};
+
+struct GFX_DPA_SETTING {
+        int ClkRangeIndex;
+        u8 DVP0;                /* CR96[3:0] */
+        u8 DVP0DataDri_S1;      /* SR2A[5]   */
+        u8 DVP0DataDri_S;       /* SR1B[1]   */
+        u8 DVP0ClockDri_S1;     /* SR2A[4]   */
+        u8 DVP0ClockDri_S;      /* SR1E[2]   */
+        u8 DVP1;                /* CR9B[3:0] */
+        u8 DVP1Driving;         /* SR65[3:0], Data and Clock driving */
+        u8 DFPHigh;             /* CR97[3:0] */
+        u8 DFPLow;              /* CR99[3:0] */
+
+};
+
+struct VT1636_DPA_SETTING {
+        int PanelSizeID;
+        u8 CLK_SEL_ST1;
+        u8 CLK_SEL_ST2;
+};
+#endif /* __CHIP_H__ */
diff --git a/drivers/video/via/debug.h b/drivers/video/via/debug.h
new file mode 100644
index 000000000000..86eacc2017f3
--- /dev/null
+++ b/drivers/video/via/debug.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __DEBUG_H__
+#define __DEBUG_H__
+
+#ifndef VIAFB_DEBUG
+#define VIAFB_DEBUG 0
+#endif
+
+#if VIAFB_DEBUG
+#define DEBUG_MSG(f, a...)   printk(f, ## a)
+#else
+#define DEBUG_MSG(f, a...)
+#endif
+
+#define VIAFB_WARN 0
+#if VIAFB_WARN
+#define WARN_MSG(f, a...)   printk(f, ## a)
+#else
+#define WARN_MSG(f, a...)
+#endif
+
+#endif /* __DEBUG_H__ */
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
new file mode 100644
index 000000000000..d6965447ca69
--- /dev/null
+++ b/drivers/video/via/dvi.c
@@ -0,0 +1,682 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#include "global.h"
+
+static void tmds_register_write(int index, u8 data);
+static int tmds_register_read(int index);
+static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);
+static int check_reduce_blanking_mode(int mode_index,
+        int refresh_rate);
+static int dvi_get_panel_size_from_DDCv1(void);
+static int dvi_get_panel_size_from_DDCv2(void);
+static unsigned char dvi_get_panel_info(void);
+static int viafb_dvi_query_EDID(void);
+
+static int check_tmds_chip(int device_id_subaddr, int device_id)
+{
+        if (tmds_register_read(device_id_subaddr) == device_id)
+                return OK;
+        else
+                return FAIL;
+}
+
+void viafb_init_dvi_size(void)
+{
+        DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");
+        DEBUG_MSG(KERN_INFO
+                "viaparinfo->tmds_setting_info->get_dvi_size_method %d\n",
+                  viaparinfo->tmds_setting_info->get_dvi_size_method);
+
+        switch (viaparinfo->tmds_setting_info->get_dvi_size_method) {
+        case GET_DVI_SIZE_BY_SYSTEM_BIOS:
+                break;
+        case GET_DVI_SZIE_BY_HW_STRAPPING:
+                break;
+        case GET_DVI_SIZE_BY_VGA_BIOS:
+        default:
+                dvi_get_panel_info();
+                break;
+        }
+        return;
+}
+
+int viafb_tmds_trasmitter_identify(void)
+{
+        unsigned char sr2a = 0, sr1e = 0, sr3e = 0;
+
+        /* Turn on ouputting pad */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+            /*=* DFP Low Pad on *=*/
+                sr2a = viafb_read_reg(VIASR, SR2A);
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                break;
+
+        case UNICHROME_P4M900:
+        case UNICHROME_P4M890:
+                /* DFP Low Pad on */
+                sr2a = viafb_read_reg(VIASR, SR2A);
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                /* DVP0 Pad on */
+                sr1e = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT6 + BIT7);
+                break;
+
+        default:
+            /* DVP0/DVP1 Pad on */
+                sr1e = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg_mask(SR1E, VIASR, 0xF0, BIT4 +
+                        BIT5 + BIT6 + BIT7);
+            /* SR3E[1]Multi-function selection:
+            0 = Emulate I2C and DDC bus by GPIO2/3/4. */
+                sr3e = viafb_read_reg(VIASR, SR3E);
+                viafb_write_reg_mask(SR3E, VIASR, 0x0, BIT5);
+                break;
+        }
+
+        /* Check for VT1632: */
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_name = VT1632_TMDS;
+        viaparinfo->chip_info->
+                tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR;
+        viaparinfo->chip_info->tmds_chip_info.i2c_port = I2CPORTINDEX;
+        if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID) != FAIL) {
+                /*
+                 * Currently only support 12bits,dual edge,add 24bits mode later
+                 */
+                tmds_register_write(0x08, 0x3b);
+
+                DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n");
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->tmds_chip_info.tmds_chip_name);
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->tmds_chip_info.i2c_port);
+                return OK;
+        } else {
+                viaparinfo->chip_info->tmds_chip_info.i2c_port = GPIOPORTINDEX;
+                if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)
+                    != FAIL) {
+                        tmds_register_write(0x08, 0x3b);
+                        DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n");
+                        DEBUG_MSG(KERN_INFO "\n %2d",
+                                  viaparinfo->chip_info->
+                                  tmds_chip_info.tmds_chip_name);
+                        DEBUG_MSG(KERN_INFO "\n %2d",
+                                  viaparinfo->chip_info->
+                                  tmds_chip_info.i2c_port);
+                        return OK;
+                }
+        }
+
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_name = INTEGRATED_TMDS;
+
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) &&
+            ((viafb_display_hardware_layout == HW_LAYOUT_DVI_ONLY) ||
+             (viafb_display_hardware_layout == HW_LAYOUT_LCD_DVI))) {
+                DEBUG_MSG(KERN_INFO "\n Integrated TMDS ! \n");
+                return OK;
+        }
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+                viafb_write_reg(SR2A, VIASR, sr2a);
+                break;
+
+        case UNICHROME_P4M900:
+        case UNICHROME_P4M890:
+                viafb_write_reg(SR2A, VIASR, sr2a);
+                viafb_write_reg(SR1E, VIASR, sr1e);
+                break;
+
+        default:
+                viafb_write_reg(SR1E, VIASR, sr1e);
+                viafb_write_reg(SR3E, VIASR, sr3e);
+                break;
+        }
+
+        viaparinfo->chip_info->
+                tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER;
+        viaparinfo->chip_info->tmds_chip_info.
+                tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR;
+        return FAIL;
+}
+
+static void tmds_register_write(int index, u8 data)
+{
+        viaparinfo->i2c_stuff.i2c_port =
+                viaparinfo->chip_info->tmds_chip_info.i2c_port;
+
+        viafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info.
+                tmds_chip_slave_addr, index,
+                     data);
+}
+
+static int tmds_register_read(int index)
+{
+        u8 data;
+
+        viaparinfo->i2c_stuff.i2c_port =
+                viaparinfo->chip_info->tmds_chip_info.i2c_port;
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->
+            tmds_chip_info.tmds_chip_slave_addr,
+                        (u8) index, &data);
+        return data;
+}
+
+static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)
+{
+        viaparinfo->i2c_stuff.i2c_port =
+                viaparinfo->chip_info->tmds_chip_info.i2c_port;
+        viafb_i2c_readbytes((u8) viaparinfo->chip_info->tmds_chip_info.
+                         tmds_chip_slave_addr, (u8) index, buff, buff_len);
+        return 0;
+}
+
+static int check_reduce_blanking_mode(int mode_index,
+        int refresh_rate)
+{
+        if (refresh_rate != 60)
+                return false;
+
+        switch (mode_index) {
+                /* Following modes have reduce blanking mode. */
+        case VIA_RES_1360X768:
+        case VIA_RES_1400X1050:
+        case VIA_RES_1440X900:
+        case VIA_RES_1600X900:
+        case VIA_RES_1680X1050:
+        case VIA_RES_1920X1080:
+        case VIA_RES_1920X1200:
+                break;
+
+        default:
+                DEBUG_MSG(KERN_INFO
+                          "This dvi mode %d have no reduce blanking mode!\n",
+                          mode_index);
+                return false;
+        }
+
+        return true;
+}
+
+/* DVI Set Mode */
+void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga)
+{
+        struct VideoModeTable *videoMode = NULL;
+        struct crt_mode_table *pDviTiming;
+        unsigned long desirePixelClock, maxPixelClock;
+        int status = 0;
+        videoMode = viafb_get_modetbl_pointer(video_index);
+        pDviTiming = videoMode->crtc;
+        desirePixelClock = pDviTiming->clk / 1000000;
+        maxPixelClock = (unsigned long)viaparinfo->
+                tmds_setting_info->max_pixel_clock;
+
+        DEBUG_MSG(KERN_INFO "\nDVI_set_mode!!\n");
+
+        if ((maxPixelClock != 0) && (desirePixelClock > maxPixelClock)) {
+                /*Check if reduce-blanking mode is exist */
+                status =
+                    check_reduce_blanking_mode(video_index,
+                                               pDviTiming->refresh_rate);
+                if (status) {
+                        video_index += 100;     /*Use reduce-blanking mode */
+                        videoMode = viafb_get_modetbl_pointer(video_index);
+                        pDviTiming = videoMode->crtc;
+                        DEBUG_MSG(KERN_INFO
+                                  "DVI use reduce blanking mode %d!!\n",
+                                  video_index);
+                }
+        }
+        viafb_fill_crtc_timing(pDviTiming, video_index, mode_bpp / 8, set_iga);
+        viafb_set_output_path(DEVICE_DVI, set_iga,
+                        viaparinfo->chip_info->tmds_chip_info.output_interface);
+}
+
+/* Sense DVI Connector */
+int viafb_dvi_sense(void)
+{
+        u8 RegSR1E = 0, RegSR3E = 0, RegCR6B = 0, RegCR91 = 0,
+                RegCR93 = 0, RegCR9B = 0, data;
+        int ret = false;
+
+        DEBUG_MSG(KERN_INFO "viafb_dvi_sense!!\n");
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                /* DI1 Pad on */
+                RegSR1E = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg(SR1E, VIASR, RegSR1E | 0x30);
+
+                /* CR6B[0]VCK Input Selection: 1 = External clock. */
+                RegCR6B = viafb_read_reg(VIACR, CR6B);
+                viafb_write_reg(CR6B, VIACR, RegCR6B | 0x08);
+
+                /* CR91[4] VDD On [3] Data On [2] VEE On [1] Back Light Off
+                   [0] Software Control Power Sequence */
+                RegCR91 = viafb_read_reg(VIACR, CR91);
+                viafb_write_reg(CR91, VIACR, 0x1D);
+
+                /* CR93[7] DI1 Data Source Selection: 1 = DSP2.
+                   CR93[5] DI1 Clock Source: 1 = internal.
+                   CR93[4] DI1 Clock Polarity.
+                   CR93[3:1] DI1 Clock Adjust. CR93[0] DI1 enable */
+                RegCR93 = viafb_read_reg(VIACR, CR93);
+                viafb_write_reg(CR93, VIACR, 0x01);
+        } else {
+                /* DVP0/DVP1 Pad on */
+                RegSR1E = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg(SR1E, VIASR, RegSR1E | 0xF0);
+
+                /* SR3E[1]Multi-function selection:
+                   0 = Emulate I2C and DDC bus by GPIO2/3/4. */
+                RegSR3E = viafb_read_reg(VIASR, SR3E);
+                viafb_write_reg(SR3E, VIASR, RegSR3E & (~0x20));
+
+                /* CR91[4] VDD On [3] Data On [2] VEE On [1] Back Light Off
+                   [0] Software Control Power Sequence */
+                RegCR91 = viafb_read_reg(VIACR, CR91);
+                viafb_write_reg(CR91, VIACR, 0x1D);
+
+                /*CR9B[4] DVP1 Data Source Selection: 1 = From secondary
+                display.CR9B[2:0] DVP1 Clock Adjust */
+                RegCR9B = viafb_read_reg(VIACR, CR9B);
+                viafb_write_reg(CR9B, VIACR, 0x01);
+        }
+
+        data = (u8) tmds_register_read(0x09);
+        if (data & 0x04)
+                ret = true;
+
+        if (ret == false) {
+                if (viafb_dvi_query_EDID())
+                        ret = true;
+        }
+
+        /* Restore status */
+        viafb_write_reg(SR1E, VIASR, RegSR1E);
+        viafb_write_reg(CR91, VIACR, RegCR91);
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                viafb_write_reg(CR6B, VIACR, RegCR6B);
+                viafb_write_reg(CR93, VIACR, RegCR93);
+        } else {
+                viafb_write_reg(SR3E, VIASR, RegSR3E);
+                viafb_write_reg(CR9B, VIACR, RegCR9B);
+        }
+
+        return ret;
+}
+
+/* Query Flat Panel's EDID Table Version Through DVI Connector */
+static int viafb_dvi_query_EDID(void)
+{
+        u8 data0, data1;
+        int restore;
+
+        DEBUG_MSG(KERN_INFO "viafb_dvi_query_EDID!!\n");
+
+        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0;
+
+        data0 = (u8) tmds_register_read(0x00);
+        data1 = (u8) tmds_register_read(0x01);
+        if ((data0 == 0) && (data1 == 0xFF)) {
+                viaparinfo->chip_info->
+                        tmds_chip_info.tmds_chip_slave_addr = restore;
+                return EDID_VERSION_1;  /* Found EDID1 Table */
+        }
+
+        data0 = (u8) tmds_register_read(0x00);
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
+        if (data0 == 0x20)
+                return EDID_VERSION_2;  /* Found EDID2 Table */
+        else
+                return false;
+}
+
+/*
+ *
+ * int dvi_get_panel_size_from_DDCv1(void)
+ *
+ *     - Get Panel Size Using EDID1 Table
+ *
+ * Return Type:    int
+ *
+ */
+static int dvi_get_panel_size_from_DDCv1(void)
+{
+        int i, max_h = 0, max_v = 0, tmp, restore;
+        unsigned char rData;
+        unsigned char EDID_DATA[18];
+
+        DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n");
+
+        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0;
+
+        rData = tmds_register_read(0x23);
+        if (rData & 0x3C)
+                max_h = 640;
+        if (rData & 0xC0)
+                max_h = 720;
+        if (rData & 0x03)
+                max_h = 800;
+
+        rData = tmds_register_read(0x24);
+        if (rData & 0xC0)
+                max_h = 800;
+        if (rData & 0x1E)
+                max_h = 1024;
+        if (rData & 0x01)
+                max_h = 1280;
+
+        for (i = 0x25; i < 0x6D; i++) {
+                switch (i) {
+                case 0x26:
+                case 0x28:
+                case 0x2A:
+                case 0x2C:
+                case 0x2E:
+                case 0x30:
+                case 0x32:
+                case 0x34:
+                        rData = tmds_register_read(i);
+                        if (rData == 1)
+                                break;
+                        /* data = (data + 31) * 8 */
+                        tmp = (rData + 31) << 3;
+                        if (tmp > max_h)
+                                max_h = tmp;
+                        break;
+
+                case 0x36:
+                case 0x48:
+                case 0x5A:
+                case 0x6C:
+                        tmds_register_read_bytes(i, EDID_DATA, 10);
+                        if (!(EDID_DATA[0] || EDID_DATA[1])) {
+                                /* The first two byte must be zero. */
+                                if (EDID_DATA[3] == 0xFD) {
+                                        /* To get max pixel clock. */
+                                        viaparinfo->tmds_setting_info->
+                                        max_pixel_clock = EDID_DATA[9] * 10;
+                                }
+                        }
+                        break;
+
+                default:
+                        break;
+                }
+        }
+
+        switch (max_h) {
+        case 640:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_640X480;
+                break;
+        case 800:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_800X600;
+                break;
+        case 1024:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                break;
+        case 1280:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1280X1024;
+                break;
+        case 1400:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1400X1050;
+                break;
+        case 1440:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1440X1050;
+                break;
+        case 1600:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1600X1200;
+                break;
+        case 1920:
+                if (max_v == 1200) {
+                        viaparinfo->tmds_setting_info->dvi_panel_size =
+                                VIA_RES_1920X1200;
+                } else {
+                        viaparinfo->tmds_setting_info->dvi_panel_size =
+                                VIA_RES_1920X1080;
+                }
+
+                break;
+        default:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d !\
+                                         set default panel size.\n", max_h);
+                break;
+        }
+
+        DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n",
+                  viaparinfo->tmds_setting_info->max_pixel_clock);
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
+        return viaparinfo->tmds_setting_info->dvi_panel_size;
+}
+
+/*
+ *
+ * int dvi_get_panel_size_from_DDCv2(void)
+ *
+ *     - Get Panel Size Using EDID2 Table
+ *
+ * Return Type:    int
+ *
+ */
+static int dvi_get_panel_size_from_DDCv2(void)
+{
+        int HSize = 0, restore;
+        unsigned char R_Buffer[2];
+
+        DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv2 \n");
+
+        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA2;
+
+        /* Horizontal: 0x76, 0x77 */
+        tmds_register_read_bytes(0x76, R_Buffer, 2);
+        HSize = R_Buffer[0];
+        HSize += R_Buffer[1] << 8;
+
+        switch (HSize) {
+        case 640:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_640X480;
+                break;
+        case 800:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_800X600;
+                break;
+        case 1024:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                break;
+        case 1280:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1280X1024;
+                break;
+        case 1400:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1400X1050;
+                break;
+        case 1440:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1440X1050;
+                break;
+        case 1600:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1600X1200;
+                break;
+        default:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d!\
+                                        set default panel size.\n", HSize);
+                break;
+        }
+
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
+        return viaparinfo->tmds_setting_info->dvi_panel_size;
+}
+
+/*
+ *
+ * unsigned char dvi_get_panel_info(void)
+ *
+ *     - Get Panel Size
+ *
+ * Return Type:    unsigned char
+ */
+static unsigned char dvi_get_panel_info(void)
+{
+        unsigned char dvipanelsize;
+        DEBUG_MSG(KERN_INFO "dvi_get_panel_info! \n");
+
+        viafb_dvi_sense();
+        switch (viafb_dvi_query_EDID()) {
+        case 1:
+                dvi_get_panel_size_from_DDCv1();
+                break;
+        case 2:
+                dvi_get_panel_size_from_DDCv2();
+                break;
+        default:
+                break;
+        }
+
+        DEBUG_MSG(KERN_INFO "dvi panel size is %2d \n",
+                  viaparinfo->tmds_setting_info->dvi_panel_size);
+        dvipanelsize = (unsigned char)(viaparinfo->
+                tmds_setting_info->dvi_panel_size);
+        return dvipanelsize;
+}
+
+/* If Disable DVI, turn off pad */
+void viafb_dvi_disable(void)
+{
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP0)
+                viafb_write_reg(SR1E, VIASR,
+                viafb_read_reg(VIASR, SR1E) & (~0xC0));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP1)
+                viafb_write_reg(SR1E, VIASR,
+                viafb_read_reg(VIASR, SR1E) & (~0x30));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_HIGH)
+                viafb_write_reg(SR2A, VIASR,
+                viafb_read_reg(VIASR, SR2A) & (~0x0C));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_LOW)
+                viafb_write_reg(SR2A, VIASR,
+                viafb_read_reg(VIASR, SR2A) & (~0x03));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_TMDS)
+                /* Turn off TMDS power. */
+                viafb_write_reg(CRD2, VIACR,
+                viafb_read_reg(VIACR, CRD2) | 0x08);
+}
+
+/* If Enable DVI, turn off pad */
+void viafb_dvi_enable(void)
+{
+        u8 data;
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP0) {
+                viafb_write_reg(SR1E, VIASR,
+                        viafb_read_reg(VIASR, SR1E) | 0xC0);
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                        tmds_register_write(0x88, 0x3b);
+                else
+                        /*clear CR91[5] to direct on display period
+                           in the secondary diplay path */
+                        viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+        }
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP1) {
+                viafb_write_reg(SR1E, VIASR,
+                        viafb_read_reg(VIASR, SR1E) | 0x30);
+
+                /*fix dvi cann't be enabled with MB VT5718C4 - Al Zhang */
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                        tmds_register_write(0x88, 0x3b);
+                } else {
+                        /*clear CR91[5] to direct on display period
+                          in the secondary diplay path */
+                        viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+                }
+
+                /*fix DVI cannot enable on EPIA-M board */
+                if (viafb_platform_epia_dvi == 1) {
+                        viafb_write_reg_mask(CR91, VIACR, 0x1f, 0x1f);
+                        viafb_write_reg_mask(CR88, VIACR, 0x00, BIT6 + BIT0);
+                        if (viafb_bus_width == 24) {
+                                if (viafb_device_lcd_dualedge == 1)
+                                        data = 0x3F;
+                                else
+                                        data = 0x37;
+                                viafb_i2c_writebyte(viaparinfo->chip_info->
+                                             tmds_chip_info.
+                                             tmds_chip_slave_addr,
+                                             0x08, data);
+                        }
+                }
+        }
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_HIGH) {
+                viafb_write_reg(SR2A, VIASR,
+                        viafb_read_reg(VIASR, SR2A) | 0x0C);
+                viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+        }
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_LOW) {
+                viafb_write_reg(SR2A, VIASR,
+                        viafb_read_reg(VIASR, SR2A) | 0x03);
+                viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+        }
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_TMDS) {
+                /* Turn on Display period in the panel path. */
+                viafb_write_reg_mask(CR91, VIACR, 0, BIT7);
+
+                /* Turn on TMDS power. */
+                viafb_write_reg_mask(CRD2, VIACR, 0, BIT3);
+        }
+}
+
diff --git a/drivers/video/via/dvi.h b/drivers/video/via/dvi.h
new file mode 100644
index 000000000000..e1ec37fb0dc3
--- /dev/null
+++ b/drivers/video/via/dvi.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __DVI_H__
+#define __DVI_H__
+
+/*Definition TMDS Device ID register*/
+#define     VT1632_DEVICE_ID_REG        0x02
+#define     VT1632_DEVICE_ID            0x92
+
+#define     GET_DVI_SIZE_BY_SYSTEM_BIOS     0x01
+#define     GET_DVI_SIZE_BY_VGA_BIOS        0x02
+#define     GET_DVI_SZIE_BY_HW_STRAPPING    0x03
+
+/* Definition DVI Panel ID*/
+/* Resolution: 640x480,   Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID0_640X480       0x00
+/* Resolution: 800x600,   Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID1_800x600       0x01
+/* Resolution: 1024x768,  Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID1_1024x768      0x02
+/* Resolution: 1280x768,  Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID1_1280x768      0x03
+/* Resolution: 1280x1024, Channel: dual,   Dithering: Enable */
+#define     DVI_PANEL_ID1_1280x1024     0x04
+/* Resolution: 1400x1050, Channel: dual,   Dithering: Enable */
+#define     DVI_PANEL_ID1_1400x1050     0x05
+/* Resolution: 1600x1200, Channel: dual,   Dithering: Enable */
+#define     DVI_PANEL_ID1_1600x1200     0x06
+
+/* Define the version of EDID*/
+#define     EDID_VERSION_1      1
+#define     EDID_VERSION_2      2
+
+#define     DEV_CONNECT_DVI     0x01
+#define     DEV_CONNECT_HDMI    0x02
+
+struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index);
+int viafb_dvi_sense(void);
+void viafb_dvi_disable(void);
+void viafb_dvi_enable(void);
+int viafb_tmds_trasmitter_identify(void);
+void viafb_init_dvi_size(void);
+void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga);
+
+#endif /* __DVI_H__ */
diff --git a/drivers/video/via/global.c b/drivers/video/via/global.c
new file mode 100644
index 000000000000..468be2425af3
--- /dev/null
+++ b/drivers/video/via/global.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#include "global.h"
+int viafb_platform_epia_dvi = STATE_OFF;
+int viafb_device_lcd_dualedge = STATE_OFF;
+int viafb_bus_width = 12;
+int viafb_display_hardware_layout = HW_LAYOUT_LCD_DVI;
+int viafb_memsize;
+int viafb_DeviceStatus = CRT_Device;
+int viafb_hotplug;
+int viafb_refresh = 60;
+int viafb_refresh1 = 60;
+int viafb_lcd_dsp_method = LCD_EXPANDSION;
+int viafb_lcd_mode = LCD_OPENLDI;
+int viafb_bpp = 32;
+int viafb_bpp1 = 32;
+int viafb_accel = 1;
+int viafb_CRT_ON = 1;
+int viafb_DVI_ON;
+int viafb_LCD_ON ;
+int viafb_LCD2_ON;
+int viafb_SAMM_ON;
+int viafb_dual_fb;
+int viafb_hotplug_Xres = 640;
+int viafb_hotplug_Yres = 480;
+int viafb_hotplug_bpp = 32;
+int viafb_hotplug_refresh = 60;
+unsigned int viafb_second_offset;
+int viafb_second_size;
+int viafb_primary_dev = None_Device;
+void __iomem *viafb_FB_MM;
+unsigned int viafb_second_xres = 640;
+unsigned int viafb_second_yres = 480;
+unsigned int viafb_second_virtual_xres;
+unsigned int viafb_second_virtual_yres;
+int viafb_lcd_panel_id = LCD_PANEL_ID_MAXIMUM + 1;
+struct fb_cursor viacursor;
+struct fb_info *viafbinfo;
+struct fb_info *viafbinfo1;
+struct viafb_par *viaparinfo;
+struct viafb_par *viaparinfo1;
+
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
new file mode 100644
index 000000000000..8e5263c5b812
--- /dev/null
+++ b/drivers/video/via/global.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GLOBAL_H__
+#define __GLOBAL_H__
+
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/console.h>
+#include <linux/timer.h>
+
+#include "debug.h"
+
+#include "iface.h"
+#include "viafbdev.h"
+#include "chip.h"
+#include "debug.h"
+#include "accel.h"
+#include "share.h"
+#include "dvi.h"
+#include "viamode.h"
+#include "via_i2c.h"
+#include "hw.h"
+
+#include "lcd.h"
+#include "ioctl.h"
+#include "viamode.h"
+#include "via_utility.h"
+#include "vt1636.h"
+#include "tblDPASetting.h"
+#include "tbl1636.h"
+#include "viafbdev.h"
+
+/* External struct*/
+
+extern int viafb_platform_epia_dvi;
+extern int viafb_device_lcd_dualedge;
+extern int viafb_bus_width;
+extern int viafb_display_hardware_layout;
+extern struct offset offset_reg;
+extern struct viafb_par *viaparinfo;
+extern struct viafb_par *viaparinfo1;
+extern struct fb_info *viafbinfo;
+extern struct fb_info *viafbinfo1;
+extern int viafb_DeviceStatus;
+extern int viafb_refresh;
+extern int viafb_refresh1;
+extern int viafb_lcd_dsp_method;
+extern int viafb_lcd_mode;
+extern int viafb_bpp;
+extern int viafb_bpp1;
+
+extern int viafb_CRT_ON;
+extern int viafb_hotplug_Xres;
+extern int viafb_hotplug_Yres;
+extern int viafb_hotplug_bpp;
+extern int viafb_hotplug_refresh;
+extern int viafb_primary_dev;
+extern void __iomem *viafb_FB_MM;
+extern struct fb_cursor viacursor;
+
+extern unsigned int viafb_second_xres;
+extern unsigned int viafb_second_yres;
+extern int viafb_lcd_panel_id;
+
+#endif /* __GLOBAL_H__ */
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
new file mode 100644
index 000000000000..fcd53ceb88fa
--- /dev/null
+++ b/drivers/video/via/hw.c
@@ -0,0 +1,2865 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+
+static const struct pci_device_id_info pciidlist[] = {
+        {PCI_VIA_VENDOR_ID, UNICHROME_CLE266_DID, UNICHROME_CLE266},
+        {PCI_VIA_VENDOR_ID, UNICHROME_PM800_DID, UNICHROME_PM800},
+        {PCI_VIA_VENDOR_ID, UNICHROME_K400_DID, UNICHROME_K400},
+        {PCI_VIA_VENDOR_ID, UNICHROME_K800_DID, UNICHROME_K800},
+        {PCI_VIA_VENDOR_ID, UNICHROME_CN700_DID, UNICHROME_CN700},
+        {PCI_VIA_VENDOR_ID, UNICHROME_P4M890_DID, UNICHROME_P4M890},
+        {PCI_VIA_VENDOR_ID, UNICHROME_K8M890_DID, UNICHROME_K8M890},
+        {PCI_VIA_VENDOR_ID, UNICHROME_CX700_DID, UNICHROME_CX700},
+        {PCI_VIA_VENDOR_ID, UNICHROME_P4M900_DID, UNICHROME_P4M900},
+        {PCI_VIA_VENDOR_ID, UNICHROME_CN750_DID, UNICHROME_CN750},
+        {PCI_VIA_VENDOR_ID, UNICHROME_VX800_DID, UNICHROME_VX800},
+        {0, 0, 0}
+};
+
+struct offset offset_reg = {
+        /* IGA1 Offset Register */
+        {IGA1_OFFSET_REG_NUM, {{CR13, 0, 7}, {CR35, 5, 7} } },
+        /* IGA2 Offset Register */
+        {IGA2_OFFSET_REG_NUM, {{CR66, 0, 7}, {CR67, 0, 1} } }
+};
+
+static struct pll_map pll_value[] = {
+        {CLK_25_175M, CLE266_PLL_25_175M, K800_PLL_25_175M, CX700_25_175M},
+        {CLK_29_581M, CLE266_PLL_29_581M, K800_PLL_29_581M, CX700_29_581M},
+        {CLK_26_880M, CLE266_PLL_26_880M, K800_PLL_26_880M, CX700_26_880M},
+        {CLK_31_490M, CLE266_PLL_31_490M, K800_PLL_31_490M, CX700_31_490M},
+        {CLK_31_500M, CLE266_PLL_31_500M, K800_PLL_31_500M, CX700_31_500M},
+        {CLK_31_728M, CLE266_PLL_31_728M, K800_PLL_31_728M, CX700_31_728M},
+        {CLK_32_668M, CLE266_PLL_32_668M, K800_PLL_32_668M, CX700_32_668M},
+        {CLK_36_000M, CLE266_PLL_36_000M, K800_PLL_36_000M, CX700_36_000M},
+        {CLK_40_000M, CLE266_PLL_40_000M, K800_PLL_40_000M, CX700_40_000M},
+        {CLK_41_291M, CLE266_PLL_41_291M, K800_PLL_41_291M, CX700_41_291M},
+        {CLK_43_163M, CLE266_PLL_43_163M, K800_PLL_43_163M, CX700_43_163M},
+        {CLK_45_250M, CLE266_PLL_45_250M, K800_PLL_45_250M, CX700_45_250M},
+        {CLK_46_000M, CLE266_PLL_46_000M, K800_PLL_46_000M, CX700_46_000M},
+        {CLK_46_996M, CLE266_PLL_46_996M, K800_PLL_46_996M, CX700_46_996M},
+        {CLK_48_000M, CLE266_PLL_48_000M, K800_PLL_48_000M, CX700_48_000M},
+        {CLK_48_875M, CLE266_PLL_48_875M, K800_PLL_48_875M, CX700_48_875M},
+        {CLK_49_500M, CLE266_PLL_49_500M, K800_PLL_49_500M, CX700_49_500M},
+        {CLK_52_406M, CLE266_PLL_52_406M, K800_PLL_52_406M, CX700_52_406M},
+        {CLK_52_977M, CLE266_PLL_52_977M, K800_PLL_52_977M, CX700_52_977M},
+        {CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M, CX700_56_250M},
+        {CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M, CX700_60_466M},
+        {CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M, CX700_61_500M},
+        {CLK_65_000M, CLE266_PLL_65_000M, K800_PLL_65_000M, CX700_65_000M},
+        {CLK_65_178M, CLE266_PLL_65_178M, K800_PLL_65_178M, CX700_65_178M},
+        {CLK_66_750M, CLE266_PLL_66_750M, K800_PLL_66_750M, CX700_66_750M},
+        {CLK_68_179M, CLE266_PLL_68_179M, K800_PLL_68_179M, CX700_68_179M},
+        {CLK_69_924M, CLE266_PLL_69_924M, K800_PLL_69_924M, CX700_69_924M},
+        {CLK_70_159M, CLE266_PLL_70_159M, K800_PLL_70_159M, CX700_70_159M},
+        {CLK_72_000M, CLE266_PLL_72_000M, K800_PLL_72_000M, CX700_72_000M},
+        {CLK_78_750M, CLE266_PLL_78_750M, K800_PLL_78_750M, CX700_78_750M},
+        {CLK_80_136M, CLE266_PLL_80_136M, K800_PLL_80_136M, CX700_80_136M},
+        {CLK_83_375M, CLE266_PLL_83_375M, K800_PLL_83_375M, CX700_83_375M},
+        {CLK_83_950M, CLE266_PLL_83_950M, K800_PLL_83_950M, CX700_83_950M},
+        {CLK_84_750M, CLE266_PLL_84_750M, K800_PLL_84_750M, CX700_84_750M},
+        {CLK_85_860M, CLE266_PLL_85_860M, K800_PLL_85_860M, CX700_85_860M},
+        {CLK_88_750M, CLE266_PLL_88_750M, K800_PLL_88_750M, CX700_88_750M},
+        {CLK_94_500M, CLE266_PLL_94_500M, K800_PLL_94_500M, CX700_94_500M},
+        {CLK_97_750M, CLE266_PLL_97_750M, K800_PLL_97_750M, CX700_97_750M},
+        {CLK_101_000M, CLE266_PLL_101_000M, K800_PLL_101_000M,
+         CX700_101_000M},
+        {CLK_106_500M, CLE266_PLL_106_500M, K800_PLL_106_500M,
+         CX700_106_500M},
+        {CLK_108_000M, CLE266_PLL_108_000M, K800_PLL_108_000M,
+         CX700_108_000M},
+        {CLK_113_309M, CLE266_PLL_113_309M, K800_PLL_113_309M,
+         CX700_113_309M},
+        {CLK_118_840M, CLE266_PLL_118_840M, K800_PLL_118_840M,
+         CX700_118_840M},
+        {CLK_119_000M, CLE266_PLL_119_000M, K800_PLL_119_000M,
+         CX700_119_000M},
+        {CLK_121_750M, CLE266_PLL_121_750M, K800_PLL_121_750M,
+         CX700_121_750M},
+        {CLK_125_104M, CLE266_PLL_125_104M, K800_PLL_125_104M,
+         CX700_125_104M},
+        {CLK_133_308M, CLE266_PLL_133_308M, K800_PLL_133_308M,
+         CX700_133_308M},
+        {CLK_135_000M, CLE266_PLL_135_000M, K800_PLL_135_000M,
+         CX700_135_000M},
+        {CLK_136_700M, CLE266_PLL_136_700M, K800_PLL_136_700M,
+         CX700_136_700M},
+        {CLK_138_400M, CLE266_PLL_138_400M, K800_PLL_138_400M,
+         CX700_138_400M},
+        {CLK_146_760M, CLE266_PLL_146_760M, K800_PLL_146_760M,
+         CX700_146_760M},
+        {CLK_153_920M, CLE266_PLL_153_920M, K800_PLL_153_920M,
+         CX700_153_920M},
+        {CLK_156_000M, CLE266_PLL_156_000M, K800_PLL_156_000M,
+         CX700_156_000M},
+        {CLK_157_500M, CLE266_PLL_157_500M, K800_PLL_157_500M,
+         CX700_157_500M},
+        {CLK_162_000M, CLE266_PLL_162_000M, K800_PLL_162_000M,
+         CX700_162_000M},
+        {CLK_187_000M, CLE266_PLL_187_000M, K800_PLL_187_000M,
+         CX700_187_000M},
+        {CLK_193_295M, CLE266_PLL_193_295M, K800_PLL_193_295M,
+         CX700_193_295M},
+        {CLK_202_500M, CLE266_PLL_202_500M, K800_PLL_202_500M,
+         CX700_202_500M},
+        {CLK_204_000M, CLE266_PLL_204_000M, K800_PLL_204_000M,
+         CX700_204_000M},
+        {CLK_218_500M, CLE266_PLL_218_500M, K800_PLL_218_500M,
+         CX700_218_500M},
+        {CLK_234_000M, CLE266_PLL_234_000M, K800_PLL_234_000M,
+         CX700_234_000M},
+        {CLK_267_250M, CLE266_PLL_267_250M, K800_PLL_267_250M,
+         CX700_267_250M},
+        {CLK_297_500M, CLE266_PLL_297_500M, K800_PLL_297_500M,
+         CX700_297_500M},
+        {CLK_74_481M, CLE266_PLL_74_481M, K800_PLL_74_481M, CX700_74_481M},
+        {CLK_172_798M, CLE266_PLL_172_798M, K800_PLL_172_798M,
+         CX700_172_798M},
+        {CLK_122_614M, CLE266_PLL_122_614M, K800_PLL_122_614M,
+         CX700_122_614M},
+        {CLK_74_270M, CLE266_PLL_74_270M, K800_PLL_74_270M, CX700_74_270M},
+        {CLK_148_500M, CLE266_PLL_148_500M, K800_PLL_148_500M,
+         CX700_148_500M}
+};
+
+static struct fifo_depth_select display_fifo_depth_reg = {
+        /* IGA1 FIFO Depth_Select */
+        {IGA1_FIFO_DEPTH_SELECT_REG_NUM, {{SR17, 0, 7} } },
+        /* IGA2 FIFO Depth_Select */
+        {IGA2_FIFO_DEPTH_SELECT_REG_NUM,
+         {{CR68, 4, 7}, {CR94, 7, 7}, {CR95, 7, 7} } }
+};
+
+static struct fifo_threshold_select fifo_threshold_select_reg = {
+        /* IGA1 FIFO Threshold Select */
+        {IGA1_FIFO_THRESHOLD_REG_NUM, {{SR16, 0, 5}, {SR16, 7, 7} } },
+        /* IGA2 FIFO Threshold Select */
+        {IGA2_FIFO_THRESHOLD_REG_NUM, {{CR68, 0, 3}, {CR95, 4, 6} } }
+};
+
+static struct fifo_high_threshold_select fifo_high_threshold_select_reg = {
+        /* IGA1 FIFO High Threshold Select */
+        {IGA1_FIFO_HIGH_THRESHOLD_REG_NUM, {{SR18, 0, 5}, {SR18, 7, 7} } },
+        /* IGA2 FIFO High Threshold Select */
+        {IGA2_FIFO_HIGH_THRESHOLD_REG_NUM, {{CR92, 0, 3}, {CR95, 0, 2} } }
+};
+
+static struct display_queue_expire_num display_queue_expire_num_reg = {
+        /* IGA1 Display Queue Expire Num */
+        {IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM, {{SR22, 0, 4} } },
+        /* IGA2 Display Queue Expire Num */
+        {IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM, {{CR94, 0, 6} } }
+};
+
+/* Definition Fetch Count Registers*/
+static struct fetch_count fetch_count_reg = {
+        /* IGA1 Fetch Count Register */
+        {IGA1_FETCH_COUNT_REG_NUM, {{SR1C, 0, 7}, {SR1D, 0, 1} } },
+        /* IGA2 Fetch Count Register */
+        {IGA2_FETCH_COUNT_REG_NUM, {{CR65, 0, 7}, {CR67, 2, 3} } }
+};
+
+static struct iga1_crtc_timing iga1_crtc_reg = {
+        /* IGA1 Horizontal Total */
+        {IGA1_HOR_TOTAL_REG_NUM, {{CR00, 0, 7}, {CR36, 3, 3} } },
+        /* IGA1 Horizontal Addressable Video */
+        {IGA1_HOR_ADDR_REG_NUM, {{CR01, 0, 7} } },
+        /* IGA1 Horizontal Blank Start */
+        {IGA1_HOR_BLANK_START_REG_NUM, {{CR02, 0, 7} } },
+        /* IGA1 Horizontal Blank End */
+        {IGA1_HOR_BLANK_END_REG_NUM,
+         {{CR03, 0, 4}, {CR05, 7, 7}, {CR33, 5, 5} } },
+        /* IGA1 Horizontal Sync Start */
+        {IGA1_HOR_SYNC_START_REG_NUM, {{CR04, 0, 7}, {CR33, 4, 4} } },
+        /* IGA1 Horizontal Sync End */
+        {IGA1_HOR_SYNC_END_REG_NUM, {{CR05, 0, 4} } },
+        /* IGA1 Vertical Total */
+        {IGA1_VER_TOTAL_REG_NUM,
+         {{CR06, 0, 7}, {CR07, 0, 0}, {CR07, 5, 5}, {CR35, 0, 0} } },
+        /* IGA1 Vertical Addressable Video */
+        {IGA1_VER_ADDR_REG_NUM,
+         {{CR12, 0, 7}, {CR07, 1, 1}, {CR07, 6, 6}, {CR35, 2, 2} } },
+        /* IGA1 Vertical Blank Start */
+        {IGA1_VER_BLANK_START_REG_NUM,
+         {{CR15, 0, 7}, {CR07, 3, 3}, {CR09, 5, 5}, {CR35, 3, 3} } },
+        /* IGA1 Vertical Blank End */
+        {IGA1_VER_BLANK_END_REG_NUM, {{CR16, 0, 7} } },
+        /* IGA1 Vertical Sync Start */
+        {IGA1_VER_SYNC_START_REG_NUM,
+         {{CR10, 0, 7}, {CR07, 2, 2}, {CR07, 7, 7}, {CR35, 1, 1} } },
+        /* IGA1 Vertical Sync End */
+        {IGA1_VER_SYNC_END_REG_NUM, {{CR11, 0, 3} } }
+};
+
+static struct iga2_crtc_timing iga2_crtc_reg = {
+        /* IGA2 Horizontal Total */
+        {IGA2_HOR_TOTAL_REG_NUM, {{CR50, 0, 7}, {CR55, 0, 3} } },
+        /* IGA2 Horizontal Addressable Video */
+        {IGA2_HOR_ADDR_REG_NUM, {{CR51, 0, 7}, {CR55, 4, 6} } },
+        /* IGA2 Horizontal Blank Start */
+        {IGA2_HOR_BLANK_START_REG_NUM, {{CR52, 0, 7}, {CR54, 0, 2} } },
+        /* IGA2 Horizontal Blank End */
+        {IGA2_HOR_BLANK_END_REG_NUM,
+         {{CR53, 0, 7}, {CR54, 3, 5}, {CR5D, 6, 6} } },
+        /* IGA2 Horizontal Sync Start */
+        {IGA2_HOR_SYNC_START_REG_NUM,
+         {{CR56, 0, 7}, {CR54, 6, 7}, {CR5C, 7, 7}, {CR5D, 7, 7} } },
+        /* IGA2 Horizontal Sync End */
+        {IGA2_HOR_SYNC_END_REG_NUM, {{CR57, 0, 7}, {CR5C, 6, 6} } },
+        /* IGA2 Vertical Total */
+        {IGA2_VER_TOTAL_REG_NUM, {{CR58, 0, 7}, {CR5D, 0, 2} } },
+        /* IGA2 Vertical Addressable Video */
+        {IGA2_VER_ADDR_REG_NUM, {{CR59, 0, 7}, {CR5D, 3, 5} } },
+        /* IGA2 Vertical Blank Start */
+        {IGA2_VER_BLANK_START_REG_NUM, {{CR5A, 0, 7}, {CR5C, 0, 2} } },
+        /* IGA2 Vertical Blank End */
+        {IGA2_VER_BLANK_END_REG_NUM, {{CR5B, 0, 7}, {CR5C, 3, 5} } },
+        /* IGA2 Vertical Sync Start */
+        {IGA2_VER_SYNC_START_REG_NUM, {{CR5E, 0, 7}, {CR5F, 5, 7} } },
+        /* IGA2 Vertical Sync End */
+        {IGA2_VER_SYNC_END_REG_NUM, {{CR5F, 0, 4} } }
+};
+
+static struct rgbLUT palLUT_table[] = {
+        /* {R,G,B} */
+        /* Index 0x00~0x03 */
+        {0x00, 0x00, 0x00}, {0x00, 0x00, 0x2A}, {0x00, 0x2A, 0x00}, {0x00,
+                                                                     0x2A,
+                                                                     0x2A},
+        /* Index 0x04~0x07 */
+        {0x2A, 0x00, 0x00}, {0x2A, 0x00, 0x2A}, {0x2A, 0x15, 0x00}, {0x2A,
+                                                                     0x2A,
+                                                                     0x2A},
+        /* Index 0x08~0x0B */
+        {0x15, 0x15, 0x15}, {0x15, 0x15, 0x3F}, {0x15, 0x3F, 0x15}, {0x15,
+                                                                     0x3F,
+                                                                     0x3F},
+        /* Index 0x0C~0x0F */
+        {0x3F, 0x15, 0x15}, {0x3F, 0x15, 0x3F}, {0x3F, 0x3F, 0x15}, {0x3F,
+                                                                     0x3F,
+                                                                     0x3F},
+        /* Index 0x10~0x13 */
+        {0x00, 0x00, 0x00}, {0x05, 0x05, 0x05}, {0x08, 0x08, 0x08}, {0x0B,
+                                                                     0x0B,
+                                                                     0x0B},
+        /* Index 0x14~0x17 */
+        {0x0E, 0x0E, 0x0E}, {0x11, 0x11, 0x11}, {0x14, 0x14, 0x14}, {0x18,
+                                                                     0x18,
+                                                                     0x18},
+        /* Index 0x18~0x1B */
+        {0x1C, 0x1C, 0x1C}, {0x20, 0x20, 0x20}, {0x24, 0x24, 0x24}, {0x28,
+                                                                     0x28,
+                                                                     0x28},
+        /* Index 0x1C~0x1F */
+        {0x2D, 0x2D, 0x2D}, {0x32, 0x32, 0x32}, {0x38, 0x38, 0x38}, {0x3F,
+                                                                     0x3F,
+                                                                     0x3F},
+        /* Index 0x20~0x23 */
+        {0x00, 0x00, 0x3F}, {0x10, 0x00, 0x3F}, {0x1F, 0x00, 0x3F}, {0x2F,
+                                                                     0x00,
+                                                                     0x3F},
+        /* Index 0x24~0x27 */
+        {0x3F, 0x00, 0x3F}, {0x3F, 0x00, 0x2F}, {0x3F, 0x00, 0x1F}, {0x3F,
+                                                                     0x00,
+                                                                     0x10},
+        /* Index 0x28~0x2B */
+        {0x3F, 0x00, 0x00}, {0x3F, 0x10, 0x00}, {0x3F, 0x1F, 0x00}, {0x3F,
+                                                                     0x2F,
+                                                                     0x00},
+        /* Index 0x2C~0x2F */
+        {0x3F, 0x3F, 0x00}, {0x2F, 0x3F, 0x00}, {0x1F, 0x3F, 0x00}, {0x10,
+                                                                     0x3F,
+                                                                     0x00},
+        /* Index 0x30~0x33 */
+        {0x00, 0x3F, 0x00}, {0x00, 0x3F, 0x10}, {0x00, 0x3F, 0x1F}, {0x00,
+                                                                     0x3F,
+                                                                     0x2F},
+        /* Index 0x34~0x37 */
+        {0x00, 0x3F, 0x3F}, {0x00, 0x2F, 0x3F}, {0x00, 0x1F, 0x3F}, {0x00,
+                                                                     0x10,
+                                                                     0x3F},
+        /* Index 0x38~0x3B */
+        {0x1F, 0x1F, 0x3F}, {0x27, 0x1F, 0x3F}, {0x2F, 0x1F, 0x3F}, {0x37,
+                                                                     0x1F,
+                                                                     0x3F},
+        /* Index 0x3C~0x3F */
+        {0x3F, 0x1F, 0x3F}, {0x3F, 0x1F, 0x37}, {0x3F, 0x1F, 0x2F}, {0x3F,
+                                                                     0x1F,
+                                                                     0x27},
+        /* Index 0x40~0x43 */
+        {0x3F, 0x1F, 0x1F}, {0x3F, 0x27, 0x1F}, {0x3F, 0x2F, 0x1F}, {0x3F,
+                                                                     0x3F,
+                                                                     0x1F},
+        /* Index 0x44~0x47 */
+        {0x3F, 0x3F, 0x1F}, {0x37, 0x3F, 0x1F}, {0x2F, 0x3F, 0x1F}, {0x27,
+                                                                     0x3F,
+                                                                     0x1F},
+        /* Index 0x48~0x4B */
+        {0x1F, 0x3F, 0x1F}, {0x1F, 0x3F, 0x27}, {0x1F, 0x3F, 0x2F}, {0x1F,
+                                                                     0x3F,
+                                                                     0x37},
+        /* Index 0x4C~0x4F */
+        {0x1F, 0x3F, 0x3F}, {0x1F, 0x37, 0x3F}, {0x1F, 0x2F, 0x3F}, {0x1F,
+                                                                     0x27,
+                                                                     0x3F},
+        /* Index 0x50~0x53 */
+        {0x2D, 0x2D, 0x3F}, {0x31, 0x2D, 0x3F}, {0x36, 0x2D, 0x3F}, {0x3A,
+                                                                     0x2D,
+                                                                     0x3F},
+        /* Index 0x54~0x57 */
+        {0x3F, 0x2D, 0x3F}, {0x3F, 0x2D, 0x3A}, {0x3F, 0x2D, 0x36}, {0x3F,
+                                                                     0x2D,
+                                                                     0x31},
+        /* Index 0x58~0x5B */
+        {0x3F, 0x2D, 0x2D}, {0x3F, 0x31, 0x2D}, {0x3F, 0x36, 0x2D}, {0x3F,
+                                                                     0x3A,
+                                                                     0x2D},
+        /* Index 0x5C~0x5F */
+        {0x3F, 0x3F, 0x2D}, {0x3A, 0x3F, 0x2D}, {0x36, 0x3F, 0x2D}, {0x31,
+                                                                     0x3F,
+                                                                     0x2D},
+        /* Index 0x60~0x63 */
+        {0x2D, 0x3F, 0x2D}, {0x2D, 0x3F, 0x31}, {0x2D, 0x3F, 0x36}, {0x2D,
+                                                                     0x3F,
+                                                                     0x3A},
+        /* Index 0x64~0x67 */
+        {0x2D, 0x3F, 0x3F}, {0x2D, 0x3A, 0x3F}, {0x2D, 0x36, 0x3F}, {0x2D,
+                                                                     0x31,
+                                                                     0x3F},
+        /* Index 0x68~0x6B */
+        {0x00, 0x00, 0x1C}, {0x07, 0x00, 0x1C}, {0x0E, 0x00, 0x1C}, {0x15,
+                                                                     0x00,
+                                                                     0x1C},
+        /* Index 0x6C~0x6F */
+        {0x1C, 0x00, 0x1C}, {0x1C, 0x00, 0x15}, {0x1C, 0x00, 0x0E}, {0x1C,
+                                                                     0x00,
+                                                                     0x07},
+        /* Index 0x70~0x73 */
+        {0x1C, 0x00, 0x00}, {0x1C, 0x07, 0x00}, {0x1C, 0x0E, 0x00}, {0x1C,
+                                                                     0x15,
+                                                                     0x00},
+        /* Index 0x74~0x77 */
+        {0x1C, 0x1C, 0x00}, {0x15, 0x1C, 0x00}, {0x0E, 0x1C, 0x00}, {0x07,
+                                                                     0x1C,
+                                                                     0x00},
+        /* Index 0x78~0x7B */
+        {0x00, 0x1C, 0x00}, {0x00, 0x1C, 0x07}, {0x00, 0x1C, 0x0E}, {0x00,
+                                                                     0x1C,
+                                                                     0x15},
+        /* Index 0x7C~0x7F */
+        {0x00, 0x1C, 0x1C}, {0x00, 0x15, 0x1C}, {0x00, 0x0E, 0x1C}, {0x00,
+                                                                     0x07,
+                                                                     0x1C},
+        /* Index 0x80~0x83 */
+        {0x0E, 0x0E, 0x1C}, {0x11, 0x0E, 0x1C}, {0x15, 0x0E, 0x1C}, {0x18,
+                                                                     0x0E,
+                                                                     0x1C},
+        /* Index 0x84~0x87 */
+        {0x1C, 0x0E, 0x1C}, {0x1C, 0x0E, 0x18}, {0x1C, 0x0E, 0x15}, {0x1C,
+                                                                     0x0E,
+                                                                     0x11},
+        /* Index 0x88~0x8B */
+        {0x1C, 0x0E, 0x0E}, {0x1C, 0x11, 0x0E}, {0x1C, 0x15, 0x0E}, {0x1C,
+                                                                     0x18,
+                                                                     0x0E},
+        /* Index 0x8C~0x8F */
+        {0x1C, 0x1C, 0x0E}, {0x18, 0x1C, 0x0E}, {0x15, 0x1C, 0x0E}, {0x11,
+                                                                     0x1C,
+                                                                     0x0E},
+        /* Index 0x90~0x93 */
+        {0x0E, 0x1C, 0x0E}, {0x0E, 0x1C, 0x11}, {0x0E, 0x1C, 0x15}, {0x0E,
+                                                                     0x1C,
+                                                                     0x18},
+        /* Index 0x94~0x97 */
+        {0x0E, 0x1C, 0x1C}, {0x0E, 0x18, 0x1C}, {0x0E, 0x15, 0x1C}, {0x0E,
+                                                                     0x11,
+                                                                     0x1C},
+        /* Index 0x98~0x9B */
+        {0x14, 0x14, 0x1C}, {0x16, 0x14, 0x1C}, {0x18, 0x14, 0x1C}, {0x1A,
+                                                                     0x14,
+                                                                     0x1C},
+        /* Index 0x9C~0x9F */
+        {0x1C, 0x14, 0x1C}, {0x1C, 0x14, 0x1A}, {0x1C, 0x14, 0x18}, {0x1C,
+                                                                     0x14,
+                                                                     0x16},
+        /* Index 0xA0~0xA3 */
+        {0x1C, 0x14, 0x14}, {0x1C, 0x16, 0x14}, {0x1C, 0x18, 0x14}, {0x1C,
+                                                                     0x1A,
+                                                                     0x14},
+        /* Index 0xA4~0xA7 */
+        {0x1C, 0x1C, 0x14}, {0x1A, 0x1C, 0x14}, {0x18, 0x1C, 0x14}, {0x16,
+                                                                     0x1C,
+                                                                     0x14},
+        /* Index 0xA8~0xAB */
+        {0x14, 0x1C, 0x14}, {0x14, 0x1C, 0x16}, {0x14, 0x1C, 0x18}, {0x14,
+                                                                     0x1C,
+                                                                     0x1A},
+        /* Index 0xAC~0xAF */
+        {0x14, 0x1C, 0x1C}, {0x14, 0x1A, 0x1C}, {0x14, 0x18, 0x1C}, {0x14,
+                                                                     0x16,
+                                                                     0x1C},
+        /* Index 0xB0~0xB3 */
+        {0x00, 0x00, 0x10}, {0x04, 0x00, 0x10}, {0x08, 0x00, 0x10}, {0x0C,
+                                                                     0x00,
+                                                                     0x10},
+        /* Index 0xB4~0xB7 */
+        {0x10, 0x00, 0x10}, {0x10, 0x00, 0x0C}, {0x10, 0x00, 0x08}, {0x10,
+                                                                     0x00,
+                                                                     0x04},
+        /* Index 0xB8~0xBB */
+        {0x10, 0x00, 0x00}, {0x10, 0x04, 0x00}, {0x10, 0x08, 0x00}, {0x10,
+                                                                     0x0C,
+                                                                     0x00},
+        /* Index 0xBC~0xBF */
+        {0x10, 0x10, 0x00}, {0x0C, 0x10, 0x00}, {0x08, 0x10, 0x00}, {0x04,
+                                                                     0x10,
+                                                                     0x00},
+        /* Index 0xC0~0xC3 */
+        {0x00, 0x10, 0x00}, {0x00, 0x10, 0x04}, {0x00, 0x10, 0x08}, {0x00,
+                                                                     0x10,
+                                                                     0x0C},
+        /* Index 0xC4~0xC7 */
+        {0x00, 0x10, 0x10}, {0x00, 0x0C, 0x10}, {0x00, 0x08, 0x10}, {0x00,
+                                                                     0x04,
+                                                                     0x10},
+        /* Index 0xC8~0xCB */
+        {0x08, 0x08, 0x10}, {0x0A, 0x08, 0x10}, {0x0C, 0x08, 0x10}, {0x0E,
+                                                                     0x08,
+                                                                     0x10},
+        /* Index 0xCC~0xCF */
+        {0x10, 0x08, 0x10}, {0x10, 0x08, 0x0E}, {0x10, 0x08, 0x0C}, {0x10,
+                                                                     0x08,
+                                                                     0x0A},
+        /* Index 0xD0~0xD3 */
+        {0x10, 0x08, 0x08}, {0x10, 0x0A, 0x08}, {0x10, 0x0C, 0x08}, {0x10,
+                                                                     0x0E,
+                                                                     0x08},
+        /* Index 0xD4~0xD7 */
+        {0x10, 0x10, 0x08}, {0x0E, 0x10, 0x08}, {0x0C, 0x10, 0x08}, {0x0A,
+                                                                     0x10,
+                                                                     0x08},
+        /* Index 0xD8~0xDB */
+        {0x08, 0x10, 0x08}, {0x08, 0x10, 0x0A}, {0x08, 0x10, 0x0C}, {0x08,
+                                                                     0x10,
+                                                                     0x0E},
+        /* Index 0xDC~0xDF */
+        {0x08, 0x10, 0x10}, {0x08, 0x0E, 0x10}, {0x08, 0x0C, 0x10}, {0x08,
+                                                                     0x0A,
+                                                                     0x10},
+        /* Index 0xE0~0xE3 */
+        {0x0B, 0x0B, 0x10}, {0x0C, 0x0B, 0x10}, {0x0D, 0x0B, 0x10}, {0x0F,
+                                                                     0x0B,
+                                                                     0x10},
+        /* Index 0xE4~0xE7 */
+        {0x10, 0x0B, 0x10}, {0x10, 0x0B, 0x0F}, {0x10, 0x0B, 0x0D}, {0x10,
+                                                                     0x0B,
+                                                                     0x0C},
+        /* Index 0xE8~0xEB */
+        {0x10, 0x0B, 0x0B}, {0x10, 0x0C, 0x0B}, {0x10, 0x0D, 0x0B}, {0x10,
+                                                                     0x0F,
+                                                                     0x0B},
+        /* Index 0xEC~0xEF */
+        {0x10, 0x10, 0x0B}, {0x0F, 0x10, 0x0B}, {0x0D, 0x10, 0x0B}, {0x0C,
+                                                                     0x10,
+                                                                     0x0B},
+        /* Index 0xF0~0xF3 */
+        {0x0B, 0x10, 0x0B}, {0x0B, 0x10, 0x0C}, {0x0B, 0x10, 0x0D}, {0x0B,
+                                                                     0x10,
+                                                                     0x0F},
+        /* Index 0xF4~0xF7 */
+        {0x0B, 0x10, 0x10}, {0x0B, 0x0F, 0x10}, {0x0B, 0x0D, 0x10}, {0x0B,
+                                                                     0x0C,
+                                                                     0x10},
+        /* Index 0xF8~0xFB */
+        {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00,
+                                                                     0x00,
+                                                                     0x00},
+        /* Index 0xFC~0xFF */
+        {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00,
+                                                                     0x00,
+                                                                     0x00}
+};
+
+static void set_crt_output_path(int set_iga);
+static void dvi_patch_skew_dvp0(void);
+static void dvi_patch_skew_dvp1(void);
+static void dvi_patch_skew_dvp_low(void);
+static void set_dvi_output_path(int set_iga, int output_interface);
+static void set_lcd_output_path(int set_iga, int output_interface);
+static int search_mode_setting(int ModeInfoIndex);
+static void load_fix_bit_crtc_reg(void);
+static void init_gfx_chip_info(void);
+static void init_tmds_chip_info(void);
+static void init_lvds_chip_info(void);
+static void device_screen_off(void);
+static void device_screen_on(void);
+static void set_display_channel(void);
+static void device_off(void);
+static void device_on(void);
+static void enable_second_display_channel(void);
+static void disable_second_display_channel(void);
+static int get_fb_size_from_pci(void);
+
+void viafb_write_reg(u8 index, u16 io_port, u8 data)
+{
+        outb(index, io_port);
+        outb(data, io_port + 1);
+        /*DEBUG_MSG(KERN_INFO "\nIndex=%2d Value=%2d", index, data); */
+}
+u8 viafb_read_reg(int io_port, u8 index)
+{
+        outb(index, io_port);
+        return inb(io_port + 1);
+}
+
+void viafb_lock_crt(void)
+{
+        viafb_write_reg_mask(CR11, VIACR, BIT7, BIT7);
+}
+
+void viafb_unlock_crt(void)
+{
+        viafb_write_reg_mask(CR11, VIACR, 0, BIT7);
+        viafb_write_reg_mask(CR47, VIACR, 0, BIT0);
+}
+
+void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask)
+{
+        u8 tmp;
+
+        outb(index, io_port);
+        tmp = inb(io_port + 1);
+        outb((data & mask) | (tmp & (~mask)), io_port + 1);
+        /*DEBUG_MSG(KERN_INFO "\nIndex=%2d Value=%2d", index, tmp); */
+}
+
+void write_dac_reg(u8 index, u8 r, u8 g, u8 b)
+{
+        outb(index, LUT_INDEX_WRITE);
+        outb(r, LUT_DATA);
+        outb(g, LUT_DATA);
+        outb(b, LUT_DATA);
+}
+
+/*Set IGA path for each device*/
+void viafb_set_iga_path(void)
+{
+
+        if (viafb_SAMM_ON == 1) {
+                if (viafb_CRT_ON) {
+                        if (viafb_primary_dev == CRT_Device)
+                                viaparinfo->crt_setting_info->iga_path = IGA1;
+                        else
+                                viaparinfo->crt_setting_info->iga_path = IGA2;
+                }
+
+                if (viafb_DVI_ON) {
+                        if (viafb_primary_dev == DVI_Device)
+                                viaparinfo->tmds_setting_info->iga_path = IGA1;
+                        else
+                                viaparinfo->tmds_setting_info->iga_path = IGA2;
+                }
+
+                if (viafb_LCD_ON) {
+                        if (viafb_primary_dev == LCD_Device) {
+                                if (viafb_dual_fb &&
+                                        (viaparinfo->chip_info->gfx_chip_name ==
+                                        UNICHROME_CLE266)) {
+                                        viaparinfo->
+                                        lvds_setting_info->iga_path = IGA2;
+                                        viaparinfo->
+                                        crt_setting_info->iga_path = IGA1;
+                                        viaparinfo->
+                                        tmds_setting_info->iga_path = IGA1;
+                                } else
+                                        viaparinfo->
+                                        lvds_setting_info->iga_path = IGA1;
+                        } else {
+                                viaparinfo->lvds_setting_info->iga_path = IGA2;
+                        }
+                }
+                if (viafb_LCD2_ON) {
+                        if (LCD2_Device == viafb_primary_dev)
+                                viaparinfo->lvds_setting_info2->iga_path = IGA1;
+                        else
+                                viaparinfo->lvds_setting_info2->iga_path = IGA2;
+                }
+        } else {
+                viafb_SAMM_ON = 0;
+
+                if (viafb_CRT_ON && viafb_LCD_ON) {
+                        viaparinfo->crt_setting_info->iga_path = IGA1;
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                } else if (viafb_CRT_ON && viafb_DVI_ON) {
+                        viaparinfo->crt_setting_info->iga_path = IGA1;
+                        viaparinfo->tmds_setting_info->iga_path = IGA2;
+                } else if (viafb_LCD_ON && viafb_DVI_ON) {
+                        viaparinfo->tmds_setting_info->iga_path = IGA1;
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                } else if (viafb_LCD_ON && viafb_LCD2_ON) {
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                        viaparinfo->lvds_setting_info2->iga_path = IGA2;
+                } else if (viafb_CRT_ON) {
+                        viaparinfo->crt_setting_info->iga_path = IGA1;
+                } else if (viafb_LCD_ON) {
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                } else if (viafb_DVI_ON) {
+                        viaparinfo->tmds_setting_info->iga_path = IGA1;
+                }
+        }
+}
+
+void viafb_set_start_addr(void)
+{
+        unsigned long offset = 0, tmp = 0, size = 0;
+        unsigned long length;
+
+        DEBUG_MSG(KERN_INFO "viafb_set_start_addr!\n");
+        viafb_unlock_crt();
+        /* update starting address of IGA1 */
+        viafb_write_reg(CR0C, VIACR, 0x00);     /*initial starting address */
+        viafb_write_reg(CR0D, VIACR, 0x00);
+        viafb_write_reg(CR34, VIACR, 0x00);
+        viafb_write_reg_mask(CR48, VIACR, 0x00, 0x1F);
+
+        if (viafb_dual_fb) {
+                viaparinfo->iga_path = IGA1;
+                viaparinfo1->iga_path = IGA2;
+        }
+
+        if (viafb_SAMM_ON == 1) {
+                if (!viafb_dual_fb) {
+                        if (viafb_second_size)
+                                size = viafb_second_size * 1024 * 1024;
+                        else
+                                size = 8 * 1024 * 1024;
+                } else {
+
+                        size = viaparinfo1->memsize;
+                }
+                offset = viafb_second_offset;
+                DEBUG_MSG(KERN_INFO
+                          "viafb_second_size=%lx, second start_adddress=%lx\n",
+                          size, offset);
+        }
+        if (viafb_SAMM_ON == 1) {
+                offset = offset >> 3;
+
+                tmp = viafb_read_reg(VIACR, 0x62) & 0x01;
+                tmp |= (offset & 0x7F) << 1;
+                viafb_write_reg(CR62, VIACR, tmp);
+                viafb_write_reg(CR63, VIACR, ((offset & 0x7F80) >> 7));
+                viafb_write_reg(CR64, VIACR, ((offset & 0x7F8000) >> 15));
+                viafb_write_reg(CRA3, VIACR, ((offset & 0x3800000) >> 23));
+        } else {
+                /* update starting address */
+                viafb_write_reg(CR62, VIACR, 0x00);
+                viafb_write_reg(CR63, VIACR, 0x00);
+                viafb_write_reg(CR64, VIACR, 0x00);
+                viafb_write_reg(CRA3, VIACR, 0x00);
+        }
+
+        if (viafb_SAMM_ON == 1) {
+                if (viafb_accel) {
+                        if (!viafb_dual_fb)
+                                length = size - viaparinfo->fbmem_used;
+                        else
+                                length = size - viaparinfo1->fbmem_used;
+                } else
+                        length = size;
+                offset = (unsigned long)(void *)viafb_FB_MM +
+                        viafb_second_offset;
+                memset((void *)offset, 0, length);
+        }
+
+        viafb_lock_crt();
+}
+
+void viafb_set_output_path(int device, int set_iga, int output_interface)
+{
+        switch (device) {
+        case DEVICE_CRT:
+                set_crt_output_path(set_iga);
+                break;
+        case DEVICE_DVI:
+                set_dvi_output_path(set_iga, output_interface);
+                break;
+        case DEVICE_LCD:
+                set_lcd_output_path(set_iga, output_interface);
+                break;
+        }
+}
+
+static void set_crt_output_path(int set_iga)
+{
+        viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);
+
+        switch (set_iga) {
+        case IGA1:
+                viafb_write_reg_mask(SR16, VIASR, 0x00, BIT6);
+                break;
+        case IGA2:
+        case IGA1_IGA2:
+                viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);
+                viafb_write_reg_mask(SR16, VIASR, 0x40, BIT6);
+                if (set_iga == IGA1_IGA2)
+                        viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);
+                break;
+        }
+}
+
+static void dvi_patch_skew_dvp0(void)
+{
+        /* Reset data driving first: */
+        viafb_write_reg_mask(SR1B, VIASR, 0, BIT1);
+        viafb_write_reg_mask(SR2A, VIASR, 0, BIT4);
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_P4M890:
+                {
+                        if ((viaparinfo->tmds_setting_info->h_active == 1600) &&
+                                (viaparinfo->tmds_setting_info->v_active ==
+                                1200))
+                                viafb_write_reg_mask(CR96, VIACR, 0x03,
+                                               BIT0 + BIT1 + BIT2);
+                        else
+                                viafb_write_reg_mask(CR96, VIACR, 0x07,
+                                               BIT0 + BIT1 + BIT2);
+                        break;
+                }
+
+        case UNICHROME_P4M900:
+                {
+                        viafb_write_reg_mask(CR96, VIACR, 0x07,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        viafb_write_reg_mask(SR1B, VIASR, 0x02, BIT1);
+                        viafb_write_reg_mask(SR2A, VIASR, 0x10, BIT4);
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void dvi_patch_skew_dvp1(void)
+{
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CX700:
+                {
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void dvi_patch_skew_dvp_low(void)
+{
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x03, BIT0 + BIT1);
+                        break;
+                }
+
+        case UNICHROME_P4M900:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x08,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        break;
+                }
+
+        case UNICHROME_P4M890:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x0F,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void set_dvi_output_path(int set_iga, int output_interface)
+{
+        switch (output_interface) {
+        case INTERFACE_DVP0:
+                viafb_write_reg_mask(CR6B, VIACR, 0x01, BIT0);
+
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
+                        viafb_write_reg_mask(CR6C, VIACR, 0x21, BIT0 +
+                                BIT5 + BIT7);
+                } else {
+                        viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR6C, VIACR, 0xA1, BIT0 +
+                                BIT5 + BIT7);
+                }
+
+                viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT7 + BIT6);
+
+                dvi_patch_skew_dvp0();
+                break;
+
+        case INTERFACE_DVP1:
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                        if (set_iga == IGA1)
+                                viafb_write_reg_mask(CR93, VIACR, 0x21,
+                                               BIT0 + BIT5 + BIT7);
+                        else
+                                viafb_write_reg_mask(CR93, VIACR, 0xA1,
+                                               BIT0 + BIT5 + BIT7);
+                } else {
+                        if (set_iga == IGA1)
+                                viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
+                        else
+                                viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+
+                viafb_write_reg_mask(SR1E, VIASR, 0x30, BIT4 + BIT5);
+                dvi_patch_skew_dvp1();
+                break;
+        case INTERFACE_DFP_HIGH:
+                if (viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266) {
+                        if (set_iga == IGA1) {
+                                viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
+                                viafb_write_reg_mask(CR97, VIACR, 0x03,
+                                               BIT0 + BIT1 + BIT4);
+                        } else {
+                                viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                                viafb_write_reg_mask(CR97, VIACR, 0x13,
+                                               BIT0 + BIT1 + BIT4);
+                        }
+                }
+                viafb_write_reg_mask(SR2A, VIASR, 0x0C, BIT2 + BIT3);
+                break;
+
+        case INTERFACE_DFP_LOW:
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                        break;
+
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
+                } else {
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                dvi_patch_skew_dvp_low();
+                break;
+
+        case INTERFACE_TMDS:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                else
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                break;
+        }
+
+        if (set_iga == IGA2) {
+                enable_second_display_channel();
+                /* Disable LCD Scaling */
+                viafb_write_reg_mask(CR79, VIACR, 0x00, BIT0);
+        }
+}
+
+static void set_lcd_output_path(int set_iga, int output_interface)
+{
+        DEBUG_MSG(KERN_INFO
+                  "set_lcd_output_path, iga:%d,out_interface:%d\n",
+                  set_iga, output_interface);
+        switch (set_iga) {
+        case IGA1:
+                viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+
+                disable_second_display_channel();
+                break;
+
+        case IGA2:
+                viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+
+                enable_second_display_channel();
+                break;
+
+        case IGA1_IGA2:
+                viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+
+                disable_second_display_channel();
+                break;
+        }
+
+        switch (output_interface) {
+        case INTERFACE_DVP0:
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
+                } else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_DVP1:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
+                else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_DFP_HIGH:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
+                else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_DFP_LOW:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+
+                break;
+
+        case INTERFACE_DFP:
+                if ((UNICHROME_K8M890 == viaparinfo->chip_info->gfx_chip_name)
+                    || (UNICHROME_P4M890 ==
+                    viaparinfo->chip_info->gfx_chip_name))
+                        viafb_write_reg_mask(CR97, VIACR, 0x84,
+                                       BIT7 + BIT2 + BIT1 + BIT0);
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                } else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_LVDS0:
+        case INTERFACE_LVDS0LVDS1:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                else
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+
+                break;
+
+        case INTERFACE_LVDS1:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
+                else
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
+                break;
+        }
+}
+
+/* Search Mode Index */
+static int search_mode_setting(int ModeInfoIndex)
+{
+        int i = 0;
+
+        while ((i < NUM_TOTAL_MODETABLE) &&
+                        (ModeInfoIndex != CLE266Modes[i].ModeIndex))
+                i++;
+        if (i >= NUM_TOTAL_MODETABLE)
+                i = 0;
+        return i;
+
+}
+
+struct VideoModeTable *viafb_get_modetbl_pointer(int Index)
+{
+        struct VideoModeTable *TmpTbl = NULL;
+        TmpTbl = &CLE266Modes[search_mode_setting(Index)];
+        return TmpTbl;
+}
+
+struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index)
+{
+        struct VideoModeTable *TmpTbl = NULL;
+        int i = 0;
+        while ((i < NUM_TOTAL_CEA_MODES) &&
+                        (Index != CEA_HDMI_Modes[i].ModeIndex))
+                i++;
+        if ((i < NUM_TOTAL_CEA_MODES))
+                TmpTbl = &CEA_HDMI_Modes[i];
+         else {
+                /*Still use general timing if don't find CEA timing */
+                i = 0;
+                while ((i < NUM_TOTAL_MODETABLE) &&
+                                (Index != CLE266Modes[i].ModeIndex))
+                       i++;
+                if (i >= NUM_TOTAL_MODETABLE)
+                        i = 0;
+                TmpTbl = &CLE266Modes[i];
+        }
+        return TmpTbl;
+}
+
+static void load_fix_bit_crtc_reg(void)
+{
+        /* always set to 1 */
+        viafb_write_reg_mask(CR03, VIACR, 0x80, BIT7);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg(CR18, VIACR, 0xff);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR07, VIACR, 0x10, BIT4);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR09, VIACR, 0x40, BIT6);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR35, VIACR, 0x10, BIT4);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR33, VIACR, 0x06, BIT0 + BIT1 + BIT2);
+        /*viafb_write_reg_mask(CR32, VIACR, 0x01, BIT0); */
+        /* extend mode always set to e3h */
+        viafb_write_reg(CR17, VIACR, 0xe3);
+        /* extend mode always set to 0h */
+        viafb_write_reg(CR08, VIACR, 0x00);
+        /* extend mode always set to 0h */
+        viafb_write_reg(CR14, VIACR, 0x00);
+
+        /* If K8M800, enable Prefetch Mode. */
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800)
+                || (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K8M890))
+                viafb_write_reg_mask(CR33, VIACR, 0x08, BIT3);
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+            && (viaparinfo->chip_info->gfx_chip_revision == CLE266_REVISION_AX))
+                viafb_write_reg_mask(SR1A, VIASR, 0x02, BIT1);
+
+}
+
+void viafb_load_reg(int timing_value, int viafb_load_reg_num,
+        struct io_register *reg,
+              int io_type)
+{
+        int reg_mask;
+        int bit_num = 0;
+        int data;
+        int i, j;
+        int shift_next_reg;
+        int start_index, end_index, cr_index;
+        u16 get_bit;
+
+        for (i = 0; i < viafb_load_reg_num; i++) {
+                reg_mask = 0;
+                data = 0;
+                start_index = reg[i].start_bit;
+                end_index = reg[i].end_bit;
+                cr_index = reg[i].io_addr;
+
+                shift_next_reg = bit_num;
+                for (j = start_index; j <= end_index; j++) {
+                        /*if (bit_num==8) timing_value = timing_value >>8; */
+                        reg_mask = reg_mask | (BIT0 << j);
+                        get_bit = (timing_value & (BIT0 << bit_num));
+                        data =
+                            data | ((get_bit >> shift_next_reg) << start_index);
+                        bit_num++;
+                }
+                if (io_type == VIACR)
+                        viafb_write_reg_mask(cr_index, VIACR, data, reg_mask);
+                else
+                        viafb_write_reg_mask(cr_index, VIASR, data, reg_mask);
+        }
+
+}
+
+/* Write Registers */
+void viafb_write_regx(struct io_reg RegTable[], int ItemNum)
+{
+        int i;
+        unsigned char RegTemp;
+
+        /*DEBUG_MSG(KERN_INFO "Table Size : %x!!\n",ItemNum ); */
+
+        for (i = 0; i < ItemNum; i++) {
+                outb(RegTable[i].index, RegTable[i].port);
+                RegTemp = inb(RegTable[i].port + 1);
+                RegTemp = (RegTemp & (~RegTable[i].mask)) | RegTable[i].value;
+                outb(RegTemp, RegTable[i].port + 1);
+        }
+}
+
+void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga)
+{
+        int reg_value;
+        int viafb_load_reg_num;
+        struct io_register *reg;
+
+        switch (set_iga) {
+        case IGA1_IGA2:
+        case IGA1:
+                reg_value = IGA1_OFFSET_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = offset_reg.iga1_offset_reg.reg_num;
+                reg = offset_reg.iga1_offset_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                if (set_iga == IGA1)
+                        break;
+        case IGA2:
+                reg_value = IGA2_OFFSET_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;
+                reg = offset_reg.iga2_offset_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                break;
+        }
+}
+
+void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga)
+{
+        int reg_value;
+        int viafb_load_reg_num;
+        struct io_register *reg = NULL;
+
+        switch (set_iga) {
+        case IGA1_IGA2:
+        case IGA1:
+                reg_value = IGA1_FETCH_COUNT_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = fetch_count_reg.
+                        iga1_fetch_count_reg.reg_num;
+                reg = fetch_count_reg.iga1_fetch_count_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+                if (set_iga == IGA1)
+                        break;
+        case IGA2:
+                reg_value = IGA2_FETCH_COUNT_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = fetch_count_reg.
+                        iga2_fetch_count_reg.reg_num;
+                reg = fetch_count_reg.iga2_fetch_count_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                break;
+        }
+
+}
+
+void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active)
+{
+        int reg_value;
+        int viafb_load_reg_num;
+        struct io_register *reg = NULL;
+        int iga1_fifo_max_depth = 0, iga1_fifo_threshold =
+            0, iga1_fifo_high_threshold = 0, iga1_display_queue_expire_num = 0;
+        int iga2_fifo_max_depth = 0, iga2_fifo_threshold =
+            0, iga2_fifo_high_threshold = 0, iga2_display_queue_expire_num = 0;
+
+        if (set_iga == IGA1) {
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
+                        iga1_fifo_max_depth = K800_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = K800_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            K800_IGA1_FIFO_HIGH_THRESHOLD;
+                        /* If resolution > 1280x1024, expire length = 64, else
+                           expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga1_display_queue_expire_num = 16;
+                        else
+                                iga1_display_queue_expire_num =
+                                    K800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_PM800) {
+                        iga1_fifo_max_depth = P880_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = P880_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            P880_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+
+                        /* If resolution > 1280x1024, expire length = 64, else
+                           expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga1_display_queue_expire_num = 16;
+                        else
+                                iga1_display_queue_expire_num =
+                                    P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CN700) {
+                        iga1_fifo_max_depth = CN700_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = CN700_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            CN700_IGA1_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga1_display_queue_expire_num = 16;
+                        else
+                                iga1_display_queue_expire_num =
+                                    CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                        iga1_fifo_max_depth = CX700_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = CX700_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            CX700_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            CX700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K8M890) {
+                        iga1_fifo_max_depth = K8M890_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = K8M890_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            K8M890_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M890) {
+                        iga1_fifo_max_depth = P4M890_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = P4M890_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            P4M890_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M900) {
+                        iga1_fifo_max_depth = P4M900_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = P4M900_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            P4M900_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX800) {
+                        iga1_fifo_max_depth = VX800_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = VX800_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            VX800_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                /* Set Display FIFO Depath Select */
+                reg_value = IGA1_FIFO_DEPTH_SELECT_FORMULA(iga1_fifo_max_depth);
+                viafb_load_reg_num =
+                    display_fifo_depth_reg.iga1_fifo_depth_select_reg.reg_num;
+                reg = display_fifo_depth_reg.iga1_fifo_depth_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+                /* Set Display FIFO Threshold Select */
+                reg_value = IGA1_FIFO_THRESHOLD_FORMULA(iga1_fifo_threshold);
+                viafb_load_reg_num =
+                    fifo_threshold_select_reg.
+                    iga1_fifo_threshold_select_reg.reg_num;
+                reg =
+                    fifo_threshold_select_reg.
+                    iga1_fifo_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+                /* Set FIFO High Threshold Select */
+                reg_value =
+                    IGA1_FIFO_HIGH_THRESHOLD_FORMULA(iga1_fifo_high_threshold);
+                viafb_load_reg_num =
+                    fifo_high_threshold_select_reg.
+                    iga1_fifo_high_threshold_select_reg.reg_num;
+                reg =
+                    fifo_high_threshold_select_reg.
+                    iga1_fifo_high_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+                /* Set Display Queue Expire Num */
+                reg_value =
+                    IGA1_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA
+                    (iga1_display_queue_expire_num);
+                viafb_load_reg_num =
+                    display_queue_expire_num_reg.
+                    iga1_display_queue_expire_num_reg.reg_num;
+                reg =
+                    display_queue_expire_num_reg.
+                    iga1_display_queue_expire_num_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+        } else {
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
+                        iga2_fifo_max_depth = K800_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = K800_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            K800_IGA2_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else  expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga2_display_queue_expire_num = 16;
+                        else
+                                iga2_display_queue_expire_num =
+                                    K800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_PM800) {
+                        iga2_fifo_max_depth = P880_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = P880_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            P880_IGA2_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else  expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga2_display_queue_expire_num = 16;
+                        else
+                                iga2_display_queue_expire_num =
+                                    P880_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CN700) {
+                        iga2_fifo_max_depth = CN700_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = CN700_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            CN700_IGA2_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga2_display_queue_expire_num = 16;
+                        else
+                                iga2_display_queue_expire_num =
+                                    CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                        iga2_fifo_max_depth = CX700_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = CX700_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            CX700_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            CX700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K8M890) {
+                        iga2_fifo_max_depth = K8M890_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = K8M890_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            K8M890_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M890) {
+                        iga2_fifo_max_depth = P4M890_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = P4M890_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            P4M890_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M900) {
+                        iga2_fifo_max_depth = P4M900_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = P4M900_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            P4M900_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX800) {
+                        iga2_fifo_max_depth = VX800_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = VX800_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            VX800_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
+                        /* Set Display FIFO Depath Select */
+                        reg_value =
+                            IGA2_FIFO_DEPTH_SELECT_FORMULA(iga2_fifo_max_depth)
+                            - 1;
+                        /* Patch LCD in IGA2 case */
+                        viafb_load_reg_num =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg_num;
+                        reg =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                } else {
+
+                        /* Set Display FIFO Depath Select */
+                        reg_value =
+                            IGA2_FIFO_DEPTH_SELECT_FORMULA(iga2_fifo_max_depth);
+                        viafb_load_reg_num =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg_num;
+                        reg =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                }
+
+                /* Set Display FIFO Threshold Select */
+                reg_value = IGA2_FIFO_THRESHOLD_FORMULA(iga2_fifo_threshold);
+                viafb_load_reg_num =
+                    fifo_threshold_select_reg.
+                    iga2_fifo_threshold_select_reg.reg_num;
+                reg =
+                    fifo_threshold_select_reg.
+                    iga2_fifo_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+
+                /* Set FIFO High Threshold Select */
+                reg_value =
+                    IGA2_FIFO_HIGH_THRESHOLD_FORMULA(iga2_fifo_high_threshold);
+                viafb_load_reg_num =
+                    fifo_high_threshold_select_reg.
+                    iga2_fifo_high_threshold_select_reg.reg_num;
+                reg =
+                    fifo_high_threshold_select_reg.
+                    iga2_fifo_high_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+
+                /* Set Display Queue Expire Num */
+                reg_value =
+                    IGA2_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA
+                    (iga2_display_queue_expire_num);
+                viafb_load_reg_num =
+                    display_queue_expire_num_reg.
+                    iga2_display_queue_expire_num_reg.reg_num;
+                reg =
+                    display_queue_expire_num_reg.
+                    iga2_display_queue_expire_num_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+
+        }
+
+}
+
+u32 viafb_get_clk_value(int clk)
+{
+        int i;
+
+        for (i = 0; i < NUM_TOTAL_PLL_TABLE; i++) {
+                if (clk == pll_value[i].clk) {
+                        switch (viaparinfo->chip_info->gfx_chip_name) {
+                        case UNICHROME_CLE266:
+                        case UNICHROME_K400:
+                                return pll_value[i].cle266_pll;
+
+                        case UNICHROME_K800:
+                        case UNICHROME_PM800:
+                        case UNICHROME_CN700:
+                                return pll_value[i].k800_pll;
+
+                        case UNICHROME_CX700:
+                        case UNICHROME_K8M890:
+                        case UNICHROME_P4M890:
+                        case UNICHROME_P4M900:
+                        case UNICHROME_VX800:
+                                return pll_value[i].cx700_pll;
+                        }
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO "Can't find match PLL value\n\n");
+        return 0;
+}
+
+/* Set VCLK*/
+void viafb_set_vclock(u32 CLK, int set_iga)
+{
+        unsigned char RegTemp;
+
+        /* H.W. Reset : ON */
+        viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+
+        if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {
+                /* Change D,N FOR VCLK */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        viafb_write_reg(SR46, VIASR, CLK / 0x100);
+                        viafb_write_reg(SR47, VIASR, CLK % 0x100);
+                        break;
+
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_VX800:
+                        viafb_write_reg(SR44, VIASR, CLK / 0x10000);
+                        DEBUG_MSG(KERN_INFO "\nSR44=%x", CLK / 0x10000);
+                        viafb_write_reg(SR45, VIASR, (CLK & 0xFFFF) / 0x100);
+                        DEBUG_MSG(KERN_INFO "\nSR45=%x",
+                                  (CLK & 0xFFFF) / 0x100);
+                        viafb_write_reg(SR46, VIASR, CLK % 0x100);
+                        DEBUG_MSG(KERN_INFO "\nSR46=%x", CLK % 0x100);
+                        break;
+                }
+        }
+
+        if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {
+                /* Change D,N FOR LCK */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        viafb_write_reg(SR44, VIASR, CLK / 0x100);
+                        viafb_write_reg(SR45, VIASR, CLK % 0x100);
+                        break;
+
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_VX800:
+                        viafb_write_reg(SR4A, VIASR, CLK / 0x10000);
+                        viafb_write_reg(SR4B, VIASR, (CLK & 0xFFFF) / 0x100);
+                        viafb_write_reg(SR4C, VIASR, CLK % 0x100);
+                        break;
+                }
+        }
+
+        /* H.W. Reset : OFF */
+        viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+
+        /* Reset PLL */
+        if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {
+                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
+        }
+
+        if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {
+                viafb_write_reg_mask(SR40, VIASR, 0x01, BIT0);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT0);
+        }
+
+        /* Fire! */
+        RegTemp = inb(VIARMisc);
+        outb(RegTemp | (BIT2 + BIT3), VIAWMisc);
+}
+
+void viafb_load_crtc_timing(struct display_timing device_timing,
+        int set_iga)
+{
+        int i;
+        int viafb_load_reg_num = 0;
+        int reg_value = 0;
+        struct io_register *reg = NULL;
+
+        viafb_unlock_crt();
+
+        for (i = 0; i < 12; i++) {
+                if (set_iga == IGA1) {
+                        switch (i) {
+                        case H_TOTAL_INDEX:
+                                reg_value =
+                                    IGA1_HOR_TOTAL_FORMULA(device_timing.
+                                                           hor_total);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.hor_total.reg_num;
+                                reg = iga1_crtc_reg.hor_total.reg;
+                                break;
+                        case H_ADDR_INDEX:
+                                reg_value =
+                                    IGA1_HOR_ADDR_FORMULA(device_timing.
+                                                          hor_addr);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.hor_addr.reg_num;
+                                reg = iga1_crtc_reg.hor_addr.reg;
+                                break;
+                        case H_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA1_HOR_BLANK_START_FORMULA
+                                    (device_timing.hor_blank_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_blank_start.reg_num;
+                                reg = iga1_crtc_reg.hor_blank_start.reg;
+                                break;
+                        case H_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA1_HOR_BLANK_END_FORMULA
+                                    (device_timing.hor_blank_start,
+                                     device_timing.hor_blank_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_blank_end.reg_num;
+                                reg = iga1_crtc_reg.hor_blank_end.reg;
+                                break;
+                        case H_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA1_HOR_SYNC_START_FORMULA
+                                    (device_timing.hor_sync_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_sync_start.reg_num;
+                                reg = iga1_crtc_reg.hor_sync_start.reg;
+                                break;
+                        case H_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA1_HOR_SYNC_END_FORMULA
+                                    (device_timing.hor_sync_start,
+                                     device_timing.hor_sync_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_sync_end.reg_num;
+                                reg = iga1_crtc_reg.hor_sync_end.reg;
+                                break;
+                        case V_TOTAL_INDEX:
+                                reg_value =
+                                    IGA1_VER_TOTAL_FORMULA(device_timing.
+                                                           ver_total);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.ver_total.reg_num;
+                                reg = iga1_crtc_reg.ver_total.reg;
+                                break;
+                        case V_ADDR_INDEX:
+                                reg_value =
+                                    IGA1_VER_ADDR_FORMULA(device_timing.
+                                                          ver_addr);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.ver_addr.reg_num;
+                                reg = iga1_crtc_reg.ver_addr.reg;
+                                break;
+                        case V_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA1_VER_BLANK_START_FORMULA
+                                    (device_timing.ver_blank_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_blank_start.reg_num;
+                                reg = iga1_crtc_reg.ver_blank_start.reg;
+                                break;
+                        case V_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA1_VER_BLANK_END_FORMULA
+                                    (device_timing.ver_blank_start,
+                                     device_timing.ver_blank_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_blank_end.reg_num;
+                                reg = iga1_crtc_reg.ver_blank_end.reg;
+                                break;
+                        case V_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA1_VER_SYNC_START_FORMULA
+                                    (device_timing.ver_sync_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_sync_start.reg_num;
+                                reg = iga1_crtc_reg.ver_sync_start.reg;
+                                break;
+                        case V_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA1_VER_SYNC_END_FORMULA
+                                    (device_timing.ver_sync_start,
+                                     device_timing.ver_sync_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_sync_end.reg_num;
+                                reg = iga1_crtc_reg.ver_sync_end.reg;
+                                break;
+
+                        }
+                }
+
+                if (set_iga == IGA2) {
+                        switch (i) {
+                        case H_TOTAL_INDEX:
+                                reg_value =
+                                    IGA2_HOR_TOTAL_FORMULA(device_timing.
+                                                           hor_total);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.hor_total.reg_num;
+                                reg = iga2_crtc_reg.hor_total.reg;
+                                break;
+                        case H_ADDR_INDEX:
+                                reg_value =
+                                    IGA2_HOR_ADDR_FORMULA(device_timing.
+                                                          hor_addr);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.hor_addr.reg_num;
+                                reg = iga2_crtc_reg.hor_addr.reg;
+                                break;
+                        case H_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_START_FORMULA
+                                    (device_timing.hor_blank_start);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.hor_blank_start.reg_num;
+                                reg = iga2_crtc_reg.hor_blank_start.reg;
+                                break;
+                        case H_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_END_FORMULA
+                                    (device_timing.hor_blank_start,
+                                     device_timing.hor_blank_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.hor_blank_end.reg_num;
+                                reg = iga2_crtc_reg.hor_blank_end.reg;
+                                break;
+                        case H_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA2_HOR_SYNC_START_FORMULA
+                                    (device_timing.hor_sync_start);
+                                if (UNICHROME_CN700 <=
+                                        viaparinfo->chip_info->gfx_chip_name)
+                                        viafb_load_reg_num =
+                                            iga2_crtc_reg.hor_sync_start.
+                                            reg_num;
+                                else
+                                        viafb_load_reg_num = 3;
+                                reg = iga2_crtc_reg.hor_sync_start.reg;
+                                break;
+                        case H_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA2_HOR_SYNC_END_FORMULA
+                                    (device_timing.hor_sync_start,
+                                     device_timing.hor_sync_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.hor_sync_end.reg_num;
+                                reg = iga2_crtc_reg.hor_sync_end.reg;
+                                break;
+                        case V_TOTAL_INDEX:
+                                reg_value =
+                                    IGA2_VER_TOTAL_FORMULA(device_timing.
+                                                           ver_total);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.ver_total.reg_num;
+                                reg = iga2_crtc_reg.ver_total.reg;
+                                break;
+                        case V_ADDR_INDEX:
+                                reg_value =
+                                    IGA2_VER_ADDR_FORMULA(device_timing.
+                                                          ver_addr);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.ver_addr.reg_num;
+                                reg = iga2_crtc_reg.ver_addr.reg;
+                                break;
+                        case V_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_START_FORMULA
+                                    (device_timing.ver_blank_start);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_blank_start.reg_num;
+                                reg = iga2_crtc_reg.ver_blank_start.reg;
+                                break;
+                        case V_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_END_FORMULA
+                                    (device_timing.ver_blank_start,
+                                     device_timing.ver_blank_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_blank_end.reg_num;
+                                reg = iga2_crtc_reg.ver_blank_end.reg;
+                                break;
+                        case V_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_START_FORMULA
+                                    (device_timing.ver_sync_start);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_sync_start.reg_num;
+                                reg = iga2_crtc_reg.ver_sync_start.reg;
+                                break;
+                        case V_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_END_FORMULA
+                                    (device_timing.ver_sync_start,
+                                     device_timing.ver_sync_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_sync_end.reg_num;
+                                reg = iga2_crtc_reg.ver_sync_end.reg;
+                                break;
+
+                        }
+                }
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+        }
+
+        viafb_lock_crt();
+}
+
+void viafb_set_color_depth(int bpp_byte, int set_iga)
+{
+        if (set_iga == IGA1) {
+                switch (bpp_byte) {
+                case MODE_8BPP:
+                        viafb_write_reg_mask(SR15, VIASR, 0x22, 0x7E);
+                        break;
+                case MODE_16BPP:
+                        viafb_write_reg_mask(SR15, VIASR, 0xB6, 0xFE);
+                        break;
+                case MODE_32BPP:
+                        viafb_write_reg_mask(SR15, VIASR, 0xAE, 0xFE);
+                        break;
+                }
+        } else {
+                switch (bpp_byte) {
+                case MODE_8BPP:
+                        viafb_write_reg_mask(CR67, VIACR, 0x00, BIT6 + BIT7);
+                        break;
+                case MODE_16BPP:
+                        viafb_write_reg_mask(CR67, VIACR, 0x40, BIT6 + BIT7);
+                        break;
+                case MODE_32BPP:
+                        viafb_write_reg_mask(CR67, VIACR, 0xC0, BIT6 + BIT7);
+                        break;
+                }
+        }
+}
+
+void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
+        int mode_index, int bpp_byte, int set_iga)
+{
+        struct VideoModeTable *video_mode;
+        struct display_timing crt_reg;
+        int i;
+        int index = 0;
+        int h_addr, v_addr;
+        u32 pll_D_N;
+
+        video_mode = &CLE266Modes[search_mode_setting(mode_index)];
+
+        for (i = 0; i < video_mode->mode_array; i++) {
+                index = i;
+
+                if (crt_table[i].refresh_rate == viaparinfo->
+                        crt_setting_info->refresh_rate)
+                        break;
+        }
+
+        crt_reg = crt_table[index].crtc;
+
+        /* Mode 640x480 has border, but LCD/DFP didn't have border. */
+        /* So we would delete border. */
+        if ((viafb_LCD_ON | viafb_DVI_ON) && (mode_index == VIA_RES_640X480)
+            && (viaparinfo->crt_setting_info->refresh_rate == 60)) {
+                /* The border is 8 pixels. */
+                crt_reg.hor_blank_start = crt_reg.hor_blank_start - 8;
+
+                /* Blanking time should add left and right borders. */
+                crt_reg.hor_blank_end = crt_reg.hor_blank_end + 16;
+        }
+
+        h_addr = crt_reg.hor_addr;
+        v_addr = crt_reg.ver_addr;
+
+        /* update polarity for CRT timing */
+        if (crt_table[index].h_sync_polarity == NEGATIVE) {
+                if (crt_table[index].v_sync_polarity == NEGATIVE)
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))) |
+                             (BIT6 + BIT7), VIAWMisc);
+                else
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))) | (BIT6),
+                             VIAWMisc);
+        } else {
+                if (crt_table[index].v_sync_polarity == NEGATIVE)
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))) | (BIT7),
+                             VIAWMisc);
+                else
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))), VIAWMisc);
+        }
+
+        if (set_iga == IGA1) {
+                viafb_unlock_crt();
+                viafb_write_reg(CR09, VIACR, 0x00);     /*initial CR09=0 */
+                viafb_write_reg_mask(CR11, VIACR, 0x00, BIT4 + BIT5 + BIT6);
+                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+        }
+
+        switch (set_iga) {
+        case IGA1:
+                viafb_load_crtc_timing(crt_reg, IGA1);
+                break;
+        case IGA2:
+                viafb_load_crtc_timing(crt_reg, IGA2);
+                break;
+        }
+
+        load_fix_bit_crtc_reg();
+        viafb_lock_crt();
+        viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+        viafb_load_offset_reg(h_addr, bpp_byte, set_iga);
+        viafb_load_fetch_count_reg(h_addr, bpp_byte, set_iga);
+
+        /* load FIFO */
+        if ((viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
+            && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
+                viafb_load_FIFO_reg(set_iga, h_addr, v_addr);
+
+        /* load SR Register About Memory and Color part */
+        viafb_set_color_depth(bpp_byte, set_iga);
+
+        pll_D_N = viafb_get_clk_value(crt_table[index].clk);
+        DEBUG_MSG(KERN_INFO "PLL=%x", pll_D_N);
+        viafb_set_vclock(pll_D_N, set_iga);
+
+}
+
+void viafb_init_chip_info(void)
+{
+        init_gfx_chip_info();
+        init_tmds_chip_info();
+        init_lvds_chip_info();
+
+        viaparinfo->crt_setting_info->iga_path = IGA1;
+        viaparinfo->crt_setting_info->refresh_rate = viafb_refresh;
+
+        /*Set IGA path for each device */
+        viafb_set_iga_path();
+
+        viaparinfo->lvds_setting_info->display_method = viafb_lcd_dsp_method;
+        viaparinfo->lvds_setting_info->get_lcd_size_method =
+                GET_LCD_SIZE_BY_USER_SETTING;
+        viaparinfo->lvds_setting_info->lcd_mode = viafb_lcd_mode;
+        viaparinfo->lvds_setting_info2->display_method =
+                viaparinfo->lvds_setting_info->display_method;
+        viaparinfo->lvds_setting_info2->lcd_mode =
+                viaparinfo->lvds_setting_info->lcd_mode;
+}
+
+void viafb_update_device_setting(int hres, int vres,
+        int bpp, int vmode_refresh, int flag)
+{
+        if (flag == 0) {
+                viaparinfo->crt_setting_info->h_active = hres;
+                viaparinfo->crt_setting_info->v_active = vres;
+                viaparinfo->crt_setting_info->bpp = bpp;
+                viaparinfo->crt_setting_info->refresh_rate =
+                        vmode_refresh;
+
+                viaparinfo->tmds_setting_info->h_active = hres;
+                viaparinfo->tmds_setting_info->v_active = vres;
+                viaparinfo->tmds_setting_info->bpp = bpp;
+                viaparinfo->tmds_setting_info->refresh_rate =
+                        vmode_refresh;
+
+                viaparinfo->lvds_setting_info->h_active = hres;
+                viaparinfo->lvds_setting_info->v_active = vres;
+                viaparinfo->lvds_setting_info->bpp = bpp;
+                viaparinfo->lvds_setting_info->refresh_rate =
+                        vmode_refresh;
+                viaparinfo->lvds_setting_info2->h_active = hres;
+                viaparinfo->lvds_setting_info2->v_active = vres;
+                viaparinfo->lvds_setting_info2->bpp = bpp;
+                viaparinfo->lvds_setting_info2->refresh_rate =
+                        vmode_refresh;
+        } else {
+
+                if (viaparinfo->tmds_setting_info->iga_path == IGA2) {
+                        viaparinfo->tmds_setting_info->h_active = hres;
+                        viaparinfo->tmds_setting_info->v_active = vres;
+                        viaparinfo->tmds_setting_info->bpp = bpp;
+                        viaparinfo->tmds_setting_info->refresh_rate =
+                                vmode_refresh;
+                }
+
+                if (viaparinfo->lvds_setting_info->iga_path == IGA2) {
+                        viaparinfo->lvds_setting_info->h_active = hres;
+                        viaparinfo->lvds_setting_info->v_active = vres;
+                        viaparinfo->lvds_setting_info->bpp = bpp;
+                        viaparinfo->lvds_setting_info->refresh_rate =
+                                vmode_refresh;
+                }
+                if (IGA2 == viaparinfo->lvds_setting_info2->iga_path) {
+                        viaparinfo->lvds_setting_info2->h_active = hres;
+                        viaparinfo->lvds_setting_info2->v_active = vres;
+                        viaparinfo->lvds_setting_info2->bpp = bpp;
+                        viaparinfo->lvds_setting_info2->refresh_rate =
+                                vmode_refresh;
+                }
+        }
+}
+
+static void init_gfx_chip_info(void)
+{
+        struct pci_dev *pdev = NULL;
+        u32 i;
+        u8 tmp;
+
+        /* Indentify GFX Chip Name */
+        for (i = 0; pciidlist[i].vendor != 0; i++) {
+                pdev = pci_get_device(pciidlist[i].vendor,
+                        pciidlist[i].device, 0);
+                if (pdev)
+                        break;
+        }
+
+        if (!pciidlist[i].vendor)
+                return ;
+
+        viaparinfo->chip_info->gfx_chip_name = pciidlist[i].chip_index;
+
+        /* Check revision of CLE266 Chip */
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                /* CR4F only define in CLE266.CX chip */
+                tmp = viafb_read_reg(VIACR, CR4F);
+                viafb_write_reg(CR4F, VIACR, 0x55);
+                if (viafb_read_reg(VIACR, CR4F) != 0x55)
+                        viaparinfo->chip_info->gfx_chip_revision =
+                        CLE266_REVISION_AX;
+                else
+                        viaparinfo->chip_info->gfx_chip_revision =
+                        CLE266_REVISION_CX;
+                /* restore orignal CR4F value */
+                viafb_write_reg(CR4F, VIACR, tmp);
+        }
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                tmp = viafb_read_reg(VIASR, SR43);
+                DEBUG_MSG(KERN_INFO "SR43:%X\n", tmp);
+                if (tmp & 0x02) {
+                        viaparinfo->chip_info->gfx_chip_revision =
+                                CX700_REVISION_700M2;
+                } else if (tmp & 0x40) {
+                        viaparinfo->chip_info->gfx_chip_revision =
+                                CX700_REVISION_700M;
+                } else {
+                        viaparinfo->chip_info->gfx_chip_revision =
+                                CX700_REVISION_700;
+                }
+        }
+
+        pci_dev_put(pdev);
+}
+
+static void init_tmds_chip_info(void)
+{
+        viafb_tmds_trasmitter_identify();
+
+        if (INTERFACE_NONE == viaparinfo->chip_info->tmds_chip_info.
+                output_interface) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CX700:
+                        {
+                                /* we should check support by hardware layout.*/
+                                if ((viafb_display_hardware_layout ==
+                                     HW_LAYOUT_DVI_ONLY)
+                                    || (viafb_display_hardware_layout ==
+                                        HW_LAYOUT_LCD_DVI)) {
+                                        viaparinfo->chip_info->tmds_chip_info.
+                                            output_interface = INTERFACE_TMDS;
+                                } else {
+                                        viaparinfo->chip_info->tmds_chip_info.
+                                                output_interface =
+                                                INTERFACE_NONE;
+                                }
+                                break;
+                        }
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_P4M890:
+                        /* TMDS on PCIE, we set DFPLOW as default. */
+                        viaparinfo->chip_info->tmds_chip_info.output_interface =
+                            INTERFACE_DFP_LOW;
+                        break;
+                default:
+                        {
+                                /* set DVP1 default for DVI */
+                                viaparinfo->chip_info->tmds_chip_info
+                                .output_interface = INTERFACE_DVP1;
+                        }
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO "TMDS Chip = %d\n",
+                  viaparinfo->chip_info->tmds_chip_info.tmds_chip_name);
+        viaparinfo->tmds_setting_info->get_dvi_size_method =
+                GET_DVI_SIZE_BY_VGA_BIOS;
+        viafb_init_dvi_size();
+}
+
+static void init_lvds_chip_info(void)
+{
+        if (viafb_lcd_panel_id > LCD_PANEL_ID_MAXIMUM)
+                viaparinfo->lvds_setting_info->get_lcd_size_method =
+                    GET_LCD_SIZE_BY_VGA_BIOS;
+        else
+                viaparinfo->lvds_setting_info->get_lcd_size_method =
+                    GET_LCD_SIZE_BY_USER_SETTING;
+
+        viafb_lvds_trasmitter_identify();
+        viafb_init_lcd_size();
+        viafb_init_lvds_output_interface(&viaparinfo->chip_info->lvds_chip_info,
+                                   viaparinfo->lvds_setting_info);
+        if (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+                viafb_init_lvds_output_interface(&viaparinfo->chip_info->
+                        lvds_chip_info2, viaparinfo->lvds_setting_info2);
+        }
+        /*If CX700,two singel LCD, we need to reassign
+           LCD interface to different LVDS port */
+        if ((UNICHROME_CX700 == viaparinfo->chip_info->gfx_chip_name)
+            && (HW_LAYOUT_LCD1_LCD2 == viafb_display_hardware_layout)) {
+                if ((INTEGRATED_LVDS == viaparinfo->chip_info->lvds_chip_info.
+                        lvds_chip_name) && (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->
+                        lvds_chip_info2.lvds_chip_name)) {
+                        viaparinfo->chip_info->lvds_chip_info.output_interface =
+                                INTERFACE_LVDS0;
+                        viaparinfo->chip_info->lvds_chip_info2.
+                                output_interface =
+                            INTERFACE_LVDS1;
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO "LVDS Chip = %d\n",
+                  viaparinfo->chip_info->lvds_chip_info.lvds_chip_name);
+        DEBUG_MSG(KERN_INFO "LVDS1 output_interface = %d\n",
+                  viaparinfo->chip_info->lvds_chip_info.output_interface);
+        DEBUG_MSG(KERN_INFO "LVDS2 output_interface = %d\n",
+                  viaparinfo->chip_info->lvds_chip_info.output_interface);
+}
+
+void viafb_init_dac(int set_iga)
+{
+        int i;
+        u8 tmp;
+
+        if (set_iga == IGA1) {
+                /* access Primary Display's LUT */
+                viafb_write_reg_mask(SR1A, VIASR, 0x00, BIT0);
+                /* turn off LCK */
+                viafb_write_reg_mask(SR1B, VIASR, 0x00, BIT7 + BIT6);
+                for (i = 0; i < 256; i++) {
+                        write_dac_reg(i, palLUT_table[i].red,
+                                      palLUT_table[i].green,
+                                      palLUT_table[i].blue);
+                }
+                /* turn on LCK */
+                viafb_write_reg_mask(SR1B, VIASR, 0xC0, BIT7 + BIT6);
+        } else {
+                tmp = viafb_read_reg(VIACR, CR6A);
+                /* access Secondary Display's LUT */
+                viafb_write_reg_mask(CR6A, VIACR, 0x40, BIT6);
+                viafb_write_reg_mask(SR1A, VIASR, 0x01, BIT0);
+                for (i = 0; i < 256; i++) {
+                        write_dac_reg(i, palLUT_table[i].red,
+                                      palLUT_table[i].green,
+                                      palLUT_table[i].blue);
+                }
+                /* set IGA1 DAC for default */
+                viafb_write_reg_mask(SR1A, VIASR, 0x00, BIT0);
+                viafb_write_reg(CR6A, VIACR, tmp);
+        }
+}
+
+static void device_screen_off(void)
+{
+        /* turn off CRT screen (IGA1) */
+        viafb_write_reg_mask(SR01, VIASR, 0x20, BIT5);
+}
+
+static void device_screen_on(void)
+{
+        /* turn on CRT screen (IGA1) */
+        viafb_write_reg_mask(SR01, VIASR, 0x00, BIT5);
+}
+
+static void set_display_channel(void)
+{
+        /*If viafb_LCD2_ON, on cx700, internal lvds's information
+        is keeped on lvds_setting_info2 */
+        if (viafb_LCD2_ON &&
+                viaparinfo->lvds_setting_info2->device_lcd_dualedge) {
+                /* For dual channel LCD: */
+                /* Set to Dual LVDS channel. */
+                viafb_write_reg_mask(CRD2, VIACR, 0x20, BIT4 + BIT5);
+        } else if (viafb_LCD_ON && viafb_DVI_ON) {
+                /* For LCD+DFP: */
+                /* Set to LVDS1 + TMDS channel. */
+                viafb_write_reg_mask(CRD2, VIACR, 0x10, BIT4 + BIT5);
+        } else if (viafb_DVI_ON) {
+                /* Set to single TMDS channel. */
+                viafb_write_reg_mask(CRD2, VIACR, 0x30, BIT4 + BIT5);
+        } else if (viafb_LCD_ON) {
+                if (viaparinfo->lvds_setting_info->device_lcd_dualedge) {
+                        /* For dual channel LCD: */
+                        /* Set to Dual LVDS channel. */
+                        viafb_write_reg_mask(CRD2, VIACR, 0x20, BIT4 + BIT5);
+                } else {
+                        /* Set to LVDS0 + LVDS1 channel. */
+                        viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT4 + BIT5);
+                }
+        }
+}
+
+int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
+        int vmode_index1, int hor_res1, int ver_res1, int video_bpp1)
+{
+        int i, j;
+        int port;
+        u8 value, index, mask;
+        struct VideoModeTable *vmode_tbl;
+        struct crt_mode_table *crt_timing;
+        struct VideoModeTable *vmode_tbl1 = NULL;
+        struct crt_mode_table *crt_timing1 = NULL;
+
+        DEBUG_MSG(KERN_INFO "Set Mode!!\n");
+        DEBUG_MSG(KERN_INFO
+                  "vmode_index=%d hor_res=%d ver_res=%d video_bpp=%d\n",
+                  vmode_index, hor_res, ver_res, video_bpp);
+
+        device_screen_off();
+        vmode_tbl = &CLE266Modes[search_mode_setting(vmode_index)];
+        crt_timing = vmode_tbl->crtc;
+
+        if (viafb_SAMM_ON == 1) {
+                vmode_tbl1 = &CLE266Modes[search_mode_setting(vmode_index1)];
+                crt_timing1 = vmode_tbl1->crtc;
+        }
+
+        inb(VIAStatus);
+        outb(0x00, VIAAR);
+
+        /* Write Common Setting for Video Mode */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+                viafb_write_regx(CLE266_ModeXregs, NUM_TOTAL_CLE266_ModeXregs);
+                break;
+
+        case UNICHROME_K400:
+                viafb_write_regx(KM400_ModeXregs, NUM_TOTAL_KM400_ModeXregs);
+                break;
+
+        case UNICHROME_K800:
+        case UNICHROME_PM800:
+                viafb_write_regx(CN400_ModeXregs, NUM_TOTAL_CN400_ModeXregs);
+                break;
+
+        case UNICHROME_CN700:
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M890:
+        case UNICHROME_P4M900:
+                viafb_write_regx(CN700_ModeXregs, NUM_TOTAL_CN700_ModeXregs);
+                break;
+
+        case UNICHROME_CX700:
+                viafb_write_regx(CX700_ModeXregs, NUM_TOTAL_CX700_ModeXregs);
+
+        case UNICHROME_VX800:
+                viafb_write_regx(VX800_ModeXregs, NUM_TOTAL_VX800_ModeXregs);
+
+                break;
+        }
+
+        device_off();
+
+        /* Fill VPIT Parameters */
+        /* Write Misc Register */
+        outb(VPIT.Misc, VIAWMisc);
+
+        /* Write Sequencer */
+        for (i = 1; i <= StdSR; i++) {
+                outb(i, VIASR);
+                outb(VPIT.SR[i - 1], VIASR + 1);
+        }
+
+        viafb_set_start_addr();
+        viafb_set_iga_path();
+
+        /* Write CRTC */
+        viafb_fill_crtc_timing(crt_timing, vmode_index, video_bpp / 8, IGA1);
+
+        /* Write Graphic Controller */
+        for (i = 0; i < StdGR; i++) {
+                outb(i, VIAGR);
+                outb(VPIT.GR[i], VIAGR + 1);
+        }
+
+        /* Write Attribute Controller */
+        for (i = 0; i < StdAR; i++) {
+                inb(VIAStatus);
+                outb(i, VIAAR);
+                outb(VPIT.AR[i], VIAAR);
+        }
+
+        inb(VIAStatus);
+        outb(0x20, VIAAR);
+
+        /* Update Patch Register */
+
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+            || (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K400)) {
+                for (i = 0; i < NUM_TOTAL_PATCH_MODE; i++) {
+                        if (res_patch_table[i].mode_index == vmode_index) {
+                                for (j = 0;
+                                     j < res_patch_table[i].table_length; j++) {
+                                        index =
+                                            res_patch_table[i].
+                                            io_reg_table[j].index;
+                                        port =
+                                            res_patch_table[i].
+                                            io_reg_table[j].port;
+                                        value =
+                                            res_patch_table[i].
+                                            io_reg_table[j].value;
+                                        mask =
+                                            res_patch_table[i].
+                                            io_reg_table[j].mask;
+                                        viafb_write_reg_mask(index, port, value,
+                                                       mask);
+                                }
+                        }
+                }
+        }
+
+        if (viafb_SAMM_ON == 1) {
+                if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                    || (viaparinfo->chip_info->gfx_chip_name ==
+                    UNICHROME_K400)) {
+                        for (i = 0; i < NUM_TOTAL_PATCH_MODE; i++) {
+                                if (res_patch_table[i].mode_index ==
+                                    vmode_index1) {
+                                        for (j = 0;
+                                             j <
+                                             res_patch_table[i].
+                                             table_length; j++) {
+                                                index =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].index;
+                                                port =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].port;
+                                                value =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].value;
+                                                mask =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].mask;
+                                                viafb_write_reg_mask(index,
+                                                        port, value, mask);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /* Update Refresh Rate Setting */
+
+        /* Clear On Screen */
+
+        /* CRT set mode */
+        if (viafb_CRT_ON) {
+                if (viafb_SAMM_ON && (viaparinfo->crt_setting_info->iga_path ==
+                        IGA2)) {
+                        viafb_fill_crtc_timing(crt_timing1, vmode_index1,
+                                video_bpp1 / 8,
+                                viaparinfo->crt_setting_info->iga_path);
+                } else {
+                        viafb_fill_crtc_timing(crt_timing, vmode_index,
+                                video_bpp / 8,
+                                viaparinfo->crt_setting_info->iga_path);
+                }
+
+                set_crt_output_path(viaparinfo->crt_setting_info->iga_path);
+
+                /* Patch if set_hres is not 8 alignment (1366) to viafb_setmode
+                to 8 alignment (1368),there is several pixels (2 pixels)
+                on right side of screen. */
+                if (hor_res % 8) {
+                        viafb_unlock_crt();
+                        viafb_write_reg(CR02, VIACR,
+                                viafb_read_reg(VIACR, CR02) - 1);
+                        viafb_lock_crt();
+                }
+        }
+
+        if (viafb_DVI_ON) {
+                if (viafb_SAMM_ON &&
+                        (viaparinfo->tmds_setting_info->iga_path == IGA2)) {
+                        viafb_dvi_set_mode(viafb_get_mode_index
+                                     (viaparinfo->tmds_setting_info->h_active,
+                                      viaparinfo->tmds_setting_info->
+                                      v_active, 1),
+                                     video_bpp1, viaparinfo->
+                                     tmds_setting_info->iga_path);
+                } else {
+                        viafb_dvi_set_mode(viafb_get_mode_index
+                                     (viaparinfo->tmds_setting_info->h_active,
+                                      viaparinfo->
+                                      tmds_setting_info->v_active, 0),
+                                     video_bpp, viaparinfo->
+                                     tmds_setting_info->iga_path);
+                }
+        }
+
+        if (viafb_LCD_ON) {
+                if (viafb_SAMM_ON &&
+                        (viaparinfo->lvds_setting_info->iga_path == IGA2)) {
+                        viaparinfo->lvds_setting_info->bpp = video_bpp1;
+                        viafb_lcd_set_mode(crt_timing1, viaparinfo->
+                                lvds_setting_info,
+                                     &viaparinfo->chip_info->lvds_chip_info);
+                } else {
+                        /* IGA1 doesn't have LCD scaling, so set it center. */
+                        if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
+                                viaparinfo->lvds_setting_info->display_method =
+                                    LCD_CENTERING;
+                        }
+                        viaparinfo->lvds_setting_info->bpp = video_bpp;
+                        viafb_lcd_set_mode(crt_timing, viaparinfo->
+                                lvds_setting_info,
+                                     &viaparinfo->chip_info->lvds_chip_info);
+                }
+        }
+        if (viafb_LCD2_ON) {
+                if (viafb_SAMM_ON &&
+                        (viaparinfo->lvds_setting_info2->iga_path == IGA2)) {
+                        viaparinfo->lvds_setting_info2->bpp = video_bpp1;
+                        viafb_lcd_set_mode(crt_timing1, viaparinfo->
+                                lvds_setting_info2,
+                                     &viaparinfo->chip_info->lvds_chip_info2);
+                } else {
+                        /* IGA1 doesn't have LCD scaling, so set it center. */
+                        if (viaparinfo->lvds_setting_info2->iga_path == IGA1) {
+                                viaparinfo->lvds_setting_info2->display_method =
+                                    LCD_CENTERING;
+                        }
+                        viaparinfo->lvds_setting_info2->bpp = video_bpp;
+                        viafb_lcd_set_mode(crt_timing, viaparinfo->
+                                lvds_setting_info2,
+                                     &viaparinfo->chip_info->lvds_chip_info2);
+                }
+        }
+
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700)
+            && (viafb_LCD_ON || viafb_DVI_ON))
+                set_display_channel();
+
+        /* If set mode normally, save resolution information for hot-plug . */
+        if (!viafb_hotplug) {
+                viafb_hotplug_Xres = hor_res;
+                viafb_hotplug_Yres = ver_res;
+                viafb_hotplug_bpp = video_bpp;
+                viafb_hotplug_refresh = viafb_refresh;
+
+                if (viafb_DVI_ON)
+                        viafb_DeviceStatus = DVI_Device;
+                else
+                        viafb_DeviceStatus = CRT_Device;
+        }
+        device_on();
+
+        if (viafb_SAMM_ON == 1)
+                viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);
+
+        device_screen_on();
+        return 1;
+}
+
+int viafb_get_pixclock(int hres, int vres, int vmode_refresh)
+{
+        int i;
+
+        for (i = 0; i < NUM_TOTAL_RES_MAP_REFRESH; i++) {
+                if ((hres == res_map_refresh_tbl[i].hres)
+                    && (vres == res_map_refresh_tbl[i].vres)
+                    && (vmode_refresh == res_map_refresh_tbl[i].vmode_refresh))
+                        return res_map_refresh_tbl[i].pixclock;
+        }
+        return RES_640X480_60HZ_PIXCLOCK;
+
+}
+
+int viafb_get_refresh(int hres, int vres, u32 long_refresh)
+{
+#define REFRESH_TOLERANCE 3
+        int i, nearest = -1, diff = REFRESH_TOLERANCE;
+        for (i = 0; i < NUM_TOTAL_RES_MAP_REFRESH; i++) {
+                if ((hres == res_map_refresh_tbl[i].hres)
+                    && (vres == res_map_refresh_tbl[i].vres)
+                    && (diff > (abs(long_refresh -
+                    res_map_refresh_tbl[i].vmode_refresh)))) {
+                        diff = abs(long_refresh - res_map_refresh_tbl[i].
+                                vmode_refresh);
+                        nearest = i;
+                }
+        }
+#undef REFRESH_TOLERANCE
+        if (nearest > 0)
+                return res_map_refresh_tbl[nearest].vmode_refresh;
+        return 60;
+}
+
+static void device_off(void)
+{
+        viafb_crt_disable();
+        viafb_dvi_disable();
+        viafb_lcd_disable();
+}
+
+static void device_on(void)
+{
+        if (viafb_CRT_ON == 1)
+                viafb_crt_enable();
+        if (viafb_DVI_ON == 1)
+                viafb_dvi_enable();
+        if (viafb_LCD_ON == 1)
+                viafb_lcd_enable();
+}
+
+void viafb_crt_disable(void)
+{
+        viafb_write_reg_mask(CR36, VIACR, BIT5 + BIT4, BIT5 + BIT4);
+}
+
+void viafb_crt_enable(void)
+{
+        viafb_write_reg_mask(CR36, VIACR, 0x0, BIT5 + BIT4);
+}
+
+void viafb_get_mmio_info(unsigned long *mmio_base,
+        unsigned long *mmio_len)
+{
+        struct pci_dev *pdev = NULL;
+        u32 vendor, device;
+        u32 i;
+
+        for (i = 0; pciidlist[i].vendor != 0; i++)
+                if (viaparinfo->chip_info->gfx_chip_name ==
+                        pciidlist[i].chip_index)
+                        break;
+
+        if (!pciidlist[i].vendor)
+                return ;
+
+        vendor = pciidlist[i].vendor;
+        device = pciidlist[i].device;
+
+        pdev = pci_get_device(vendor, device, NULL);
+
+        if (!pdev) {
+                *mmio_base = 0;
+                *mmio_len = 0;
+                return ;
+        }
+
+        *mmio_base = pci_resource_start(pdev, 1);
+        *mmio_len = pci_resource_len(pdev, 1);
+
+        pci_dev_put(pdev);
+}
+
+static void enable_second_display_channel(void)
+{
+        /* to enable second display channel. */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT6);
+        viafb_write_reg_mask(CR6A, VIACR, BIT7, BIT7);
+        viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);
+}
+
+static void disable_second_display_channel(void)
+{
+        /* to disable second display channel. */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT6);
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT7);
+        viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);
+}
+
+void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len)
+{
+        struct pci_dev *pdev = NULL;
+        u32 vendor, device;
+        u32 i;
+
+        for (i = 0; pciidlist[i].vendor != 0; i++)
+                if (viaparinfo->chip_info->gfx_chip_name ==
+                        pciidlist[i].chip_index)
+                        break;
+
+        if (!pciidlist[i].vendor)
+                return ;
+
+        vendor = pciidlist[i].vendor;
+        device = pciidlist[i].device;
+
+        pdev = pci_get_device(vendor, device, NULL);
+
+        if (!pdev) {
+                *fb_base = viafb_read_reg(VIASR, SR30) << 24;
+                *fb_len = viafb_get_memsize();
+                DEBUG_MSG(KERN_INFO "Get FB info from SR30!\n");
+                DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);
+                DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);
+                return ;
+        }
+
+        *fb_base = (unsigned int)pci_resource_start(pdev, 0);
+        *fb_len = get_fb_size_from_pci();
+        DEBUG_MSG(KERN_INFO "Get FB info from PCI system!\n");
+        DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);
+        DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);
+
+        pci_dev_put(pdev);
+}
+
+static int get_fb_size_from_pci(void)
+{
+        unsigned long configid, deviceid, FBSize = 0;
+        int VideoMemSize;
+        int DeviceFound = false;
+
+        for (configid = 0x80000000; configid < 0x80010800; configid += 0x100) {
+                outl(configid, (unsigned long)0xCF8);
+                deviceid = (inl((unsigned long)0xCFC) >> 16) & 0xffff;
+
+                switch (deviceid) {
+                case CLE266:
+                case KM400:
+                        outl(configid + 0xE0, (unsigned long)0xCF8);
+                        FBSize = inl((unsigned long)0xCFC);
+                        DeviceFound = true;     /* Found device id */
+                        break;
+
+                case CN400_FUNCTION3:
+                case CN700_FUNCTION3:
+                case CX700_FUNCTION3:
+                case KM800_FUNCTION3:
+                case KM890_FUNCTION3:
+                case P4M890_FUNCTION3:
+                case P4M900_FUNCTION3:
+                case VX800_FUNCTION3:
+                        /*case CN750_FUNCTION3: */
+                        outl(configid + 0xA0, (unsigned long)0xCF8);
+                        FBSize = inl((unsigned long)0xCFC);
+                        DeviceFound = true;     /* Found device id */
+                        break;
+
+                default:
+                        break;
+                }
+
+                if (DeviceFound)
+                        break;
+        }
+
+        DEBUG_MSG(KERN_INFO "Device ID = %lx\n", deviceid);
+
+        FBSize = FBSize & 0x00007000;
+        DEBUG_MSG(KERN_INFO "FB Size = %x\n", FBSize);
+
+        if (viaparinfo->chip_info->gfx_chip_name < UNICHROME_CX700) {
+                switch (FBSize) {
+                case 0x00004000:
+                        VideoMemSize = (16 << 20);      /*16M */
+                        break;
+
+                case 0x00005000:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+
+                case 0x00006000:
+                        VideoMemSize = (64 << 20);      /*64M */
+                        break;
+
+                default:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+                }
+        } else {
+                switch (FBSize) {
+                case 0x00001000:
+                        VideoMemSize = (8 << 20);       /*8M */
+                        break;
+
+                case 0x00002000:
+                        VideoMemSize = (16 << 20);      /*16M */
+                        break;
+
+                case 0x00003000:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+
+                case 0x00004000:
+                        VideoMemSize = (64 << 20);      /*64M */
+                        break;
+
+                case 0x00005000:
+                        VideoMemSize = (128 << 20);     /*128M */
+                        break;
+
+                case 0x00006000:
+                        VideoMemSize = (256 << 20);     /*256M */
+                        break;
+
+                default:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+                }
+        }
+
+        return VideoMemSize;
+}
+
+void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
+                                        *p_gfx_dpa_setting)
+{
+        switch (output_interface) {
+        case INTERFACE_DVP0:
+                {
+                        /* DVP0 Clock Polarity and Adjust: */
+                        viafb_write_reg_mask(CR96, VIACR,
+                                       p_gfx_dpa_setting->DVP0, 0x0F);
+
+                        /* DVP0 Clock and Data Pads Driving: */
+                        viafb_write_reg_mask(SR1E, VIASR,
+                                       p_gfx_dpa_setting->DVP0ClockDri_S, BIT2);
+                        viafb_write_reg_mask(SR2A, VIASR,
+                                       p_gfx_dpa_setting->DVP0ClockDri_S1,
+                                       BIT4);
+                        viafb_write_reg_mask(SR1B, VIASR,
+                                       p_gfx_dpa_setting->DVP0DataDri_S, BIT1);
+                        viafb_write_reg_mask(SR2A, VIASR,
+                                       p_gfx_dpa_setting->DVP0DataDri_S1, BIT5);
+                        break;
+                }
+
+        case INTERFACE_DVP1:
+                {
+                        /* DVP1 Clock Polarity and Adjust: */
+                        viafb_write_reg_mask(CR9B, VIACR,
+                                       p_gfx_dpa_setting->DVP1, 0x0F);
+
+                        /* DVP1 Clock and Data Pads Driving: */
+                        viafb_write_reg_mask(SR65, VIASR,
+                                       p_gfx_dpa_setting->DVP1Driving, 0x0F);
+                        break;
+                }
+
+        case INTERFACE_DFP_HIGH:
+                {
+                        viafb_write_reg_mask(CR97, VIACR,
+                                       p_gfx_dpa_setting->DFPHigh, 0x0F);
+                        break;
+                }
+
+        case INTERFACE_DFP_LOW:
+                {
+                        viafb_write_reg_mask(CR99, VIACR,
+                                       p_gfx_dpa_setting->DFPLow, 0x0F);
+                        break;
+                }
+
+        case INTERFACE_DFP:
+                {
+                        viafb_write_reg_mask(CR97, VIACR,
+                                       p_gfx_dpa_setting->DFPHigh, 0x0F);
+                        viafb_write_reg_mask(CR99, VIACR,
+                                       p_gfx_dpa_setting->DFPLow, 0x0F);
+                        break;
+                }
+        }
+}
+
+void viafb_memory_pitch_patch(struct fb_info *info)
+{
+        if (info->var.xres != info->var.xres_virtual) {
+                viafb_load_offset_reg(info->var.xres_virtual,
+                                info->var.bits_per_pixel >> 3, IGA1);
+
+                if (viafb_SAMM_ON) {
+                        viafb_load_offset_reg(viafb_second_virtual_xres,
+                                viafb_bpp1 >> 3,
+                                        IGA2);
+                } else {
+                        viafb_load_offset_reg(info->var.xres_virtual,
+                                        info->var.bits_per_pixel >> 3, IGA2);
+                }
+
+        }
+}
+
+/*According var's xres, yres fill var's other timing information*/
+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
+                          int mode_index)
+{
+        struct VideoModeTable *vmode_tbl = NULL;
+        struct crt_mode_table *crt_timing = NULL;
+        struct display_timing crt_reg;
+        int i = 0, index = 0;
+        vmode_tbl = &CLE266Modes[search_mode_setting(mode_index)];
+        crt_timing = vmode_tbl->crtc;
+        for (i = 0; i < vmode_tbl->mode_array; i++) {
+                index = i;
+                if (crt_timing[i].refresh_rate == refresh)
+                        break;
+        }
+
+        crt_reg = crt_timing[index].crtc;
+        switch (var->bits_per_pixel) {
+        case 8:
+                var->red.offset = 0;
+                var->green.offset = 0;
+                var->blue.offset = 0;
+                var->red.length = 6;
+                var->green.length = 6;
+                var->blue.length = 6;
+                break;
+        case 16:
+                var->red.offset = 11;
+                var->green.offset = 5;
+                var->blue.offset = 0;
+                var->red.length = 5;
+                var->green.length = 6;
+                var->blue.length = 5;
+                break;
+        case 32:
+                var->red.offset = 16;
+                var->green.offset = 8;
+                var->blue.offset = 0;
+                var->red.length = 8;
+                var->green.length = 8;
+                var->blue.length = 8;
+                break;
+        default:
+                /* never happed, put here to keep consistent */
+                break;
+        }
+
+        var->pixclock = viafb_get_pixclock(var->xres, var->yres, refresh);
+        var->left_margin =
+            crt_reg.hor_total - (crt_reg.hor_sync_start + crt_reg.hor_sync_end);
+        var->right_margin = crt_reg.hor_sync_start - crt_reg.hor_addr;
+        var->hsync_len = crt_reg.hor_sync_end;
+        var->upper_margin =
+            crt_reg.ver_total - (crt_reg.ver_sync_start + crt_reg.ver_sync_end);
+        var->lower_margin = crt_reg.ver_sync_start - crt_reg.ver_addr;
+        var->vsync_len = crt_reg.ver_sync_end;
+}
diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h
new file mode 100644
index 000000000000..6ff38fa8569a
--- /dev/null
+++ b/drivers/video/via/hw.h
@@ -0,0 +1,933 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __HW_H__
+#define __HW_H__
+
+#include "global.h"
+
+/***************************************************
+* Definition IGA1 Design Method of CRTC Registers *
+****************************************************/
+#define IGA1_HOR_TOTAL_FORMULA(x)           (((x)/8)-5)
+#define IGA1_HOR_ADDR_FORMULA(x)            (((x)/8)-1)
+#define IGA1_HOR_BLANK_START_FORMULA(x)     (((x)/8)-1)
+#define IGA1_HOR_BLANK_END_FORMULA(x, y)     (((x+y)/8)-1)
+#define IGA1_HOR_SYNC_START_FORMULA(x)      ((x)/8)
+#define IGA1_HOR_SYNC_END_FORMULA(x, y)      ((x+y)/8)
+
+#define IGA1_VER_TOTAL_FORMULA(x)           ((x)-2)
+#define IGA1_VER_ADDR_FORMULA(x)            ((x)-1)
+#define IGA1_VER_BLANK_START_FORMULA(x)     ((x)-1)
+#define IGA1_VER_BLANK_END_FORMULA(x, y)     ((x+y)-1)
+#define IGA1_VER_SYNC_START_FORMULA(x)      ((x)-1)
+#define IGA1_VER_SYNC_END_FORMULA(x, y)      ((x+y)-1)
+
+/***************************************************
+** Definition IGA2 Design Method of CRTC Registers *
+****************************************************/
+#define IGA2_HOR_TOTAL_FORMULA(x)           ((x)-1)
+#define IGA2_HOR_ADDR_FORMULA(x)            ((x)-1)
+#define IGA2_HOR_BLANK_START_FORMULA(x)     ((x)-1)
+#define IGA2_HOR_BLANK_END_FORMULA(x, y)     ((x+y)-1)
+#define IGA2_HOR_SYNC_START_FORMULA(x)      ((x)-1)
+#define IGA2_HOR_SYNC_END_FORMULA(x, y)      ((x+y)-1)
+
+#define IGA2_VER_TOTAL_FORMULA(x)           ((x)-1)
+#define IGA2_VER_ADDR_FORMULA(x)            ((x)-1)
+#define IGA2_VER_BLANK_START_FORMULA(x)     ((x)-1)
+#define IGA2_VER_BLANK_END_FORMULA(x, y)     ((x+y)-1)
+#define IGA2_VER_SYNC_START_FORMULA(x)      ((x)-1)
+#define IGA2_VER_SYNC_END_FORMULA(x, y)      ((x+y)-1)
+
+/**********************************************************/
+/* Definition IGA2 Design Method of CRTC Shadow Registers */
+/**********************************************************/
+#define IGA2_HOR_TOTAL_SHADOW_FORMULA(x)           ((x/8)-5)
+#define IGA2_HOR_BLANK_END_SHADOW_FORMULA(x, y)     (((x+y)/8)-1)
+#define IGA2_VER_TOTAL_SHADOW_FORMULA(x)           ((x)-2)
+#define IGA2_VER_ADDR_SHADOW_FORMULA(x)            ((x)-1)
+#define IGA2_VER_BLANK_START_SHADOW_FORMULA(x)     ((x)-1)
+#define IGA2_VER_BLANK_END_SHADOW_FORMULA(x, y)     ((x+y)-1)
+#define IGA2_VER_SYNC_START_SHADOW_FORMULA(x)      (x)
+#define IGA2_VER_SYNC_END_SHADOW_FORMULA(x, y)      (x+y)
+
+/* Define Register Number for IGA1 CRTC Timing */
+
+/* location: {CR00,0,7},{CR36,3,3} */
+#define IGA1_HOR_TOTAL_REG_NUM          2
+/* location: {CR01,0,7} */
+#define IGA1_HOR_ADDR_REG_NUM           1
+/* location: {CR02,0,7} */
+#define IGA1_HOR_BLANK_START_REG_NUM    1
+/* location: {CR03,0,4},{CR05,7,7},{CR33,5,5} */
+#define IGA1_HOR_BLANK_END_REG_NUM      3
+/* location: {CR04,0,7},{CR33,4,4} */
+#define IGA1_HOR_SYNC_START_REG_NUM     2
+/* location: {CR05,0,4} */
+#define IGA1_HOR_SYNC_END_REG_NUM       1
+/* location: {CR06,0,7},{CR07,0,0},{CR07,5,5},{CR35,0,0} */
+#define IGA1_VER_TOTAL_REG_NUM          4
+/* location: {CR12,0,7},{CR07,1,1},{CR07,6,6},{CR35,2,2} */
+#define IGA1_VER_ADDR_REG_NUM           4
+/* location: {CR15,0,7},{CR07,3,3},{CR09,5,5},{CR35,3,3} */
+#define IGA1_VER_BLANK_START_REG_NUM    4
+/* location: {CR16,0,7} */
+#define IGA1_VER_BLANK_END_REG_NUM      1
+/* location: {CR10,0,7},{CR07,2,2},{CR07,7,7},{CR35,1,1} */
+#define IGA1_VER_SYNC_START_REG_NUM     4
+/* location: {CR11,0,3} */
+#define IGA1_VER_SYNC_END_REG_NUM       1
+
+/* Define Register Number for IGA2 Shadow CRTC Timing */
+
+/* location: {CR6D,0,7},{CR71,3,3} */
+#define IGA2_SHADOW_HOR_TOTAL_REG_NUM       2
+/* location: {CR6E,0,7} */
+#define IGA2_SHADOW_HOR_BLANK_END_REG_NUM   1
+/* location: {CR6F,0,7},{CR71,0,2} */
+#define IGA2_SHADOW_VER_TOTAL_REG_NUM       2
+/* location: {CR70,0,7},{CR71,4,6} */
+#define IGA2_SHADOW_VER_ADDR_REG_NUM        2
+/* location: {CR72,0,7},{CR74,4,6} */
+#define IGA2_SHADOW_VER_BLANK_START_REG_NUM 2
+/* location: {CR73,0,7},{CR74,0,2} */
+#define IGA2_SHADOW_VER_BLANK_END_REG_NUM   2
+/* location: {CR75,0,7},{CR76,4,6} */
+#define IGA2_SHADOW_VER_SYNC_START_REG_NUM  2
+/* location: {CR76,0,3} */
+#define IGA2_SHADOW_VER_SYNC_END_REG_NUM    1
+
+/* Define Register Number for IGA2 CRTC Timing */
+
+/* location: {CR50,0,7},{CR55,0,3} */
+#define IGA2_HOR_TOTAL_REG_NUM          2
+/* location: {CR51,0,7},{CR55,4,6} */
+#define IGA2_HOR_ADDR_REG_NUM           2
+/* location: {CR52,0,7},{CR54,0,2} */
+#define IGA2_HOR_BLANK_START_REG_NUM    2
+/* location: CLE266: {CR53,0,7},{CR54,3,5} => CLE266's CR5D[6]
+is reserved, so it may have problem to set 1600x1200 on IGA2. */
+/*              Others: {CR53,0,7},{CR54,3,5},{CR5D,6,6} */
+#define IGA2_HOR_BLANK_END_REG_NUM      3
+/* location: {CR56,0,7},{CR54,6,7},{CR5C,7,7} */
+/* VT3314 and Later: {CR56,0,7},{CR54,6,7},{CR5C,7,7}, {CR5D,7,7} */
+#define IGA2_HOR_SYNC_START_REG_NUM     4
+
+/* location: {CR57,0,7},{CR5C,6,6} */
+#define IGA2_HOR_SYNC_END_REG_NUM       2
+/* location: {CR58,0,7},{CR5D,0,2} */
+#define IGA2_VER_TOTAL_REG_NUM          2
+/* location: {CR59,0,7},{CR5D,3,5} */
+#define IGA2_VER_ADDR_REG_NUM           2
+/* location: {CR5A,0,7},{CR5C,0,2} */
+#define IGA2_VER_BLANK_START_REG_NUM    2
+/* location: {CR5E,0,7},{CR5C,3,5} */
+#define IGA2_VER_BLANK_END_REG_NUM      2
+/* location: {CR5E,0,7},{CR5F,5,7} */
+#define IGA2_VER_SYNC_START_REG_NUM     2
+/* location: {CR5F,0,4} */
+#define IGA2_VER_SYNC_END_REG_NUM       1
+
+/* Define Offset and Fetch Count Register*/
+
+/* location: {CR13,0,7},{CR35,5,7} */
+#define IGA1_OFFSET_REG_NUM             2
+/* 8 bytes alignment. */
+#define IGA1_OFFSER_ALIGN_BYTE          8
+/* x: H resolution, y: color depth */
+#define IGA1_OFFSET_FORMULA(x, y)        ((x*y)/IGA1_OFFSER_ALIGN_BYTE)
+/* location: {SR1C,0,7},{SR1D,0,1} */
+#define IGA1_FETCH_COUNT_REG_NUM        2
+/* 16 bytes alignment. */
+#define IGA1_FETCH_COUNT_ALIGN_BYTE     16
+/* x: H resolution, y: color depth */
+#define IGA1_FETCH_COUNT_PATCH_VALUE    4
+#define IGA1_FETCH_COUNT_FORMULA(x, y)   \
+        (((x*y)/IGA1_FETCH_COUNT_ALIGN_BYTE) + IGA1_FETCH_COUNT_PATCH_VALUE)
+
+/* location: {CR66,0,7},{CR67,0,1} */
+#define IGA2_OFFSET_REG_NUM             2
+#define IGA2_OFFSET_ALIGN_BYTE          8
+/* x: H resolution, y: color depth */
+#define IGA2_OFFSET_FORMULA(x, y)        ((x*y)/IGA2_OFFSET_ALIGN_BYTE)
+/* location: {CR65,0,7},{CR67,2,3} */
+#define IGA2_FETCH_COUNT_REG_NUM        2
+#define IGA2_FETCH_COUNT_ALIGN_BYTE     16
+#define IGA2_FETCH_COUNT_PATCH_VALUE    0
+#define IGA2_FETCH_COUNT_FORMULA(x, y)   \
+        (((x*y)/IGA2_FETCH_COUNT_ALIGN_BYTE) + IGA2_FETCH_COUNT_PATCH_VALUE)
+
+/* Staring Address*/
+
+/* location: {CR0C,0,7},{CR0D,0,7},{CR34,0,7},{CR48,0,1} */
+#define IGA1_STARTING_ADDR_REG_NUM      4
+/* location: {CR62,1,7},{CR63,0,7},{CR64,0,7} */
+#define IGA2_STARTING_ADDR_REG_NUM      3
+
+/* Define Display OFFSET*/
+/* These value are by HW suggested value*/
+/* location: {SR17,0,7} */
+#define K800_IGA1_FIFO_MAX_DEPTH                384
+/* location: {SR16,0,5},{SR16,7,7} */
+#define K800_IGA1_FIFO_THRESHOLD                328
+/* location: {SR18,0,5},{SR18,7,7} */
+#define K800_IGA1_FIFO_HIGH_THRESHOLD           296
+/* location: {SR22,0,4}. (128/4) =64, K800 must be set zero, */
+                                /* because HW only 5 bits */
+#define K800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      0
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define K800_IGA2_FIFO_MAX_DEPTH                384
+/* location: {CR68,0,3},{CR95,4,6} */
+#define K800_IGA2_FIFO_THRESHOLD                328
+/* location: {CR92,0,3},{CR95,0,2} */
+#define K800_IGA2_FIFO_HIGH_THRESHOLD           296
+/* location: {CR94,0,6} */
+#define K800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM      128
+
+/* location: {SR17,0,7} */
+#define P880_IGA1_FIFO_MAX_DEPTH                192
+/* location: {SR16,0,5},{SR16,7,7} */
+#define P880_IGA1_FIFO_THRESHOLD                128
+/* location: {SR18,0,5},{SR18,7,7} */
+#define P880_IGA1_FIFO_HIGH_THRESHOLD           64
+/* location: {SR22,0,4}. (128/4) =64, K800 must be set zero, */
+                                /* because HW only 5 bits */
+#define P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      0
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define P880_IGA2_FIFO_MAX_DEPTH                96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define P880_IGA2_FIFO_THRESHOLD                64
+/* location: {CR92,0,3},{CR95,0,2} */
+#define P880_IGA2_FIFO_HIGH_THRESHOLD           32
+/* location: {CR94,0,6} */
+#define P880_IGA2_DISPLAY_QUEUE_EXPIRE_NUM      128
+
+/* VT3314 chipset*/
+
+/* location: {SR17,0,7} */
+#define CN700_IGA1_FIFO_MAX_DEPTH               96
+/* location: {SR16,0,5},{SR16,7,7} */
+#define CN700_IGA1_FIFO_THRESHOLD               80
+/* location: {SR18,0,5},{SR18,7,7} */
+#define CN700_IGA1_FIFO_HIGH_THRESHOLD          64
+/* location: {SR22,0,4}. (128/4) =64, P800 must be set zero,
+                                because HW only 5 bits */
+#define CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     0
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define CN700_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define CN700_IGA2_FIFO_THRESHOLD               80
+/* location: {CR92,0,3},{CR95,0,2} */
+#define CN700_IGA2_FIFO_HIGH_THRESHOLD          32
+/* location: {CR94,0,6} */
+#define CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
+
+/* For VT3324, these values are suggested by HW */
+/* location: {SR17,0,7} */
+#define CX700_IGA1_FIFO_MAX_DEPTH               192
+/* location: {SR16,0,5},{SR16,7,7} */
+#define CX700_IGA1_FIFO_THRESHOLD               128
+/* location: {SR18,0,5},{SR18,7,7} */
+#define CX700_IGA1_FIFO_HIGH_THRESHOLD          128
+/* location: {SR22,0,4} */
+#define CX700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     124
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define CX700_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define CX700_IGA2_FIFO_THRESHOLD               64
+/* location: {CR92,0,3},{CR95,0,2} */
+#define CX700_IGA2_FIFO_HIGH_THRESHOLD          32
+/* location: {CR94,0,6} */
+#define CX700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
+
+/* VT3336 chipset*/
+/* location: {SR17,0,7} */
+#define K8M890_IGA1_FIFO_MAX_DEPTH               360
+/* location: {SR16,0,5},{SR16,7,7} */
+#define K8M890_IGA1_FIFO_THRESHOLD               328
+/* location: {SR18,0,5},{SR18,7,7} */
+#define K8M890_IGA1_FIFO_HIGH_THRESHOLD          296
+/* location: {SR22,0,4}. */
+#define K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     124
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define K8M890_IGA2_FIFO_MAX_DEPTH               360
+/* location: {CR68,0,3},{CR95,4,6} */
+#define K8M890_IGA2_FIFO_THRESHOLD               328
+/* location: {CR92,0,3},{CR95,0,2} */
+#define K8M890_IGA2_FIFO_HIGH_THRESHOLD          296
+/* location: {CR94,0,6} */
+#define K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     124
+
+/* VT3327 chipset*/
+/* location: {SR17,0,7} */
+#define P4M890_IGA1_FIFO_MAX_DEPTH               96
+/* location: {SR16,0,5},{SR16,7,7} */
+#define P4M890_IGA1_FIFO_THRESHOLD               76
+/* location: {SR18,0,5},{SR18,7,7} */
+#define P4M890_IGA1_FIFO_HIGH_THRESHOLD          64
+/* location: {SR22,0,4}. (32/4) =8 */
+#define P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     32
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define P4M890_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define P4M890_IGA2_FIFO_THRESHOLD               76
+/* location: {CR92,0,3},{CR95,0,2} */
+#define P4M890_IGA2_FIFO_HIGH_THRESHOLD          64
+/* location: {CR94,0,6} */
+#define P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     32
+
+/* VT3364 chipset*/
+/* location: {SR17,0,7} */
+#define P4M900_IGA1_FIFO_MAX_DEPTH               96
+/* location: {SR16,0,5},{SR16,7,7} */
+#define P4M900_IGA1_FIFO_THRESHOLD               76
+/* location: {SR18,0,5},{SR18,7,7} */
+#define P4M900_IGA1_FIFO_HIGH_THRESHOLD          76
+/* location: {SR22,0,4}. */
+#define P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     32
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define P4M900_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define P4M900_IGA2_FIFO_THRESHOLD               76
+/* location: {CR92,0,3},{CR95,0,2} */
+#define P4M900_IGA2_FIFO_HIGH_THRESHOLD          76
+/* location: {CR94,0,6} */
+#define P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     32
+
+/* For VT3353, these values are suggested by HW */
+/* location: {SR17,0,7} */
+#define VX800_IGA1_FIFO_MAX_DEPTH               192
+/* location: {SR16,0,5},{SR16,7,7} */
+#define VX800_IGA1_FIFO_THRESHOLD               152
+/* location: {SR18,0,5},{SR18,7,7} */
+#define VX800_IGA1_FIFO_HIGH_THRESHOLD          152
+/* location: {SR22,0,4} */
+#define VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      64
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define VX800_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define VX800_IGA2_FIFO_THRESHOLD               64
+/* location: {CR92,0,3},{CR95,0,2} */
+#define VX800_IGA2_FIFO_HIGH_THRESHOLD          32
+/* location: {CR94,0,6} */
+#define VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
+
+#define IGA1_FIFO_DEPTH_SELECT_REG_NUM          1
+#define IGA1_FIFO_THRESHOLD_REG_NUM             2
+#define IGA1_FIFO_HIGH_THRESHOLD_REG_NUM        2
+#define IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM   1
+
+#define IGA2_FIFO_DEPTH_SELECT_REG_NUM          3
+#define IGA2_FIFO_THRESHOLD_REG_NUM             2
+#define IGA2_FIFO_HIGH_THRESHOLD_REG_NUM        2
+#define IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM   1
+
+#define IGA1_FIFO_DEPTH_SELECT_FORMULA(x)                   ((x/2)-1)
+#define IGA1_FIFO_THRESHOLD_FORMULA(x)                      (x/4)
+#define IGA1_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA(x)            (x/4)
+#define IGA1_FIFO_HIGH_THRESHOLD_FORMULA(x)                 (x/4)
+#define IGA2_FIFO_DEPTH_SELECT_FORMULA(x)                   (((x/2)/4)-1)
+#define IGA2_FIFO_THRESHOLD_FORMULA(x)                      (x/4)
+#define IGA2_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA(x)            (x/4)
+#define IGA2_FIFO_HIGH_THRESHOLD_FORMULA(x)                 (x/4)
+
+/************************************************************************/
+/*  LCD Timing                                                          */
+/************************************************************************/
+
+/* 500 ms = 500000 us */
+#define LCD_POWER_SEQ_TD0               500000
+/* 50 ms = 50000 us */
+#define LCD_POWER_SEQ_TD1               50000
+/* 0 us */
+#define LCD_POWER_SEQ_TD2               0
+/* 210 ms = 210000 us */
+#define LCD_POWER_SEQ_TD3               210000
+/* 2^10 * (1/14.31818M) = 71.475 us (K400.revA) */
+#define CLE266_POWER_SEQ_UNIT           71
+/* 2^11 * (1/14.31818M) = 142.95 us (K400.revB) */
+#define K800_POWER_SEQ_UNIT             142
+/* 2^13 * (1/14.31818M) = 572.1 us */
+#define P880_POWER_SEQ_UNIT             572
+
+#define CLE266_POWER_SEQ_FORMULA(x)     ((x)/CLE266_POWER_SEQ_UNIT)
+#define K800_POWER_SEQ_FORMULA(x)       ((x)/K800_POWER_SEQ_UNIT)
+#define P880_POWER_SEQ_FORMULA(x)       ((x)/P880_POWER_SEQ_UNIT)
+
+/* location: {CR8B,0,7},{CR8F,0,3} */
+#define LCD_POWER_SEQ_TD0_REG_NUM       2
+/* location: {CR8C,0,7},{CR8F,4,7} */
+#define LCD_POWER_SEQ_TD1_REG_NUM       2
+/* location: {CR8D,0,7},{CR90,0,3} */
+#define LCD_POWER_SEQ_TD2_REG_NUM       2
+/* location: {CR8E,0,7},{CR90,4,7} */
+#define LCD_POWER_SEQ_TD3_REG_NUM       2
+
+/* LCD Scaling factor*/
+/* x: indicate setting horizontal size*/
+/* y: indicate panel horizontal size*/
+
+/* Horizontal scaling factor 10 bits (2^10) */
+#define CLE266_LCD_HOR_SCF_FORMULA(x, y)   (((x-1)*1024)/(y-1))
+/* Vertical scaling factor 10 bits (2^10) */
+#define CLE266_LCD_VER_SCF_FORMULA(x, y)   (((x-1)*1024)/(y-1))
+/* Horizontal scaling factor 10 bits (2^12) */
+#define K800_LCD_HOR_SCF_FORMULA(x, y)     (((x-1)*4096)/(y-1))
+/* Vertical scaling factor 10 bits (2^11) */
+#define K800_LCD_VER_SCF_FORMULA(x, y)     (((x-1)*2048)/(y-1))
+
+/* location: {CR9F,0,1},{CR77,0,7},{CR79,4,5} */
+#define LCD_HOR_SCALING_FACTOR_REG_NUM  3
+/* location: {CR79,3,3},{CR78,0,7},{CR79,6,7} */
+#define LCD_VER_SCALING_FACTOR_REG_NUM  3
+/* location: {CR77,0,7},{CR79,4,5} */
+#define LCD_HOR_SCALING_FACTOR_REG_NUM_CLE  2
+/* location: {CR78,0,7},{CR79,6,7} */
+#define LCD_VER_SCALING_FACTOR_REG_NUM_CLE  2
+
+/************************************************
+ *****     Define IGA1 Display Timing       *****
+ ************************************************/
+struct io_register {
+        u8 io_addr;
+        u8 start_bit;
+        u8 end_bit;
+};
+
+/* IGA1 Horizontal Total */
+struct iga1_hor_total {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_TOTAL_REG_NUM];
+};
+
+/* IGA1 Horizontal Addressable Video */
+struct iga1_hor_addr {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_ADDR_REG_NUM];
+};
+
+/* IGA1 Horizontal Blank Start */
+struct iga1_hor_blank_start {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_BLANK_START_REG_NUM];
+};
+
+/* IGA1 Horizontal Blank End */
+struct iga1_hor_blank_end {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_BLANK_END_REG_NUM];
+};
+
+/* IGA1 Horizontal Sync Start */
+struct iga1_hor_sync_start {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_SYNC_START_REG_NUM];
+};
+
+/* IGA1 Horizontal Sync End */
+struct iga1_hor_sync_end {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_SYNC_END_REG_NUM];
+};
+
+/* IGA1 Vertical Total */
+struct iga1_ver_total {
+        int reg_num;
+        struct io_register reg[IGA1_VER_TOTAL_REG_NUM];
+};
+
+/* IGA1 Vertical Addressable Video */
+struct iga1_ver_addr {
+        int reg_num;
+        struct io_register reg[IGA1_VER_ADDR_REG_NUM];
+};
+
+/* IGA1 Vertical Blank Start */
+struct iga1_ver_blank_start {
+        int reg_num;
+        struct io_register reg[IGA1_VER_BLANK_START_REG_NUM];
+};
+
+/* IGA1 Vertical Blank End */
+struct iga1_ver_blank_end {
+        int reg_num;
+        struct io_register reg[IGA1_VER_BLANK_END_REG_NUM];
+};
+
+/* IGA1 Vertical Sync Start */
+struct iga1_ver_sync_start {
+        int reg_num;
+        struct io_register reg[IGA1_VER_SYNC_START_REG_NUM];
+};
+
+/* IGA1 Vertical Sync End */
+struct iga1_ver_sync_end {
+        int reg_num;
+        struct io_register reg[IGA1_VER_SYNC_END_REG_NUM];
+};
+
+/*****************************************************
+**      Define IGA2 Shadow Display Timing         ****
+*****************************************************/
+
+/* IGA2 Shadow Horizontal Total */
+struct iga2_shadow_hor_total {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_HOR_TOTAL_REG_NUM];
+};
+
+/* IGA2 Shadow Horizontal Blank End */
+struct iga2_shadow_hor_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_HOR_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Total */
+struct iga2_shadow_ver_total {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_TOTAL_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Addressable Video */
+struct iga2_shadow_ver_addr {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_ADDR_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Blank Start */
+struct iga2_shadow_ver_blank_start {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_BLANK_START_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Blank End */
+struct iga2_shadow_ver_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Sync Start */
+struct iga2_shadow_ver_sync_start {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_SYNC_START_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Sync End */
+struct iga2_shadow_ver_sync_end {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_SYNC_END_REG_NUM];
+};
+
+/*****************************************************
+**      Define IGA2 Display Timing                ****
+******************************************************/
+
+/* IGA2 Horizontal Total */
+struct iga2_hor_total {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_TOTAL_REG_NUM];
+};
+
+/* IGA2 Horizontal Addressable Video */
+struct iga2_hor_addr {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_ADDR_REG_NUM];
+};
+
+/* IGA2 Horizontal Blank Start */
+struct iga2_hor_blank_start {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_BLANK_START_REG_NUM];
+};
+
+/* IGA2 Horizontal Blank End */
+struct iga2_hor_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Horizontal Sync Start */
+struct iga2_hor_sync_start {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_SYNC_START_REG_NUM];
+};
+
+/* IGA2 Horizontal Sync End */
+struct iga2_hor_sync_end {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_SYNC_END_REG_NUM];
+};
+
+/* IGA2 Vertical Total */
+struct iga2_ver_total {
+        int reg_num;
+        struct io_register reg[IGA2_VER_TOTAL_REG_NUM];
+};
+
+/* IGA2 Vertical Addressable Video */
+struct iga2_ver_addr {
+        int reg_num;
+        struct io_register reg[IGA2_VER_ADDR_REG_NUM];
+};
+
+/* IGA2 Vertical Blank Start */
+struct iga2_ver_blank_start {
+        int reg_num;
+        struct io_register reg[IGA2_VER_BLANK_START_REG_NUM];
+};
+
+/* IGA2 Vertical Blank End */
+struct iga2_ver_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_VER_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Vertical Sync Start */
+struct iga2_ver_sync_start {
+        int reg_num;
+        struct io_register reg[IGA2_VER_SYNC_START_REG_NUM];
+};
+
+/* IGA2 Vertical Sync End */
+struct iga2_ver_sync_end {
+        int reg_num;
+        struct io_register reg[IGA2_VER_SYNC_END_REG_NUM];
+};
+
+/* IGA1 Offset Register */
+struct iga1_offset {
+        int reg_num;
+        struct io_register reg[IGA1_OFFSET_REG_NUM];
+};
+
+/* IGA2 Offset Register */
+struct iga2_offset {
+        int reg_num;
+        struct io_register reg[IGA2_OFFSET_REG_NUM];
+};
+
+struct offset {
+        struct iga1_offset iga1_offset_reg;
+        struct iga2_offset iga2_offset_reg;
+};
+
+/* IGA1 Fetch Count Register */
+struct iga1_fetch_count {
+        int reg_num;
+        struct io_register reg[IGA1_FETCH_COUNT_REG_NUM];
+};
+
+/* IGA2 Fetch Count Register */
+struct iga2_fetch_count {
+        int reg_num;
+        struct io_register reg[IGA2_FETCH_COUNT_REG_NUM];
+};
+
+struct fetch_count {
+        struct iga1_fetch_count iga1_fetch_count_reg;
+        struct iga2_fetch_count iga2_fetch_count_reg;
+};
+
+/* Starting Address Register */
+struct iga1_starting_addr {
+        int reg_num;
+        struct io_register reg[IGA1_STARTING_ADDR_REG_NUM];
+};
+
+struct iga2_starting_addr {
+        int reg_num;
+        struct io_register reg[IGA2_STARTING_ADDR_REG_NUM];
+};
+
+struct starting_addr {
+        struct iga1_starting_addr iga1_starting_addr_reg;
+        struct iga2_starting_addr iga2_starting_addr_reg;
+};
+
+/* LCD Power Sequence Timer */
+struct lcd_pwd_seq_td0 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD0_REG_NUM];
+};
+
+struct lcd_pwd_seq_td1 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD1_REG_NUM];
+};
+
+struct lcd_pwd_seq_td2 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD2_REG_NUM];
+};
+
+struct lcd_pwd_seq_td3 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD3_REG_NUM];
+};
+
+struct _lcd_pwd_seq_timer {
+        struct lcd_pwd_seq_td0 td0;
+        struct lcd_pwd_seq_td1 td1;
+        struct lcd_pwd_seq_td2 td2;
+        struct lcd_pwd_seq_td3 td3;
+};
+
+/* LCD Scaling Factor */
+struct _lcd_hor_scaling_factor {
+        int reg_num;
+        struct io_register reg[LCD_HOR_SCALING_FACTOR_REG_NUM];
+};
+
+struct _lcd_ver_scaling_factor {
+        int reg_num;
+        struct io_register reg[LCD_VER_SCALING_FACTOR_REG_NUM];
+};
+
+struct _lcd_scaling_factor {
+        struct _lcd_hor_scaling_factor lcd_hor_scaling_factor;
+        struct _lcd_ver_scaling_factor lcd_ver_scaling_factor;
+};
+
+struct pll_map {
+        u32 clk;
+        u32 cle266_pll;
+        u32 k800_pll;
+        u32 cx700_pll;
+};
+
+struct rgbLUT {
+        u8 red;
+        u8 green;
+        u8 blue;
+};
+
+struct lcd_pwd_seq_timer {
+        u16 td0;
+        u16 td1;
+        u16 td2;
+        u16 td3;
+};
+
+/* Display FIFO Relation Registers*/
+struct iga1_fifo_depth_select {
+        int reg_num;
+        struct io_register reg[IGA1_FIFO_DEPTH_SELECT_REG_NUM];
+};
+
+struct iga1_fifo_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA1_FIFO_THRESHOLD_REG_NUM];
+};
+
+struct iga1_fifo_high_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA1_FIFO_HIGH_THRESHOLD_REG_NUM];
+};
+
+struct iga1_display_queue_expire_num {
+        int reg_num;
+        struct io_register reg[IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM];
+};
+
+struct iga2_fifo_depth_select {
+        int reg_num;
+        struct io_register reg[IGA2_FIFO_DEPTH_SELECT_REG_NUM];
+};
+
+struct iga2_fifo_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA2_FIFO_THRESHOLD_REG_NUM];
+};
+
+struct iga2_fifo_high_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA2_FIFO_HIGH_THRESHOLD_REG_NUM];
+};
+
+struct iga2_display_queue_expire_num {
+        int reg_num;
+        struct io_register reg[IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM];
+};
+
+struct fifo_depth_select {
+        struct iga1_fifo_depth_select iga1_fifo_depth_select_reg;
+        struct iga2_fifo_depth_select iga2_fifo_depth_select_reg;
+};
+
+struct fifo_threshold_select {
+        struct iga1_fifo_threshold_select iga1_fifo_threshold_select_reg;
+        struct iga2_fifo_threshold_select iga2_fifo_threshold_select_reg;
+};
+
+struct fifo_high_threshold_select {
+        struct iga1_fifo_high_threshold_select
+         iga1_fifo_high_threshold_select_reg;
+        struct iga2_fifo_high_threshold_select
+         iga2_fifo_high_threshold_select_reg;
+};
+
+struct display_queue_expire_num {
+        struct iga1_display_queue_expire_num
+         iga1_display_queue_expire_num_reg;
+        struct iga2_display_queue_expire_num
+         iga2_display_queue_expire_num_reg;
+};
+
+struct iga1_crtc_timing {
+        struct iga1_hor_total hor_total;
+        struct iga1_hor_addr hor_addr;
+        struct iga1_hor_blank_start hor_blank_start;
+        struct iga1_hor_blank_end hor_blank_end;
+        struct iga1_hor_sync_start hor_sync_start;
+        struct iga1_hor_sync_end hor_sync_end;
+        struct iga1_ver_total ver_total;
+        struct iga1_ver_addr ver_addr;
+        struct iga1_ver_blank_start ver_blank_start;
+        struct iga1_ver_blank_end ver_blank_end;
+        struct iga1_ver_sync_start ver_sync_start;
+        struct iga1_ver_sync_end ver_sync_end;
+};
+
+struct iga2_shadow_crtc_timing {
+        struct iga2_shadow_hor_total hor_total_shadow;
+        struct iga2_shadow_hor_blank_end hor_blank_end_shadow;
+        struct iga2_shadow_ver_total ver_total_shadow;
+        struct iga2_shadow_ver_addr ver_addr_shadow;
+        struct iga2_shadow_ver_blank_start ver_blank_start_shadow;
+        struct iga2_shadow_ver_blank_end ver_blank_end_shadow;
+        struct iga2_shadow_ver_sync_start ver_sync_start_shadow;
+        struct iga2_shadow_ver_sync_end ver_sync_end_shadow;
+};
+
+struct iga2_crtc_timing {
+        struct iga2_hor_total hor_total;
+        struct iga2_hor_addr hor_addr;
+        struct iga2_hor_blank_start hor_blank_start;
+        struct iga2_hor_blank_end hor_blank_end;
+        struct iga2_hor_sync_start hor_sync_start;
+        struct iga2_hor_sync_end hor_sync_end;
+        struct iga2_ver_total ver_total;
+        struct iga2_ver_addr ver_addr;
+        struct iga2_ver_blank_start ver_blank_start;
+        struct iga2_ver_blank_end ver_blank_end;
+        struct iga2_ver_sync_start ver_sync_start;
+        struct iga2_ver_sync_end ver_sync_end;
+};
+
+/* device ID */
+#define CLE266              0x3123
+#define KM400               0x3205
+#define CN400_FUNCTION2     0x2259
+#define CN400_FUNCTION3     0x3259
+/* support VT3314 chipset */
+#define CN700_FUNCTION2     0x2314
+#define CN700_FUNCTION3     0x3208
+/* VT3324 chipset */
+#define CX700_FUNCTION2     0x2324
+#define CX700_FUNCTION3     0x3324
+/* VT3204 chipset*/
+#define KM800_FUNCTION3      0x3204
+/* VT3336 chipset*/
+#define KM890_FUNCTION3      0x3336
+/* VT3327 chipset*/
+#define P4M890_FUNCTION3     0x3327
+/* VT3293 chipset*/
+#define CN750_FUNCTION3     0x3208
+/* VT3364 chipset*/
+#define P4M900_FUNCTION3    0x3364
+/* VT3353 chipset*/
+#define VX800_FUNCTION3     0x3353
+
+#define NUM_TOTAL_PLL_TABLE ARRAY_SIZE(pll_value)
+
+struct IODATA {
+        u8 Index;
+        u8 Mask;
+        u8 Data;
+};
+
+struct pci_device_id_info {
+        u32 vendor;
+        u32 device;
+        u32 chip_index;
+};
+
+extern unsigned int viafb_second_virtual_xres;
+extern unsigned int viafb_second_offset;
+extern int viafb_second_size;
+extern int viafb_SAMM_ON;
+extern int viafb_dual_fb;
+extern int viafb_LCD2_ON;
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+extern int viafb_accel;
+extern int viafb_hotplug;
+
+void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask);
+void viafb_set_output_path(int device, int set_iga,
+        int output_interface);
+void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
+                      int mode_index, int bpp_byte, int set_iga);
+
+void viafb_set_vclock(u32 CLK, int set_iga);
+void viafb_load_reg(int timing_value, int viafb_load_reg_num,
+        struct io_register *reg,
+              int io_type);
+void viafb_crt_disable(void);
+void viafb_crt_enable(void);
+void init_ad9389(void);
+/* Access I/O Function */
+void viafb_write_reg(u8 index, u16 io_port, u8 data);
+u8 viafb_read_reg(int io_port, u8 index);
+void viafb_lock_crt(void);
+void viafb_unlock_crt(void);
+void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga);
+void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga);
+void viafb_write_regx(struct io_reg RegTable[], int ItemNum);
+struct VideoModeTable *viafb_get_modetbl_pointer(int Index);
+u32 viafb_get_clk_value(int clk);
+void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active);
+void viafb_set_color_depth(int bpp_byte, int set_iga);
+void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
+                                        *p_gfx_dpa_setting);
+
+int viafb_setmode(int vmode_index, int hor_res, int ver_res,
+            int video_bpp, int vmode_index1, int hor_res1,
+            int ver_res1, int video_bpp1);
+void viafb_init_chip_info(void);
+void viafb_init_dac(int set_iga);
+int viafb_get_pixclock(int hres, int vres, int vmode_refresh);
+int viafb_get_refresh(int hres, int vres, u32 float_refresh);
+void viafb_update_device_setting(int hres, int vres, int bpp,
+                           int vmode_refresh, int flag);
+void viafb_get_mmio_info(unsigned long *mmio_base,
+        unsigned long *mmio_len);
+
+void viafb_set_iga_path(void);
+void viafb_set_start_addr(void);
+void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len);
+
+#endif /* __HW_H__ */
diff --git a/drivers/video/via/iface.c b/drivers/video/via/iface.c
new file mode 100644
index 000000000000..1570636c8d51
--- /dev/null
+++ b/drivers/video/via/iface.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+
+/* Get frame buffer size from VGA BIOS */
+
+unsigned int viafb_get_memsize(void)
+{
+        unsigned int m;
+
+        /* If memory size provided by user */
+        if (viafb_memsize)
+                m = viafb_memsize * Mb;
+        else {
+                m = (unsigned int)viafb_read_reg(VIASR, SR39);
+                m = m * (4 * Mb);
+
+                if ((m < (16 * Mb)) || (m > (64 * Mb)))
+                        m = 16 * Mb;
+        }
+        DEBUG_MSG(KERN_INFO "framebuffer size = %d Mb\n", m / Mb);
+        return m;
+}
+
+/* Get Video Buffer Starting Physical Address(back door)*/
+
+unsigned long viafb_get_videobuf_addr(void)
+{
+        struct pci_dev *pdev = NULL;
+        unsigned char sys_mem;
+        unsigned char video_mem;
+        unsigned long sys_mem_size;
+        unsigned long video_mem_size;
+        /*system memory = 256 MB, video memory 64 MB */
+        unsigned long vmem_starting_adr = 0x0C000000;
+
+        pdev =
+            (struct pci_dev *)pci_get_device(VIA_K800_BRIDGE_VID,
+                                             VIA_K800_BRIDGE_DID, NULL);
+        if (pdev != NULL) {
+                pci_read_config_byte(pdev, VIA_K800_SYSTEM_MEMORY_REG,
+                                     &sys_mem);
+                pci_read_config_byte(pdev, VIA_K800_VIDEO_MEMORY_REG,
+                                     &video_mem);
+                video_mem = (video_mem & 0x70) >> 4;
+                sys_mem_size = ((unsigned long)sys_mem) << 24;
+                if (video_mem != 0)
+                        video_mem_size = (1 << (video_mem)) * 1024 * 1024;
+                else
+                        video_mem_size = 0;
+
+                vmem_starting_adr = sys_mem_size - video_mem_size;
+                pci_dev_put(pdev);
+        }
+
+        DEBUG_MSG(KERN_INFO "Video Memory Starting Address = %lx \n",
+                  vmem_starting_adr);
+        return vmem_starting_adr;
+}
diff --git a/drivers/video/via/iface.h b/drivers/video/via/iface.h
new file mode 100644
index 000000000000..790ec3e3aea2
--- /dev/null
+++ b/drivers/video/via/iface.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __IFACE_H__
+#define __IFACE_H__
+
+#define Kb  (1024)
+#define Mb  (Kb*Kb)
+
+#define VIA_K800_BRIDGE_VID         0x1106
+#define VIA_K800_BRIDGE_DID         0x3204
+
+#define VIA_K800_SYSTEM_MEMORY_REG  0x47
+#define VIA_K800_VIDEO_MEMORY_REG   0xA1
+
+extern int viafb_memsize;
+unsigned int viafb_get_memsize(void);
+unsigned long viafb_get_videobuf_addr(void);
+
+#endif /* __IFACE_H__ */
diff --git a/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c
new file mode 100644
index 000000000000..da03c074e32a
--- /dev/null
+++ b/drivers/video/via/ioctl.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+
+int viafb_ioctl_get_viafb_info(u_long arg)
+{
+        struct viafb_ioctl_info viainfo;
+
+        viainfo.viafb_id = VIAID;
+        viainfo.vendor_id = PCI_VIA_VENDOR_ID;
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+                viainfo.device_id = UNICHROME_CLE266_DID;
+                break;
+
+        case UNICHROME_K400:
+                viainfo.device_id = UNICHROME_K400_DID;
+                break;
+
+        case UNICHROME_K800:
+                viainfo.device_id = UNICHROME_K800_DID;
+                break;
+
+        case UNICHROME_PM800:
+                viainfo.device_id = UNICHROME_PM800_DID;
+                break;
+
+        case UNICHROME_CN700:
+                viainfo.device_id = UNICHROME_CN700_DID;
+                break;
+
+        case UNICHROME_CX700:
+                viainfo.device_id = UNICHROME_CX700_DID;
+                break;
+
+        case UNICHROME_K8M890:
+                viainfo.device_id = UNICHROME_K8M890_DID;
+                break;
+
+        case UNICHROME_P4M890:
+                viainfo.device_id = UNICHROME_P4M890_DID;
+                break;
+
+        case UNICHROME_P4M900:
+                viainfo.device_id = UNICHROME_P4M900_DID;
+                break;
+        }
+
+        viainfo.version = VERSION_MAJOR;
+        viainfo.revision = VERSION_MINOR;
+
+        if (copy_to_user((void __user *)arg, &viainfo, sizeof(viainfo)))
+                return -EFAULT;
+
+        return 0;
+}
+
+/* Hot-Plug Priority: DVI > CRT*/
+int viafb_ioctl_hotplug(int hres, int vres, int bpp)
+{
+        int DVIsense, status = 0;
+        DEBUG_MSG(KERN_INFO "viafb_ioctl_hotplug!!\n");
+
+        if (viaparinfo->chip_info->tmds_chip_info.tmds_chip_name !=
+                NON_TMDS_TRANSMITTER) {
+                DVIsense = viafb_dvi_sense();
+
+                if (DVIsense) {
+                        DEBUG_MSG(KERN_INFO "DVI Attached...\n");
+                        if (viafb_DeviceStatus != DVI_Device) {
+                                viafb_DVI_ON = 1;
+                                viafb_CRT_ON = 0;
+                                viafb_LCD_ON = 0;
+                                viafb_DeviceStatus = DVI_Device;
+                                return viafb_DeviceStatus;
+                        }
+                        status = 1;
+                } else
+                        DEBUG_MSG(KERN_INFO "DVI De-attached...\n");
+        }
+
+        if ((viafb_DeviceStatus != CRT_Device) && (status == 0)) {
+                viafb_CRT_ON = 1;
+                viafb_DVI_ON = 0;
+                viafb_LCD_ON = 0;
+
+                viafb_DeviceStatus = CRT_Device;
+                return viafb_DeviceStatus;
+        }
+
+        return 0;
+}
diff --git a/drivers/video/via/ioctl.h b/drivers/video/via/ioctl.h
new file mode 100644
index 000000000000..842fe30b9868
--- /dev/null
+++ b/drivers/video/via/ioctl.h
@@ -0,0 +1,210 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __IOCTL_H__
+#define __IOCTL_H__
+
+#ifndef __user
+#define __user
+#endif
+
+/* VIAFB IOCTL definition */
+#define VIAFB_GET_INFO_SIZE             0x56494101      /* 'VIA\01' */
+#define VIAFB_GET_INFO                  0x56494102      /* 'VIA\02' */
+#define VIAFB_HOTPLUG                   0x56494103      /* 'VIA\03' */
+#define VIAFB_SET_HOTPLUG_FLAG          0x56494104      /* 'VIA\04' */
+#define VIAFB_GET_RESOLUTION            0x56494105      /* 'VIA\05' */
+#define VIAFB_GET_SAMM_INFO             0x56494107      /* 'VIA\07' */
+#define VIAFB_TURN_ON_OUTPUT_DEVICE     0x56494108      /* 'VIA\08' */
+#define VIAFB_TURN_OFF_OUTPUT_DEVICE    0x56494109      /* 'VIA\09' */
+#define VIAFB_SET_DEVICE                0x5649410A
+#define VIAFB_GET_DEVICE                0x5649410B
+#define VIAFB_GET_DRIVER_VERSION        0x56494112      /* 'VIA\12' */
+#define VIAFB_GET_CHIP_INFO             0x56494113      /* 'VIA\13' */
+#define VIAFB_SET_DEVICE_INFO           0x56494114
+#define VIAFB_GET_DEVICE_INFO           0x56494115
+
+#define VIAFB_GET_DEVICE_SUPPORT        0x56494118
+#define VIAFB_GET_DEVICE_CONNECT        0x56494119
+#define VIAFB_GET_PANEL_SUPPORT_EXPAND  0x5649411A
+#define VIAFB_GET_DRIVER_NAME           0x56494122
+#define VIAFB_GET_DEVICE_SUPPORT_STATE  0x56494123
+#define VIAFB_GET_GAMMA_LUT             0x56494124
+#define VIAFB_SET_GAMMA_LUT             0x56494125
+#define VIAFB_GET_GAMMA_SUPPORT_STATE   0x56494126
+#define VIAFB_SET_VIDEO_DEVICE          0x56494127
+#define VIAFB_GET_VIDEO_DEVICE          0x56494128
+#define VIAFB_SET_SECOND_MODE           0x56494129
+#define VIAFB_SYNC_SURFACE              0x56494130
+#define VIAFB_GET_DRIVER_CAPS           0x56494131
+#define VIAFB_GET_IGA_SCALING_INFO      0x56494132
+#define VIAFB_GET_PANEL_MAX_SIZE        0x56494133
+#define VIAFB_GET_PANEL_MAX_POSITION    0x56494134
+#define VIAFB_SET_PANEL_SIZE            0x56494135
+#define VIAFB_SET_PANEL_POSITION        0x56494136
+#define VIAFB_GET_PANEL_POSITION        0x56494137
+#define VIAFB_GET_PANEL_SIZE            0x56494138
+
+#define None_Device 0x00
+#define CRT_Device  0x01
+#define LCD_Device  0x02
+#define DVI_Device  0x08
+#define CRT2_Device 0x10
+#define LCD2_Device 0x40
+
+#define OP_LCD_CENTERING   0x01
+#define OP_LCD_PANEL_ID    0x02
+#define OP_LCD_MODE        0x03
+
+/*SAMM operation flag*/
+#define OP_SAMM            0x80
+
+#define LCD_PANEL_ID_MAXIMUM    22
+
+#define STATE_ON            0x1
+#define STATE_OFF           0x0
+#define STATE_DEFAULT       0xFFFF
+
+#define MAX_ACTIVE_DEV_NUM  2
+
+struct device_t {
+        unsigned short crt:1;
+        unsigned short dvi:1;
+        unsigned short lcd:1;
+        unsigned short samm:1;
+        unsigned short lcd_dsp_cent:1;
+        unsigned char lcd_mode:1;
+        unsigned short epia_dvi:1;
+        unsigned short lcd_dual_edge:1;
+        unsigned short lcd2:1;
+
+        unsigned short primary_dev;
+        unsigned char lcd_panel_id;
+        unsigned short xres, yres;
+        unsigned short xres1, yres1;
+        unsigned short refresh;
+        unsigned short bpp;
+        unsigned short refresh1;
+        unsigned short bpp1;
+        unsigned short sequence;
+        unsigned short bus_width;
+};
+
+struct viafb_ioctl_info {
+        u32 viafb_id;           /* for identifying viafb */
+#define VIAID       0x56494146  /* Identify myself with 'VIAF' */
+        u16 vendor_id;
+        u16 device_id;
+        u8 version;
+        u8 revision;
+        u8 reserved[246];       /* for future use */
+};
+
+struct viafb_ioctl_mode {
+        u32 xres;
+        u32 yres;
+        u32 refresh;
+        u32 bpp;
+        u32 xres_sec;
+        u32 yres_sec;
+        u32 virtual_xres_sec;
+        u32 virtual_yres_sec;
+        u32 refresh_sec;
+        u32 bpp_sec;
+};
+struct viafb_ioctl_samm {
+        u32 samm_status;
+        u32 size_prim;
+        u32 size_sec;
+        u32 mem_base;
+        u32 offset_sec;
+};
+
+struct viafb_driver_version {
+        int iMajorNum;
+        int iKernelNum;
+        int iOSNum;
+        int iMinorNum;
+};
+
+struct viafb_ioctl_lcd_attribute {
+        unsigned int panel_id;
+        unsigned int display_center;
+        unsigned int lcd_mode;
+};
+
+struct viafb_ioctl_setting {
+        /* Enable or disable active devices */
+        unsigned short device_flag;
+        /* Indicate which device should be turn on or turn off. */
+        unsigned short device_status;
+        unsigned int reserved;
+        /* Indicate which LCD's attribute can be changed. */
+        unsigned short lcd_operation_flag;
+        /* 1: SAMM ON  0: SAMM OFF */
+        unsigned short samm_status;
+        /* horizontal resolution of first device */
+        unsigned short first_dev_hor_res;
+        /* vertical resolution of first device */
+        unsigned short first_dev_ver_res;
+        /* horizontal resolution of second device */
+        unsigned short second_dev_hor_res;
+        /* vertical resolution of second device */
+        unsigned short second_dev_ver_res;
+        /* refresh rate of first device */
+        unsigned short first_dev_refresh;
+        /* bpp of first device */
+        unsigned short first_dev_bpp;
+        /* refresh rate of second device */
+        unsigned short second_dev_refresh;
+        /* bpp of second device */
+        unsigned short second_dev_bpp;
+        /* Indicate which device are primary display device. */
+        unsigned int primary_device;
+        /* Indicate which device will show video. only valid in duoview mode */
+        unsigned int video_device_status;
+        unsigned int struct_reserved[34];
+        struct viafb_ioctl_lcd_attribute lcd_attributes;
+};
+
+struct _UTFunctionCaps {
+        unsigned int dw3DScalingState;
+        unsigned int reserved[31];
+};
+
+struct _POSITIONVALUE {
+        unsigned int dwX;
+        unsigned int dwY;
+};
+
+struct _panel_size_pos_info {
+        unsigned int device_type;
+        int x;
+        int y;
+};
+
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+
+int viafb_ioctl_get_viafb_info(u_long arg);
+int viafb_ioctl_hotplug(int hres, int vres, int bpp);
+
+#endif /* __IOCTL_H__ */
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
new file mode 100644
index 000000000000..6c7290a6a447
--- /dev/null
+++ b/drivers/video/via/lcd.c
@@ -0,0 +1,1821 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+#include "lcdtbl.h"
+
+static struct iga2_shadow_crtc_timing iga2_shadow_crtc_reg = {
+        /* IGA2 Shadow Horizontal Total */
+        {IGA2_SHADOW_HOR_TOTAL_REG_NUM, {{CR6D, 0, 7}, {CR71, 3, 3} } },
+        /* IGA2 Shadow Horizontal Blank End */
+        {IGA2_SHADOW_HOR_BLANK_END_REG_NUM, {{CR6E, 0, 7} } },
+        /* IGA2 Shadow Vertical Total */
+        {IGA2_SHADOW_VER_TOTAL_REG_NUM, {{CR6F, 0, 7}, {CR71, 0, 2} } },
+        /* IGA2 Shadow Vertical Addressable Video */
+        {IGA2_SHADOW_VER_ADDR_REG_NUM, {{CR70, 0, 7}, {CR71, 4, 6} } },
+        /* IGA2 Shadow Vertical Blank Start */
+        {IGA2_SHADOW_VER_BLANK_START_REG_NUM,
+         {{CR72, 0, 7}, {CR74, 4, 6} } },
+        /* IGA2 Shadow Vertical Blank End */
+        {IGA2_SHADOW_VER_BLANK_END_REG_NUM, {{CR73, 0, 7}, {CR74, 0, 2} } },
+        /* IGA2 Shadow Vertical Sync Start */
+        {IGA2_SHADOW_VER_SYNC_START_REG_NUM, {{CR75, 0, 7}, {CR76, 4, 6} } },
+        /* IGA2 Shadow Vertical Sync End */
+        {IGA2_SHADOW_VER_SYNC_END_REG_NUM, {{CR76, 0, 3} } }
+};
+
+static struct _lcd_scaling_factor lcd_scaling_factor = {
+        /* LCD Horizontal Scaling Factor Register */
+        {LCD_HOR_SCALING_FACTOR_REG_NUM,
+         {{CR9F, 0, 1}, {CR77, 0, 7}, {CR79, 4, 5} } },
+        /* LCD Vertical Scaling Factor Register */
+        {LCD_VER_SCALING_FACTOR_REG_NUM,
+         {{CR79, 3, 3}, {CR78, 0, 7}, {CR79, 6, 7} } }
+};
+static struct _lcd_scaling_factor lcd_scaling_factor_CLE = {
+        /* LCD Horizontal Scaling Factor Register */
+        {LCD_HOR_SCALING_FACTOR_REG_NUM_CLE, {{CR77, 0, 7}, {CR79, 4, 5} } },
+        /* LCD Vertical Scaling Factor Register */
+        {LCD_VER_SCALING_FACTOR_REG_NUM_CLE, {{CR78, 0, 7}, {CR79, 6, 7} } }
+};
+
+static int check_lvds_chip(int device_id_subaddr, int device_id);
+static bool lvds_identify_integratedlvds(void);
+static int fp_id_to_vindex(int panel_id);
+static int lvds_register_read(int index);
+static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
+                      int panel_vres);
+static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
+        int panel_id);
+static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
+        int panel_id);
+static void load_lcd_patch_regs(int set_hres, int set_vres,
+        int panel_id, int set_iga);
+static void via_pitch_alignment_patch_lcd(
+        struct lvds_setting_information *plvds_setting_info,
+                                   struct lvds_chip_information
+                                   *plvds_chip_info);
+static void lcd_patch_skew_dvp0(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+static void lcd_patch_skew_dvp1(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+static void lcd_patch_skew(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info);
+
+static void integrated_lvds_disable(struct lvds_setting_information
+                             *plvds_setting_info,
+                             struct lvds_chip_information *plvds_chip_info);
+static void integrated_lvds_enable(struct lvds_setting_information
+                            *plvds_setting_info,
+                            struct lvds_chip_information *plvds_chip_info);
+static void lcd_powersequence_off(void);
+static void lcd_powersequence_on(void);
+static void fill_lcd_format(void);
+static void check_diport_of_integrated_lvds(
+        struct lvds_chip_information *plvds_chip_info,
+                                     struct lvds_setting_information
+                                     *plvds_setting_info);
+static struct display_timing lcd_centering_timging(struct display_timing
+                                            mode_crt_reg,
+                                           struct display_timing panel_crt_reg);
+static void load_crtc_shadow_timing(struct display_timing mode_timing,
+                             struct display_timing panel_timing);
+static void viafb_load_scaling_factor_for_p4m900(int set_hres,
+        int set_vres, int panel_hres, int panel_vres);
+
+static int check_lvds_chip(int device_id_subaddr, int device_id)
+{
+        if (lvds_register_read(device_id_subaddr) == device_id)
+                return OK;
+        else
+                return FAIL;
+}
+
+void viafb_init_lcd_size(void)
+{
+        DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");
+        DEBUG_MSG(KERN_INFO
+                "viaparinfo->lvds_setting_info->get_lcd_size_method %d\n",
+                viaparinfo->lvds_setting_info->get_lcd_size_method);
+
+        switch (viaparinfo->lvds_setting_info->get_lcd_size_method) {
+        case GET_LCD_SIZE_BY_SYSTEM_BIOS:
+                break;
+        case GET_LCD_SZIE_BY_HW_STRAPPING:
+                break;
+        case GET_LCD_SIZE_BY_VGA_BIOS:
+                DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n");
+                viaparinfo->lvds_setting_info->lcd_panel_size =
+                    fp_id_to_vindex(viafb_lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_size);
+                break;
+        case GET_LCD_SIZE_BY_USER_SETTING:
+                DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n");
+                viaparinfo->lvds_setting_info->lcd_panel_size =
+                    fp_id_to_vindex(viafb_lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_size);
+                break;
+        default:
+                DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n");
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID1_800X600;
+                viaparinfo->lvds_setting_info->lcd_panel_size =
+                    fp_id_to_vindex(LCD_PANEL_ID1_800X600);
+        }
+        viaparinfo->lvds_setting_info2->lcd_panel_id =
+                viaparinfo->lvds_setting_info->lcd_panel_id;
+        viaparinfo->lvds_setting_info2->lcd_panel_size =
+                viaparinfo->lvds_setting_info->lcd_panel_size;
+        viaparinfo->lvds_setting_info2->lcd_panel_hres =
+                viaparinfo->lvds_setting_info->lcd_panel_hres;
+        viaparinfo->lvds_setting_info2->lcd_panel_vres =
+                viaparinfo->lvds_setting_info->lcd_panel_vres;
+        viaparinfo->lvds_setting_info2->device_lcd_dualedge =
+            viaparinfo->lvds_setting_info->device_lcd_dualedge;
+        viaparinfo->lvds_setting_info2->LCDDithering =
+                viaparinfo->lvds_setting_info->LCDDithering;
+}
+
+static bool lvds_identify_integratedlvds(void)
+{
+        if (viafb_display_hardware_layout == HW_LAYOUT_LCD_EXTERNAL_LCD2) {
+                /* Two dual channel LCD (Internal LVDS + External LVDS): */
+                /* If we have an external LVDS, such as VT1636, we should
+                   have its chip ID already. */
+                if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                        viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name =
+                            INTEGRATED_LVDS;
+                        DEBUG_MSG(KERN_INFO "Support two dual channel LVDS!\
+                                  (Internal LVDS + External LVDS)\n");
+                } else {
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                            INTEGRATED_LVDS;
+                        DEBUG_MSG(KERN_INFO "Not found external LVDS,\
+                                  so can't support two dual channel LVDS!\n");
+                }
+        } else if (viafb_display_hardware_layout == HW_LAYOUT_LCD1_LCD2) {
+                /* Two single channel LCD (Internal LVDS + Internal LVDS): */
+                viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                INTEGRATED_LVDS;
+                viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name =
+                        INTEGRATED_LVDS;
+                DEBUG_MSG(KERN_INFO "Support two single channel LVDS!\
+                          (Internal LVDS + Internal LVDS)\n");
+        } else if (viafb_display_hardware_layout != HW_LAYOUT_DVI_ONLY) {
+                /* If we have found external LVDS, just use it,
+                   otherwise, we will use internal LVDS as default. */
+                if (!viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                            INTEGRATED_LVDS;
+                        DEBUG_MSG(KERN_INFO "Found Integrated LVDS!\n");
+                }
+        } else {
+                viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                        NON_LVDS_TRANSMITTER;
+                DEBUG_MSG(KERN_INFO "Do not support LVDS!\n");
+                return false;
+        }
+
+        return true;
+}
+
+int viafb_lvds_trasmitter_identify(void)
+{
+        viaparinfo->i2c_stuff.i2c_port = I2CPORTINDEX;
+        if (viafb_lvds_identify_vt1636()) {
+                viaparinfo->chip_info->lvds_chip_info.i2c_port = I2CPORTINDEX;
+                DEBUG_MSG(KERN_INFO
+                          "Found VIA VT1636 LVDS on port i2c 0x31 \n");
+        } else {
+                viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+                if (viafb_lvds_identify_vt1636()) {
+                        viaparinfo->chip_info->lvds_chip_info.i2c_port =
+                                GPIOPORTINDEX;
+                        DEBUG_MSG(KERN_INFO
+                                  "Found VIA VT1636 LVDS on port gpio 0x2c \n");
+                }
+        }
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700)
+                lvds_identify_integratedlvds();
+
+        if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name)
+                return true;
+        /* Check for VT1631: */
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = VT1631_LVDS;
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =
+                VT1631_LVDS_I2C_ADDR;
+
+        if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID) != FAIL) {
+                DEBUG_MSG(KERN_INFO "\n VT1631 LVDS ! \n");
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->lvds_chip_info.lvds_chip_name);
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->lvds_chip_info.lvds_chip_name);
+                return OK;
+        }
+
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                NON_LVDS_TRANSMITTER;
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =
+                VT1631_LVDS_I2C_ADDR;
+        return FAIL;
+}
+
+static int fp_id_to_vindex(int panel_id)
+{
+        DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n");
+
+        if (panel_id > LCD_PANEL_ID_MAXIMUM)
+                viafb_lcd_panel_id = panel_id =
+                viafb_read_reg(VIACR, CR3F) & 0x0F;
+
+        switch (panel_id) {
+        case 0x0:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 640;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 480;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID0_640X480;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_640X480;
+                break;
+        case 0x1:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 600;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID1_800X600;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_800X600;
+                break;
+        case 0x2:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1024X768;
+                break;
+        case 0x3:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X768;
+                break;
+        case 0x4:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID4_1280X1024;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X1024;
+                break;
+        case 0x5:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1050;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID5_1400X1050;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1400X1050;
+                break;
+        case 0x6:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1200;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID6_1600X1200;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1600X1200;
+                break;
+        case 0x8:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 480;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDA_800X480;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_800X480;
+                break;
+        case 0x9:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1024X768;
+                break;
+        case 0xA:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1024X768;
+                break;
+        case 0xB:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1024X768;
+                break;
+        case 0xC:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1280X768;
+                break;
+        case 0xD:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID4_1280X1024;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1280X1024;
+                break;
+        case 0xE:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1050;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID5_1400X1050;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1400X1050;
+                break;
+        case 0xF:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1200;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID6_1600X1200;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1600X1200;
+                break;
+        case 0x10:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1366;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID7_1366X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1368X768;
+                break;
+        case 0x11:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 600;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID8_1024X600;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1024X600;
+                break;
+        case 0x12:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X768;
+                break;
+        case 0x13:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID9_1280X800;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X800;
+                break;
+        case 0x14:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1360;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDB_1360X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1360X768;
+                break;
+        case 0x15:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1280X768;
+                break;
+        case 0x16:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 480;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 640;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDC_480X640;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_480X640;
+                break;
+        default:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 600;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID1_800X600;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_800X600;
+        }
+}
+
+static int lvds_register_read(int index)
+{
+        u8 data;
+
+        viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->
+            lvds_chip_info.lvds_chip_slave_addr,
+                        (u8) index, &data);
+        return data;
+}
+
+static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
+                      int panel_vres)
+{
+        int reg_value = 0;
+        int viafb_load_reg_num;
+        struct io_register *reg = NULL;
+
+        DEBUG_MSG(KERN_INFO "load_lcd_scaling()!!\n");
+
+        /* LCD Scaling Enable */
+        viafb_write_reg_mask(CR79, VIACR, 0x07, BIT0 + BIT1 + BIT2);
+        if (UNICHROME_P4M900 == viaparinfo->chip_info->gfx_chip_name) {
+                viafb_load_scaling_factor_for_p4m900(set_hres, set_vres,
+                                               panel_hres, panel_vres);
+                return;
+        }
+
+        /* Check if expansion for horizontal */
+        if (set_hres != panel_hres) {
+                /* Load Horizontal Scaling Factor */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        reg_value =
+                            CLE266_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor_CLE.lcd_hor_scaling_factor.
+                            reg_num;
+                        reg = lcd_scaling_factor_CLE.lcd_hor_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                        reg_value =
+                            K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
+                        /* Horizontal scaling enabled */
+                        viafb_write_reg_mask(CRA2, VIACR, 0xC0, BIT7 + BIT6);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor.lcd_hor_scaling_factor.reg_num;
+                        reg = lcd_scaling_factor.lcd_hor_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                }
+
+                DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d", reg_value);
+        } else {
+                /* Horizontal scaling disabled */
+                viafb_write_reg_mask(CRA2, VIACR, 0x00, BIT7);
+        }
+
+        /* Check if expansion for vertical */
+        if (set_vres != panel_vres) {
+                /* Load Vertical Scaling Factor */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        reg_value =
+                            CLE266_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor_CLE.lcd_ver_scaling_factor.
+                            reg_num;
+                        reg = lcd_scaling_factor_CLE.lcd_ver_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                        reg_value =
+                            K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
+                        /* Vertical scaling enabled */
+                        viafb_write_reg_mask(CRA2, VIACR, 0x08, BIT3);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor.lcd_ver_scaling_factor.reg_num;
+                        reg = lcd_scaling_factor.lcd_ver_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                }
+
+                DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d", reg_value);
+        } else {
+                /* Vertical scaling disabled */
+                viafb_write_reg_mask(CRA2, VIACR, 0x00, BIT3);
+        }
+}
+
+static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
+        int panel_id)
+{
+        int vmode_index;
+        int reg_num = 0;
+        struct io_reg *lcd_patch_reg = NULL;
+
+        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
+        else
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
+        switch (panel_id) {
+                /* LCD 800x600 */
+        case LCD_PANEL_ID1_800X600:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_8X6;
+                        lcd_patch_reg = K400_LCD_RES_6X4_8X6;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_8X6;
+                        lcd_patch_reg = K400_LCD_RES_7X4_8X6;
+                        break;
+                }
+                break;
+
+                /* LCD 1024x768 */
+        case LCD_PANEL_ID2_1024X768:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_10X7;
+                        lcd_patch_reg = K400_LCD_RES_6X4_10X7;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_10X7;
+                        lcd_patch_reg = K400_LCD_RES_7X4_10X7;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_10X7;
+                        lcd_patch_reg = K400_LCD_RES_8X6_10X7;
+                        break;
+                }
+                break;
+
+                /* LCD 1280x1024 */
+        case LCD_PANEL_ID4_1280X1024:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_12X10;
+                        lcd_patch_reg = K400_LCD_RES_6X4_12X10;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_12X10;
+                        lcd_patch_reg = K400_LCD_RES_7X4_12X10;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_12X10;
+                        lcd_patch_reg = K400_LCD_RES_8X6_12X10;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_12X10;
+                        lcd_patch_reg = K400_LCD_RES_10X7_12X10;
+                        break;
+
+                }
+                break;
+
+                /* LCD 1400x1050 */
+        case LCD_PANEL_ID5_1400X1050:
+                switch (vmode_index) {
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_14X10;
+                        lcd_patch_reg = K400_LCD_RES_6X4_14X10;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_14X10;
+                        lcd_patch_reg = K400_LCD_RES_8X6_14X10;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_14X10;
+                        lcd_patch_reg = K400_LCD_RES_10X7_14X10;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X800:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_14X10;
+                        lcd_patch_reg = K400_LCD_RES_12X10_14X10;
+                        break;
+                }
+                break;
+
+                /* LCD 1600x1200 */
+        case LCD_PANEL_ID6_1600X1200:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_16X12;
+                        lcd_patch_reg = K400_LCD_RES_6X4_16X12;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_16X12;
+                        lcd_patch_reg = K400_LCD_RES_7X4_16X12;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_16X12;
+                        lcd_patch_reg = K400_LCD_RES_8X6_16X12;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_16X12;
+                        lcd_patch_reg = K400_LCD_RES_10X7_16X12;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X800:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_16X12;
+                        lcd_patch_reg = K400_LCD_RES_12X10_16X12;
+                        break;
+                }
+                break;
+
+                /* LCD 1366x768 */
+        case LCD_PANEL_ID7_1366X768:
+                switch (vmode_index) {
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_6X4_1366X7;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_7X4_1366X7;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_8X6_1366X7;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_10X7_1366X7;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X800:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_12X10_1366X7;
+                        break;
+                }
+                break;
+
+                /* LCD 1360x768 */
+        case LCD_PANEL_IDB_1360X768:
+                break;
+        }
+        if (reg_num != 0) {
+                /* H.W. Reset : ON */
+                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+
+                viafb_write_regx(lcd_patch_reg, reg_num);
+
+                /* H.W. Reset : OFF */
+                viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+
+                /* Reset PLL */
+                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
+
+                /* Fire! */
+                outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);
+        }
+}
+
+static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
+        int panel_id)
+{
+        int vmode_index;
+        int reg_num = 0;
+        struct io_reg *lcd_patch_reg = NULL;
+
+        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
+        else
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
+
+        switch (panel_id) {
+        case LCD_PANEL_ID5_1400X1050:
+                switch (vmode_index) {
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_6X4_14X10;
+                        lcd_patch_reg = P880_LCD_RES_6X4_14X10;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_8X6_14X10;
+                        lcd_patch_reg = P880_LCD_RES_8X6_14X10;
+                        break;
+                }
+                break;
+        case LCD_PANEL_ID6_1600X1200:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_6X4_16X12;
+                        lcd_patch_reg = P880_LCD_RES_6X4_16X12;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_7X4_16X12;
+                        lcd_patch_reg = P880_LCD_RES_7X4_16X12;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_8X6_16X12;
+                        lcd_patch_reg = P880_LCD_RES_8X6_16X12;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_10X7_16X12;
+                        lcd_patch_reg = P880_LCD_RES_10X7_16X12;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_12X10_16X12;
+                        lcd_patch_reg = P880_LCD_RES_12X10_16X12;
+                        break;
+                }
+                break;
+
+        }
+        if (reg_num != 0) {
+                /* H.W. Reset : ON */
+                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+
+                viafb_write_regx(lcd_patch_reg, reg_num);
+
+                /* H.W. Reset : OFF */
+                viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+
+                /* Reset PLL */
+                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
+
+                /* Fire! */
+                outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);
+        }
+}
+
+static void load_lcd_patch_regs(int set_hres, int set_vres,
+        int panel_id, int set_iga)
+{
+        int vmode_index;
+
+        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
+        else
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
+
+        viafb_unlock_crt();
+
+        /* Patch for simultaneous & Expansion */
+        if ((set_iga == IGA1_IGA2) &&
+                (viaparinfo->lvds_setting_info->display_method ==
+            LCD_EXPANDSION)) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        load_lcd_k400_patch_tbl(set_hres, set_vres, panel_id);
+                        break;
+                case UNICHROME_K800:
+                        break;
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                        load_lcd_p880_patch_tbl(set_hres, set_vres, panel_id);
+                }
+        }
+
+        viafb_lock_crt();
+}
+
+static void via_pitch_alignment_patch_lcd(
+        struct lvds_setting_information *plvds_setting_info,
+                                   struct lvds_chip_information
+                                   *plvds_chip_info)
+{
+        unsigned char cr13, cr35, cr65, cr66, cr67;
+        unsigned long dwScreenPitch = 0;
+        unsigned long dwPitch;
+
+        dwPitch = plvds_setting_info->h_active * (plvds_setting_info->bpp >> 3);
+        if (dwPitch & 0x1F) {
+                dwScreenPitch = ((dwPitch + 31) & ~31) >> 3;
+                if (plvds_setting_info->iga_path == IGA2) {
+                        if (plvds_setting_info->bpp > 8) {
+                                cr66 = (unsigned char)(dwScreenPitch & 0xFF);
+                                viafb_write_reg(CR66, VIACR, cr66);
+                                cr67 = viafb_read_reg(VIACR, CR67) & 0xFC;
+                                cr67 |=
+                                    (unsigned
+                                     char)((dwScreenPitch & 0x300) >> 8);
+                                viafb_write_reg(CR67, VIACR, cr67);
+                        }
+
+                        /* Fetch Count */
+                        cr67 = viafb_read_reg(VIACR, CR67) & 0xF3;
+                        cr67 |= (unsigned char)((dwScreenPitch & 0x600) >> 7);
+                        viafb_write_reg(CR67, VIACR, cr67);
+                        cr65 = (unsigned char)((dwScreenPitch >> 1) & 0xFF);
+                        cr65 += 2;
+                        viafb_write_reg(CR65, VIACR, cr65);
+                } else {
+                        if (plvds_setting_info->bpp > 8) {
+                                cr13 = (unsigned char)(dwScreenPitch & 0xFF);
+                                viafb_write_reg(CR13, VIACR, cr13);
+                                cr35 = viafb_read_reg(VIACR, CR35) & 0x1F;
+                                cr35 |=
+                                    (unsigned
+                                     char)((dwScreenPitch & 0x700) >> 3);
+                                viafb_write_reg(CR35, VIACR, cr35);
+                        }
+                }
+        }
+}
+static void lcd_patch_skew_dvp0(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info)
+{
+        if (VT1636_LVDS == plvds_chip_info->lvds_chip_name) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_P4M900:
+                        viafb_vt1636_patch_skew_on_vt3364(plvds_setting_info,
+                                                    plvds_chip_info);
+                        break;
+                case UNICHROME_P4M890:
+                        viafb_vt1636_patch_skew_on_vt3327(plvds_setting_info,
+                                                    plvds_chip_info);
+                        break;
+                }
+        }
+}
+static void lcd_patch_skew_dvp1(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info)
+{
+        if (VT1636_LVDS == plvds_chip_info->lvds_chip_name) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CX700:
+                        viafb_vt1636_patch_skew_on_vt3324(plvds_setting_info,
+                                                    plvds_chip_info);
+                        break;
+                }
+        }
+}
+static void lcd_patch_skew(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info)
+{
+        DEBUG_MSG(KERN_INFO "lcd_patch_skew\n");
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_DVP0:
+                lcd_patch_skew_dvp0(plvds_setting_info, plvds_chip_info);
+                break;
+        case INTERFACE_DVP1:
+                lcd_patch_skew_dvp1(plvds_setting_info, plvds_chip_info);
+                break;
+        case INTERFACE_DFP_LOW:
+                if (UNICHROME_P4M900 == viaparinfo->chip_info->gfx_chip_name) {
+                        viafb_write_reg_mask(CR99, VIACR, 0x08,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                }
+                break;
+        }
+}
+
+/* LCD Set Mode */
+void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
+                  struct lvds_setting_information *plvds_setting_info,
+                  struct lvds_chip_information *plvds_chip_info)
+{
+        int video_index = plvds_setting_info->lcd_panel_size;
+        int set_iga = plvds_setting_info->iga_path;
+        int mode_bpp = plvds_setting_info->bpp;
+        int viafb_load_reg_num = 0;
+        int reg_value = 0;
+        int set_hres, set_vres;
+        int panel_hres, panel_vres;
+        u32 pll_D_N;
+        int offset;
+        struct io_register *reg = NULL;
+        struct display_timing mode_crt_reg, panel_crt_reg;
+        struct crt_mode_table *panel_crt_table = NULL;
+        struct VideoModeTable *vmode_tbl = NULL;
+
+        DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n");
+        /* Get mode table */
+        mode_crt_reg = mode_crt_table->crtc;
+        /* Get panel table Pointer */
+        vmode_tbl = viafb_get_modetbl_pointer(video_index);
+        panel_crt_table = vmode_tbl->crtc;
+        panel_crt_reg = panel_crt_table->crtc;
+        DEBUG_MSG(KERN_INFO "bellow viafb_lcd_set_mode!!\n");
+        set_hres = plvds_setting_info->h_active;
+        set_vres = plvds_setting_info->v_active;
+        panel_hres = plvds_setting_info->lcd_panel_hres;
+        panel_vres = plvds_setting_info->lcd_panel_vres;
+        if (VT1636_LVDS == plvds_chip_info->lvds_chip_name)
+                viafb_init_lvds_vt1636(plvds_setting_info, plvds_chip_info);
+        plvds_setting_info->vclk = panel_crt_table->clk;
+        if (set_iga == IGA1) {
+                /* IGA1 doesn't have LCD scaling, so set it as centering. */
+                viafb_load_crtc_timing(lcd_centering_timging
+                                 (mode_crt_reg, panel_crt_reg), IGA1);
+        } else {
+                /* Expansion */
+                if ((plvds_setting_info->display_method ==
+                     LCD_EXPANDSION) & ((set_hres != panel_hres)
+                                        || (set_vres != panel_vres))) {
+                        /* expansion timing IGA2 loaded panel set timing*/
+                        viafb_load_crtc_timing(panel_crt_reg, IGA2);
+                        DEBUG_MSG(KERN_INFO "viafb_load_crtc_timing!!\n");
+                        load_lcd_scaling(set_hres, set_vres, panel_hres,
+                                         panel_vres);
+                        DEBUG_MSG(KERN_INFO "load_lcd_scaling!!\n");
+                } else {        /* Centering */
+                        /* centering timing IGA2 always loaded panel
+                           and mode releative timing */
+                        viafb_load_crtc_timing(lcd_centering_timging
+                                         (mode_crt_reg, panel_crt_reg), IGA2);
+                        viafb_write_reg_mask(CR79, VIACR, 0x00,
+                                BIT0 + BIT1 + BIT2);
+                        /* LCD scaling disabled */
+                }
+        }
+
+        if (set_iga == IGA1_IGA2) {
+                load_crtc_shadow_timing(mode_crt_reg, panel_crt_reg);
+                /* Fill shadow registers */
+
+                switch (plvds_setting_info->lcd_panel_id) {
+                case LCD_PANEL_ID0_640X480:
+                        offset = 80;
+                        break;
+                case LCD_PANEL_ID1_800X600:
+                case LCD_PANEL_IDA_800X480:
+                        offset = 110;
+                        break;
+                case LCD_PANEL_ID2_1024X768:
+                        offset = 150;
+                        break;
+                case LCD_PANEL_ID3_1280X768:
+                case LCD_PANEL_ID4_1280X1024:
+                case LCD_PANEL_ID5_1400X1050:
+                case LCD_PANEL_ID9_1280X800:
+                        offset = 190;
+                        break;
+                case LCD_PANEL_ID6_1600X1200:
+                        offset = 250;
+                        break;
+                case LCD_PANEL_ID7_1366X768:
+                case LCD_PANEL_IDB_1360X768:
+                        offset = 212;
+                        break;
+                default:
+                        offset = 140;
+                        break;
+                }
+
+                /* Offset for simultaneous */
+                reg_value = offset;
+                viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;
+                reg = offset_reg.iga2_offset_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                DEBUG_MSG(KERN_INFO "viafb_load_reg!!\n");
+                viafb_load_fetch_count_reg(set_hres, 4, IGA2);
+                /* Fetch count for simultaneous */
+        } else {                /* SAMM */
+                /* Offset for IGA2 only */
+                viafb_load_offset_reg(set_hres, mode_bpp / 8, set_iga);
+                /* Fetch count for IGA2 only */
+                viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);
+
+                if ((viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
+                    && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
+                        viafb_load_FIFO_reg(set_iga, set_hres, set_vres);
+
+                viafb_set_color_depth(mode_bpp / 8, set_iga);
+        }
+
+        fill_lcd_format();
+
+        pll_D_N = viafb_get_clk_value(panel_crt_table[0].clk);
+        DEBUG_MSG(KERN_INFO "PLL=0x%x", pll_D_N);
+        viafb_set_vclock(pll_D_N, set_iga);
+
+        viafb_set_output_path(DEVICE_LCD, set_iga,
+                plvds_chip_info->output_interface);
+        lcd_patch_skew(plvds_setting_info, plvds_chip_info);
+
+        /* If K8M800, enable LCD Prefetch Mode. */
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800)
+            || (UNICHROME_K8M890 == viaparinfo->chip_info->gfx_chip_name))
+                viafb_write_reg_mask(CR6A, VIACR, 0x01, BIT0);
+
+        load_lcd_patch_regs(set_hres, set_vres,
+                            plvds_setting_info->lcd_panel_id, set_iga);
+
+        DEBUG_MSG(KERN_INFO "load_lcd_patch_regs!!\n");
+
+        /* Patch for non 32bit alignment mode */
+        via_pitch_alignment_patch_lcd(plvds_setting_info, plvds_chip_info);
+}
+
+static void integrated_lvds_disable(struct lvds_setting_information
+                             *plvds_setting_info,
+                             struct lvds_chip_information *plvds_chip_info)
+{
+        bool turn_off_first_powersequence = false;
+        bool turn_off_second_powersequence = false;
+        if (INTERFACE_LVDS0LVDS1 == plvds_chip_info->output_interface)
+                turn_off_first_powersequence = true;
+        if (INTERFACE_LVDS0 == plvds_chip_info->output_interface)
+                turn_off_first_powersequence = true;
+        if (INTERFACE_LVDS1 == plvds_chip_info->output_interface)
+                turn_off_second_powersequence = true;
+        if (turn_off_second_powersequence) {
+                /* Use second power sequence control: */
+
+                /* Turn off power sequence. */
+                viafb_write_reg_mask(CRD4, VIACR, 0, BIT1);
+
+                /* Turn off back light. */
+                viafb_write_reg_mask(CRD3, VIACR, 0xC0, BIT6 + BIT7);
+        }
+        if (turn_off_first_powersequence) {
+                /* Use first power sequence control: */
+
+                /* Turn off power sequence. */
+                viafb_write_reg_mask(CR6A, VIACR, 0, BIT3);
+
+                /* Turn off back light. */
+                viafb_write_reg_mask(CR91, VIACR, 0xC0, BIT6 + BIT7);
+        }
+
+        /* Turn DFP High/Low Pad off. */
+        viafb_write_reg_mask(SR2A, VIASR, 0, BIT0 + BIT1 + BIT2 + BIT3);
+
+        /* Power off LVDS channel. */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_LVDS0:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0x80, BIT7);
+                        break;
+                }
+
+        case INTERFACE_LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0x40, BIT6);
+                        break;
+                }
+
+        case INTERFACE_LVDS0LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0xC0, BIT6 + BIT7);
+                        break;
+                }
+        }
+}
+
+static void integrated_lvds_enable(struct lvds_setting_information
+                            *plvds_setting_info,
+                            struct lvds_chip_information *plvds_chip_info)
+{
+        bool turn_on_first_powersequence = false;
+        bool turn_on_second_powersequence = false;
+
+        DEBUG_MSG(KERN_INFO "integrated_lvds_enable, out_interface:%d\n",
+                  plvds_chip_info->output_interface);
+        if (plvds_setting_info->lcd_mode == LCD_SPWG)
+                viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT0 + BIT1);
+         else
+                viafb_write_reg_mask(CRD2, VIACR, 0x03, BIT0 + BIT1);
+        if (INTERFACE_LVDS0LVDS1 == plvds_chip_info->output_interface)
+                turn_on_first_powersequence = true;
+        if (INTERFACE_LVDS0 == plvds_chip_info->output_interface)
+                turn_on_first_powersequence = true;
+        if (INTERFACE_LVDS1 == plvds_chip_info->output_interface)
+                turn_on_second_powersequence = true;
+
+        if (turn_on_second_powersequence) {
+                /* Use second power sequence control: */
+
+                /* Use hardware control power sequence. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);
+
+                /* Turn on back light. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);
+
+                /* Turn on hardware power sequence. */
+                viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);
+        }
+        if (turn_on_first_powersequence) {
+                /* Use first power sequence control: */
+
+                /* Use hardware control power sequence. */
+                viafb_write_reg_mask(CR91, VIACR, 0, BIT0);
+
+                /* Turn on back light. */
+                viafb_write_reg_mask(CR91, VIACR, 0, BIT6 + BIT7);
+
+                /* Turn on hardware power sequence. */
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+        }
+
+        /* Turn DFP High/Low pad on. */
+        viafb_write_reg_mask(SR2A, VIASR, 0x0F, BIT0 + BIT1 + BIT2 + BIT3);
+
+        /* Power on LVDS channel. */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_LVDS0:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0, BIT7);
+                        break;
+                }
+
+        case INTERFACE_LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0, BIT6);
+                        break;
+                }
+
+        case INTERFACE_LVDS0LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0, BIT6 + BIT7);
+                        break;
+                }
+        }
+}
+
+void viafb_lcd_disable(void)
+{
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                lcd_powersequence_off();
+                /* DI1 pad off */
+                viafb_write_reg_mask(SR1E, VIASR, 0x00, 0x30);
+        } else if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                if (viafb_LCD2_ON
+                    && (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name))
+                        integrated_lvds_disable(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info2);
+                if (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name)
+                        integrated_lvds_disable(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info);
+                if (VT1636_LVDS == viaparinfo->chip_info->
+                        lvds_chip_info.lvds_chip_name)
+                        viafb_disable_lvds_vt1636(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info);
+        } else if (VT1636_LVDS ==
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                viafb_disable_lvds_vt1636(viaparinfo->lvds_setting_info,
+                                    &viaparinfo->chip_info->lvds_chip_info);
+        } else {
+                /* DFP-HL pad off          */
+                viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x0F);
+                /* Backlight off           */
+                viafb_write_reg_mask(SR3D, VIASR, 0x00, 0x20);
+                /* 24 bit DI data paht off */
+                viafb_write_reg_mask(CR91, VIACR, 0x80, 0x80);
+                /* Simultaneout disabled   */
+                viafb_write_reg_mask(CR6B, VIACR, 0x00, 0x08);
+        }
+
+        /* Disable expansion bit   */
+        viafb_write_reg_mask(CR79, VIACR, 0x00, 0x01);
+        /* CRT path set to IGA1    */
+        viafb_write_reg_mask(SR16, VIASR, 0x00, 0x40);
+        /* Simultaneout disabled   */
+        viafb_write_reg_mask(CR6B, VIACR, 0x00, 0x08);
+        /* IGA2 path disabled      */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x80);
+
+}
+
+void viafb_lcd_enable(void)
+{
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                /* DI1 pad on */
+                viafb_write_reg_mask(SR1E, VIASR, 0x30, 0x30);
+                lcd_powersequence_on();
+        } else if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                if (viafb_LCD2_ON && (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name))
+                        integrated_lvds_enable(viaparinfo->lvds_setting_info2, \
+                                &viaparinfo->chip_info->lvds_chip_info2);
+                if (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name)
+                        integrated_lvds_enable(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info);
+                if (VT1636_LVDS == viaparinfo->chip_info->
+                        lvds_chip_info.lvds_chip_name)
+                        viafb_enable_lvds_vt1636(viaparinfo->
+                        lvds_setting_info, &viaparinfo->chip_info->
+                        lvds_chip_info);
+        } else if (VT1636_LVDS ==
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                viafb_enable_lvds_vt1636(viaparinfo->lvds_setting_info,
+                                   &viaparinfo->chip_info->lvds_chip_info);
+        } else {
+                /* DFP-HL pad on           */
+                viafb_write_reg_mask(SR2A, VIASR, 0x0F, 0x0F);
+                /* Backlight on            */
+                viafb_write_reg_mask(SR3D, VIASR, 0x20, 0x20);
+                /* 24 bit DI data paht on  */
+                viafb_write_reg_mask(CR91, VIACR, 0x00, 0x80);
+
+                /* Set data source selection bit by iga path */
+                if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
+                        /* DFP-H set to IGA1       */
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, 0x10);
+                        /* DFP-L set to IGA1       */
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, 0x10);
+                } else {
+                        /* DFP-H set to IGA2       */
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, 0x10);
+                        /* DFP-L set to IGA2       */
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, 0x10);
+                }
+                /* LCD enabled             */
+                viafb_write_reg_mask(CR6A, VIACR, 0x48, 0x48);
+        }
+
+        if ((viaparinfo->lvds_setting_info->iga_path == IGA1)
+            || (viaparinfo->lvds_setting_info->iga_path == IGA1_IGA2)) {
+                /* CRT path set to IGA2    */
+                viafb_write_reg_mask(SR16, VIASR, 0x40, 0x40);
+                /* IGA2 path disabled      */
+                viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x80);
+                /* IGA2 path enabled       */
+        } else {                /* IGA2 */
+                viafb_write_reg_mask(CR6A, VIACR, 0x80, 0x80);
+        }
+
+}
+
+static void lcd_powersequence_off(void)
+{
+        int i, mask, data;
+
+        /* Software control power sequence */
+        viafb_write_reg_mask(CR91, VIACR, 0x11, 0x11);
+
+        for (i = 0; i < 3; i++) {
+                mask = PowerSequenceOff[0][i];
+                data = PowerSequenceOff[1][i] & mask;
+                viafb_write_reg_mask(CR91, VIACR, (u8) data, (u8) mask);
+                udelay(PowerSequenceOff[2][i]);
+        }
+
+        /* Disable LCD */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x08);
+}
+
+static void lcd_powersequence_on(void)
+{
+        int i, mask, data;
+
+        /* Software control power sequence */
+        viafb_write_reg_mask(CR91, VIACR, 0x11, 0x11);
+
+        /* Enable LCD */
+        viafb_write_reg_mask(CR6A, VIACR, 0x08, 0x08);
+
+        for (i = 0; i < 3; i++) {
+                mask = PowerSequenceOn[0][i];
+                data = PowerSequenceOn[1][i] & mask;
+                viafb_write_reg_mask(CR91, VIACR, (u8) data, (u8) mask);
+                udelay(PowerSequenceOn[2][i]);
+        }
+
+        udelay(1);
+}
+
+static void fill_lcd_format(void)
+{
+        u8 bdithering = 0, bdual = 0;
+
+        if (viaparinfo->lvds_setting_info->device_lcd_dualedge)
+                bdual = BIT4;
+        if (viaparinfo->lvds_setting_info->LCDDithering)
+                bdithering = BIT0;
+        /* Dual & Dithering */
+        viafb_write_reg_mask(CR88, VIACR, (bdithering | bdual), BIT4 + BIT0);
+}
+
+static void check_diport_of_integrated_lvds(
+        struct lvds_chip_information *plvds_chip_info,
+                                     struct lvds_setting_information
+                                     *plvds_setting_info)
+{
+        /* Determine LCD DI Port by hardware layout. */
+        switch (viafb_display_hardware_layout) {
+        case HW_LAYOUT_LCD_ONLY:
+                {
+                        if (plvds_setting_info->device_lcd_dualedge) {
+                                plvds_chip_info->output_interface =
+                                    INTERFACE_LVDS0LVDS1;
+                        } else {
+                                plvds_chip_info->output_interface =
+                                    INTERFACE_LVDS0;
+                        }
+
+                        break;
+                }
+
+        case HW_LAYOUT_DVI_ONLY:
+                {
+                        plvds_chip_info->output_interface = INTERFACE_NONE;
+                        break;
+                }
+
+        case HW_LAYOUT_LCD1_LCD2:
+        case HW_LAYOUT_LCD_EXTERNAL_LCD2:
+                {
+                        plvds_chip_info->output_interface =
+                            INTERFACE_LVDS0LVDS1;
+                        break;
+                }
+
+        case HW_LAYOUT_LCD_DVI:
+                {
+                        plvds_chip_info->output_interface = INTERFACE_LVDS1;
+                        break;
+                }
+
+        default:
+                {
+                        plvds_chip_info->output_interface = INTERFACE_LVDS1;
+                        break;
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO
+                  "Display Hardware Layout: 0x%x, LCD DI Port: 0x%x\n",
+                  viafb_display_hardware_layout,
+                  plvds_chip_info->output_interface);
+}
+
+void viafb_init_lvds_output_interface(struct lvds_chip_information
+                                *plvds_chip_info,
+                                struct lvds_setting_information
+                                *plvds_setting_info)
+{
+        if (INTERFACE_NONE != plvds_chip_info->output_interface) {
+                /*Do nothing, lcd port is specified by module parameter */
+                return;
+        }
+
+        switch (plvds_chip_info->lvds_chip_name) {
+
+        case VT1636_LVDS:
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CX700:
+                        plvds_chip_info->output_interface = INTERFACE_DVP1;
+                        break;
+                case UNICHROME_CN700:
+                        plvds_chip_info->output_interface = INTERFACE_DFP_LOW;
+                        break;
+                default:
+                        plvds_chip_info->output_interface = INTERFACE_DVP0;
+                        break;
+                }
+                break;
+
+        case INTEGRATED_LVDS:
+                check_diport_of_integrated_lvds(plvds_chip_info,
+                                                plvds_setting_info);
+                break;
+
+        default:
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_P4M890:
+                        plvds_chip_info->output_interface = INTERFACE_DFP_LOW;
+                        break;
+                default:
+                        plvds_chip_info->output_interface = INTERFACE_DFP;
+                        break;
+                }
+                break;
+        }
+}
+
+static struct display_timing lcd_centering_timging(struct display_timing
+                                            mode_crt_reg,
+                                            struct display_timing panel_crt_reg)
+{
+        struct display_timing crt_reg;
+
+        crt_reg.hor_total = panel_crt_reg.hor_total;
+        crt_reg.hor_addr = mode_crt_reg.hor_addr;
+        crt_reg.hor_blank_start =
+            (panel_crt_reg.hor_addr - mode_crt_reg.hor_addr) / 2 +
+            crt_reg.hor_addr;
+        crt_reg.hor_blank_end = panel_crt_reg.hor_blank_end;
+        crt_reg.hor_sync_start =
+            (panel_crt_reg.hor_sync_start -
+             panel_crt_reg.hor_blank_start) + crt_reg.hor_blank_start;
+        crt_reg.hor_sync_end = panel_crt_reg.hor_sync_end;
+
+        crt_reg.ver_total = panel_crt_reg.ver_total;
+        crt_reg.ver_addr = mode_crt_reg.ver_addr;
+        crt_reg.ver_blank_start =
+            (panel_crt_reg.ver_addr - mode_crt_reg.ver_addr) / 2 +
+            crt_reg.ver_addr;
+        crt_reg.ver_blank_end = panel_crt_reg.ver_blank_end;
+        crt_reg.ver_sync_start =
+            (panel_crt_reg.ver_sync_start -
+             panel_crt_reg.ver_blank_start) + crt_reg.ver_blank_start;
+        crt_reg.ver_sync_end = panel_crt_reg.ver_sync_end;
+
+        return crt_reg;
+}
+
+static void load_crtc_shadow_timing(struct display_timing mode_timing,
+                             struct display_timing panel_timing)
+{
+        struct io_register *reg = NULL;
+        int i;
+        int viafb_load_reg_Num = 0;
+        int reg_value = 0;
+
+        if (viaparinfo->lvds_setting_info->display_method == LCD_EXPANDSION) {
+                /* Expansion */
+                for (i = 12; i < 20; i++) {
+                        switch (i) {
+                        case H_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.hor_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.hor_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;
+                                break;
+                        case H_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.hor_blank_start,
+                                     panel_timing.hor_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg;
+                                break;
+                        case V_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.ver_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;
+                                break;
+                        case V_ADDR_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_ADDR_SHADOW_FORMULA
+                                    (panel_timing.ver_addr);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_addr_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;
+                                break;
+                        case V_BLANK_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_START_SHADOW_FORMULA
+                                    (panel_timing.ver_blank_start);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg;
+                                break;
+                        case V_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.ver_blank_start,
+                                     panel_timing.ver_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg;
+                                break;
+                        case V_SYNC_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_START_SHADOW_FORMULA
+                                    (panel_timing.ver_sync_start);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_start_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_start_shadow.reg;
+                                break;
+                        case V_SYNC_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_END_SHADOW_FORMULA
+                                    (panel_timing.ver_sync_start,
+                                     panel_timing.ver_sync_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_end_shadow.reg;
+                                break;
+                        }
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_Num, reg, VIACR);
+                }
+        } else {                /* Centering */
+                for (i = 12; i < 20; i++) {
+                        switch (i) {
+                        case H_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.hor_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.hor_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;
+                                break;
+                        case H_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.hor_blank_start,
+                                     panel_timing.hor_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg;
+                                break;
+                        case V_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.ver_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;
+                                break;
+                        case V_ADDR_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_ADDR_SHADOW_FORMULA
+                                    (mode_timing.ver_addr);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_addr_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;
+                                break;
+                        case V_BLANK_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_START_SHADOW_FORMULA
+                                    (mode_timing.ver_blank_start);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg;
+                                break;
+                        case V_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.ver_blank_start,
+                                     panel_timing.ver_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg;
+                                break;
+                        case V_SYNC_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_START_SHADOW_FORMULA(
+                                    (panel_timing.ver_sync_start -
+                                    panel_timing.ver_blank_start) +
+                                    (panel_timing.ver_addr -
+                                    mode_timing.ver_addr) / 2 +
+                                    mode_timing.ver_addr);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_sync_start_shadow.
+                                    reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.ver_sync_start_shadow.
+                                    reg;
+                                break;
+                        case V_SYNC_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_END_SHADOW_FORMULA(
+                                    (panel_timing.ver_sync_start -
+                                    panel_timing.ver_blank_start) +
+                                    (panel_timing.ver_addr -
+                                    mode_timing.ver_addr) / 2 +
+                                    mode_timing.ver_addr,
+                                    panel_timing.ver_sync_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_sync_end_shadow.
+                                    reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.ver_sync_end_shadow.
+                                    reg;
+                                break;
+                        }
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_Num, reg, VIACR);
+                }
+        }
+}
+
+bool viafb_lcd_get_mobile_state(bool *mobile)
+{
+        unsigned char *romptr, *tableptr;
+        u8 core_base;
+        unsigned char *biosptr;
+        /* Rom address */
+        u32 romaddr = 0x000C0000;
+        u16 start_pattern = 0;
+
+        biosptr = ioremap(romaddr, 0x10000);
+
+        memcpy(&start_pattern, biosptr, 2);
+        /* Compare pattern */
+        if (start_pattern == 0xAA55) {
+                /* Get the start of Table */
+                /* 0x1B means BIOS offset position */
+                romptr = biosptr + 0x1B;
+                tableptr = biosptr + *((u16 *) romptr);
+
+                /* Get the start of biosver structure */
+                /* 18 means BIOS version position. */
+                romptr = tableptr + 18;
+                romptr = biosptr + *((u16 *) romptr);
+
+                /* The offset should be 44, but the
+                   actual image is less three char. */
+                /* pRom += 44; */
+                romptr += 41;
+
+                core_base = *romptr++;
+
+                if (core_base & 0x8)
+                        *mobile = false;
+                else
+                        *mobile = true;
+                /* release memory */
+                iounmap(biosptr);
+
+                return true;
+        } else {
+                iounmap(biosptr);
+                return false;
+        }
+}
+
+static void viafb_load_scaling_factor_for_p4m900(int set_hres,
+        int set_vres, int panel_hres, int panel_vres)
+{
+        int h_scaling_factor;
+        int v_scaling_factor;
+        u8 cra2 = 0;
+        u8 cr77 = 0;
+        u8 cr78 = 0;
+        u8 cr79 = 0;
+        u8 cr9f = 0;
+        /* Check if expansion for horizontal */
+        if (set_hres < panel_hres) {
+                /* Load Horizontal Scaling Factor */
+
+                /* For VIA_K8M800 or later chipsets. */
+                h_scaling_factor =
+                    K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
+                /* HSCaleFactor[1:0] at CR9F[1:0] */
+                cr9f = h_scaling_factor & 0x0003;
+                /* HSCaleFactor[9:2] at CR77[7:0] */
+                cr77 = (h_scaling_factor & 0x03FC) >> 2;
+                /* HSCaleFactor[11:10] at CR79[5:4] */
+                cr79 = (h_scaling_factor & 0x0C00) >> 10;
+                cr79 <<= 4;
+
+                /* Horizontal scaling enabled */
+                cra2 = 0xC0;
+
+                DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d\n",
+                          h_scaling_factor);
+        } else {
+                /* Horizontal scaling disabled */
+                cra2 = 0x00;
+        }
+
+        /* Check if expansion for vertical */
+        if (set_vres < panel_vres) {
+                /* Load Vertical Scaling Factor */
+
+                /* For VIA_K8M800 or later chipsets. */
+                v_scaling_factor =
+                    K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
+
+                /* Vertical scaling enabled */
+                cra2 |= 0x08;
+                /* VSCaleFactor[0] at CR79[3] */
+                cr79 |= ((v_scaling_factor & 0x0001) << 3);
+                /* VSCaleFactor[8:1] at CR78[7:0] */
+                cr78 |= (v_scaling_factor & 0x01FE) >> 1;
+                /* VSCaleFactor[10:9] at CR79[7:6] */
+                cr79 |= ((v_scaling_factor & 0x0600) >> 9) << 6;
+
+                DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d\n",
+                          v_scaling_factor);
+        } else {
+                /* Vertical scaling disabled */
+                cra2 |= 0x00;
+        }
+
+        viafb_write_reg_mask(CRA2, VIACR, cra2, BIT3 + BIT6 + BIT7);
+        viafb_write_reg_mask(CR77, VIACR, cr77, 0xFF);
+        viafb_write_reg_mask(CR78, VIACR, cr78, 0xFF);
+        viafb_write_reg_mask(CR79, VIACR, cr79, 0xF8);
+        viafb_write_reg_mask(CR9F, VIACR, cr9f, BIT0 + BIT1);
+}
diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h
new file mode 100644
index 000000000000..071f47cf5be1
--- /dev/null
+++ b/drivers/video/via/lcd.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __LCD_H__
+#define __LCD_H__
+
+/*Definition TMDS Device ID register*/
+#define     VT1631_DEVICE_ID_REG        0x02
+#define     VT1631_DEVICE_ID            0x92
+
+#define     VT3271_DEVICE_ID_REG        0x02
+#define     VT3271_DEVICE_ID            0x71
+
+#define     GET_LCD_SIZE_BY_SYSTEM_BIOS     0x01
+#define     GET_LCD_SIZE_BY_VGA_BIOS        0x02
+#define     GET_LCD_SZIE_BY_HW_STRAPPING    0x03
+#define     GET_LCD_SIZE_BY_USER_SETTING    0x04
+
+/* Definition DVI Panel ID*/
+/* Resolution: 640x480,   Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID0_640X480       0x00
+/* Resolution: 800x600,   Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID1_800X600       0x01
+/* Resolution: 1024x768,  Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID2_1024X768      0x02
+/* Resolution: 1280x768,  Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID3_1280X768      0x03
+/* Resolution: 1280x1024, Channel: dual,   Dithering: Enable */
+#define     LCD_PANEL_ID4_1280X1024     0x04
+/* Resolution: 1400x1050, Channel: dual,   Dithering: Enable */
+#define     LCD_PANEL_ID5_1400X1050     0x05
+/* Resolution: 1600x1200, Channel: dual,   Dithering: Enable */
+#define     LCD_PANEL_ID6_1600X1200     0x06
+/* Resolution: 1366x768,  Channel: single, Dithering: Disable */
+#define     LCD_PANEL_ID7_1366X768      0x07
+/* Resolution: 1024x600,  Channel: single, Dithering: Enable*/
+#define     LCD_PANEL_ID8_1024X600      0x08
+/* Resolution: 1280x800,  Channel: single, Dithering: Enable*/
+#define     LCD_PANEL_ID9_1280X800      0x09
+/* Resolution: 800x480,   Channel: single, Dithering: Enable*/
+#define     LCD_PANEL_IDA_800X480       0x0A
+/* Resolution: 1360x768,   Channel: single, Dithering: Disable*/
+#define     LCD_PANEL_IDB_1360X768     0x0B
+/* Resolution: 480x640,  Channel: single, Dithering: Enable */
+#define     LCD_PANEL_IDC_480X640      0x0C
+
+
+extern int viafb_LCD2_ON;
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+
+void viafb_disable_lvds_vt1636(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+void viafb_enable_lvds_vt1636(struct lvds_setting_information
+                        *plvds_setting_info,
+                        struct lvds_chip_information *plvds_chip_info);
+void viafb_lcd_disable(void);
+void viafb_lcd_enable(void);
+void viafb_init_lcd_size(void);
+void viafb_init_lvds_output_interface(struct lvds_chip_information
+                                *plvds_chip_info,
+                                struct lvds_setting_information
+                                *plvds_setting_info);
+void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
+                  struct lvds_setting_information *plvds_setting_info,
+                  struct lvds_chip_information *plvds_chip_info);
+int viafb_lvds_trasmitter_identify(void);
+void viafb_init_lvds_output_interface(struct lvds_chip_information
+                                *plvds_chip_info,
+                                struct lvds_setting_information
+                                *plvds_setting_info);
+bool viafb_lcd_get_mobile_state(bool *mobile);
+void viafb_load_crtc_timing(struct display_timing device_timing,
+        int set_iga);
+
+#endif /* __LCD_H__ */
diff --git a/drivers/video/via/lcdtbl.h b/drivers/video/via/lcdtbl.h
new file mode 100644
index 000000000000..6f3dd800be59
--- /dev/null
+++ b/drivers/video/via/lcdtbl.h
@@ -0,0 +1,591 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __LCDTBL_H__
+#define __LCDTBL_H__
+
+#include "share.h"
+
+/* CLE266 Software Power Sequence */
+/* {Mask}, {Data}, {Delay} */
+int PowerSequenceOn[3][3] =
+    { {0x10, 0x08, 0x06}, {0x10, 0x08, 0x06}, {0x19, 0x1FE, 0x01} };
+int PowerSequenceOff[3][3] =
+    { {0x06, 0x08, 0x10}, {0x00, 0x00, 0x00}, {0xD2, 0x19, 0x01} };
+
+/* ++++++ P880 ++++++ */
+/*   Panel 1600x1200   */
+struct io_reg P880_LCD_RES_6X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x73}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x73}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5A}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x5E},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xD6}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x7D}, {VIASR, SR45, 0xFF, 0x8C},
+        {VIASR, SR46, 0xFF, 0x02}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_6X4_16X12 ARRAY_SIZE(P880_LCD_RES_6X4_16X12)
+
+struct io_reg P880_LCD_RES_7X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x67}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x67}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x74}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x78},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF5}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x78}, {VIASR, SR45, 0xFF, 0x8C},
+        {VIASR, SR46, 0xFF, 0x01}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_7X4_16X12 ARRAY_SIZE(P880_LCD_RES_7X4_16X12)
+
+struct io_reg P880_LCD_RES_8X6_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xE1}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x6D}, {VIASR, SR45, 0xFF, 0x88},
+        {VIASR, SR46, 0xFF, 0x03}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_8X6_16X12 ARRAY_SIZE(P880_LCD_RES_8X6_16X12)
+
+struct io_reg P880_LCD_RES_10X7_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xAB}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xAF},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF0}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x92}, {VIASR, SR45, 0xFF, 0x88},
+        {VIASR, SR46, 0xFF, 0x03}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_10X7_16X12 ARRAY_SIZE(P880_LCD_RES_10X7_16X12)
+
+struct io_reg P880_LCD_RES_12X10_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x7D}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x7D}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xD0}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD4},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xFA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0xF6}, {VIASR, SR45, 0xFF, 0x88},
+        {VIASR, SR46, 0xFF, 0x05}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_12X10_16X12 ARRAY_SIZE(P880_LCD_RES_12X10_16X12)
+
+/*   Panel 1400x1050   */
+struct io_reg P880_LCD_RES_6X4_14X10[] = {
+        /* 640x480                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xB4}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR44, 0xFF, 0xC6}, {VIASR, SR45, 0xFF, 0x8C},
+        {VIASR, SR46, 0xFF, 0x05}
+};
+
+#define NUM_TOTAL_P880_LCD_RES_6X4_14X10 ARRAY_SIZE(P880_LCD_RES_6X4_14X10)
+
+struct io_reg P880_LCD_RES_8X6_14X10[] = {
+        /* 800x600                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR44, 0xFF, 0x06}, {VIASR, SR45, 0xFF, 0x8D},
+        {VIASR, SR46, 0xFF, 0x05}
+};
+
+#define NUM_TOTAL_P880_LCD_RES_8X6_14X10 ARRAY_SIZE(P880_LCD_RES_8X6_14X10)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1600x1200   */
+struct io_reg K400_LCD_RES_6X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x73}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x73}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5A}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x5E},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xDA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0xC4}, {VIASR, SR47, 0xFF, 0x7F}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_16X12 ARRAY_SIZE(K400_LCD_RES_6X4_16X12)
+
+struct io_reg K400_LCD_RES_7X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x67}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x67}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x74}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x78},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF5}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x46}, {VIASR, SR47, 0xFF, 0x3D}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_16X12 ARRAY_SIZE(K400_LCD_RES_7X4_16X12)
+
+struct io_reg K400_LCD_RES_8X6_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xE1}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x85}, {VIASR, SR47, 0xFF, 0x6F}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_16X12 ARRAY_SIZE(K400_LCD_RES_8X6_16X12)
+
+struct io_reg K400_LCD_RES_10X7_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xAB}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xAF},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF0}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x45}, {VIASR, SR47, 0xFF, 0x4A}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_16X12 ARRAY_SIZE(K400_LCD_RES_10X7_16X12)
+
+struct io_reg K400_LCD_RES_12X10_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x7D}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x7D}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xD0}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD4},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xFA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x47}, {VIASR, SR47, 0xFF, 0x7C}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_12X10_16X12 ARRAY_SIZE(K400_LCD_RES_12X10_16X12)
+
+/*   Panel 1400x1050   */
+struct io_reg K400_LCD_RES_6X4_14X10[] = {
+        /* 640x400                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xB4}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x19}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_14X10 ARRAY_SIZE(K400_LCD_RES_6X4_14X10)
+
+struct io_reg K400_LCD_RES_8X6_14X10[] = {
+        /* 800x600                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x21}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_14X10 ARRAY_SIZE(K400_LCD_RES_8X6_14X10)
+
+struct io_reg K400_LCD_RES_10X7_14X10[] = {
+        /* 1024x768                         */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xA7},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC3}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_14X10 ARRAY_SIZE(K400_LCD_RES_10X7_14X10)
+
+struct io_reg K400_LCD_RES_12X10_14X10[] = {
+        /* 1280x768, 1280x960, 1280x1024    */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x97}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x97}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xCE}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD2},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC9}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0x79}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_12X10_14X10 ARRAY_SIZE(K400_LCD_RES_12X10_14X10)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1366x768   */
+struct io_reg K400_LCD_RES_6X4_1366X7[] = {
+        /* 640x400                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x47}, {VIACR, CR55, 0x0F, 0x35},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x47}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x60}, {VIACR, CR71, 0x08, 0x23},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x64},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0x4C}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_1366X7 ARRAY_SIZE(K400_LCD_RES_6X4_1366X7)
+
+struct io_reg K400_LCD_RES_7X4_1366X7[] = {
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x3B}, {VIACR, CR55, 0x0F, 0x35},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x3B}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x71}, {VIACR, CR71, 0x08, 0x23},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x75},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0x96}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x10}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_1366X7 ARRAY_SIZE(K400_LCD_RES_7X4_1366X7)
+
+struct io_reg K400_LCD_RES_8X6_1366X7[] = {
+        /* 800x600                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x37}, {VIACR, CR55, 0x0F, 0x35},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x37}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x7E}, {VIACR, CR71, 0x08, 0x23},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x82},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0xB9}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_1366X7 ARRAY_SIZE(K400_LCD_RES_8X6_1366X7)
+
+struct io_reg K400_LCD_RES_10X7_1366X7[] = {
+        /* 1024x768                         */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xA7},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC3}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_1366X7 ARRAY_SIZE(K400_LCD_RES_10X7_1366X7)
+
+struct io_reg K400_LCD_RES_12X10_1366X7[] = {
+        /* 1280x768, 1280x960, 1280x1024    */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x97}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x97}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xCE}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD2},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC9}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0x79}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_12X10_1366X7\
+                        ARRAY_SIZE(K400_LCD_RES_12X10_1366X7)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1280x1024   */
+struct io_reg K400_LCD_RES_6X4_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xAA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x19}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_12X10 ARRAY_SIZE(K400_LCD_RES_6X4_12X10)
+
+struct io_reg K400_LCD_RES_7X4_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x68}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x6C},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xA8}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0xED}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_12X10 ARRAY_SIZE(K400_LCD_RES_7X4_12X10)
+
+struct io_reg K400_LCD_RES_8X6_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x21}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_12X10 ARRAY_SIZE(K400_LCD_RES_8X6_12X10)
+
+struct io_reg K400_LCD_RES_10X7_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xA7},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x04},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_12X10 ARRAY_SIZE(K400_LCD_RES_10X7_12X10)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1024x768    */
+struct io_reg K400_LCD_RES_6X4_10X7[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x47}, {VIACR, CR55, 0x0F, 0x35},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x47}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x60}, {VIACR, CR71, 0x08, 0x23},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x64},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0x4C}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_10X7 ARRAY_SIZE(K400_LCD_RES_6X4_10X7)
+
+struct io_reg K400_LCD_RES_7X4_10X7[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x3B}, {VIACR, CR55, 0x0F, 0x35},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x3B}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x71}, {VIACR, CR71, 0x08, 0x23},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x75},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x96}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x10}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_10X7 ARRAY_SIZE(K400_LCD_RES_7X4_10X7)
+
+struct io_reg K400_LCD_RES_8X6_10X7[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x37}, {VIACR, CR55, 0x0F, 0x35},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x37}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7E}, {VIACR, CR71, 0x08, 0x23},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x82},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0xB9}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_10X7 ARRAY_SIZE(K400_LCD_RES_8X6_10X7)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 800x600     */
+struct io_reg K400_LCD_RES_6X4_8X6[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x1A}, {VIACR, CR55, 0x0F, 0x34},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x1A}, {VIACR, CR54, 0x38, 0xE3},
+        {VIACR, CR5D, 0x40, 0x12},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x22},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x6E}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x86}, {VIASR, SR47, 0xFF, 0xB3}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_8X6 ARRAY_SIZE(K400_LCD_RES_6X4_8X6)
+
+struct io_reg K400_LCD_RES_7X4_8X6[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x1F}, {VIACR, CR55, 0x0F, 0x34},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x1F}, {VIACR, CR54, 0x38, 0xE3},
+        {VIACR, CR5D, 0x40, 0x12},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x22},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x78}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0xC4}, {VIASR, SR47, 0xFF, 0x59}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_8X6 ARRAY_SIZE(K400_LCD_RES_7X4_8X6)
+
+#endif /* __LCDTBL_H__ */
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h
new file mode 100644
index 000000000000..2e1254da9c8c
--- /dev/null
+++ b/drivers/video/via/share.h
@@ -0,0 +1,1105 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SHARE_H__
+#define __SHARE_H__
+
+/* Define Return Value */
+#define FAIL        -1
+#define OK          1
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+/* Define Bit Field */
+#define BIT0    0x01
+#define BIT1    0x02
+#define BIT2    0x04
+#define BIT3    0x08
+#define BIT4    0x10
+#define BIT5    0x20
+#define BIT6    0x40
+#define BIT7    0x80
+
+/* Video Memory Size */
+#define VIDEO_MEMORY_SIZE_16M    0x1000000
+
+/* Definition Mode Index
+*/
+#define     VIA_RES_640X480                     0
+#define     VIA_RES_800X600                     1
+#define     VIA_RES_1024X768                    2
+#define     VIA_RES_1152X864                    3
+#define     VIA_RES_1280X1024                   4
+#define     VIA_RES_1600X1200                   5
+#define     VIA_RES_1440X1050                   6
+#define     VIA_RES_1280X768                    7
+#define     VIA_RES_1280X960                    8
+#define     VIA_RES_1920X1440                   9
+#define     VIA_RES_848X480                     10
+#define     VIA_RES_1400X1050                   11
+#define     VIA_RES_720X480                     12
+#define     VIA_RES_720X576                     13
+#define     VIA_RES_1024X512                    14
+#define     VIA_RES_856X480                     15
+#define     VIA_RES_1024X576                    16
+#define     VIA_RES_640X400                     17
+#define     VIA_RES_1280X720                    18
+#define     VIA_RES_1920X1080                   19
+#define     VIA_RES_800X480                     20
+#define     VIA_RES_1368X768                    21
+#define     VIA_RES_1024X600                    22
+#define     VIA_RES_1280X800                    23
+#define     VIA_RES_1680X1050                   24
+#define     VIA_RES_960X600                     25
+#define     VIA_RES_1000X600                    26
+#define     VIA_RES_1088X612                    27
+#define     VIA_RES_1152X720                    28
+#define     VIA_RES_1200X720                    29
+#define     VIA_RES_1280X600                    30
+#define     VIA_RES_1360X768                    31
+#define     VIA_RES_1366X768                    32
+#define     VIA_RES_1440X900                    33
+#define     VIA_RES_1600X900                    34
+#define     VIA_RES_1600X1024                   35
+#define     VIA_RES_1792X1344                   36
+#define     VIA_RES_1856X1392                   37
+#define     VIA_RES_1920X1200                   38
+#define     VIA_RES_2048X1536                   39
+#define     VIA_RES_480X640                     40
+
+/*Reduce Blanking*/
+#define     VIA_RES_1360X768_RB                 131
+#define     VIA_RES_1440X900_RB                 133
+#define     VIA_RES_1400X1050_RB                111
+#define     VIA_RES_1600X900_RB                 134
+#define     VIA_RES_1680X1050_RB                124
+#define     VIA_RES_1920X1080_RB                119
+#define     VIA_RES_1920X1200_RB                138
+
+#define     VIA_RES_INVALID                     255
+
+/* standard VGA IO port
+*/
+#define VIARMisc    0x3CC
+#define VIAWMisc    0x3C2
+#define VIAStatus   0x3DA
+#define VIACR       0x3D4
+#define VIASR       0x3C4
+#define VIAGR       0x3CE
+#define VIAAR       0x3C0
+
+#define StdCR       0x19
+#define StdSR       0x04
+#define StdGR       0x09
+#define StdAR       0x14
+
+#define PatchCR     11
+
+/* Display path */
+#define IGA1        1
+#define IGA2        2
+#define IGA1_IGA2   3
+
+/* Define Color Depth  */
+#define MODE_8BPP       1
+#define MODE_16BPP      2
+#define MODE_32BPP      4
+
+#define GR20    0x20
+#define GR21    0x21
+#define GR22    0x22
+
+/* Sequencer Registers */
+#define SR01    0x01
+#define SR10    0x10
+#define SR12    0x12
+#define SR15    0x15
+#define SR16    0x16
+#define SR17    0x17
+#define SR18    0x18
+#define SR1B    0x1B
+#define SR1A    0x1A
+#define SR1C    0x1C
+#define SR1D    0x1D
+#define SR1E    0x1E
+#define SR1F    0x1F
+#define SR20    0x20
+#define SR21    0x21
+#define SR22    0x22
+#define SR2A    0x2A
+#define SR2D    0x2D
+#define SR2E    0x2E
+
+#define SR30    0x30
+#define SR39    0x39
+#define SR3D    0x3D
+#define SR3E    0x3E
+#define SR3F    0x3F
+#define SR40    0x40
+#define SR43    0x43
+#define SR44    0x44
+#define SR45    0x45
+#define SR46    0x46
+#define SR47    0x47
+#define SR48    0x48
+#define SR49    0x49
+#define SR4A    0x4A
+#define SR4B    0x4B
+#define SR4C    0x4C
+#define SR52    0x52
+#define SR5E    0x5E
+#define SR65    0x65
+
+/* CRT Controller Registers */
+#define CR00    0x00
+#define CR01    0x01
+#define CR02    0x02
+#define CR03    0x03
+#define CR04    0x04
+#define CR05    0x05
+#define CR06    0x06
+#define CR07    0x07
+#define CR08    0x08
+#define CR09    0x09
+#define CR0A    0x0A
+#define CR0B    0x0B
+#define CR0C    0x0C
+#define CR0D    0x0D
+#define CR0E    0x0E
+#define CR0F    0x0F
+#define CR10    0x10
+#define CR11    0x11
+#define CR12    0x12
+#define CR13    0x13
+#define CR14    0x14
+#define CR15    0x15
+#define CR16    0x16
+#define CR17    0x17
+#define CR18    0x18
+
+/* Extend CRT Controller Registers */
+#define CR30    0x30
+#define CR31    0x31
+#define CR32    0x32
+#define CR33    0x33
+#define CR34    0x34
+#define CR35    0x35
+#define CR36    0x36
+#define CR37    0x37
+#define CR38    0x38
+#define CR39    0x39
+#define CR3A    0x3A
+#define CR3B    0x3B
+#define CR3C    0x3C
+#define CR3D    0x3D
+#define CR3E    0x3E
+#define CR3F    0x3F
+#define CR40    0x40
+#define CR41    0x41
+#define CR42    0x42
+#define CR43    0x43
+#define CR44    0x44
+#define CR45    0x45
+#define CR46    0x46
+#define CR47    0x47
+#define CR48    0x48
+#define CR49    0x49
+#define CR4A    0x4A
+#define CR4B    0x4B
+#define CR4C    0x4C
+#define CR4D    0x4D
+#define CR4E    0x4E
+#define CR4F    0x4F
+#define CR50    0x50
+#define CR51    0x51
+#define CR52    0x52
+#define CR53    0x53
+#define CR54    0x54
+#define CR55    0x55
+#define CR56    0x56
+#define CR57    0x57
+#define CR58    0x58
+#define CR59    0x59
+#define CR5A    0x5A
+#define CR5B    0x5B
+#define CR5C    0x5C
+#define CR5D    0x5D
+#define CR5E    0x5E
+#define CR5F    0x5F
+#define CR60    0x60
+#define CR61    0x61
+#define CR62    0x62
+#define CR63    0x63
+#define CR64    0x64
+#define CR65    0x65
+#define CR66    0x66
+#define CR67    0x67
+#define CR68    0x68
+#define CR69    0x69
+#define CR6A    0x6A
+#define CR6B    0x6B
+#define CR6C    0x6C
+#define CR6D    0x6D
+#define CR6E    0x6E
+#define CR6F    0x6F
+#define CR70    0x70
+#define CR71    0x71
+#define CR72    0x72
+#define CR73    0x73
+#define CR74    0x74
+#define CR75    0x75
+#define CR76    0x76
+#define CR77    0x77
+#define CR78    0x78
+#define CR79    0x79
+#define CR7A    0x7A
+#define CR7B    0x7B
+#define CR7C    0x7C
+#define CR7D    0x7D
+#define CR7E    0x7E
+#define CR7F    0x7F
+#define CR80    0x80
+#define CR81    0x81
+#define CR82    0x82
+#define CR83    0x83
+#define CR84    0x84
+#define CR85    0x85
+#define CR86    0x86
+#define CR87    0x87
+#define CR88    0x88
+#define CR89    0x89
+#define CR8A    0x8A
+#define CR8B    0x8B
+#define CR8C    0x8C
+#define CR8D    0x8D
+#define CR8E    0x8E
+#define CR8F    0x8F
+#define CR90    0x90
+#define CR91    0x91
+#define CR92    0x92
+#define CR93    0x93
+#define CR94    0x94
+#define CR95    0x95
+#define CR96    0x96
+#define CR97    0x97
+#define CR98    0x98
+#define CR99    0x99
+#define CR9A    0x9A
+#define CR9B    0x9B
+#define CR9C    0x9C
+#define CR9D    0x9D
+#define CR9E    0x9E
+#define CR9F    0x9F
+#define CRA0    0xA0
+#define CRA1    0xA1
+#define CRA2    0xA2
+#define CRA3    0xA3
+#define CRD2    0xD2
+#define CRD3    0xD3
+#define CRD4    0xD4
+
+/* LUT Table*/
+#define LUT_DATA             0x3C9      /* DACDATA */
+#define LUT_INDEX_READ       0x3C7      /* DACRX */
+#define LUT_INDEX_WRITE      0x3C8      /* DACWX */
+#define DACMASK              0x3C6
+
+/* Definition Device */
+#define DEVICE_CRT  0x01
+#define DEVICE_DVI  0x03
+#define DEVICE_LCD  0x04
+
+/* Device output interface */
+#define INTERFACE_NONE          0x00
+#define INTERFACE_ANALOG_RGB    0x01
+#define INTERFACE_DVP0          0x02
+#define INTERFACE_DVP1          0x03
+#define INTERFACE_DFP_HIGH      0x04
+#define INTERFACE_DFP_LOW       0x05
+#define INTERFACE_DFP           0x06
+#define INTERFACE_LVDS0         0x07
+#define INTERFACE_LVDS1         0x08
+#define INTERFACE_LVDS0LVDS1    0x09
+#define INTERFACE_TMDS          0x0A
+
+#define HW_LAYOUT_LCD_ONLY      0x01
+#define HW_LAYOUT_DVI_ONLY      0x02
+#define HW_LAYOUT_LCD_DVI       0x03
+#define HW_LAYOUT_LCD1_LCD2     0x04
+#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10
+
+/* Definition Refresh Rate */
+#define REFRESH_50      50
+#define REFRESH_60      60
+#define REFRESH_75      75
+#define REFRESH_85      85
+#define REFRESH_100     100
+#define REFRESH_120     120
+
+/* Definition Sync Polarity*/
+#define NEGATIVE        1
+#define POSITIVE        0
+
+/*480x640@60 Sync Polarity (GTF)
+*/
+#define M480X640_R60_HSP        NEGATIVE
+#define M480X640_R60_VSP        POSITIVE
+
+/*640x480@60 Sync Polarity (VESA Mode)
+*/
+#define M640X480_R60_HSP        NEGATIVE
+#define M640X480_R60_VSP        NEGATIVE
+
+/*640x480@75 Sync Polarity (VESA Mode)
+*/
+#define M640X480_R75_HSP        NEGATIVE
+#define M640X480_R75_VSP        NEGATIVE
+
+/*640x480@85 Sync Polarity (VESA Mode)
+*/
+#define M640X480_R85_HSP        NEGATIVE
+#define M640X480_R85_VSP        NEGATIVE
+
+/*640x480@100 Sync Polarity (GTF Mode)
+*/
+#define M640X480_R100_HSP       NEGATIVE
+#define M640X480_R100_VSP       POSITIVE
+
+/*640x480@120 Sync Polarity (GTF Mode)
+*/
+#define M640X480_R120_HSP       NEGATIVE
+#define M640X480_R120_VSP       POSITIVE
+
+/*720x480@60 Sync Polarity  (GTF Mode)
+*/
+#define M720X480_R60_HSP        NEGATIVE
+#define M720X480_R60_VSP        POSITIVE
+
+/*720x576@60 Sync Polarity  (GTF Mode)
+*/
+#define M720X576_R60_HSP        NEGATIVE
+#define M720X576_R60_VSP        POSITIVE
+
+/*800x600@60 Sync Polarity (VESA Mode)
+*/
+#define M800X600_R60_HSP        POSITIVE
+#define M800X600_R60_VSP        POSITIVE
+
+/*800x600@75 Sync Polarity (VESA Mode)
+*/
+#define M800X600_R75_HSP        POSITIVE
+#define M800X600_R75_VSP        POSITIVE
+
+/*800x600@85 Sync Polarity (VESA Mode)
+*/
+#define M800X600_R85_HSP        POSITIVE
+#define M800X600_R85_VSP        POSITIVE
+
+/*800x600@100 Sync Polarity (GTF Mode)
+*/
+#define M800X600_R100_HSP       NEGATIVE
+#define M800X600_R100_VSP       POSITIVE
+
+/*800x600@120 Sync Polarity (GTF Mode)
+*/
+#define M800X600_R120_HSP       NEGATIVE
+#define M800X600_R120_VSP       POSITIVE
+
+/*800x480@60 Sync Polarity  (CVT Mode)
+*/
+#define M800X480_R60_HSP        NEGATIVE
+#define M800X480_R60_VSP        POSITIVE
+
+/*848x480@60 Sync Polarity  (CVT Mode)
+*/
+#define M848X480_R60_HSP        NEGATIVE
+#define M848X480_R60_VSP        POSITIVE
+
+/*852x480@60 Sync Polarity  (GTF Mode)
+*/
+#define M852X480_R60_HSP        NEGATIVE
+#define M852X480_R60_VSP        POSITIVE
+
+/*1024x512@60 Sync Polarity (GTF Mode)
+*/
+#define M1024X512_R60_HSP       NEGATIVE
+#define M1024X512_R60_VSP       POSITIVE
+
+/*1024x600@60 Sync Polarity (GTF Mode)
+*/
+#define M1024X600_R60_HSP       NEGATIVE
+#define M1024X600_R60_VSP       POSITIVE
+
+/*1024x768@60 Sync Polarity (VESA Mode)
+*/
+#define M1024X768_R60_HSP       NEGATIVE
+#define M1024X768_R60_VSP       NEGATIVE
+
+/*1024x768@75 Sync Polarity (VESA Mode)
+*/
+#define M1024X768_R75_HSP       POSITIVE
+#define M1024X768_R75_VSP       POSITIVE
+
+/*1024x768@85 Sync Polarity (VESA Mode)
+*/
+#define M1024X768_R85_HSP       POSITIVE
+#define M1024X768_R85_VSP       POSITIVE
+
+/*1024x768@100 Sync Polarity (GTF Mode)
+*/
+#define M1024X768_R100_HSP      NEGATIVE
+#define M1024X768_R100_VSP      POSITIVE
+
+/*1152x864@75 Sync Polarity (VESA Mode)
+*/
+#define M1152X864_R75_HSP       POSITIVE
+#define M1152X864_R75_VSP       POSITIVE
+
+/*1280x720@60 Sync Polarity  (GTF Mode)
+*/
+#define M1280X720_R60_HSP       NEGATIVE
+#define M1280X720_R60_VSP       POSITIVE
+
+/* 1280x768@50 Sync Polarity  (GTF Mode) */
+#define M1280X768_R50_HSP       NEGATIVE
+#define M1280X768_R50_VSP       POSITIVE
+
+/*1280x768@60 Sync Polarity  (GTF Mode)
+*/
+#define M1280X768_R60_HSP       NEGATIVE
+#define M1280X768_R60_VSP       POSITIVE
+
+/*1280x800@60 Sync Polarity  (CVT Mode)
+*/
+#define M1280X800_R60_HSP       NEGATIVE
+#define M1280X800_R60_VSP       POSITIVE
+
+/*1280x960@60 Sync Polarity (VESA Mode)
+*/
+#define M1280X960_R60_HSP       POSITIVE
+#define M1280X960_R60_VSP       POSITIVE
+
+/*1280x1024@60 Sync Polarity (VESA Mode)
+*/
+#define M1280X1024_R60_HSP      POSITIVE
+#define M1280X1024_R60_VSP      POSITIVE
+
+/* 1360x768@60 Sync Polarity (CVT Mode) */
+#define M1360X768_R60_HSP       POSITIVE
+#define M1360X768_R60_VSP       POSITIVE
+
+/* 1360x768@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1360X768_RB_R60_HSP       POSITIVE
+#define M1360X768_RB_R60_VSP       NEGATIVE
+
+/* 1368x768@50 Sync Polarity (GTF Mode) */
+#define M1368X768_R50_HSP       NEGATIVE
+#define M1368X768_R50_VSP       POSITIVE
+
+/* 1368x768@60 Sync Polarity (VESA Mode) */
+#define M1368X768_R60_HSP       NEGATIVE
+#define M1368X768_R60_VSP       POSITIVE
+
+/*1280x1024@75 Sync Polarity (VESA Mode)
+*/
+#define M1280X1024_R75_HSP      POSITIVE
+#define M1280X1024_R75_VSP      POSITIVE
+
+/*1280x1024@85 Sync Polarity (VESA Mode)
+*/
+#define M1280X1024_R85_HSP      POSITIVE
+#define M1280X1024_R85_VSP      POSITIVE
+
+/*1440x1050@60 Sync Polarity (GTF Mode)
+*/
+#define M1440X1050_R60_HSP      NEGATIVE
+#define M1440X1050_R60_VSP      POSITIVE
+
+/*1600x1200@60 Sync Polarity (VESA Mode)
+*/
+#define M1600X1200_R60_HSP      POSITIVE
+#define M1600X1200_R60_VSP      POSITIVE
+
+/*1600x1200@75 Sync Polarity (VESA Mode)
+*/
+#define M1600X1200_R75_HSP      POSITIVE
+#define M1600X1200_R75_VSP      POSITIVE
+
+/* 1680x1050@60 Sync Polarity (CVT Mode) */
+#define M1680x1050_R60_HSP      NEGATIVE
+#define M1680x1050_R60_VSP      NEGATIVE
+
+/* 1680x1050@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1680x1050_RB_R60_HSP      POSITIVE
+#define M1680x1050_RB_R60_VSP      NEGATIVE
+
+/* 1680x1050@75 Sync Polarity (CVT Mode) */
+#define M1680x1050_R75_HSP      NEGATIVE
+#define M1680x1050_R75_VSP      POSITIVE
+
+/*1920x1080@60 Sync Polarity (CVT Mode)
+*/
+#define M1920X1080_R60_HSP      NEGATIVE
+#define M1920X1080_R60_VSP      POSITIVE
+
+/* 1920x1080@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1920X1080_RB_R60_HSP  POSITIVE
+#define M1920X1080_RB_R60_VSP  NEGATIVE
+
+/*1920x1440@60 Sync Polarity (VESA Mode)
+*/
+#define M1920X1440_R60_HSP      NEGATIVE
+#define M1920X1440_R60_VSP      POSITIVE
+
+/*1920x1440@75 Sync Polarity (VESA Mode)
+*/
+#define M1920X1440_R75_HSP      NEGATIVE
+#define M1920X1440_R75_VSP      POSITIVE
+
+#if 0
+/* 1400x1050@60 Sync Polarity (VESA Mode) */
+#define M1400X1050_R60_HSP      NEGATIVE
+#define M1400X1050_R60_VSP      NEGATIVE
+#endif
+
+/* 1400x1050@60 Sync Polarity (CVT Mode) */
+#define M1400X1050_R60_HSP      NEGATIVE
+#define M1400X1050_R60_VSP      POSITIVE
+
+/* 1400x1050@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1400X1050_RB_R60_HSP      POSITIVE
+#define M1400X1050_RB_R60_VSP      NEGATIVE
+
+/* 1400x1050@75 Sync Polarity (CVT Mode) */
+#define M1400X1050_R75_HSP      NEGATIVE
+#define M1400X1050_R75_VSP      POSITIVE
+
+/* 960x600@60 Sync Polarity (CVT Mode) */
+#define M960X600_R60_HSP        NEGATIVE
+#define M960X600_R60_VSP        POSITIVE
+
+/* 1000x600@60 Sync Polarity (GTF Mode) */
+#define M1000X600_R60_HSP       NEGATIVE
+#define M1000X600_R60_VSP       POSITIVE
+
+/* 1024x576@60 Sync Polarity (GTF Mode) */
+#define M1024X576_R60_HSP       NEGATIVE
+#define M1024X576_R60_VSP       POSITIVE
+
+/*1024x600@60 Sync Polarity (GTF Mode)*/
+#define M1024X600_R60_HSP       NEGATIVE
+#define M1024X600_R60_VSP       POSITIVE
+
+/* 1088x612@60 Sync Polarity (CVT Mode) */
+#define M1088X612_R60_HSP       NEGATIVE
+#define M1088X612_R60_VSP       POSITIVE
+
+/* 1152x720@60 Sync Polarity (CVT Mode) */
+#define M1152X720_R60_HSP       NEGATIVE
+#define M1152X720_R60_VSP       POSITIVE
+
+/* 1200x720@60 Sync Polarity (GTF Mode) */
+#define M1200X720_R60_HSP       NEGATIVE
+#define M1200X720_R60_VSP       POSITIVE
+
+/* 1280x600@60 Sync Polarity (GTF Mode) */
+#define M1280x600_R60_HSP       NEGATIVE
+#define M1280x600_R60_VSP       POSITIVE
+
+/* 1280x720@50 Sync Polarity  (GTF Mode) */
+#define M1280X720_R50_HSP       NEGATIVE
+#define M1280X720_R50_VSP       POSITIVE
+
+/* 1280x720@60 Sync Polarity  (CEA Mode) */
+#define M1280X720_CEA_R60_HSP       POSITIVE
+#define M1280X720_CEA_R60_VSP       POSITIVE
+
+/* 1440x900@60 Sync Polarity (CVT Mode) */
+#define M1440X900_R60_HSP       NEGATIVE
+#define M1440X900_R60_VSP       POSITIVE
+
+/* 1440x900@75 Sync Polarity (CVT Mode) */
+#define M1440X900_R75_HSP       NEGATIVE
+#define M1440X900_R75_VSP       POSITIVE
+
+/* 1440x900@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1440X900_RB_R60_HSP       POSITIVE
+#define M1440X900_RB_R60_VSP       NEGATIVE
+
+/* 1600x900@60 Sync Polarity (CVT Mode) */
+#define M1600X900_R60_HSP       NEGATIVE
+#define M1600X900_R60_VSP       POSITIVE
+
+/* 1600x900@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1600X900_RB_R60_HSP       POSITIVE
+#define M1600X900_RB_R60_VSP       NEGATIVE
+
+/* 1600x1024@60 Sync Polarity (GTF Mode) */
+#define M1600X1024_R60_HSP      NEGATIVE
+#define M1600X1024_R60_VSP      POSITIVE
+
+/* 1792x1344@60 Sync Polarity (DMT Mode) */
+#define M1792x1344_R60_HSP      NEGATIVE
+#define M1792x1344_R60_VSP      POSITIVE
+
+/* 1856x1392@60 Sync Polarity (DMT Mode) */
+#define M1856x1392_R60_HSP      NEGATIVE
+#define M1856x1392_R60_VSP      POSITIVE
+
+/* 1920x1200@60 Sync Polarity (CVT Mode) */
+#define M1920X1200_R60_HSP      NEGATIVE
+#define M1920X1200_R60_VSP      POSITIVE
+
+/* 1920x1200@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1920X1200_RB_R60_HSP  POSITIVE
+#define M1920X1200_RB_R60_VSP  NEGATIVE
+
+/* 1920x1080@60 Sync Polarity  (CEA Mode) */
+#define M1920X1080_CEA_R60_HSP       POSITIVE
+#define M1920X1080_CEA_R60_VSP       POSITIVE
+
+/* 2048x1536@60 Sync Polarity (CVT Mode) */
+#define M2048x1536_R60_HSP      NEGATIVE
+#define M2048x1536_R60_VSP      POSITIVE
+
+/* define PLL index: */
+#define CLK_25_175M     25175000
+#define CLK_26_880M     26880000
+#define CLK_29_581M     29581000
+#define CLK_31_490M     31490000
+#define CLK_31_500M     31500000
+#define CLK_31_728M     31728000
+#define CLK_32_668M     32688000
+#define CLK_36_000M     36000000
+#define CLK_40_000M     40000000
+#define CLK_41_291M     41291000
+#define CLK_43_163M     43163000
+#define CLK_45_250M     45250000        /* 45.46MHz */
+#define CLK_46_000M     46000000
+#define CLK_46_996M     46996000
+#define CLK_48_000M     48000000
+#define CLK_48_875M     48875000
+#define CLK_49_500M     49500000
+#define CLK_52_406M     52406000
+#define CLK_52_977M     52977000
+#define CLK_56_250M     56250000
+#define CLK_60_466M     60466000
+#define CLK_61_500M     61500000
+#define CLK_65_000M     65000000
+#define CLK_65_178M     65178000
+#define CLK_66_750M     66750000        /* 67.116MHz */
+#define CLK_68_179M     68179000
+#define CLK_69_924M     69924000
+#define CLK_70_159M     70159000
+#define CLK_72_000M     72000000
+#define CLK_74_270M     74270000
+#define CLK_78_750M     78750000
+#define CLK_80_136M     80136000
+#define CLK_83_375M     83375000
+#define CLK_83_950M     83950000
+#define CLK_84_750M     84750000        /* 84.537Mhz */
+#define CLK_85_860M     85860000
+#define CLK_88_750M     88750000
+#define CLK_94_500M     94500000
+#define CLK_97_750M     97750000
+#define CLK_101_000M    101000000
+#define CLK_106_500M    106500000
+#define CLK_108_000M    108000000
+#define CLK_113_309M    113309000
+#define CLK_118_840M    118840000
+#define CLK_119_000M    119000000
+#define CLK_121_750M    121750000       /* 121.704MHz */
+#define CLK_125_104M    125104000
+#define CLK_133_308M    133308000
+#define CLK_135_000M    135000000
+#define CLK_136_700M    136700000
+#define CLK_138_400M    138400000
+#define CLK_146_760M    146760000
+#define CLK_148_500M    148500000
+
+#define CLK_153_920M    153920000
+#define CLK_156_000M    156000000
+#define CLK_157_500M    157500000
+#define CLK_162_000M    162000000
+#define CLK_187_000M    187000000
+#define CLK_193_295M    193295000
+#define CLK_202_500M    202500000
+#define CLK_204_000M    204000000
+#define CLK_218_500M    218500000
+#define CLK_234_000M    234000000
+#define CLK_267_250M    267250000
+#define CLK_297_500M    297500000
+#define CLK_74_481M     74481000
+#define CLK_172_798M    172798000
+#define CLK_122_614M    122614000
+
+/* CLE266 PLL value
+*/
+#define CLE266_PLL_25_175M     0x0000C763
+#define CLE266_PLL_26_880M     0x0000440F
+#define CLE266_PLL_29_581M     0x00008421
+#define CLE266_PLL_31_490M     0x00004721
+#define CLE266_PLL_31_500M     0x0000C3B5
+#define CLE266_PLL_31_728M     0x0000471F
+#define CLE266_PLL_32_668M     0x0000C449
+#define CLE266_PLL_36_000M     0x0000C5E5
+#define CLE266_PLL_40_000M     0x0000C459
+#define CLE266_PLL_41_291M     0x00004417
+#define CLE266_PLL_43_163M     0x0000C579
+#define CLE266_PLL_45_250M     0x0000C57F       /* 45.46MHz */
+#define CLE266_PLL_46_000M     0x0000875A
+#define CLE266_PLL_46_996M     0x0000C4E9
+#define CLE266_PLL_48_000M     0x00001443
+#define CLE266_PLL_48_875M     0x00001D63
+#define CLE266_PLL_49_500M     0x00008653
+#define CLE266_PLL_52_406M     0x0000C475
+#define CLE266_PLL_52_977M     0x00004525
+#define CLE266_PLL_56_250M     0x000047B7
+#define CLE266_PLL_60_466M     0x0000494C
+#define CLE266_PLL_61_500M     0x00001456
+#define CLE266_PLL_65_000M     0x000086ED
+#define CLE266_PLL_65_178M     0x0000855B
+#define CLE266_PLL_66_750M     0x0000844B       /* 67.116MHz */
+#define CLE266_PLL_68_179M     0x00000413
+#define CLE266_PLL_69_924M     0x00001153
+#define CLE266_PLL_70_159M     0x00001462
+#define CLE266_PLL_72_000M     0x00001879
+#define CLE266_PLL_74_270M     0x00004853
+#define CLE266_PLL_78_750M     0x00004321
+#define CLE266_PLL_80_136M     0x0000051C
+#define CLE266_PLL_83_375M     0x0000C25D
+#define CLE266_PLL_83_950M     0x00000729
+#define CLE266_PLL_84_750M     0x00008576       /* 84.537MHz */
+#define CLE266_PLL_85_860M     0x00004754
+#define CLE266_PLL_88_750M     0x0000051F
+#define CLE266_PLL_94_500M     0x00000521
+#define CLE266_PLL_97_750M     0x00004652
+#define CLE266_PLL_101_000M    0x0000497F
+#define CLE266_PLL_106_500M    0x00008477       /* 106.491463 MHz */
+#define CLE266_PLL_108_000M    0x00008479
+#define CLE266_PLL_113_309M    0x00000C5F
+#define CLE266_PLL_118_840M    0x00004553
+#define CLE266_PLL_119_000M    0x00000D6C
+#define CLE266_PLL_121_750M    0x00004555       /* 121.704MHz */
+#define CLE266_PLL_125_104M    0x000006B5
+#define CLE266_PLL_133_308M    0x0000465F
+#define CLE266_PLL_135_000M    0x0000455E
+#define CLE266_PLL_136_700M    0x00000C73
+#define CLE266_PLL_138_400M    0x00000957
+#define CLE266_PLL_146_760M    0x00004567
+#define CLE266_PLL_148_500M    0x00000853
+#define CLE266_PLL_153_920M    0x00000856
+#define CLE266_PLL_156_000M    0x0000456D
+#define CLE266_PLL_157_500M    0x000005B7
+#define CLE266_PLL_162_000M    0x00004571
+#define CLE266_PLL_187_000M    0x00000976
+#define CLE266_PLL_193_295M    0x0000086C
+#define CLE266_PLL_202_500M    0x00000763
+#define CLE266_PLL_204_000M    0x00000764
+#define CLE266_PLL_218_500M    0x0000065C
+#define CLE266_PLL_234_000M    0x00000662
+#define CLE266_PLL_267_250M    0x00000670
+#define CLE266_PLL_297_500M    0x000005E6
+#define CLE266_PLL_74_481M     0x0000051A
+#define CLE266_PLL_172_798M    0x00004579
+#define CLE266_PLL_122_614M    0x0000073C
+
+/* K800 PLL value
+*/
+#define K800_PLL_25_175M     0x00539001
+#define K800_PLL_26_880M     0x001C8C80
+#define K800_PLL_29_581M     0x00409080
+#define K800_PLL_31_490M     0x006F9001
+#define K800_PLL_31_500M     0x008B9002
+#define K800_PLL_31_728M     0x00AF9003
+#define K800_PLL_32_668M     0x00909002
+#define K800_PLL_36_000M     0x009F9002
+#define K800_PLL_40_000M     0x00578C02
+#define K800_PLL_41_291M     0x00438C01
+#define K800_PLL_43_163M     0x00778C03
+#define K800_PLL_45_250M     0x007D8C83 /* 45.46MHz */
+#define K800_PLL_46_000M     0x00658C02
+#define K800_PLL_46_996M     0x00818C83
+#define K800_PLL_48_000M     0x00848C83
+#define K800_PLL_48_875M     0x00508C81
+#define K800_PLL_49_500M     0x00518C01
+#define K800_PLL_52_406M     0x00738C02
+#define K800_PLL_52_977M     0x00928C83
+#define K800_PLL_56_250M     0x007C8C02
+#define K800_PLL_60_466M     0x00A78C83
+#define K800_PLL_61_500M     0x00AA8C83
+#define K800_PLL_65_000M     0x006B8C01
+#define K800_PLL_65_178M     0x00B48C83
+#define K800_PLL_66_750M     0x00948C82 /* 67.116MHz */
+#define K800_PLL_68_179M     0x00708C01
+#define K800_PLL_69_924M     0x00C18C83
+#define K800_PLL_70_159M     0x00C28C83
+#define K800_PLL_72_000M     0x009F8C82
+#define K800_PLL_74_270M     0x00ce0c03
+#define K800_PLL_78_750M     0x00408801
+#define K800_PLL_80_136M     0x00428801
+#define K800_PLL_83_375M     0x005B0882
+#define K800_PLL_83_950M     0x00738803
+#define K800_PLL_84_750M     0x00748883 /* 84.477MHz */
+#define K800_PLL_85_860M     0x00768883
+#define K800_PLL_88_750M     0x007A8883
+#define K800_PLL_94_500M     0x00828803
+#define K800_PLL_97_750M     0x00878883
+#define K800_PLL_101_000M    0x008B8883
+#define K800_PLL_106_500M    0x00758882 /* 106.491463 MHz */
+#define K800_PLL_108_000M    0x00778882
+#define K800_PLL_113_309M    0x005D8881
+#define K800_PLL_118_840M    0x00A48883
+#define K800_PLL_119_000M    0x00838882
+#define K800_PLL_121_750M    0x00A88883 /* 121.704MHz */
+#define K800_PLL_125_104M    0x00688801
+#define K800_PLL_133_308M    0x005D8801
+#define K800_PLL_135_000M    0x001A4081
+#define K800_PLL_136_700M    0x00BD8883
+#define K800_PLL_138_400M    0x00728881
+#define K800_PLL_146_760M    0x00CC8883
+#define K800_PLL_148_500M    0x00ce0803
+#define K800_PLL_153_920M    0x00548482
+#define K800_PLL_156_000M    0x006B8483
+#define K800_PLL_157_500M    0x00142080
+#define K800_PLL_162_000M    0x006F8483
+#define K800_PLL_187_000M    0x00818483
+#define K800_PLL_193_295M    0x004F8481
+#define K800_PLL_202_500M    0x00538481
+#define K800_PLL_204_000M    0x008D8483
+#define K800_PLL_218_500M    0x00978483
+#define K800_PLL_234_000M    0x00608401
+#define K800_PLL_267_250M    0x006E8481
+#define K800_PLL_297_500M    0x00A48402
+#define K800_PLL_74_481M     0x007B8C81
+#define K800_PLL_172_798M    0x00778483
+#define K800_PLL_122_614M    0x00878882
+
+/* PLL for VT3324 */
+#define CX700_25_175M     0x008B1003
+#define CX700_26_719M     0x00931003
+#define CX700_26_880M     0x00941003
+#define CX700_29_581M     0x00A49003
+#define CX700_31_490M     0x00AE1003
+#define CX700_31_500M     0x00AE1003
+#define CX700_31_728M     0x00AF1003
+#define CX700_32_668M     0x00B51003
+#define CX700_36_000M     0x00C81003
+#define CX700_40_000M     0x006E0C03
+#define CX700_41_291M     0x00710C03
+#define CX700_43_163M     0x00770C03
+#define CX700_45_250M     0x007D0C03    /* 45.46MHz */
+#define CX700_46_000M     0x007F0C03
+#define CX700_46_996M     0x00818C83
+#define CX700_48_000M     0x00840C03
+#define CX700_48_875M     0x00508C81
+#define CX700_49_500M     0x00880C03
+#define CX700_52_406M     0x00730C02
+#define CX700_52_977M     0x00920C03
+#define CX700_56_250M     0x009B0C03
+#define CX700_60_466M     0x00460C00
+#define CX700_61_500M     0x00AA0C03
+#define CX700_65_000M     0x006B0C01
+#define CX700_65_178M     0x006B0C01
+#define CX700_66_750M     0x00940C02    /*67.116MHz */
+#define CX700_68_179M     0x00BC0C03
+#define CX700_69_924M     0x00C10C03
+#define CX700_70_159M     0x00C20C03
+#define CX700_72_000M     0x009F0C02
+#define CX700_74_270M     0x00CE0C03
+#define CX700_74_481M     0x00CE0C03
+#define CX700_78_750M     0x006C0803
+#define CX700_80_136M     0x006E0803
+#define CX700_83_375M     0x005B0882
+#define CX700_83_950M     0x00730803
+#define CX700_84_750M     0x00740803    /* 84.537Mhz */
+#define CX700_85_860M     0x00760803
+#define CX700_88_750M     0x00AC8885
+#define CX700_94_500M     0x00820803
+#define CX700_97_750M     0x00870803
+#define CX700_101_000M    0x008B0803
+#define CX700_106_500M    0x00750802
+#define CX700_108_000M    0x00950803
+#define CX700_113_309M    0x005D0801
+#define CX700_118_840M    0x00A40803
+#define CX700_119_000M    0x00830802
+#define CX700_121_750M    0x00420800    /* 121.704MHz */
+#define CX700_125_104M    0x00AD0803
+#define CX700_133_308M    0x00930802
+#define CX700_135_000M    0x00950802
+#define CX700_136_700M    0x00BD0803
+#define CX700_138_400M    0x00720801
+#define CX700_146_760M    0x00CC0803
+#define CX700_148_500M    0x00a40802
+#define CX700_153_920M    0x00540402
+#define CX700_156_000M    0x006B0403
+#define CX700_157_500M    0x006C0403
+#define CX700_162_000M    0x006F0403
+#define CX700_172_798M    0x00770403
+#define CX700_187_000M    0x00810403
+#define CX700_193_295M    0x00850403
+#define CX700_202_500M    0x008C0403
+#define CX700_204_000M    0x008D0403
+#define CX700_218_500M    0x00970403
+#define CX700_234_000M    0x00600401
+#define CX700_267_250M    0x00B90403
+#define CX700_297_500M    0x00CE0403
+#define CX700_122_614M    0x00870802
+
+/* Definition CRTC Timing Index */
+#define H_TOTAL_INDEX               0
+#define H_ADDR_INDEX                1
+#define H_BLANK_START_INDEX         2
+#define H_BLANK_END_INDEX           3
+#define H_SYNC_START_INDEX          4
+#define H_SYNC_END_INDEX            5
+#define V_TOTAL_INDEX               6
+#define V_ADDR_INDEX                7
+#define V_BLANK_START_INDEX         8
+#define V_BLANK_END_INDEX           9
+#define V_SYNC_START_INDEX          10
+#define V_SYNC_END_INDEX            11
+#define H_TOTAL_SHADOW_INDEX        12
+#define H_BLANK_END_SHADOW_INDEX    13
+#define V_TOTAL_SHADOW_INDEX        14
+#define V_ADDR_SHADOW_INDEX         15
+#define V_BLANK_SATRT_SHADOW_INDEX  16
+#define V_BLANK_END_SHADOW_INDEX    17
+#define V_SYNC_SATRT_SHADOW_INDEX   18
+#define V_SYNC_END_SHADOW_INDEX     19
+
+/* Definition Video Mode Pixel Clock (picoseconds)
+*/
+#define RES_480X640_60HZ_PIXCLOCK    39722
+#define RES_640X480_60HZ_PIXCLOCK    39722
+#define RES_640X480_75HZ_PIXCLOCK    31747
+#define RES_640X480_85HZ_PIXCLOCK    27777
+#define RES_640X480_100HZ_PIXCLOCK   23168
+#define RES_640X480_120HZ_PIXCLOCK   19081
+#define RES_720X480_60HZ_PIXCLOCK    37020
+#define RES_720X576_60HZ_PIXCLOCK    30611
+#define RES_800X600_60HZ_PIXCLOCK    25000
+#define RES_800X600_75HZ_PIXCLOCK    20203
+#define RES_800X600_85HZ_PIXCLOCK    17777
+#define RES_800X600_100HZ_PIXCLOCK   14667
+#define RES_800X600_120HZ_PIXCLOCK   11912
+#define RES_800X480_60HZ_PIXCLOCK    33805
+#define RES_848X480_60HZ_PIXCLOCK    31756
+#define RES_856X480_60HZ_PIXCLOCK    31518
+#define RES_1024X512_60HZ_PIXCLOCK   24218
+#define RES_1024X600_60HZ_PIXCLOCK   20460
+#define RES_1024X768_60HZ_PIXCLOCK   15385
+#define RES_1024X768_75HZ_PIXCLOCK   12699
+#define RES_1024X768_85HZ_PIXCLOCK   10582
+#define RES_1024X768_100HZ_PIXCLOCK  8825
+#define RES_1152X864_75HZ_PIXCLOCK   9259
+#define RES_1280X768_60HZ_PIXCLOCK   12480
+#define RES_1280X800_60HZ_PIXCLOCK   11994
+#define RES_1280X960_60HZ_PIXCLOCK   9259
+#define RES_1280X1024_60HZ_PIXCLOCK  9260
+#define RES_1280X1024_75HZ_PIXCLOCK  7408
+#define RES_1280X768_85HZ_PIXCLOCK   6349
+#define RES_1440X1050_60HZ_PIXCLOCK  7993
+#define RES_1600X1200_60HZ_PIXCLOCK  6172
+#define RES_1600X1200_75HZ_PIXCLOCK  4938
+#define RES_1280X720_60HZ_PIXCLOCK   13426
+#define RES_1920X1080_60HZ_PIXCLOCK  5787
+#define RES_1400X1050_60HZ_PIXCLOCK  8214
+#define RES_1400X1050_75HZ_PIXCLOCK  6410
+#define RES_1368X768_60HZ_PIXCLOCK   11647
+#define RES_960X600_60HZ_PIXCLOCK      22099
+#define RES_1000X600_60HZ_PIXCLOCK    20834
+#define RES_1024X576_60HZ_PIXCLOCK    21278
+#define RES_1088X612_60HZ_PIXCLOCK    18877
+#define RES_1152X720_60HZ_PIXCLOCK    14981
+#define RES_1200X720_60HZ_PIXCLOCK    14253
+#define RES_1280X600_60HZ_PIXCLOCK    16260
+#define RES_1280X720_50HZ_PIXCLOCK    16538
+#define RES_1280X768_50HZ_PIXCLOCK    15342
+#define RES_1366X768_50HZ_PIXCLOCK    14301
+#define RES_1366X768_60HZ_PIXCLOCK    11646
+#define RES_1360X768_60HZ_PIXCLOCK    11799
+#define RES_1440X900_60HZ_PIXCLOCK    9390
+#define RES_1440X900_75HZ_PIXCLOCK    7315
+#define RES_1600X900_60HZ_PIXCLOCK    8415
+#define RES_1600X1024_60HZ_PIXCLOCK   7315
+#define RES_1680X1050_60HZ_PIXCLOCK   6814
+#define RES_1680X1050_75HZ_PIXCLOCK   5348
+#define RES_1792X1344_60HZ_PIXCLOCK   4902
+#define RES_1856X1392_60HZ_PIXCLOCK   4577
+#define RES_1920X1200_60HZ_PIXCLOCK   5173
+#define RES_1920X1440_60HZ_PIXCLOCK   4274
+#define RES_1920X1440_75HZ_PIXCLOCK   3367
+#define RES_2048X1536_60HZ_PIXCLOCK   3742
+
+#define RES_1360X768_RB_60HZ_PIXCLOCK 13889
+#define RES_1400X1050_RB_60HZ_PIXCLOCK 9901
+#define RES_1440X900_RB_60HZ_PIXCLOCK   11268
+#define RES_1600X900_RB_60HZ_PIXCLOCK   10230
+#define RES_1680X1050_RB_60HZ_PIXCLOCK 8403
+#define RES_1920X1080_RB_60HZ_PIXCLOCK 7225
+#define RES_1920X1200_RB_60HZ_PIXCLOCK 6497
+
+/* LCD display method
+*/
+#define     LCD_EXPANDSION              0x00
+#define     LCD_CENTERING               0x01
+
+/* LCD mode
+*/
+#define     LCD_OPENLDI               0x00
+#define     LCD_SPWG                  0x01
+
+/* Define display timing
+*/
+struct display_timing {
+        u16 hor_total;
+        u16 hor_addr;
+        u16 hor_blank_start;
+        u16 hor_blank_end;
+        u16 hor_sync_start;
+        u16 hor_sync_end;
+        u16 ver_total;
+        u16 ver_addr;
+        u16 ver_blank_start;
+        u16 ver_blank_end;
+        u16 ver_sync_start;
+        u16 ver_sync_end;
+};
+
+struct crt_mode_table {
+        int refresh_rate;
+        unsigned long clk;
+        int h_sync_polarity;
+        int v_sync_polarity;
+        struct display_timing crtc;
+};
+
+struct io_reg {
+        int port;
+        u8 index;
+        u8 mask;
+        u8 value;
+};
+
+#endif /* __SHARE_H__ */
diff --git a/drivers/video/via/tbl1636.c b/drivers/video/via/tbl1636.c
new file mode 100644
index 000000000000..2d8453429d4a
--- /dev/null
+++ b/drivers/video/via/tbl1636.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+struct IODATA COMMON_INIT_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        /* Set panel power sequence timing */
+        {0x10, 0xC0, 0x00},
+        /* T1: VDD on - Data on. Each increment is 1 ms. (50ms = 031h) */
+        {0x0B, 0xFF, 0x40},
+        /* T2: Data on - Backlight on. Each increment is 2 ms. (210ms = 068h) */
+        {0x0C, 0xFF, 0x31},
+        /* T3: Backlight off -Data off. Each increment is 2 ms. (210ms = 068h)*/
+        {0x0D, 0xFF, 0x31},
+        /* T4: Data off - VDD off. Each increment is 1 ms. (50ms = 031h) */
+        {0x0E, 0xFF, 0x68},
+        /* T5: VDD off - VDD on. Each increment is 100 ms. (500ms = 04h) */
+        {0x0F, 0xFF, 0x68},
+        /* LVDS output power up */
+        {0x09, 0xA0, 0xA0},
+        /* turn on back light */
+        {0x10, 0x33, 0x13}
+};
+
+struct IODATA DUAL_CHANNEL_ENABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x08, 0xF0, 0xE0}      /* Input Data Mode Select */
+};
+
+struct IODATA SINGLE_CHANNEL_ENABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x08, 0xF0, 0x00}      /* Input Data Mode Select */
+};
+
+struct IODATA DITHERING_ENABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x0A, 0x70, 0x50}
+};
+
+struct IODATA DITHERING_DISABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x0A, 0x70, 0x00}
+};
+
+struct IODATA VDD_ON_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x10, 0x20, 0x20}
+};
+
+struct IODATA VDD_OFF_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x10, 0x20, 0x00}
+};
diff --git a/drivers/video/via/tbl1636.h b/drivers/video/via/tbl1636.h
new file mode 100644
index 000000000000..d906055f1511
--- /dev/null
+++ b/drivers/video/via/tbl1636.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _TBL1636_H_
+#define _TBL1636_H_
+#include "hw.h"
+
+extern struct IODATA COMMON_INIT_TBL_VT1636[8];
+extern struct IODATA DUAL_CHANNEL_ENABLE_TBL_VT1636[1];
+extern struct IODATA SINGLE_CHANNEL_ENABLE_TBL_VT1636[1];
+extern struct IODATA DITHERING_ENABLE_TBL_VT1636[1];
+extern struct IODATA DITHERING_DISABLE_TBL_VT1636[1];
+extern struct IODATA VDD_ON_TBL_VT1636[1];
+extern struct IODATA VDD_OFF_TBL_VT1636[1];
+
+#endif /* _VIA_TBL1636_H_ */
diff --git a/drivers/video/via/tblDPASetting.c b/drivers/video/via/tblDPASetting.c
new file mode 100644
index 000000000000..0c4c8cc712f4
--- /dev/null
+++ b/drivers/video/via/tblDPASetting.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+/* For VT3324: */
+struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[] = {
+        /* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */
+        {LCD_PANEL_ID0_640X480, 0x00, 0x00},    /* For 640x480   */
+        {LCD_PANEL_ID1_800X600, 0x00, 0x00},    /* For 800x600   */
+        {LCD_PANEL_ID2_1024X768, 0x00, 0x00},   /* For 1024x768  */
+        {LCD_PANEL_ID3_1280X768, 0x00, 0x00},   /* For 1280x768  */
+        {LCD_PANEL_ID4_1280X1024, 0x00, 0x00},  /* For 1280x1024 */
+        {LCD_PANEL_ID5_1400X1050, 0x00, 0x00},  /* For 1400x1050 */
+        {LCD_PANEL_ID6_1600X1200, 0x0B, 0x03}   /* For 1600x1200 */
+};
+
+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[] = {
+/*  ClkRange, DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
+                                        DVP1Driving, DFPHigh, DFPLow */
+/*  CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,
+                                        SR65,        CR97,    CR99   */
+        /* LCK/VCK < 30000000 will use this value */
+        {DPA_CLK_RANGE_30M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+         0x00},
+        /* 30000000 < LCK/VCK < 50000000 will use this value */
+        {DPA_CLK_RANGE_30_50M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+         0x00},
+        /* 50000000 < LCK/VCK < 70000000 will use this value */
+        {DPA_CLK_RANGE_50_70M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+         0x00},
+        /* 70000000 < LCK/VCK < 100000000 will use this value */
+        {DPA_CLK_RANGE_70_100M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+         0x00},
+        /* 100000000 < LCK/VCK < 15000000 will use this value */
+        {DPA_CLK_RANGE_100_150M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+         0x00},
+        /* 15000000 < LCK/VCK will use this value */
+        {DPA_CLK_RANGE_150M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0E, 0x00,
+         0x00},
+};
+
+/* For VT3327: */
+struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[] = {
+        /* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */
+        {LCD_PANEL_ID0_640X480, 0x00, 0x00},    /* For 640x480   */
+        {LCD_PANEL_ID1_800X600, 0x00, 0x00},    /* For 800x600   */
+        {LCD_PANEL_ID2_1024X768, 0x00, 0x00},   /* For 1024x768  */
+        {LCD_PANEL_ID3_1280X768, 0x00, 0x00},   /* For 1280x768  */
+        {LCD_PANEL_ID4_1280X1024, 0x00, 0x00},  /* For 1280x1024 */
+        {LCD_PANEL_ID5_1400X1050, 0x00, 0x00},  /* For 1400x1050 */
+        {LCD_PANEL_ID6_1600X1200, 0x00, 0x00}   /* For 1600x1200 */
+};
+
+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[] = {
+/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
+                                        DVP1Driving, DFPHigh,   DFPLow */
+/*   CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,
+                                        SR65,        CR97,      CR99   */
+/* LCK/VCK < 30000000 will use this value */
+{DPA_CLK_RANGE_30M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},
+/* 30000000 < LCK/VCK < 50000000 will use this value */
+{DPA_CLK_RANGE_30_50M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},
+/* 50000000 < LCK/VCK < 70000000 will use this value */
+{DPA_CLK_RANGE_50_70M, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},
+/* 70000000 < LCK/VCK < 100000000 will use this value */
+{DPA_CLK_RANGE_70_100M, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x03},
+/* 100000000 < LCK/VCK < 15000000 will use this value */
+{DPA_CLK_RANGE_100_150M, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x02},
+/* 15000000 < LCK/VCK will use this value */
+{DPA_CLK_RANGE_150M, 0x00, 0x20, 0x00, 0x10, 0x00, 0x03, 0x00, 0x0D, 0x03},
+};
+
+/* For VT3364: */
+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[] = {
+/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
+                                        DVP1Driving, DFPHigh,   DFPLow */
+/*   CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,
+                                        SR65,        CR97,      CR99   */
+/* LCK/VCK < 30000000 will use this value */
+{DPA_CLK_RANGE_30M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 30000000 < LCK/VCK < 50000000 will use this value */
+{DPA_CLK_RANGE_30_50M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 50000000 < LCK/VCK < 70000000 will use this value */
+{DPA_CLK_RANGE_50_70M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 70000000 < LCK/VCK < 100000000 will use this value */
+{DPA_CLK_RANGE_70_100M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 100000000 < LCK/VCK < 15000000 will use this value */
+{DPA_CLK_RANGE_100_150M, 0x03, 0x00, 0x02, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 15000000 < LCK/VCK will use this value */
+{DPA_CLK_RANGE_150M, 0x01, 0x00, 0x02, 0x10, 0x00, 0x03, 0x00, 0x00, 0x08},
+};
diff --git a/drivers/video/via/tblDPASetting.h b/drivers/video/via/tblDPASetting.h
new file mode 100644
index 000000000000..b065a83481d3
--- /dev/null
+++ b/drivers/video/via/tblDPASetting.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _TBLDPASETTING_H_
+#define _TBLDPASETTING_H_
+#include "global.h"
+
+#define DPA_CLK_30M       30000000
+#define DPA_CLK_50M       50000000
+#define DPA_CLK_70M       70000000
+#define DPA_CLK_100M      100000000
+#define DPA_CLK_150M      150000000
+
+enum DPA_RANGE {
+        DPA_CLK_RANGE_30M,
+        DPA_CLK_RANGE_30_50M,
+        DPA_CLK_RANGE_50_70M,
+        DPA_CLK_RANGE_70_100M,
+        DPA_CLK_RANGE_100_150M,
+        DPA_CLK_RANGE_150M
+};
+
+extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[7];
+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[6];
+extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[7];
+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[];
+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[6];
+
+#endif
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
new file mode 100644
index 000000000000..0f3ed4eb236d
--- /dev/null
+++ b/drivers/video/via/via_i2c.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+
+static void via_i2c_setscl(void *data, int state)
+{
+        u8 val;
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        val = viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0xF0;
+        if (state)
+                val |= 0x20;
+        else
+                val &= ~0x20;
+        switch (via_i2c_chan->i2c_port) {
+        case I2CPORTINDEX:
+                val |= 0x01;
+                break;
+        case GPIOPORTINDEX:
+                val |= 0x80;
+                break;
+        default:
+                DEBUG_MSG("via_i2c: specify wrong i2c port.\n");
+        }
+        viafb_write_reg(via_i2c_chan->i2c_port, VIASR, val);
+}
+
+static int via_i2c_getscl(void *data)
+{
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        if (viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0x08)
+                return 1;
+        return 0;
+}
+
+static int via_i2c_getsda(void *data)
+{
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        if (viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0x04)
+                return 1;
+        return 0;
+}
+
+static void via_i2c_setsda(void *data, int state)
+{
+        u8 val;
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        val = viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0xF0;
+        if (state)
+                val |= 0x10;
+        else
+                val &= ~0x10;
+        switch (via_i2c_chan->i2c_port) {
+        case I2CPORTINDEX:
+                val |= 0x01;
+                break;
+        case GPIOPORTINDEX:
+                val |= 0x40;
+                break;
+        default:
+                DEBUG_MSG("via_i2c: specify wrong i2c port.\n");
+        }
+        viafb_write_reg(via_i2c_chan->i2c_port, VIASR, val);
+}
+
+int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata)
+{
+        u8 mm1[] = {0x00};
+        struct i2c_msg msgs[2];
+
+        *pdata = 0;
+        msgs[0].flags = 0;
+        msgs[1].flags = I2C_M_RD;
+        msgs[0].addr = msgs[1].addr = slave_addr / 2;
+        mm1[0] = index;
+        msgs[0].len = 1; msgs[1].len = 1;
+        msgs[0].buf = mm1; msgs[1].buf = pdata;
+        i2c_transfer(&viaparinfo->i2c_stuff.adapter, msgs, 2);
+
+        return 0;
+}
+
+int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data)
+{
+        u8 msg[2] = { index, data };
+        struct i2c_msg msgs;
+
+        msgs.flags = 0;
+        msgs.addr = slave_addr / 2;
+        msgs.len = 2;
+        msgs.buf = msg;
+        return i2c_transfer(&viaparinfo->i2c_stuff.adapter, &msgs, 1);
+}
+
+int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len)
+{
+        u8 mm1[] = {0x00};
+        struct i2c_msg msgs[2];
+
+        msgs[0].flags = 0;
+        msgs[1].flags = I2C_M_RD;
+        msgs[0].addr = msgs[1].addr = slave_addr / 2;
+        mm1[0] = index;
+        msgs[0].len = 1; msgs[1].len = buff_len;
+        msgs[0].buf = mm1; msgs[1].buf = buff;
+        i2c_transfer(&viaparinfo->i2c_stuff.adapter, msgs, 2);
+        return 0;
+}
+
+int viafb_create_i2c_bus(void *viapar)
+{
+        int ret;
+        struct viafb_par *par = (struct viafb_par *)viapar;
+
+        strcpy(par->i2c_stuff.adapter.name, "via_i2c");
+        par->i2c_stuff.i2c_port = 0x0;
+        par->i2c_stuff.adapter.owner = THIS_MODULE;
+        par->i2c_stuff.adapter.id = 0x01FFFF;
+        par->i2c_stuff.adapter.class = 0;
+        par->i2c_stuff.adapter.algo_data = &par->i2c_stuff.algo;
+        par->i2c_stuff.adapter.dev.parent = NULL;
+        par->i2c_stuff.algo.setsda = via_i2c_setsda;
+        par->i2c_stuff.algo.setscl = via_i2c_setscl;
+        par->i2c_stuff.algo.getsda = via_i2c_getsda;
+        par->i2c_stuff.algo.getscl = via_i2c_getscl;
+        par->i2c_stuff.algo.udelay = 40;
+        par->i2c_stuff.algo.timeout = 20;
+        par->i2c_stuff.algo.data = &par->i2c_stuff;
+
+        i2c_set_adapdata(&par->i2c_stuff.adapter, &par->i2c_stuff);
+
+        /* Raise SCL and SDA */
+        par->i2c_stuff.i2c_port = I2CPORTINDEX;
+        via_i2c_setsda(&par->i2c_stuff, 1);
+        via_i2c_setscl(&par->i2c_stuff, 1);
+
+        par->i2c_stuff.i2c_port = GPIOPORTINDEX;
+        via_i2c_setsda(&par->i2c_stuff, 1);
+        via_i2c_setscl(&par->i2c_stuff, 1);
+        udelay(20);
+
+        ret = i2c_bit_add_bus(&par->i2c_stuff.adapter);
+        if (ret == 0)
+                DEBUG_MSG("I2C bus %s registered.\n",
+                par->i2c_stuff.adapter.name);
+        else
+                DEBUG_MSG("Failed to register I2C bus %s.\n",
+                        par->i2c_stuff.adapter.name);
+        return ret;
+}
+
+void viafb_delete_i2c_buss(void *par)
+{
+        i2c_del_adapter(&((struct viafb_par *)par)->i2c_stuff.adapter);
+}
diff --git a/drivers/video/via/via_i2c.h b/drivers/video/via/via_i2c.h
new file mode 100644
index 000000000000..3a13242a3152
--- /dev/null
+++ b/drivers/video/via/via_i2c.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __VIA_I2C_H__
+#define __VIA_I2C_H__
+
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+
+struct via_i2c_stuff {
+        u16 i2c_port;                   /* GPIO or I2C port */
+        struct i2c_adapter adapter;
+        struct i2c_algo_bit_data algo;
+};
+
+#define I2CPORT           0x3c4
+#define I2CPORTINDEX      0x31
+#define GPIOPORT          0x3C4
+#define GPIOPORTINDEX     0x2C
+#define I2C_BUS             1
+#define GPIO_BUS            2
+#define DELAYPORT           0x3C3
+
+int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata);
+int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data);
+int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len);
+int viafb_create_i2c_bus(void *par);
+void viafb_delete_i2c_buss(void *par);
+#endif /* __VIA_I2C_H__ */
diff --git a/drivers/video/via/via_utility.c b/drivers/video/via/via_utility.c
new file mode 100644
index 000000000000..d53c3d54ed8e
--- /dev/null
+++ b/drivers/video/via/via_utility.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+
+void viafb_get_device_support_state(u32 *support_state)
+{
+        *support_state = CRT_Device;
+
+        if (viaparinfo->chip_info->tmds_chip_info.tmds_chip_name == VT1632_TMDS)
+                *support_state |= DVI_Device;
+
+        if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name == VT1631_LVDS)
+                *support_state |= LCD_Device;
+}
+
+void viafb_get_device_connect_state(u32 *connect_state)
+{
+        bool mobile = false;
+
+        *connect_state = CRT_Device;
+
+        if (viafb_dvi_sense())
+                *connect_state |= DVI_Device;
+
+        viafb_lcd_get_mobile_state(&mobile);
+        if (mobile)
+                *connect_state |= LCD_Device;
+}
+
+bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres)
+{
+        unsigned int support_state = 0;
+
+        switch (viafb_lcd_panel_id) {
+        case LCD_PANEL_ID0_640X480:
+                if ((xres < 640) && (yres < 480))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID1_800X600:
+                if ((xres < 800) && (yres < 600))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID2_1024X768:
+                if ((xres < 1024) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID3_1280X768:
+                if ((xres < 1280) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID4_1280X1024:
+                if ((xres < 1280) && (yres < 1024))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID5_1400X1050:
+                if ((xres < 1400) && (yres < 1050))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID6_1600X1200:
+                if ((xres < 1600) && (yres < 1200))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID7_1366X768:
+                if ((xres < 1366) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID8_1024X600:
+                if ((xres < 1024) && (yres < 600))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID9_1280X800:
+                if ((xres < 1280) && (yres < 800))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_IDA_800X480:
+                if ((xres < 800) && (yres < 480))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_IDB_1360X768:
+                if ((xres < 1360) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_IDC_480X640:
+                if ((xres < 480) && (yres < 640))
+                        support_state = true;
+                break;
+
+        default:
+                support_state = false;
+                break;
+        }
+
+        return support_state;
+}
+
+/*====================================================================*/
+/*                      Gamma Function Implementation*/
+/*====================================================================*/
+
+void viafb_set_gamma_table(int bpp, unsigned int *gamma_table)
+{
+        int i, sr1a;
+        int active_device_amount = 0;
+        int device_status = viafb_DeviceStatus;
+
+        for (i = 0; i < sizeof(viafb_DeviceStatus) * 8; i++) {
+                if (device_status & 1)
+                        active_device_amount++;
+                device_status >>= 1;
+        }
+
+        /* 8 bpp mode can't adjust gamma */
+        if (bpp == 8)
+                return ;
+
+        /* Enable Gamma */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+        case UNICHROME_K400:
+                viafb_write_reg_mask(SR16, VIASR, 0x80, BIT7);
+                break;
+
+        case UNICHROME_K800:
+        case UNICHROME_PM800:
+        case UNICHROME_CN700:
+        case UNICHROME_CX700:
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M890:
+        case UNICHROME_P4M900:
+                viafb_write_reg_mask(CR33, VIACR, 0x80, BIT7);
+                break;
+        }
+        sr1a = (unsigned int)viafb_read_reg(VIASR, SR1A);
+        viafb_write_reg_mask(SR1A, VIASR, 0x0, BIT0);
+
+        /* Fill IGA1 Gamma Table */
+        outb(0, LUT_INDEX_WRITE);
+        for (i = 0; i < 256; i++) {
+                outb(gamma_table[i] >> 16, LUT_DATA);
+                outb(gamma_table[i] >> 8 & 0xFF, LUT_DATA);
+                outb(gamma_table[i] & 0xFF, LUT_DATA);
+        }
+
+        /* If adjust Gamma value in SAMM, fill IGA1,
+           IGA2 Gamma table simultanous. */
+        /* Switch to IGA2 Gamma Table */
+        if ((active_device_amount > 1) &&
+                !((viaparinfo->chip_info->gfx_chip_name ==
+                UNICHROME_CLE266) &&
+                (viaparinfo->chip_info->gfx_chip_revision < 15))) {
+                viafb_write_reg_mask(SR1A, VIASR, 0x01, BIT0);
+                viafb_write_reg_mask(CR6A, VIACR, 0x02, BIT1);
+
+                /* Fill IGA2 Gamma Table */
+                outb(0, LUT_INDEX_WRITE);
+                for (i = 0; i < 256; i++) {
+                        outb(gamma_table[i] >> 16, LUT_DATA);
+                        outb(gamma_table[i] >> 8 & 0xFF, LUT_DATA);
+                        outb(gamma_table[i] & 0xFF, LUT_DATA);
+                }
+        }
+        viafb_write_reg(SR1A, VIASR, sr1a);
+}
+
+void viafb_get_gamma_table(unsigned int *gamma_table)
+{
+        unsigned char color_r, color_g, color_b;
+        unsigned char sr1a = 0;
+        int i;
+
+        /* Enable Gamma */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+        case UNICHROME_K400:
+                viafb_write_reg_mask(SR16, VIASR, 0x80, BIT7);
+                break;
+
+        case UNICHROME_K800:
+        case UNICHROME_PM800:
+        case UNICHROME_CN700:
+        case UNICHROME_CX700:
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M890:
+        case UNICHROME_P4M900:
+                viafb_write_reg_mask(CR33, VIACR, 0x80, BIT7);
+                break;
+        }
+        sr1a = viafb_read_reg(VIASR, SR1A);
+        viafb_write_reg_mask(SR1A, VIASR, 0x0, BIT0);
+
+        /* Reading gamma table to get color value */
+        outb(0, LUT_INDEX_READ);
+        for (i = 0; i < 256; i++) {
+                color_r = inb(LUT_DATA);
+                color_g = inb(LUT_DATA);
+                color_b = inb(LUT_DATA);
+                gamma_table[i] =
+                    ((((u32) color_r) << 16) |
+                     (((u16) color_g) << 8)) | color_b;
+        }
+        viafb_write_reg(SR1A, VIASR, sr1a);
+}
+
+void viafb_get_gamma_support_state(int bpp, unsigned int *support_state)
+{
+        if (bpp == 8)
+                *support_state = None_Device;
+        else
+                *support_state = CRT_Device | DVI_Device | LCD_Device;
+}
+
+int viafb_input_parameter_converter(int parameter_value)
+{
+        int result;
+
+        if (parameter_value >= 1 && parameter_value <= 9)
+                result = 1 << (parameter_value - 1);
+        else
+                result = 1;
+
+        return result;
+}
diff --git a/drivers/video/via/via_utility.h b/drivers/video/via/via_utility.h
new file mode 100644
index 000000000000..2fd455202ebd
--- /dev/null
+++ b/drivers/video/via/via_utility.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __VIAUTILITY_H__
+#define __VIAUTILITY_H__
+
+/* These functions are used to get infomation about device's state */
+void viafb_get_device_support_state(u32 *support_state);
+void viafb_get_device_connect_state(u32 *connect_state);
+bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres);
+
+/* These function are used to access gamma table */
+void viafb_set_gamma_table(int bpp, unsigned int *gamma_table);
+void viafb_get_gamma_table(unsigned int *gamma_table);
+void viafb_get_gamma_support_state(int bpp, unsigned int *support_state);
+int viafb_input_parameter_converter(int parameter_value);
+
+#endif /* __VIAUTILITY_H__ */
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
new file mode 100644
index 000000000000..0132eae06f55
--- /dev/null
+++ b/drivers/video/via/viafbdev.c
@@ -0,0 +1,2571 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#define _MASTER_FILE
+
+#include "global.h"
+
+static int MAX_CURS = 32;
+static struct fb_var_screeninfo default_var;
+static char *viafb_name = "Via";
+static u32 pseudo_pal[17];
+
+/* video mode */
+static char *viafb_mode = "640x480";
+static char *viafb_mode1 = "640x480";
+static int viafb_resMode = VIA_RES_640X480;
+
+/* Added for specifying active devices.*/
+char *viafb_active_dev = "";
+
+/* Added for specifying video on devices.*/
+char *viafb_video_dev = "";
+
+/*Added for specify lcd output port*/
+char *viafb_lcd_port = "";
+char *viafb_dvi_port = "";
+
+static void viafb_set_device(struct device_t active_dev);
+static int apply_device_setting(struct viafb_ioctl_setting setting_info,
+                         struct fb_info *info);
+static void apply_second_mode_setting(struct fb_var_screeninfo
+        *sec_var);
+static void retrieve_device_setting(struct viafb_ioctl_setting
+        *setting_info);
+static void viafb_set_video_device(u32 video_dev_info);
+static void viafb_get_video_device(u32 *video_dev_info);
+
+/* Mode information */
+static const struct viafb_modeinfo viafb_modentry[] = {
+        {480, 640, VIA_RES_480X640, "480x640"},
+        {640, 480, VIA_RES_640X480, "640x480"},
+        {800, 480, VIA_RES_800X480, "800x480"},
+        {800, 600, VIA_RES_800X600, "800x600"},
+        {1024, 768, VIA_RES_1024X768, "1024x768"},
+        {1152, 864, VIA_RES_1152X864, "1152x864"},
+        {1280, 1024, VIA_RES_1280X1024, "1280x1024"},
+        {1600, 1200, VIA_RES_1600X1200, "1600x1200"},
+        {1440, 1050, VIA_RES_1440X1050, "1440x1050"},
+        {1280, 768, VIA_RES_1280X768, "1280x768"},
+        {1280, 800, VIA_RES_1280X800, "1280x800"},
+        {1280, 960, VIA_RES_1280X960, "1280x960"},
+        {1920, 1440, VIA_RES_1920X1440, "1920x1440"},
+        {848, 480, VIA_RES_848X480, "848x480"},
+        {1400, 1050, VIA_RES_1400X1050, "1400x1050"},
+        {720, 480, VIA_RES_720X480, "720x480"},
+        {720, 576, VIA_RES_720X576, "720x576"},
+        {1024, 512, VIA_RES_1024X512, "1024x512"},
+        {1024, 576, VIA_RES_1024X576, "1024x576"},
+        {1024, 600, VIA_RES_1024X600, "1024x600"},
+        {1280, 720, VIA_RES_1280X720, "1280x720"},
+        {1920, 1080, VIA_RES_1920X1080, "1920x1080"},
+        {1366, 768, VIA_RES_1368X768, "1368x768"},
+        {1680, 1050, VIA_RES_1680X1050, "1680x1050"},
+        {960, 600, VIA_RES_960X600, "960x600"},
+        {1000, 600, VIA_RES_1000X600, "1000x600"},
+        {1024, 576, VIA_RES_1024X576, "1024x576"},
+        {1024, 600, VIA_RES_1024X600, "1024x600"},
+        {1088, 612, VIA_RES_1088X612, "1088x612"},
+        {1152, 720, VIA_RES_1152X720, "1152x720"},
+        {1200, 720, VIA_RES_1200X720, "1200x720"},
+        {1280, 600, VIA_RES_1280X600, "1280x600"},
+        {1360, 768, VIA_RES_1360X768, "1360x768"},
+        {1440, 900, VIA_RES_1440X900, "1440x900"},
+        {1600, 900, VIA_RES_1600X900, "1600x900"},
+        {1600, 1024, VIA_RES_1600X1024, "1600x1024"},
+        {1792, 1344, VIA_RES_1792X1344, "1792x1344"},
+        {1856, 1392, VIA_RES_1856X1392, "1856x1392"},
+        {1920, 1200, VIA_RES_1920X1200, "1920x1200"},
+        {2048, 1536, VIA_RES_2048X1536, "2048x1536"},
+        {0, 0, VIA_RES_INVALID, "640x480"}
+};
+
+static struct fb_ops viafb_ops;
+
+static int viafb_update_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)
+{
+        struct viafb_par *ppar;
+        ppar = info->par;
+
+        DEBUG_MSG(KERN_INFO "viafb_update_fix!\n");
+
+        fix->visual =
+            ppar->bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
+        fix->line_length = ppar->linelength;
+
+        return 0;
+}
+
+
+static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
+        struct viafb_par *viaparinfo)
+{
+        memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+        strcpy(fix->id, viafb_name);
+
+        fix->smem_start = viaparinfo->fbmem;
+        fix->smem_len = viaparinfo->fbmem_free;
+        fix->mmio_start = viaparinfo->mmio_base;
+        fix->mmio_len = viaparinfo->mmio_len;
+
+        fix->type = FB_TYPE_PACKED_PIXELS;
+        fix->type_aux = 0;
+
+        fix->xpanstep = fix->ywrapstep = 0;
+        fix->ypanstep = 1;
+
+        /* Just tell the accel name */
+        viafbinfo->fix.accel = FB_ACCEL_VIA_UNICHROME;
+}
+static int viafb_open(struct fb_info *info, int user)
+{
+        DEBUG_MSG(KERN_INFO "viafb_open!\n");
+        return 0;
+}
+
+static int viafb_release(struct fb_info *info, int user)
+{
+        DEBUG_MSG(KERN_INFO "viafb_release!\n");
+        return 0;
+}
+
+static void viafb_update_viafb_par(struct fb_info *info)
+{
+        struct viafb_par *ppar;
+
+        ppar = info->par;
+        ppar->bpp = info->var.bits_per_pixel;
+        ppar->linelength = ((info->var.xres_virtual + 7) & ~7) * ppar->bpp / 8;
+        ppar->hres = info->var.xres;
+        ppar->vres = info->var.yres;
+        ppar->xoffset = info->var.xoffset;
+        ppar->yoffset = info->var.yoffset;
+}
+
+static int viafb_check_var(struct fb_var_screeninfo *var,
+        struct fb_info *info)
+{
+        int vmode_index, htotal, vtotal;
+        struct viafb_par *ppar;
+        u32 long_refresh;
+        struct viafb_par *p_viafb_par;
+        ppar = info->par;
+
+
+        DEBUG_MSG(KERN_INFO "viafb_check_var!\n");
+        /* Sanity check */
+        /* HW neither support interlacte nor double-scaned mode */
+        if (var->vmode & FB_VMODE_INTERLACED || var->vmode & FB_VMODE_DOUBLE)
+                return -EINVAL;
+
+        vmode_index = viafb_get_mode_index(var->xres, var->yres, 0);
+        if (vmode_index == VIA_RES_INVALID) {
+                DEBUG_MSG(KERN_INFO
+                          "viafb: Mode %dx%dx%d not supported!!\n",
+                          var->xres, var->yres, var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        if (24 == var->bits_per_pixel)
+                var->bits_per_pixel = 32;
+
+        if (var->bits_per_pixel != 8 && var->bits_per_pixel != 16 &&
+                var->bits_per_pixel != 32)
+                return -EINVAL;
+
+        if ((var->xres_virtual * (var->bits_per_pixel >> 3)) & 0x1F)
+                /*32 pixel alignment */
+                var->xres_virtual = (var->xres_virtual + 31) & ~31;
+        if (var->xres_virtual * var->yres_virtual * var->bits_per_pixel / 8 >
+                ppar->memsize)
+                return -EINVAL;
+
+        /* Based on var passed in to calculate the refresh,
+         * because our driver use some modes special.
+         */
+        htotal = var->xres + var->left_margin +
+        var->right_margin + var->hsync_len;
+        vtotal = var->yres + var->upper_margin +
+                var->lower_margin + var->vsync_len;
+        long_refresh = 1000000000UL / var->pixclock * 1000;
+        long_refresh /= (htotal * vtotal);
+
+        viafb_refresh = viafb_get_refresh(var->xres, var->yres, long_refresh);
+
+        /* Adjust var according to our driver's own table */
+        viafb_fill_var_timing_info(var, viafb_refresh, vmode_index);
+
+        /* This is indeed a patch for VT3353 */
+        if (!info->par)
+                return -1;
+        p_viafb_par = (struct viafb_par *)info->par;
+        if (p_viafb_par->chip_info->gfx_chip_name == UNICHROME_VX800)
+                var->accel_flags = 0;
+
+        return 0;
+}
+
+static int viafb_set_par(struct fb_info *info)
+{
+        int vmode_index;
+        int vmode_index1 = 0;
+        DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
+
+        viafb_update_device_setting(info->var.xres, info->var.yres,
+                              info->var.bits_per_pixel, viafb_refresh, 0);
+
+        vmode_index = viafb_get_mode_index(info->var.xres, info->var.yres, 0);
+
+        if (viafb_SAMM_ON == 1) {
+                DEBUG_MSG(KERN_INFO
+                "viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n",
+                          viafb_second_xres, viafb_second_yres, viafb_bpp1);
+                vmode_index1 = viafb_get_mode_index(viafb_second_xres,
+                        viafb_second_yres, 1);
+                DEBUG_MSG(KERN_INFO "->viafb_SAMM_ON: index=%d\n",
+                        vmode_index1);
+
+                viafb_update_device_setting(viafb_second_xres,
+                        viafb_second_yres, viafb_bpp1, viafb_refresh1, 1);
+        }
+
+        if (vmode_index != VIA_RES_INVALID) {
+                viafb_setmode(vmode_index, info->var.xres, info->var.yres,
+                        info->var.bits_per_pixel, vmode_index1,
+                        viafb_second_xres, viafb_second_yres, viafb_bpp1);
+
+                /*We should set memory offset according virtual_x */
+                /*Fix me:put this function into viafb_setmode */
+                viafb_memory_pitch_patch(info);
+
+                /* Update ***fb_par information */
+                viafb_update_viafb_par(info);
+
+                /* Update other fixed information */
+                viafb_update_fix(&info->fix, info);
+                viafb_bpp = info->var.bits_per_pixel;
+                /* Update viafb_accel, it is necessary to our 2D accelerate */
+                viafb_accel = info->var.accel_flags;
+
+                if (viafb_accel)
+                        viafb_set_2d_color_depth(info->var.bits_per_pixel);
+        }
+
+        return 0;
+}
+
+/* Set one color register */
+static int viafb_setcolreg(unsigned regno, unsigned red, unsigned green,
+unsigned blue, unsigned transp, struct fb_info *info)
+{
+        u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;
+        unsigned cmap_entries = (info->var.bits_per_pixel == 8) ? 256 : 16;
+        DEBUG_MSG(KERN_INFO "viafb_setcolreg!\n");
+        if (regno >= cmap_entries)
+                return 1;
+        if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name) {
+                /*
+                 * Read PCI bus 0,dev 0,function 0,index 0xF6 to get chip rev.
+                 */
+                outl(0x80000000 | (0xf6 & ~3), (unsigned long)0xCF8);
+                rev = (inl((unsigned long)0xCFC) >> ((0xf6 & 3) * 8)) & 0xff;
+        }
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                outb(0x1A, 0x3C4);
+                sr1a = inb(0x3C5);
+                outb(0x1B, 0x3C4);
+                sr1b = inb(0x3C5);
+                outb(0x67, 0x3D4);
+                cr67 = inb(0x3D5);
+                outb(0x6A, 0x3D4);
+                cr6a = inb(0x3D5);
+
+                /* Map the 3C6/7/8/9 to the IGA2 */
+                outb(0x1A, 0x3C4);
+                outb(sr1a | 0x01, 0x3C5);
+                /* Second Display Engine colck always on */
+                outb(0x1B, 0x3C4);
+                outb(sr1b | 0x80, 0x3C5);
+                /* Second Display Color Depth 8 */
+                outb(0x67, 0x3D4);
+                outb(cr67 & 0x3F, 0x3D5);
+                outb(0x6A, 0x3D4);
+                /* Second Display Channel Reset CR6A[6]) */
+                outb(cr6a & 0xBF, 0x3D5);
+                /* Second Display Channel Enable CR6A[7] */
+                outb(cr6a | 0x80, 0x3D5);
+                /* Second Display Channel stop reset) */
+                outb(cr6a | 0x40, 0x3D5);
+
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                /* Write one register of IGA2 */
+                outb(regno, 0x3C8);
+                if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name &&
+                        rev >= 15) {
+                        shift = 8;
+                        viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);
+                } else {
+                        shift = 10;
+                        viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, 0, BIT7);
+                }
+                outb(red >> shift, 0x3C9);
+                outb(green >> shift, 0x3C9);
+                outb(blue >> shift, 0x3C9);
+
+                /* Map the 3C6/7/8/9 to the IGA1 */
+                outb(0x1A, 0x3C4);
+                outb(sr1a & 0xFE, 0x3C5);
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                /* Write one register of IGA1 */
+                outb(regno, 0x3C8);
+                outb(red >> shift, 0x3C9);
+                outb(green >> shift, 0x3C9);
+                outb(blue >> shift, 0x3C9);
+
+                outb(0x1A, 0x3C4);
+                outb(sr1a, 0x3C5);
+                outb(0x1B, 0x3C4);
+                outb(sr1b, 0x3C5);
+                outb(0x67, 0x3D4);
+                outb(cr67, 0x3D5);
+                outb(0x6A, 0x3D4);
+                outb(cr6a, 0x3D5);
+                break;
+        case 16:
+                ((u32 *) info->pseudo_palette)[regno] = (red & 0xF800) |
+                    ((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11);
+                break;
+        case 32:
+                ((u32 *) info->pseudo_palette)[regno] =
+                    ((transp & 0xFF00) << 16) |
+                    ((red & 0xFF00) << 8) |
+                    ((green & 0xFF00)) | ((blue & 0xFF00) >> 8);
+                break;
+        }
+
+        return 0;
+
+}
+
+/*CALLED BY: fb_set_cmap */
+/*           fb_set_var, pass 256 colors */
+/*CALLED BY: fb_set_cmap */
+/*           fbcon_set_palette, pass 16 colors */
+static int viafb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+        u32 len = cmap->len;
+        u32 i;
+        u16 *pred = cmap->red;
+        u16 *pgreen = cmap->green;
+        u16 *pblue = cmap->blue;
+        u16 *ptransp = cmap->transp;
+        u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;
+        if (len > 256)
+                return 1;
+        if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name) {
+                /*
+                 * Read PCI bus 0, dev 0, function 0, index 0xF6 to get chip
+                 * rev.
+                 */
+                outl(0x80000000 | (0xf6 & ~3), (unsigned long)0xCF8);
+                rev = (inl((unsigned long)0xCFC) >> ((0xf6 & 3) * 8)) & 0xff;
+        }
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                outb(0x1A, 0x3C4);
+                sr1a = inb(0x3C5);
+                outb(0x1B, 0x3C4);
+                sr1b = inb(0x3C5);
+                outb(0x67, 0x3D4);
+                cr67 = inb(0x3D5);
+                outb(0x6A, 0x3D4);
+                cr6a = inb(0x3D5);
+                /* Map the 3C6/7/8/9 to the IGA2 */
+                outb(0x1A, 0x3C4);
+                outb(sr1a | 0x01, 0x3C5);
+                outb(0x1B, 0x3C4);
+                /* Second Display Engine colck always on */
+                outb(sr1b | 0x80, 0x3C5);
+                outb(0x67, 0x3D4);
+                /* Second Display Color Depth 8 */
+                outb(cr67 & 0x3F, 0x3D5);
+                outb(0x6A, 0x3D4);
+                /* Second Display Channel Reset CR6A[6]) */
+                outb(cr6a & 0xBF, 0x3D5);
+                /* Second Display Channel Enable CR6A[7] */
+                outb(cr6a | 0x80, 0x3D5);
+                /* Second Display Channel stop reset) */
+                outb(cr6a | 0xC0, 0x3D5);
+
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                outb(0x00, 0x3C8);
+                if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name &&
+                        rev >= 15) {
+                        shift = 8;
+                        viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);
+                } else {
+                        shift = 10;
+                        viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, 0, BIT7);
+                }
+                for (i = 0; i < len; i++) {
+                        outb((*(pred + i)) >> shift, 0x3C9);
+                        outb((*(pgreen + i)) >> shift, 0x3C9);
+                        outb((*(pblue + i)) >> shift, 0x3C9);
+                }
+
+                outb(0x1A, 0x3C4);
+                /* Map the 3C6/7/8/9 to the IGA1 */
+                outb(sr1a & 0xFE, 0x3C5);
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                outb(0x00, 0x3C8);
+                for (i = 0; i < len; i++) {
+                        outb((*(pred + i)) >> shift, 0x3C9);
+                        outb((*(pgreen + i)) >> shift, 0x3C9);
+                        outb((*(pblue + i)) >> shift, 0x3C9);
+                }
+
+                outb(0x1A, 0x3C4);
+                outb(sr1a, 0x3C5);
+                outb(0x1B, 0x3C4);
+                outb(sr1b, 0x3C5);
+                outb(0x67, 0x3D4);
+                outb(cr67, 0x3D5);
+                outb(0x6A, 0x3D4);
+                outb(cr6a, 0x3D5);
+                break;
+        case 16:
+                if (len > 17)
+                        return 0;       /* Because static u32 pseudo_pal[17]; */
+                for (i = 0; i < len; i++)
+                        ((u32 *) info->pseudo_palette)[i] =
+                            (*(pred + i) & 0xF800) |
+                            ((*(pgreen + i) & 0xFC00) >> 5) |
+                            ((*(pblue + i) & 0xF800) >> 11);
+                break;
+        case 32:
+                if (len > 17)
+                        return 0;
+                if (ptransp) {
+                        for (i = 0; i < len; i++)
+                                ((u32 *) info->pseudo_palette)[i] =
+                                    ((*(ptransp + i) & 0xFF00) << 16) |
+                                    ((*(pred + i) & 0xFF00) << 8) |
+                                    ((*(pgreen + i) & 0xFF00)) |
+                                    ((*(pblue + i) & 0xFF00) >> 8);
+                } else {
+                        for (i = 0; i < len; i++)
+                                ((u32 *) info->pseudo_palette)[i] =
+                                    0x00000000 |
+                                    ((*(pred + i) & 0xFF00) << 8) |
+                                    ((*(pgreen + i) & 0xFF00)) |
+                                    ((*(pblue + i) & 0xFF00) >> 8);
+                }
+                break;
+        }
+        return 0;
+}
+
+static int viafb_pan_display(struct fb_var_screeninfo *var,
+        struct fb_info *info)
+{
+        unsigned int offset;
+
+        DEBUG_MSG(KERN_INFO "viafb_pan_display!\n");
+
+        offset = (var->xoffset + (var->yoffset * var->xres_virtual)) *
+            var->bits_per_pixel / 16;
+
+        DEBUG_MSG(KERN_INFO "\nviafb_pan_display,offset =%d ", offset);
+
+        viafb_write_reg_mask(0x48, 0x3d4, ((offset >> 24) & 0x3), 0x3);
+        viafb_write_reg_mask(0x34, 0x3d4, ((offset >> 16) & 0xff), 0xff);
+        viafb_write_reg_mask(0x0c, 0x3d4, ((offset >> 8) & 0xff), 0xff);
+        viafb_write_reg_mask(0x0d, 0x3d4, (offset & 0xff), 0xff);
+
+        return 0;
+}
+
+static int viafb_blank(int blank_mode, struct fb_info *info)
+{
+        DEBUG_MSG(KERN_INFO "viafb_blank!\n");
+        /* clear DPMS setting */
+
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                /* Screen: On, HSync: On, VSync: On */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                /* Screen: Off, HSync: Off, VSync: On */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x10, BIT4 + BIT5);
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                /* Screen: Off, HSync: On, VSync: Off */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x20, BIT4 + BIT5);
+                break;
+        case FB_BLANK_POWERDOWN:
+                /* Screen: Off, HSync: Off, VSync: Off */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x30, BIT4 + BIT5);
+                break;
+        }
+
+        return 0;
+}
+
+static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
+{
+        struct viafb_ioctl_mode viamode;
+        struct viafb_ioctl_samm viasamm;
+        struct viafb_driver_version driver_version;
+        struct fb_var_screeninfo sec_var;
+        struct _panel_size_pos_info panel_pos_size_para;
+        u32 state_info = 0;
+        u32 viainfo_size = sizeof(struct viafb_ioctl_info);
+        u32 *viafb_gamma_table;
+        char driver_name[] = "viafb";
+
+        u32 __user *argp = (u32 __user *) arg;
+        u32 gpu32;
+        u32 video_dev_info = 0;
+        struct viafb_ioctl_setting viafb_setting = {};
+        struct device_t active_dev = {};
+
+        DEBUG_MSG(KERN_INFO "viafb_ioctl: 0x%X !!\n", cmd);
+
+        switch (cmd) {
+        case VIAFB_GET_CHIP_INFO:
+                if (copy_to_user(argp, viaparinfo->chip_info,
+                                sizeof(struct chip_information)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_INFO_SIZE:
+                return put_user(viainfo_size, argp);
+        case VIAFB_GET_INFO:
+                return viafb_ioctl_get_viafb_info(arg);
+        case VIAFB_HOTPLUG:
+                return put_user(viafb_ioctl_hotplug(info->var.xres,
+                                              info->var.yres,
+                                              info->var.bits_per_pixel), argp);
+        case VIAFB_SET_HOTPLUG_FLAG:
+                if (copy_from_user(&gpu32, argp, sizeof(gpu32)))
+                        return -EFAULT;
+                viafb_hotplug = (gpu32) ? 1 : 0;
+                break;
+        case VIAFB_GET_RESOLUTION:
+                viamode.xres = (u32) viafb_hotplug_Xres;
+                viamode.yres = (u32) viafb_hotplug_Yres;
+                viamode.refresh = (u32) viafb_hotplug_refresh;
+                viamode.bpp = (u32) viafb_hotplug_bpp;
+                if (viafb_SAMM_ON == 1) {
+                        viamode.xres_sec = viafb_second_xres;
+                        viamode.yres_sec = viafb_second_yres;
+                        viamode.virtual_xres_sec = viafb_second_virtual_xres;
+                        viamode.virtual_yres_sec = viafb_second_virtual_yres;
+                        viamode.refresh_sec = viafb_refresh1;
+                        viamode.bpp_sec = viafb_bpp1;
+                } else {
+                        viamode.xres_sec = 0;
+                        viamode.yres_sec = 0;
+                        viamode.virtual_xres_sec = 0;
+                        viamode.virtual_yres_sec = 0;
+                        viamode.refresh_sec = 0;
+                        viamode.bpp_sec = 0;
+                }
+                if (copy_to_user(argp, &viamode, sizeof(viamode)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_SAMM_INFO:
+                viasamm.samm_status = viafb_SAMM_ON;
+
+                if (viafb_SAMM_ON == 1) {
+                        if (viafb_dual_fb) {
+                                viasamm.size_prim = viaparinfo->fbmem_free;
+                                viasamm.size_sec = viaparinfo1->fbmem_free;
+                        } else {
+                                if (viafb_second_size) {
+                                        viasamm.size_prim =
+                                            viaparinfo->fbmem_free -
+                                            viafb_second_size * 1024 * 1024;
+                                        viasamm.size_sec =
+                                            viafb_second_size * 1024 * 1024;
+                                } else {
+                                        viasamm.size_prim =
+                                            viaparinfo->fbmem_free >> 1;
+                                        viasamm.size_sec =
+                                            (viaparinfo->fbmem_free >> 1);
+                                }
+                        }
+                        viasamm.mem_base = viaparinfo->fbmem;
+                        viasamm.offset_sec = viafb_second_offset;
+                } else {
+                        viasamm.size_prim =
+                            viaparinfo->memsize - viaparinfo->fbmem_used;
+                        viasamm.size_sec = 0;
+                        viasamm.mem_base = viaparinfo->fbmem;
+                        viasamm.offset_sec = 0;
+                }
+
+                if (copy_to_user(argp, &viasamm, sizeof(viasamm)))
+                        return -EFAULT;
+
+                break;
+        case VIAFB_TURN_ON_OUTPUT_DEVICE:
+                if (copy_from_user(&gpu32, argp, sizeof(gpu32)))
+                        return -EFAULT;
+                if (gpu32 & CRT_Device)
+                        viafb_crt_enable();
+                if (gpu32 & DVI_Device)
+                        viafb_dvi_enable();
+                if (gpu32 & LCD_Device)
+                        viafb_lcd_enable();
+                break;
+        case VIAFB_TURN_OFF_OUTPUT_DEVICE:
+                if (copy_from_user(&gpu32, argp, sizeof(gpu32)))
+                        return -EFAULT;
+                if (gpu32 & CRT_Device)
+                        viafb_crt_disable();
+                if (gpu32 & DVI_Device)
+                        viafb_dvi_disable();
+                if (gpu32 & LCD_Device)
+                        viafb_lcd_disable();
+                break;
+        case VIAFB_SET_DEVICE:
+                if (copy_from_user(&active_dev, (void *)argp,
+                        sizeof(active_dev)))
+                        return -EFAULT;
+                viafb_set_device(active_dev);
+                viafb_set_par(info);
+                break;
+        case VIAFB_GET_DEVICE:
+                active_dev.crt = viafb_CRT_ON;
+                active_dev.dvi = viafb_DVI_ON;
+                active_dev.lcd = viafb_LCD_ON;
+                active_dev.samm = viafb_SAMM_ON;
+                active_dev.primary_dev = viafb_primary_dev;
+
+                active_dev.lcd_dsp_cent = viafb_lcd_dsp_method;
+                active_dev.lcd_panel_id = viafb_lcd_panel_id;
+                active_dev.lcd_mode = viafb_lcd_mode;
+
+                active_dev.xres = viafb_hotplug_Xres;
+                active_dev.yres = viafb_hotplug_Yres;
+
+                active_dev.xres1 = viafb_second_xres;
+                active_dev.yres1 = viafb_second_yres;
+
+                active_dev.bpp = viafb_bpp;
+                active_dev.bpp1 = viafb_bpp1;
+                active_dev.refresh = viafb_refresh;
+                active_dev.refresh1 = viafb_refresh1;
+
+                active_dev.epia_dvi = viafb_platform_epia_dvi;
+                active_dev.lcd_dual_edge = viafb_device_lcd_dualedge;
+                active_dev.bus_width = viafb_bus_width;
+
+                if (copy_to_user(argp, &active_dev, sizeof(active_dev)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_DRIVER_VERSION:
+                driver_version.iMajorNum = VERSION_MAJOR;
+                driver_version.iKernelNum = VERSION_KERNEL;
+                driver_version.iOSNum = VERSION_OS;
+                driver_version.iMinorNum = VERSION_MINOR;
+
+                if (copy_to_user(argp, &driver_version,
+                        sizeof(driver_version)))
+                        return -EFAULT;
+
+                break;
+
+        case VIAFB_SET_DEVICE_INFO:
+                if (copy_from_user(&viafb_setting,
+                        argp, sizeof(viafb_setting)))
+                        return -EFAULT;
+                if (apply_device_setting(viafb_setting, info) < 0)
+                        return -EINVAL;
+
+                break;
+
+        case VIAFB_SET_SECOND_MODE:
+                if (copy_from_user(&sec_var, argp, sizeof(sec_var)))
+                        return -EFAULT;
+                apply_second_mode_setting(&sec_var);
+                break;
+
+        case VIAFB_GET_DEVICE_INFO:
+
+                retrieve_device_setting(&viafb_setting);
+
+                if (copy_to_user(argp, &viafb_setting, sizeof(viafb_setting)))
+                        return -EFAULT;
+
+                break;
+
+        case VIAFB_GET_DEVICE_SUPPORT:
+                viafb_get_device_support_state(&state_info);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_DEVICE_CONNECT:
+                viafb_get_device_connect_state(&state_info);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_PANEL_SUPPORT_EXPAND:
+                state_info =
+                    viafb_lcd_get_support_expand_state(info->var.xres,
+                                                 info->var.yres);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_DRIVER_NAME:
+                if (copy_to_user(argp, driver_name, sizeof(driver_name)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_SET_GAMMA_LUT:
+                viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);
+                if (!viafb_gamma_table)
+                        return -ENOMEM;
+                if (copy_from_user(viafb_gamma_table, argp,
+                                sizeof(viafb_gamma_table))) {
+                        kfree(viafb_gamma_table);
+                        return -EFAULT;
+                }
+                viafb_set_gamma_table(viafb_bpp, viafb_gamma_table);
+                kfree(viafb_gamma_table);
+                break;
+
+        case VIAFB_GET_GAMMA_LUT:
+                viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);
+                if (!viafb_gamma_table)
+                        return -ENOMEM;
+                viafb_get_gamma_table(viafb_gamma_table);
+                if (copy_to_user(argp, viafb_gamma_table,
+                        sizeof(viafb_gamma_table))) {
+                        kfree(viafb_gamma_table);
+                        return -EFAULT;
+                }
+                kfree(viafb_gamma_table);
+                break;
+
+        case VIAFB_GET_GAMMA_SUPPORT_STATE:
+                viafb_get_gamma_support_state(viafb_bpp, &state_info);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+        case VIAFB_SET_VIDEO_DEVICE:
+                get_user(video_dev_info, argp);
+                viafb_set_video_device(video_dev_info);
+                break;
+        case VIAFB_GET_VIDEO_DEVICE:
+                viafb_get_video_device(&video_dev_info);
+                if (put_user(video_dev_info, argp))
+                        return -EFAULT;
+                break;
+        case VIAFB_SYNC_SURFACE:
+                DEBUG_MSG(KERN_INFO "lobo VIAFB_SYNC_SURFACE\n");
+                break;
+        case VIAFB_GET_DRIVER_CAPS:
+                break;
+
+        case VIAFB_GET_PANEL_MAX_SIZE:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_PANEL_MAX_POSITION:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_PANEL_POSITION:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_PANEL_SIZE:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_SET_PANEL_POSITION:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+        case VIAFB_SET_PANEL_SIZE:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void viafb_fillrect(struct fb_info *info,
+        const struct fb_fillrect *rect)
+{
+        u32 col = 0, rop = 0;
+        int pitch;
+
+        if (!viafb_accel)
+                return cfb_fillrect(info, rect);
+
+        if (!rect->width || !rect->height)
+                return;
+
+        switch (rect->rop) {
+        case ROP_XOR:
+                rop = 0x5A;
+                break;
+        case ROP_COPY:
+        default:
+                rop = 0xF0;
+                break;
+        }
+
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                col = rect->color;
+                break;
+        case 16:
+                col = ((u32 *) (info->pseudo_palette))[rect->color];
+                break;
+        case 32:
+                col = ((u32 *) (info->pseudo_palette))[rect->color];
+                break;
+        }
+
+        /* BitBlt Source Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
+        /* Source Base Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        /* Destination Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_DSTBASE);
+        /* Pitch */
+        pitch = (info->var.xres_virtual + 7) & ~7;
+        writel(VIA_PITCH_ENABLE |
+                   (((pitch *
+                      info->var.bits_per_pixel >> 3) >> 3) |
+                      (((pitch * info->
+                      var.bits_per_pixel >> 3) >> 3) << 16)),
+                      viaparinfo->io_virt + VIA_REG_PITCH);
+        /* BitBlt Destination Address */
+        writel(((rect->dy << 16) | rect->dx),
+                viaparinfo->io_virt + VIA_REG_DSTPOS);
+        /* Dimension: width & height */
+        writel((((rect->height - 1) << 16) | (rect->width - 1)),
+                viaparinfo->io_virt + VIA_REG_DIMENSION);
+        /* Forground color or Destination color */
+        writel(col, viaparinfo->io_virt + VIA_REG_FGCOLOR);
+        /* GE Command */
+        writel((0x01 | 0x2000 | (rop << 24)),
+                viaparinfo->io_virt + VIA_REG_GECMD);
+
+}
+
+static void viafb_copyarea(struct fb_info *info,
+        const struct fb_copyarea *area)
+{
+        u32 dy = area->dy, sy = area->sy, direction = 0x0;
+        u32 sx = area->sx, dx = area->dx, width = area->width;
+        int pitch;
+
+        DEBUG_MSG(KERN_INFO "viafb_copyarea!!\n");
+
+        if (!viafb_accel)
+                return cfb_copyarea(info, area);
+
+        if (!area->width || !area->height)
+                return;
+
+        if (sy < dy) {
+                dy += area->height - 1;
+                sy += area->height - 1;
+                direction |= 0x4000;
+        }
+
+        if (sx < dx) {
+                dx += width - 1;
+                sx += width - 1;
+                direction |= 0x8000;
+        }
+
+        /* Source Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_SRCBASE);
+        /* Destination Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_DSTBASE);
+        /* Pitch */
+        pitch = (info->var.xres_virtual + 7) & ~7;
+        /* VIA_PITCH_ENABLE can be omitted now. */
+        writel(VIA_PITCH_ENABLE |
+                   (((pitch *
+                      info->var.bits_per_pixel >> 3) >> 3) | (((pitch *
+                                                                info->var.
+                                                                bits_per_pixel
+                                                                >> 3) >> 3)
+                                                              << 16)),
+                                viaparinfo->io_virt + VIA_REG_PITCH);
+        /* BitBlt Source Address */
+        writel(((sy << 16) | sx), viaparinfo->io_virt + VIA_REG_SRCPOS);
+        /* BitBlt Destination Address */
+        writel(((dy << 16) | dx), viaparinfo->io_virt + VIA_REG_DSTPOS);
+        /* Dimension: width & height */
+        writel((((area->height - 1) << 16) | (area->width - 1)),
+                   viaparinfo->io_virt + VIA_REG_DIMENSION);
+        /* GE Command */
+        writel((0x01 | direction | (0xCC << 24)),
+                viaparinfo->io_virt + VIA_REG_GECMD);
+
+}
+
+static void viafb_imageblit(struct fb_info *info,
+        const struct fb_image *image)
+{
+        u32 size, bg_col = 0, fg_col = 0, *udata;
+        int i;
+        int pitch;
+
+        if (!viafb_accel)
+                return cfb_imageblit(info, image);
+
+        udata = (u32 *) image->data;
+
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                bg_col = image->bg_color;
+                fg_col = image->fg_color;
+                break;
+        case 16:
+                bg_col = ((u32 *) (info->pseudo_palette))[image->bg_color];
+                fg_col = ((u32 *) (info->pseudo_palette))[image->fg_color];
+                break;
+        case 32:
+                bg_col = ((u32 *) (info->pseudo_palette))[image->bg_color];
+                fg_col = ((u32 *) (info->pseudo_palette))[image->fg_color];
+                break;
+        }
+        size = image->width * image->height;
+
+        /* Source Base Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        /* Destination Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_DSTBASE);
+        /* Pitch */
+        pitch = (info->var.xres_virtual + 7) & ~7;
+        writel(VIA_PITCH_ENABLE |
+                   (((pitch *
+                      info->var.bits_per_pixel >> 3) >> 3) | (((pitch *
+                                                                info->var.
+                                                                bits_per_pixel
+                                                                >> 3) >> 3)
+                                                              << 16)),
+                                viaparinfo->io_virt + VIA_REG_PITCH);
+        /* BitBlt Source Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
+        /* BitBlt Destination Address */
+        writel(((image->dy << 16) | image->dx),
+                viaparinfo->io_virt + VIA_REG_DSTPOS);
+        /* Dimension: width & height */
+        writel((((image->height - 1) << 16) | (image->width - 1)),
+                   viaparinfo->io_virt + VIA_REG_DIMENSION);
+        /* fb color */
+        writel(fg_col, viaparinfo->io_virt + VIA_REG_FGCOLOR);
+        /* bg color */
+        writel(bg_col, viaparinfo->io_virt + VIA_REG_BGCOLOR);
+        /* GE Command */
+        writel(0xCC020142, viaparinfo->io_virt + VIA_REG_GECMD);
+
+        for (i = 0; i < size / 4; i++) {
+                writel(*udata, viaparinfo->io_virt + VIA_MMIO_BLTBASE);
+                udata++;
+        }
+
+}
+
+static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        u8 data[CURSOR_SIZE / 8];
+        u32 data_bak[CURSOR_SIZE / 32];
+        u32 temp, xx, yy, bg_col = 0, fg_col = 0;
+        int size, i, j = 0;
+        static int hw_cursor;
+        struct viafb_par *p_viafb_par;
+
+        if (viafb_accel)
+                hw_cursor = 1;
+
+        if (!viafb_accel) {
+                if (hw_cursor) {
+                        viafb_show_hw_cursor(info, HW_Cursor_OFF);
+                        hw_cursor = 0;
+                }
+                return -ENODEV;
+        }
+
+        if ((((struct viafb_par *)(info->par))->iga_path == IGA2)
+            && (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266))
+                return -ENODEV;
+
+        /* When duoview and using lcd , use soft cursor */
+        if (viafb_LCD_ON || ((struct viafb_par *)(info->par))->duoview)
+                return -ENODEV;
+
+        viafb_show_hw_cursor(info, HW_Cursor_OFF);
+        viacursor = *cursor;
+
+        if (cursor->set & FB_CUR_SETHOT) {
+                viacursor.hot = cursor->hot;
+                temp = ((viacursor.hot.x) << 16) + viacursor.hot.y;
+                writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
+        }
+
+        if (cursor->set & FB_CUR_SETPOS) {
+                viacursor.image.dx = cursor->image.dx;
+                viacursor.image.dy = cursor->image.dy;
+                yy = cursor->image.dy - info->var.yoffset;
+                xx = cursor->image.dx - info->var.xoffset;
+                temp = yy & 0xFFFF;
+                temp |= (xx << 16);
+                writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
+        }
+
+        if (cursor->set & FB_CUR_SETSIZE) {
+                temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+
+                if ((cursor->image.width <= 32)
+                    && (cursor->image.height <= 32)) {
+                        MAX_CURS = 32;
+                        temp |= 0x2;
+                } else if ((cursor->image.width <= 64)
+                           && (cursor->image.height <= 64)) {
+                        MAX_CURS = 64;
+                        temp &= 0xFFFFFFFD;
+                } else {
+                        DEBUG_MSG(KERN_INFO
+                        "The cursor image is biger than 64x64 bits...\n");
+                        return -ENXIO;
+                }
+                writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+
+                viacursor.image.height = cursor->image.height;
+                viacursor.image.width = cursor->image.width;
+        }
+
+        if (cursor->set & FB_CUR_SETCMAP) {
+                viacursor.image.fg_color = cursor->image.fg_color;
+                viacursor.image.bg_color = cursor->image.bg_color;
+
+                switch (info->var.bits_per_pixel) {
+                case 8:
+                case 16:
+                case 32:
+                        bg_col =
+                            (0xFF << 24) |
+                            (((info->cmap.red)[viacursor.image.bg_color] &
+                            0xFF00) << 8) |
+                            ((info->cmap.green)[viacursor.image.bg_color] &
+                            0xFF00) |
+                            (((info->cmap.blue)[viacursor.image.bg_color] &
+                            0xFF00) >> 8);
+                        fg_col =
+                            (0xFF << 24) |
+                            (((info->cmap.red)[viacursor.image.fg_color] &
+                            0xFF00) << 8) |
+                            ((info->cmap.green)[viacursor.image.fg_color] &
+                            0xFF00) |
+                            (((info->cmap.blue)[viacursor.image.fg_color] &
+                            0xFF00) >> 8);
+                        break;
+                default:
+                        return 0;
+                }
+
+                /* This is indeed a patch for VT3324/VT3353 */
+                if (!info->par)
+                        return 0;
+                p_viafb_par = (struct viafb_par *)info->par;
+
+                if ((p_viafb_par->chip_info->gfx_chip_name ==
+                        UNICHROME_CX700) ||
+                        ((p_viafb_par->chip_info->gfx_chip_name ==
+                        UNICHROME_VX800))) {
+                        bg_col =
+                            (((info->cmap.red)[viacursor.image.bg_color] &
+                            0xFFC0) << 14) |
+                            (((info->cmap.green)[viacursor.image.bg_color] &
+                            0xFFC0) << 4) |
+                            (((info->cmap.blue)[viacursor.image.bg_color] &
+                            0xFFC0) >> 6);
+                        fg_col =
+                            (((info->cmap.red)[viacursor.image.fg_color] &
+                            0xFFC0) << 14) |
+                            (((info->cmap.green)[viacursor.image.fg_color] &
+                            0xFFC0) << 4) |
+                            (((info->cmap.blue)[viacursor.image.fg_color] &
+                            0xFFC0) >> 6);
+                }
+
+                writel(bg_col, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
+                writel(fg_col, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
+        }
+
+        if (cursor->set & FB_CUR_SETSHAPE) {
+                size =
+                    ((viacursor.image.width + 7) >> 3) *
+                    viacursor.image.height;
+
+                if (MAX_CURS == 32) {
+                        for (i = 0; i < (CURSOR_SIZE / 32); i++) {
+                                data_bak[i] = 0x0;
+                                data_bak[i + 1] = 0xFFFFFFFF;
+                                i += 1;
+                        }
+                } else if (MAX_CURS == 64) {
+                        for (i = 0; i < (CURSOR_SIZE / 32); i++) {
+                                data_bak[i] = 0x0;
+                                data_bak[i + 1] = 0x0;
+                                data_bak[i + 2] = 0xFFFFFFFF;
+                                data_bak[i + 3] = 0xFFFFFFFF;
+                                i += 3;
+                        }
+                }
+
+                switch (viacursor.rop) {
+                case ROP_XOR:
+                        for (i = 0; i < size; i++)
+                                data[i] = viacursor.mask[i];
+                        break;
+                case ROP_COPY:
+
+                        for (i = 0; i < size; i++)
+                                data[i] = viacursor.mask[i];
+                        break;
+                default:
+                        break;
+                }
+
+                if (MAX_CURS == 32) {
+                        for (i = 0; i < size; i++) {
+                                data_bak[j] = (u32) data[i];
+                                data_bak[j + 1] = ~data_bak[j];
+                                j += 2;
+                        }
+                } else if (MAX_CURS == 64) {
+                        for (i = 0; i < size; i++) {
+                                data_bak[j] = (u32) data[i];
+                                data_bak[j + 1] = 0x0;
+                                data_bak[j + 2] = ~data_bak[j];
+                                data_bak[j + 3] = ~data_bak[j + 1];
+                                j += 4;
+                        }
+                }
+
+                memcpy(((struct viafb_par *)(info->par))->fbmem_virt +
+                       ((struct viafb_par *)(info->par))->cursor_start,
+                       data_bak, CURSOR_SIZE);
+        }
+
+        if (viacursor.enable)
+                viafb_show_hw_cursor(info, HW_Cursor_ON);
+
+        return 0;
+}
+
+static int viafb_sync(struct fb_info *info)
+{
+        if (viafb_accel)
+                viafb_wait_engine_idle();
+        return 0;
+}
+
+int viafb_get_mode_index(int hres, int vres, int flag)
+{
+        u32 i;
+        DEBUG_MSG(KERN_INFO "viafb_get_mode_index!\n");
+
+        for (i = 0; viafb_modentry[i].mode_index != VIA_RES_INVALID; i++)
+                if (viafb_modentry[i].xres == hres &&
+                        viafb_modentry[i].yres == vres)
+                        break;
+
+        viafb_resMode = viafb_modentry[i].mode_index;
+        if (flag)
+                viafb_mode1 = viafb_modentry[i].mode_res;
+        else
+                viafb_mode = viafb_modentry[i].mode_res;
+
+        return viafb_resMode;
+}
+
+static void check_available_device_to_enable(int device_id)
+{
+        int device_num = 0;
+
+        /* Initialize: */
+        viafb_CRT_ON = STATE_OFF;
+        viafb_DVI_ON = STATE_OFF;
+        viafb_LCD_ON = STATE_OFF;
+        viafb_LCD2_ON = STATE_OFF;
+        viafb_DeviceStatus = None_Device;
+
+        if ((device_id & CRT_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_CRT_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= CRT_Device;
+        }
+
+        if ((device_id & DVI_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_DVI_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= DVI_Device;
+        }
+
+        if ((device_id & LCD_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_LCD_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= LCD_Device;
+        }
+
+        if ((device_id & LCD2_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_LCD2_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= LCD2_Device;
+        }
+
+        if (viafb_DeviceStatus == None_Device) {
+                /* Use CRT as default active device: */
+                viafb_CRT_ON = STATE_ON;
+                viafb_DeviceStatus = CRT_Device;
+        }
+        DEBUG_MSG(KERN_INFO "Device Status:%x", viafb_DeviceStatus);
+}
+
+static void viafb_set_device(struct device_t active_dev)
+{
+        /* Check available device to enable: */
+        int device_id = None_Device;
+        if (active_dev.crt)
+                device_id |= CRT_Device;
+        if (active_dev.dvi)
+                device_id |= DVI_Device;
+        if (active_dev.lcd)
+                device_id |= LCD_Device;
+
+        check_available_device_to_enable(device_id);
+
+        /* Check property of LCD: */
+        if (viafb_LCD_ON) {
+                if (active_dev.lcd_dsp_cent) {
+                        viaparinfo->lvds_setting_info->display_method =
+                                viafb_lcd_dsp_method = LCD_CENTERING;
+                } else {
+                        viaparinfo->lvds_setting_info->display_method =
+                                viafb_lcd_dsp_method = LCD_EXPANDSION;
+                }
+
+                if (active_dev.lcd_mode == LCD_SPWG) {
+                        viaparinfo->lvds_setting_info->lcd_mode =
+                                viafb_lcd_mode = LCD_SPWG;
+                } else {
+                        viaparinfo->lvds_setting_info->lcd_mode =
+                                viafb_lcd_mode = LCD_OPENLDI;
+                }
+
+                if (active_dev.lcd_panel_id <= LCD_PANEL_ID_MAXIMUM) {
+                        viafb_lcd_panel_id = active_dev.lcd_panel_id;
+                        viafb_init_lcd_size();
+                }
+        }
+
+        /* Check property of mode: */
+        if (!active_dev.xres1)
+                viafb_second_xres = 640;
+        else
+                viafb_second_xres = active_dev.xres1;
+        if (!active_dev.yres1)
+                viafb_second_yres = 480;
+        else
+                viafb_second_yres = active_dev.yres1;
+        if (active_dev.bpp != 0)
+                viafb_bpp = active_dev.bpp;
+        if (active_dev.bpp1 != 0)
+                viafb_bpp1 = active_dev.bpp1;
+        if (active_dev.refresh != 0)
+                viafb_refresh = active_dev.refresh;
+        if (active_dev.refresh1 != 0)
+                viafb_refresh1 = active_dev.refresh1;
+        if ((active_dev.samm == STATE_OFF) || (active_dev.samm == STATE_ON))
+                viafb_SAMM_ON = active_dev.samm;
+        viafb_primary_dev = active_dev.primary_dev;
+
+        viafb_set_start_addr();
+        viafb_set_iga_path();
+}
+
+static void viafb_set_video_device(u32 video_dev_info)
+{
+        viaparinfo->video_on_crt = STATE_OFF;
+        viaparinfo->video_on_dvi = STATE_OFF;
+        viaparinfo->video_on_lcd = STATE_OFF;
+
+        /* Check available device to enable: */
+        if ((video_dev_info & CRT_Device) == CRT_Device)
+                viaparinfo->video_on_crt = STATE_ON;
+        else if ((video_dev_info & DVI_Device) == DVI_Device)
+                viaparinfo->video_on_dvi = STATE_ON;
+        else if ((video_dev_info & LCD_Device) == LCD_Device)
+                viaparinfo->video_on_lcd = STATE_ON;
+}
+
+static void viafb_get_video_device(u32 *video_dev_info)
+{
+        *video_dev_info = None_Device;
+        if (viaparinfo->video_on_crt == STATE_ON)
+                *video_dev_info |= CRT_Device;
+        else if (viaparinfo->video_on_dvi == STATE_ON)
+                *video_dev_info |= DVI_Device;
+        else if (viaparinfo->video_on_lcd == STATE_ON)
+                *video_dev_info |= LCD_Device;
+}
+
+static int get_primary_device(void)
+{
+        int primary_device = 0;
+        /* Rule: device on iga1 path are the primary device. */
+        if (viafb_SAMM_ON) {
+                if (viafb_CRT_ON) {
+                        if (viaparinfo->crt_setting_info->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "CRT IGA Path:%d\n",
+                                        viaparinfo->
+                                        crt_setting_info->iga_path);
+                                primary_device = CRT_Device;
+                        }
+                }
+                if (viafb_DVI_ON) {
+                        if (viaparinfo->tmds_setting_info->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "DVI IGA Path:%d\n",
+                                        viaparinfo->
+                                        tmds_setting_info->iga_path);
+                                primary_device = DVI_Device;
+                        }
+                }
+                if (viafb_LCD_ON) {
+                        if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "LCD IGA Path:%d\n",
+                                        viaparinfo->
+                                        lvds_setting_info->iga_path);
+                                primary_device = LCD_Device;
+                        }
+                }
+                if (viafb_LCD2_ON) {
+                        if (viaparinfo->lvds_setting_info2->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "LCD2 IGA Path:%d\n",
+                                        viaparinfo->
+                                        lvds_setting_info2->iga_path);
+                                primary_device = LCD2_Device;
+                        }
+                }
+        }
+        return primary_device;
+}
+
+static u8 is_duoview(void)
+{
+        if (0 == viafb_SAMM_ON) {
+                if (viafb_LCD_ON + viafb_LCD2_ON +
+                        viafb_DVI_ON + viafb_CRT_ON == 2)
+                        return true;
+                return false;
+        } else {
+                return false;
+        }
+}
+
+static void apply_second_mode_setting(struct fb_var_screeninfo
+        *sec_var)
+{
+        u32 htotal, vtotal, long_refresh;
+
+        htotal = sec_var->xres + sec_var->left_margin +
+                sec_var->right_margin + sec_var->hsync_len;
+        vtotal = sec_var->yres + sec_var->upper_margin +
+                sec_var->lower_margin + sec_var->vsync_len;
+        if ((sec_var->xres_virtual * (sec_var->bits_per_pixel >> 3)) & 0x1F) {
+                /*Is 32 bytes alignment? */
+                /*32 pixel alignment */
+                sec_var->xres_virtual = (sec_var->xres_virtual + 31) & ~31;
+        }
+
+        htotal = sec_var->xres + sec_var->left_margin +
+                sec_var->right_margin + sec_var->hsync_len;
+        vtotal = sec_var->yres + sec_var->upper_margin +
+                sec_var->lower_margin + sec_var->vsync_len;
+        long_refresh = 1000000000UL / sec_var->pixclock * 1000;
+        long_refresh /= (htotal * vtotal);
+
+        viafb_second_xres = sec_var->xres;
+        viafb_second_yres = sec_var->yres;
+        viafb_second_virtual_xres = sec_var->xres_virtual;
+        viafb_second_virtual_yres = sec_var->yres_virtual;
+        viafb_bpp1 = sec_var->bits_per_pixel;
+        viafb_refresh1 = viafb_get_refresh(sec_var->xres, sec_var->yres,
+                long_refresh);
+}
+
+static int apply_device_setting(struct viafb_ioctl_setting setting_info,
+        struct fb_info *info)
+{
+        int need_set_mode = 0;
+        DEBUG_MSG(KERN_INFO "apply_device_setting\n");
+
+        if (setting_info.device_flag) {
+                need_set_mode = 1;
+                check_available_device_to_enable(setting_info.device_status);
+        }
+
+        /* Unlock LCD's operation according to LCD flag
+           and check if the setting value is valid. */
+        /* If the value is valid, apply the new setting value to the device. */
+        if (viafb_LCD_ON) {
+                if (setting_info.lcd_operation_flag & OP_LCD_CENTERING) {
+                        need_set_mode = 1;
+                        if (setting_info.lcd_attributes.display_center) {
+                                /* Centering */
+                                viaparinfo->lvds_setting_info->display_method =
+                                    LCD_CENTERING;
+                                viafb_lcd_dsp_method = LCD_CENTERING;
+                                viaparinfo->lvds_setting_info2->display_method =
+                                    viafb_lcd_dsp_method = LCD_CENTERING;
+                        } else {
+                                /* expandsion */
+                                viaparinfo->lvds_setting_info->display_method =
+                                    LCD_EXPANDSION;
+                                viafb_lcd_dsp_method = LCD_EXPANDSION;
+                                viaparinfo->lvds_setting_info2->display_method =
+                                    LCD_EXPANDSION;
+                                viafb_lcd_dsp_method = LCD_EXPANDSION;
+                        }
+                }
+
+                if (setting_info.lcd_operation_flag & OP_LCD_MODE) {
+                        need_set_mode = 1;
+                        if (setting_info.lcd_attributes.lcd_mode ==
+                                LCD_SPWG) {
+                                viaparinfo->lvds_setting_info->lcd_mode =
+                                        viafb_lcd_mode = LCD_SPWG;
+                        } else {
+                                viaparinfo->lvds_setting_info->lcd_mode =
+                                        viafb_lcd_mode = LCD_OPENLDI;
+                        }
+                        viaparinfo->lvds_setting_info2->lcd_mode =
+                            viaparinfo->lvds_setting_info->lcd_mode;
+                }
+
+                if (setting_info.lcd_operation_flag & OP_LCD_PANEL_ID) {
+                        need_set_mode = 1;
+                        if (setting_info.lcd_attributes.panel_id <=
+                            LCD_PANEL_ID_MAXIMUM) {
+                                viafb_lcd_panel_id =
+                                    setting_info.lcd_attributes.panel_id;
+                                viafb_init_lcd_size();
+                        }
+                }
+        }
+
+        if (0 != (setting_info.samm_status & OP_SAMM)) {
+                setting_info.samm_status =
+                    setting_info.samm_status & (~OP_SAMM);
+                if (setting_info.samm_status == 0
+                    || setting_info.samm_status == 1) {
+                        viafb_SAMM_ON = setting_info.samm_status;
+
+                        if (viafb_SAMM_ON)
+                                viafb_primary_dev = setting_info.primary_device;
+
+                        viafb_set_start_addr();
+                        viafb_set_iga_path();
+                }
+                need_set_mode = 1;
+        }
+
+        viaparinfo->duoview = is_duoview();
+
+        if (!need_set_mode) {
+                ;
+        } else {
+                viafb_set_iga_path();
+                viafb_set_par(info);
+        }
+        return true;
+}
+
+static void retrieve_device_setting(struct viafb_ioctl_setting
+        *setting_info)
+{
+
+        /* get device status */
+        if (viafb_CRT_ON == 1)
+                setting_info->device_status = CRT_Device;
+        if (viafb_DVI_ON == 1)
+                setting_info->device_status |= DVI_Device;
+        if (viafb_LCD_ON == 1)
+                setting_info->device_status |= LCD_Device;
+        if (viafb_LCD2_ON == 1)
+                setting_info->device_status |= LCD2_Device;
+        if ((viaparinfo->video_on_crt == 1) && (viafb_CRT_ON == 1)) {
+                setting_info->video_device_status =
+                        viaparinfo->crt_setting_info->iga_path;
+        } else if ((viaparinfo->video_on_dvi == 1) && (viafb_DVI_ON == 1)) {
+                setting_info->video_device_status =
+                        viaparinfo->tmds_setting_info->iga_path;
+        } else if ((viaparinfo->video_on_lcd == 1) && (viafb_LCD_ON == 1)) {
+                setting_info->video_device_status =
+                        viaparinfo->lvds_setting_info->iga_path;
+        } else {
+                setting_info->video_device_status = 0;
+        }
+
+        setting_info->samm_status = viafb_SAMM_ON;
+        setting_info->primary_device = get_primary_device();
+
+        setting_info->first_dev_bpp = viafb_bpp;
+        setting_info->second_dev_bpp = viafb_bpp1;
+
+        setting_info->first_dev_refresh = viafb_refresh;
+        setting_info->second_dev_refresh = viafb_refresh1;
+
+        setting_info->first_dev_hor_res = viafb_hotplug_Xres;
+        setting_info->first_dev_ver_res = viafb_hotplug_Yres;
+        setting_info->second_dev_hor_res = viafb_second_xres;
+        setting_info->second_dev_ver_res = viafb_second_yres;
+
+        /* Get lcd attributes */
+        setting_info->lcd_attributes.display_center = viafb_lcd_dsp_method;
+        setting_info->lcd_attributes.panel_id = viafb_lcd_panel_id;
+        setting_info->lcd_attributes.lcd_mode = viafb_lcd_mode;
+}
+
+static void parse_active_dev(void)
+{
+        viafb_CRT_ON = STATE_OFF;
+        viafb_DVI_ON = STATE_OFF;
+        viafb_LCD_ON = STATE_OFF;
+        viafb_LCD2_ON = STATE_OFF;
+        /* 1. Modify the active status of devices. */
+        /* 2. Keep the order of devices, so we can set corresponding
+           IGA path to devices in SAMM case. */
+        /*    Note: The previous of active_dev is primary device,
+           and the following is secondary device. */
+        if (!strncmp(viafb_active_dev, "CRT+DVI", 7)) {
+                /* CRT+DVI */
+                viafb_CRT_ON = STATE_ON;
+                viafb_DVI_ON = STATE_ON;
+                viafb_primary_dev = CRT_Device;
+        } else if (!strncmp(viafb_active_dev, "DVI+CRT", 7)) {
+                /* DVI+CRT */
+                viafb_CRT_ON = STATE_ON;
+                viafb_DVI_ON = STATE_ON;
+                viafb_primary_dev = DVI_Device;
+        } else if (!strncmp(viafb_active_dev, "CRT+LCD", 7)) {
+                /* CRT+LCD */
+                viafb_CRT_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = CRT_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD+CRT", 7)) {
+                /* LCD+CRT */
+                viafb_CRT_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = LCD_Device;
+        } else if (!strncmp(viafb_active_dev, "DVI+LCD", 7)) {
+                /* DVI+LCD */
+                viafb_DVI_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = DVI_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD+DVI", 7)) {
+                /* LCD+DVI */
+                viafb_DVI_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = LCD_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD+LCD2", 8)) {
+                viafb_LCD_ON = STATE_ON;
+                viafb_LCD2_ON = STATE_ON;
+                viafb_primary_dev = LCD_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD2+LCD", 8)) {
+                viafb_LCD_ON = STATE_ON;
+                viafb_LCD2_ON = STATE_ON;
+                viafb_primary_dev = LCD2_Device;
+        } else if (!strncmp(viafb_active_dev, "CRT", 3)) {
+                /* CRT only */
+                viafb_CRT_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else if (!strncmp(viafb_active_dev, "DVI", 3)) {
+                /* DVI only */
+                viafb_DVI_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else if (!strncmp(viafb_active_dev, "LCD", 3)) {
+                /* LCD only */
+                viafb_LCD_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else {
+                viafb_CRT_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        }
+        viaparinfo->duoview = is_duoview();
+}
+
+static void parse_video_dev(void)
+{
+        viaparinfo->video_on_crt = STATE_OFF;
+        viaparinfo->video_on_dvi = STATE_OFF;
+        viaparinfo->video_on_lcd = STATE_OFF;
+
+        if (!strncmp(viafb_video_dev, "CRT", 3)) {
+                /* Video on CRT */
+                viaparinfo->video_on_crt = STATE_ON;
+        } else if (!strncmp(viafb_video_dev, "DVI", 3)) {
+                /* Video on DVI */
+                viaparinfo->video_on_dvi = STATE_ON;
+        } else if (!strncmp(viafb_video_dev, "LCD", 3)) {
+                /* Video on LCD */
+                viaparinfo->video_on_lcd = STATE_ON;
+        }
+}
+
+static int parse_port(char *opt_str, int *output_interface)
+{
+        if (!strncmp(opt_str, "DVP0", 4))
+                *output_interface = INTERFACE_DVP0;
+        else if (!strncmp(opt_str, "DVP1", 4))
+                *output_interface = INTERFACE_DVP1;
+        else if (!strncmp(opt_str, "DFP_HIGHLOW", 11))
+                *output_interface = INTERFACE_DFP;
+        else if (!strncmp(opt_str, "DFP_HIGH", 8))
+                *output_interface = INTERFACE_DFP_HIGH;
+        else if (!strncmp(opt_str, "DFP_LOW", 7))
+                *output_interface = INTERFACE_DFP_LOW;
+        else
+                *output_interface = INTERFACE_NONE;
+        return 0;
+}
+
+static void parse_lcd_port(void)
+{
+        parse_port(viafb_lcd_port, &viaparinfo->chip_info->lvds_chip_info.
+                output_interface);
+        /*Initialize to avoid unexpected behavior */
+        viaparinfo->chip_info->lvds_chip_info2.output_interface =
+        INTERFACE_NONE;
+
+        DEBUG_MSG(KERN_INFO "parse_lcd_port: viafb_lcd_port:%s,interface:%d\n",
+                  viafb_lcd_port, viaparinfo->chip_info->lvds_chip_info.
+                  output_interface);
+}
+
+static void parse_dvi_port(void)
+{
+        parse_port(viafb_dvi_port, &viaparinfo->chip_info->tmds_chip_info.
+                output_interface);
+
+        DEBUG_MSG(KERN_INFO "parse_dvi_port: viafb_dvi_port:%s,interface:%d\n",
+                  viafb_dvi_port, viaparinfo->chip_info->tmds_chip_info.
+                  output_interface);
+}
+
+/*
+ * The proc filesystem read/write function, a simple proc implement to
+ * get/set the value of DPA  DVP0,   DVP0DataDriving,  DVP0ClockDriving, DVP1,
+ * DVP1Driving, DFPHigh, DFPLow CR96,   SR2A[5], SR1B[1], SR2A[4], SR1E[2],
+ * CR9B,    SR65,    CR97,    CR99
+ */
+static int viafb_dvp0_proc_read(char *buf, char **start, off_t offset,
+int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dvp0_data_dri = 0, dvp0_clk_dri = 0, dvp0 = 0;
+        dvp0_data_dri =
+            (viafb_read_reg(VIASR, SR2A) & BIT5) >> 4 |
+            (viafb_read_reg(VIASR, SR1B) & BIT1) >> 1;
+        dvp0_clk_dri =
+            (viafb_read_reg(VIASR, SR2A) & BIT4) >> 3 |
+            (viafb_read_reg(VIASR, SR1E) & BIT2) >> 2;
+        dvp0 = viafb_read_reg(VIACR, CR96) & 0x0f;
+        len +=
+            sprintf(buf + len, "%x %x %x\n", dvp0, dvp0_data_dri, dvp0_clk_dri);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dvp0_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20], *value, *pbuf;
+        u8 reg_val = 0;
+        unsigned long length, i;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        pbuf = &buf[0];
+        for (i = 0; i < 3; i++) {
+                value = strsep(&pbuf, " ");
+                if (value != NULL) {
+                        strict_strtoul(value, 0, (unsigned long *)&reg_val);
+                        DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,
+                                  reg_val);
+                        switch (i) {
+                        case 0:
+                                viafb_write_reg_mask(CR96, VIACR,
+                                        reg_val, 0x0f);
+                                break;
+                        case 1:
+                                viafb_write_reg_mask(SR2A, VIASR,
+                                        reg_val << 4, BIT5);
+                                viafb_write_reg_mask(SR1B, VIASR,
+                                        reg_val << 1, BIT1);
+                                break;
+                        case 2:
+                                viafb_write_reg_mask(SR2A, VIASR,
+                                        reg_val << 3, BIT4);
+                                viafb_write_reg_mask(SR1E, VIASR,
+                                        reg_val << 2, BIT2);
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        break;
+                }
+        }
+        return count;
+}
+static int viafb_dvp1_proc_read(char *buf, char **start, off_t offset,
+        int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dvp1 = 0, dvp1_data_dri = 0, dvp1_clk_dri = 0;
+        dvp1 = viafb_read_reg(VIACR, CR9B) & 0x0f;
+        dvp1_data_dri = (viafb_read_reg(VIASR, SR65) & 0x0c) >> 2;
+        dvp1_clk_dri = viafb_read_reg(VIASR, SR65) & 0x03;
+        len +=
+            sprintf(buf + len, "%x %x %x\n", dvp1, dvp1_data_dri, dvp1_clk_dri);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dvp1_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20], *value, *pbuf;
+        u8 reg_val = 0;
+        unsigned long length, i;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        pbuf = &buf[0];
+        for (i = 0; i < 3; i++) {
+                value = strsep(&pbuf, " ");
+                if (value != NULL) {
+                        strict_strtoul(value, 0, (unsigned long *)&reg_val);
+                        switch (i) {
+                        case 0:
+                                viafb_write_reg_mask(CR9B, VIACR,
+                                        reg_val, 0x0f);
+                                break;
+                        case 1:
+                                viafb_write_reg_mask(SR65, VIASR,
+                                        reg_val << 2, 0x0c);
+                                break;
+                        case 2:
+                                viafb_write_reg_mask(SR65, VIASR,
+                                        reg_val, 0x03);
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        break;
+                }
+        }
+        return count;
+}
+
+static int viafb_dfph_proc_read(char *buf, char **start, off_t offset,
+        int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dfp_high = 0;
+        dfp_high = viafb_read_reg(VIACR, CR97) & 0x0f;
+        len += sprintf(buf + len, "%x\n", dfp_high);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dfph_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20];
+        u8 reg_val = 0;
+        unsigned long length;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+        viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
+        return count;
+}
+static int viafb_dfpl_proc_read(char *buf, char **start, off_t offset,
+        int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dfp_low = 0;
+        dfp_low = viafb_read_reg(VIACR, CR99) & 0x0f;
+        len += sprintf(buf + len, "%x\n", dfp_low);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dfpl_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20];
+        u8 reg_val = 0;
+        unsigned long length;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+        viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
+        return count;
+}
+static int viafb_vt1636_proc_read(char *buf, char **start,
+        off_t offset, int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 vt1636_08 = 0, vt1636_09 = 0;
+        switch (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+        case VT1636_LVDS:
+                vt1636_08 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info,
+                    &viaparinfo->chip_info->lvds_chip_info, 0x08) & 0x0f;
+                vt1636_09 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info,
+                    &viaparinfo->chip_info->lvds_chip_info, 0x09) & 0x1f;
+                len += sprintf(buf + len, "%x %x\n", vt1636_08, vt1636_09);
+                break;
+        default:
+                break;
+        }
+        switch (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+        case VT1636_LVDS:
+                vt1636_08 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info2,
+                        &viaparinfo->chip_info->lvds_chip_info2, 0x08) & 0x0f;
+                vt1636_09 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info2,
+                        &viaparinfo->chip_info->lvds_chip_info2, 0x09) & 0x1f;
+                len += sprintf(buf + len, " %x %x\n", vt1636_08, vt1636_09);
+                break;
+        default:
+                break;
+        }
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_vt1636_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[30], *value, *pbuf;
+        struct IODATA reg_val;
+        unsigned long length, i;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 30 ? 30 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        pbuf = &buf[0];
+        switch (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+        case VT1636_LVDS:
+                for (i = 0; i < 2; i++) {
+                        value = strsep(&pbuf, " ");
+                        if (value != NULL) {
+                                strict_strtoul(value, 0,
+                                        (unsigned long *)&reg_val.Data);
+                                switch (i) {
+                                case 0:
+                                        reg_val.Index = 0x08;
+                                        reg_val.Mask = 0x0f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info,
+                                             reg_val);
+                                        break;
+                                case 1:
+                                        reg_val.Index = 0x09;
+                                        reg_val.Mask = 0x1f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info,
+                                             reg_val);
+                                        break;
+                                default:
+                                        break;
+                                }
+                        } else {
+                                break;
+                        }
+                }
+                break;
+        default:
+                break;
+        }
+        switch (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+        case VT1636_LVDS:
+                for (i = 0; i < 2; i++) {
+                        value = strsep(&pbuf, " ");
+                        if (value != NULL) {
+                                strict_strtoul(value, 0,
+                                        (unsigned long *)&reg_val.Data);
+                                switch (i) {
+                                case 0:
+                                        reg_val.Index = 0x08;
+                                        reg_val.Mask = 0x0f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info2,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info2,
+                                             reg_val);
+                                        break;
+                                case 1:
+                                        reg_val.Index = 0x09;
+                                        reg_val.Mask = 0x1f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info2,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info2,
+                                             reg_val);
+                                        break;
+                                default:
+                                        break;
+                                }
+                        } else {
+                                break;
+                        }
+                }
+                break;
+        default:
+                break;
+        }
+        return count;
+}
+
+static void viafb_init_proc(struct proc_dir_entry *viafb_entry)
+{
+        struct proc_dir_entry *entry;
+        viafb_entry = proc_mkdir("viafb", NULL);
+        if (viafb_entry) {
+                entry = create_proc_entry("dvp0", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dvp0_proc_read;
+                        entry->write_proc = viafb_dvp0_proc_write;
+                }
+                entry = create_proc_entry("dvp1", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dvp1_proc_read;
+                        entry->write_proc = viafb_dvp1_proc_write;
+                }
+                entry = create_proc_entry("dfph", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dfph_proc_read;
+                        entry->write_proc = viafb_dfph_proc_write;
+                }
+                entry = create_proc_entry("dfpl", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dfpl_proc_read;
+                        entry->write_proc = viafb_dfpl_proc_write;
+                }
+                if (VT1636_LVDS == viaparinfo->chip_info->lvds_chip_info.
+                        lvds_chip_name || VT1636_LVDS ==
+                    viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+                        entry = create_proc_entry("vt1636", 0, viafb_entry);
+                        if (entry) {
+                                entry->owner = THIS_MODULE;
+                                entry->read_proc = viafb_vt1636_proc_read;
+                                entry->write_proc = viafb_vt1636_proc_write;
+                        }
+                }
+
+        }
+}
+static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)
+{
+        /* no problem if it was not registered */
+        remove_proc_entry("dvp0", viafb_entry);/* parent dir */
+        remove_proc_entry("dvp1", viafb_entry);
+        remove_proc_entry("dfph", viafb_entry);
+        remove_proc_entry("dfpl", viafb_entry);
+        remove_proc_entry("vt1636", viafb_entry);
+        remove_proc_entry("vt1625", viafb_entry);
+}
+
+static int __devinit via_pci_probe(void)
+{
+        unsigned int default_xres, default_yres;
+        char *tmpc, *tmpm;
+        char *tmpc_sec, *tmpm_sec;
+        int vmode_index;
+        u32 tmds_length, lvds_length, crt_length, chip_length, viafb_par_length;
+
+        DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n");
+
+        viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8);
+        tmds_length = ALIGN(sizeof(struct tmds_setting_information),
+                BITS_PER_LONG/8);
+        lvds_length = ALIGN(sizeof(struct lvds_setting_information),
+                BITS_PER_LONG/8);
+        crt_length = ALIGN(sizeof(struct lvds_setting_information),
+                BITS_PER_LONG/8);
+        chip_length = ALIGN(sizeof(struct chip_information), BITS_PER_LONG/8);
+
+        /* Allocate fb_info and ***_par here, also including some other needed
+         * variables
+        */
+        viafbinfo = framebuffer_alloc(viafb_par_length + 2 * lvds_length +
+        tmds_length + crt_length + chip_length, NULL);
+        if (!viafbinfo) {
+                printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
+                return -ENODEV;
+        }
+
+        viaparinfo = (struct viafb_par *)viafbinfo->par;
+        viaparinfo->tmds_setting_info = (struct tmds_setting_information *)
+                ((unsigned long)viaparinfo + viafb_par_length);
+        viaparinfo->lvds_setting_info = (struct lvds_setting_information *)
+                ((unsigned long)viaparinfo->tmds_setting_info + tmds_length);
+        viaparinfo->lvds_setting_info2 = (struct lvds_setting_information *)
+                ((unsigned long)viaparinfo->lvds_setting_info + lvds_length);
+        viaparinfo->crt_setting_info = (struct crt_setting_information *)
+                ((unsigned long)viaparinfo->lvds_setting_info2 + lvds_length);
+        viaparinfo->chip_info = (struct chip_information *)
+                ((unsigned long)viaparinfo->crt_setting_info + crt_length);
+
+        if (viafb_dual_fb)
+                viafb_SAMM_ON = 1;
+        parse_active_dev();
+        parse_video_dev();
+        parse_lcd_port();
+        parse_dvi_port();
+
+        /* for dual-fb must viafb_SAMM_ON=1 and viafb_dual_fb=1 */
+        if (!viafb_SAMM_ON)
+                viafb_dual_fb = 0;
+
+        /* Set up I2C bus stuff */
+        viafb_create_i2c_bus(viaparinfo);
+
+        viafb_init_chip_info();
+        viafb_get_fb_info(&viaparinfo->fbmem, &viaparinfo->memsize);
+        viaparinfo->fbmem_free = viaparinfo->memsize;
+        viaparinfo->fbmem_used = 0;
+        viaparinfo->fbmem_virt = ioremap_nocache(viaparinfo->fbmem,
+                viaparinfo->memsize);
+        viafbinfo->screen_base = (char *)viaparinfo->fbmem_virt;
+
+        if (!viaparinfo->fbmem_virt) {
+                printk(KERN_INFO "ioremap failed\n");
+                return -1;
+        }
+
+        viafb_get_mmio_info(&viaparinfo->mmio_base, &viaparinfo->mmio_len);
+        viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base,
+                viaparinfo->mmio_len);
+
+        viafbinfo->node = 0;
+        viafbinfo->fbops = &viafb_ops;
+        viafbinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
+
+        viafbinfo->pseudo_palette = pseudo_pal;
+        if (viafb_accel) {
+                viafb_init_accel();
+                viafb_init_2d_engine();
+                viafb_hw_cursor_init();
+        }
+
+        if (viafb_second_size && (viafb_second_size < 8)) {
+                viafb_second_offset = viaparinfo->fbmem_free -
+                        viafb_second_size * 1024 * 1024;
+        } else {
+                viafb_second_size = 8;
+                viafb_second_offset = viaparinfo->fbmem_free -
+                        viafb_second_size * 1024 * 1024;
+        }
+
+        viafb_FB_MM = viaparinfo->fbmem_virt;
+        tmpm = viafb_mode;
+        tmpc = strsep(&tmpm, "x");
+        strict_strtoul(tmpc, 0, (unsigned long *)&default_xres);
+        strict_strtoul(tmpm, 0, (unsigned long *)&default_yres);
+
+        vmode_index = viafb_get_mode_index(default_xres, default_yres, 0);
+        DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index);
+
+        if (viafb_SAMM_ON == 1) {
+                if (strcmp(viafb_mode, viafb_mode1)) {
+                        tmpm_sec = viafb_mode1;
+                        tmpc_sec = strsep(&tmpm_sec, "x");
+                        strict_strtoul(tmpc_sec, 0,
+                                (unsigned long *)&viafb_second_xres);
+                        strict_strtoul(tmpm_sec, 0,
+                                (unsigned long *)&viafb_second_yres);
+                } else {
+                        viafb_second_xres = default_xres;
+                        viafb_second_yres = default_yres;
+                }
+                if (0 == viafb_second_virtual_xres) {
+                        switch (viafb_second_xres) {
+                        case 1400:
+                                viafb_second_virtual_xres = 1408;
+                                break;
+                        default:
+                                viafb_second_virtual_xres = viafb_second_xres;
+                                break;
+                        }
+                }
+                if (0 == viafb_second_virtual_yres)
+                        viafb_second_virtual_yres = viafb_second_yres;
+        }
+
+        switch (viafb_bpp) {
+        case 0 ... 8:
+                viafb_bpp = 8;
+                break;
+        case 9 ... 16:
+                viafb_bpp = 16;
+                break;
+        case 17 ... 32:
+                viafb_bpp = 32;
+                break;
+        default:
+                viafb_bpp = 8;
+        }
+        default_var.xres = default_xres;
+        default_var.yres = default_yres;
+        switch (default_xres) {
+        case 1400:
+                default_var.xres_virtual = 1408;
+                break;
+        default:
+                default_var.xres_virtual = default_xres;
+                break;
+        }
+        default_var.yres_virtual = default_yres;
+        default_var.bits_per_pixel = viafb_bpp;
+        if (default_var.bits_per_pixel == 15)
+                default_var.bits_per_pixel = 16;
+        default_var.pixclock =
+            viafb_get_pixclock(default_xres, default_yres, viafb_refresh);
+        default_var.left_margin = (default_xres >> 3) & 0xf8;
+        default_var.right_margin = 32;
+        default_var.upper_margin = 16;
+        default_var.lower_margin = 4;
+        default_var.hsync_len = default_var.left_margin;
+        default_var.vsync_len = 4;
+        default_var.accel_flags = 0;
+
+        if (viafb_accel) {
+                viafbinfo->flags |=
+                    (FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
+                     FBINFO_HWACCEL_IMAGEBLIT);
+                default_var.accel_flags |= FB_ACCELF_TEXT;
+        } else
+                viafbinfo->flags |= FBINFO_HWACCEL_DISABLED;
+
+        if (viafb_dual_fb) {
+                viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);
+                if (!viafbinfo1) {
+                        printk(KERN_ERR
+                        "allocate the second framebuffer struct error\n");
+                        framebuffer_release(viafbinfo);
+                        return -ENOMEM;
+                }
+                viaparinfo1 = viafbinfo1->par;
+                memcpy(viaparinfo1, viaparinfo, viafb_par_length);
+                viaparinfo1->memsize = viaparinfo->memsize -
+                        viafb_second_offset;
+                viaparinfo->memsize = viafb_second_offset;
+                viaparinfo1->fbmem_virt = viaparinfo->fbmem_virt +
+                        viafb_second_offset;
+                viaparinfo1->fbmem = viaparinfo->fbmem + viafb_second_offset;
+
+                viaparinfo1->fbmem_used = viaparinfo->fbmem_used;
+                viaparinfo1->fbmem_free = viaparinfo1->memsize -
+                        viaparinfo1->fbmem_used;
+                viaparinfo->fbmem_free = viaparinfo->memsize;
+                viaparinfo->fbmem_used = 0;
+                if (viafb_accel) {
+                        viaparinfo1->cursor_start =
+                            viaparinfo->cursor_start - viafb_second_offset;
+                        viaparinfo1->VQ_start = viaparinfo->VQ_start -
+                                viafb_second_offset;
+                        viaparinfo1->VQ_end = viaparinfo->VQ_end -
+                                viafb_second_offset;
+                }
+
+                memcpy(viafbinfo1, viafbinfo, sizeof(struct fb_info));
+                viafbinfo1->screen_base = viafbinfo->screen_base +
+                        viafb_second_offset;
+                viafbinfo1->fix.smem_start = viaparinfo1->fbmem;
+                viafbinfo1->fix.smem_len = viaparinfo1->fbmem_free;
+
+                default_var.xres = viafb_second_xres;
+                default_var.yres = viafb_second_yres;
+                default_var.xres_virtual = viafb_second_virtual_xres;
+                default_var.yres_virtual = viafb_second_virtual_yres;
+                if (viafb_bpp1 != viafb_bpp)
+                        viafb_bpp1 = viafb_bpp;
+                default_var.bits_per_pixel = viafb_bpp1;
+                default_var.pixclock =
+                    viafb_get_pixclock(viafb_second_xres, viafb_second_yres,
+                    viafb_refresh);
+                default_var.left_margin = (viafb_second_xres >> 3) & 0xf8;
+                default_var.right_margin = 32;
+                default_var.upper_margin = 16;
+                default_var.lower_margin = 4;
+                default_var.hsync_len = default_var.left_margin;
+                default_var.vsync_len = 4;
+
+                viafb_setup_fixinfo(&viafbinfo1->fix, viaparinfo1);
+                viafb_check_var(&default_var, viafbinfo1);
+                viafbinfo1->var = default_var;
+                viafb_update_viafb_par(viafbinfo);
+                viafb_update_fix(&viafbinfo1->fix, viafbinfo1);
+        }
+
+        viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
+        viafb_check_var(&default_var, viafbinfo);
+        viafbinfo->var = default_var;
+        viafb_update_viafb_par(viafbinfo);
+        viafb_update_fix(&viafbinfo->fix, viafbinfo);
+        default_var.activate = FB_ACTIVATE_NOW;
+        fb_alloc_cmap(&viafbinfo->cmap, 256, 0);
+
+        if (viafb_dual_fb && (viafb_primary_dev == LCD_Device)
+            && (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)) {
+                if (register_framebuffer(viafbinfo1) < 0)
+                        return -EINVAL;
+        }
+        if (register_framebuffer(viafbinfo) < 0)
+                return -EINVAL;
+
+        if (viafb_dual_fb && ((viafb_primary_dev != LCD_Device)
+                        || (viaparinfo->chip_info->gfx_chip_name !=
+                        UNICHROME_CLE266))) {
+                if (register_framebuffer(viafbinfo1) < 0)
+                        return -EINVAL;
+        }
+        DEBUG_MSG(KERN_INFO "fb%d: %s frame buffer device %dx%d-%dbpp\n",
+                  viafbinfo->node, viafbinfo->fix.id, default_var.xres,
+                  default_var.yres, default_var.bits_per_pixel);
+
+        viafb_init_proc(viaparinfo->proc_entry);
+        viafb_init_dac(IGA2);
+        return 0;
+}
+
+static void __devexit via_pci_remove(void)
+{
+        DEBUG_MSG(KERN_INFO "via_pci_remove!\n");
+        fb_dealloc_cmap(&viafbinfo->cmap);
+        unregister_framebuffer(viafbinfo);
+        if (viafb_dual_fb)
+                unregister_framebuffer(viafbinfo1);
+        iounmap((void *)viaparinfo->fbmem_virt);
+        iounmap(viaparinfo->io_virt);
+
+        viafb_delete_i2c_buss(viaparinfo);
+
+        framebuffer_release(viafbinfo);
+        if (viafb_dual_fb)
+                framebuffer_release(viafbinfo1);
+
+        viafb_remove_proc(viaparinfo->proc_entry);
+}
+
+#ifndef MODULE
+static int __init viafb_setup(char *options)
+{
+        char *this_opt;
+        DEBUG_MSG(KERN_INFO "viafb_setup!\n");
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt)
+                        continue;
+
+                if (!strncmp(this_opt, "viafb_mode1=", 12))
+                        viafb_mode1 = kstrdup(this_opt + 12, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_mode=", 11))
+                        viafb_mode = kstrdup(this_opt + 11, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_bpp1=", 11))
+                        strict_strtoul(this_opt + 11, 0,
+                                (unsigned long *)&viafb_bpp1);
+                else if (!strncmp(this_opt, "viafb_bpp=", 10))
+                        strict_strtoul(this_opt + 10, 0,
+                                (unsigned long *)&viafb_bpp);
+                else if (!strncmp(this_opt, "viafb_refresh1=", 15))
+                        strict_strtoul(this_opt + 15, 0,
+                                (unsigned long *)&viafb_refresh1);
+                else if (!strncmp(this_opt, "viafb_refresh=", 14))
+                        strict_strtoul(this_opt + 14, 0,
+                                (unsigned long *)&viafb_refresh);
+                else if (!strncmp(this_opt, "viafb_lcd_dsp_method=", 21))
+                        strict_strtoul(this_opt + 21, 0,
+                                (unsigned long *)&viafb_lcd_dsp_method);
+                else if (!strncmp(this_opt, "viafb_lcd_panel_id=", 19))
+                        strict_strtoul(this_opt + 19, 0,
+                                (unsigned long *)&viafb_lcd_panel_id);
+                else if (!strncmp(this_opt, "viafb_accel=", 12))
+                        strict_strtoul(this_opt + 12, 0,
+                                (unsigned long *)&viafb_accel);
+                else if (!strncmp(this_opt, "viafb_SAMM_ON=", 14))
+                        strict_strtoul(this_opt + 14, 0,
+                                (unsigned long *)&viafb_SAMM_ON);
+                else if (!strncmp(this_opt, "viafb_active_dev=", 17))
+                        viafb_active_dev = kstrdup(this_opt + 17, GFP_KERNEL);
+                else if (!strncmp(this_opt,
+                        "viafb_display_hardware_layout=", 30))
+                        strict_strtoul(this_opt + 30, 0,
+                        (unsigned long *)&viafb_display_hardware_layout);
+                else if (!strncmp(this_opt, "viafb_second_size=", 18))
+                        strict_strtoul(this_opt + 18, 0,
+                                (unsigned long *)&viafb_second_size);
+                else if (!strncmp(this_opt,
+                        "viafb_platform_epia_dvi=", 24))
+                        strict_strtoul(this_opt + 24, 0,
+                                (unsigned long *)&viafb_platform_epia_dvi);
+                else if (!strncmp(this_opt,
+                        "viafb_device_lcd_dualedge=", 26))
+                        strict_strtoul(this_opt + 26, 0,
+                                (unsigned long *)&viafb_device_lcd_dualedge);
+                else if (!strncmp(this_opt, "viafb_bus_width=", 16))
+                        strict_strtoul(this_opt + 16, 0,
+                                (unsigned long *)&viafb_bus_width);
+                else if (!strncmp(this_opt, "viafb_lcd_mode=", 15))
+                        strict_strtoul(this_opt + 15, 0,
+                                (unsigned long *)&viafb_lcd_mode);
+                else if (!strncmp(this_opt, "viafb_video_dev=", 16))
+                        viafb_video_dev = kstrdup(this_opt + 16, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_lcd_port=", 15))
+                        viafb_lcd_port = kstrdup(this_opt + 15, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_dvi_port=", 15))
+                        viafb_dvi_port = kstrdup(this_opt + 15, GFP_KERNEL);
+        }
+        return 0;
+}
+#endif
+
+static int __init viafb_init(void)
+{
+#ifndef MODULE
+        char *option = NULL;
+        if (fb_get_options("viafb", &option))
+                return -ENODEV;
+        viafb_setup(option);
+#endif
+        printk(KERN_INFO
+       "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n",
+               VERSION_MAJOR, VERSION_MINOR);
+        return via_pci_probe();
+}
+
+static void __exit viafb_exit(void)
+{
+        DEBUG_MSG(KERN_INFO "viafb_exit!\n");
+        via_pci_remove();
+}
+
+static struct fb_ops viafb_ops = {
+        .owner = THIS_MODULE,
+        .fb_open = viafb_open,
+        .fb_release = viafb_release,
+        .fb_check_var = viafb_check_var,
+        .fb_set_par = viafb_set_par,
+        .fb_setcolreg = viafb_setcolreg,
+        .fb_pan_display = viafb_pan_display,
+        .fb_blank = viafb_blank,
+        .fb_fillrect = viafb_fillrect,
+        .fb_copyarea = viafb_copyarea,
+        .fb_imageblit = viafb_imageblit,
+        .fb_cursor = viafb_cursor,
+        .fb_ioctl = viafb_ioctl,
+        .fb_sync = viafb_sync,
+        .fb_setcmap = viafb_setcmap,
+};
+
+module_init(viafb_init);
+module_exit(viafb_exit);
+
+#ifdef MODULE
+module_param(viafb_memsize, int, 0);
+
+module_param(viafb_mode, charp, 0);
+MODULE_PARM_DESC(viafb_mode, "Set resolution (default=640x480)");
+
+module_param(viafb_mode1, charp, 0);
+MODULE_PARM_DESC(viafb_mode1, "Set resolution (default=640x480)");
+
+module_param(viafb_bpp, int, 0);
+MODULE_PARM_DESC(viafb_bpp, "Set color depth (default=32bpp)");
+
+module_param(viafb_bpp1, int, 0);
+MODULE_PARM_DESC(viafb_bpp1, "Set color depth (default=32bpp)");
+
+module_param(viafb_refresh, int, 0);
+MODULE_PARM_DESC(viafb_refresh,
+        "Set CRT viafb_refresh rate (default = 60)");
+
+module_param(viafb_refresh1, int, 0);
+MODULE_PARM_DESC(viafb_refresh1,
+        "Set CRT refresh rate (default = 60)");
+
+module_param(viafb_lcd_panel_id, int, 0);
+MODULE_PARM_DESC(viafb_lcd_panel_id,
+        "Set Flat Panel type(Default=1024x768)");
+
+module_param(viafb_lcd_dsp_method, int, 0);
+MODULE_PARM_DESC(viafb_lcd_dsp_method,
+        "Set Flat Panel display scaling method.(Default=Expandsion)");
+
+module_param(viafb_SAMM_ON, int, 0);
+MODULE_PARM_DESC(viafb_SAMM_ON,
+        "Turn on/off flag of SAMM(Default=OFF)");
+
+module_param(viafb_accel, int, 0);
+MODULE_PARM_DESC(viafb_accel,
+        "Set 2D Hardware Acceleration.(Default = OFF)");
+
+module_param(viafb_active_dev, charp, 0);
+MODULE_PARM_DESC(viafb_active_dev, "Specify active devices.");
+
+module_param(viafb_display_hardware_layout, int, 0);
+MODULE_PARM_DESC(viafb_display_hardware_layout,
+        "Display Hardware Layout (LCD Only, DVI Only...,etc)");
+
+module_param(viafb_second_size, int, 0);
+MODULE_PARM_DESC(viafb_second_size,
+        "Set secondary device memory size");
+
+module_param(viafb_dual_fb, int, 0);
+MODULE_PARM_DESC(viafb_dual_fb,
+        "Turn on/off flag of dual framebuffer devices.(Default = OFF)");
+
+module_param(viafb_platform_epia_dvi, int, 0);
+MODULE_PARM_DESC(viafb_platform_epia_dvi,
+        "Turn on/off flag of DVI devices on EPIA board.(Default = OFF)");
+
+module_param(viafb_device_lcd_dualedge, int, 0);
+MODULE_PARM_DESC(viafb_device_lcd_dualedge,
+        "Turn on/off flag of dual edge panel.(Default = OFF)");
+
+module_param(viafb_bus_width, int, 0);
+MODULE_PARM_DESC(viafb_bus_width,
+        "Set bus width of panel.(Default = 12)");
+
+module_param(viafb_lcd_mode, int, 0);
+MODULE_PARM_DESC(viafb_lcd_mode,
+        "Set Flat Panel mode(Default=OPENLDI)");
+
+module_param(viafb_video_dev, charp, 0);
+MODULE_PARM_DESC(viafb_video_dev, "Specify video devices.");
+
+module_param(viafb_lcd_port, charp, 0);
+MODULE_PARM_DESC(viafb_lcd_port, "Specify LCD output port.");
+
+module_param(viafb_dvi_port, charp, 0);
+MODULE_PARM_DESC(viafb_dvi_port, "Specify DVI output port.");
+
+MODULE_LICENSE("GPL");
+#endif
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
new file mode 100644
index 000000000000..a4158e872878
--- /dev/null
+++ b/drivers/video/via/viafbdev.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __VIAFBDEV_H__
+#define __VIAFBDEV_H__
+
+#include <linux/proc_fs.h>
+#include <linux/fb.h>
+
+#include "ioctl.h"
+#include "share.h"
+#include "chip.h"
+#include "hw.h"
+#include "via_i2c.h"
+
+#define VERSION_MAJOR       2
+#define VERSION_KERNEL      6   /* For kernel 2.6 */
+
+#define VERSION_OS          0   /* 0: for 32 bits OS, 1: for 64 bits OS */
+#define VERSION_MINOR       4
+
+struct viafb_par {
+        int bpp;
+        int hres;
+        int vres;
+        int linelength;
+        u32 xoffset;
+        u32 yoffset;
+
+        void __iomem *fbmem_virt;       /*framebuffer virtual memory address */
+        void __iomem *io_virt;  /*iospace virtual memory address */
+        unsigned int fbmem;     /*framebuffer physical memory address */
+        unsigned int memsize;   /*size of fbmem */
+        unsigned int io;        /*io space address */
+        unsigned long mmio_base;        /*mmio base address */
+        unsigned long mmio_len; /*mmio base length */
+        u32 fbmem_free;         /* Free FB memory */
+        u32 fbmem_used;         /* Use FB memory size */
+        u32 cursor_start;       /* Cursor Start Address */
+        u32 VQ_start;           /* Virtual Queue Start Address */
+        u32 VQ_end;             /* Virtual Queue End Address */
+        u32 iga_path;
+        struct proc_dir_entry *proc_entry;      /*viafb proc entry */
+        u8 duoview;             /*Is working in duoview mode? */
+
+        /* I2C stuff */
+        struct via_i2c_stuff i2c_stuff;
+
+        /* All the information will be needed to set engine */
+        struct tmds_setting_information *tmds_setting_info;
+        struct crt_setting_information *crt_setting_info;
+        struct lvds_setting_information *lvds_setting_info;
+        struct lvds_setting_information *lvds_setting_info2;
+        struct chip_information *chip_info;
+
+        /* some information related to video playing */
+        int video_on_crt;
+        int video_on_dvi;
+        int video_on_lcd;
+
+};
+struct viafb_modeinfo {
+        u32 xres;
+        u32 yres;
+        int mode_index;
+        char *mode_res;
+};
+extern unsigned int viafb_second_virtual_yres;
+extern unsigned int viafb_second_virtual_xres;
+extern unsigned int viafb_second_offset;
+extern int viafb_second_size;
+extern int viafb_SAMM_ON;
+extern int viafb_dual_fb;
+extern int viafb_LCD2_ON;
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+extern int viafb_accel;
+extern int viafb_hotplug;
+extern int viafb_memsize;
+
+extern int strict_strtoul(const char *cp, unsigned int base,
+        unsigned long *res);
+
+void viafb_memory_pitch_patch(struct fb_info *info);
+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
+                          int mode_index);
+int viafb_get_mode_index(int hres, int vres, int flag);
+u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information
+        *plvds_chip_info, u8 index);
+void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information
+                              *plvds_setting_info, struct lvds_chip_information
+                              *plvds_chip_info, struct IODATA io_data);
+#endif /* __VIAFBDEV_H__ */
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
new file mode 100644
index 000000000000..6dcf583a837d
--- /dev/null
+++ b/drivers/video/via/viamode.c
@@ -0,0 +1,1086 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+struct res_map_refresh res_map_refresh_tbl[] = {
+/*hres, vres, vclock, vmode_refresh*/
+        {480, 640, RES_480X640_60HZ_PIXCLOCK, 60},
+        {640, 480, RES_640X480_60HZ_PIXCLOCK, 60},
+        {640, 480, RES_640X480_75HZ_PIXCLOCK, 75},
+        {640, 480, RES_640X480_85HZ_PIXCLOCK, 85},
+        {640, 480, RES_640X480_100HZ_PIXCLOCK, 100},
+        {640, 480, RES_640X480_120HZ_PIXCLOCK, 120},
+        {720, 480, RES_720X480_60HZ_PIXCLOCK, 60},
+        {720, 576, RES_720X576_60HZ_PIXCLOCK, 60},
+        {800, 480, RES_800X480_60HZ_PIXCLOCK, 60},
+        {800, 600, RES_800X600_60HZ_PIXCLOCK, 60},
+        {800, 600, RES_800X600_75HZ_PIXCLOCK, 75},
+        {800, 600, RES_800X600_85HZ_PIXCLOCK, 85},
+        {800, 600, RES_800X600_100HZ_PIXCLOCK, 100},
+        {800, 600, RES_800X600_120HZ_PIXCLOCK, 120},
+        {848, 480, RES_848X480_60HZ_PIXCLOCK, 60},
+        {856, 480, RES_856X480_60HZ_PIXCLOCK, 60},
+        {1024, 512, RES_1024X512_60HZ_PIXCLOCK, 60},
+        {1024, 600, RES_1024X600_60HZ_PIXCLOCK, 60},
+        {1024, 768, RES_1024X768_60HZ_PIXCLOCK, 60},
+        {1024, 768, RES_1024X768_75HZ_PIXCLOCK, 75},
+        {1024, 768, RES_1024X768_85HZ_PIXCLOCK, 85},
+        {1024, 768, RES_1024X768_100HZ_PIXCLOCK, 100},
+/*  {1152,864, RES_1152X864_70HZ_PIXCLOCK,  70},*/
+        {1152, 864, RES_1152X864_75HZ_PIXCLOCK, 75},
+        {1280, 768, RES_1280X768_60HZ_PIXCLOCK, 60},
+        {1280, 800, RES_1280X800_60HZ_PIXCLOCK, 60},
+        {1280, 960, RES_1280X960_60HZ_PIXCLOCK, 60},
+        {1280, 1024, RES_1280X1024_60HZ_PIXCLOCK, 60},
+        {1280, 1024, RES_1280X1024_75HZ_PIXCLOCK, 75},
+        {1280, 1024, RES_1280X768_85HZ_PIXCLOCK, 85},
+        {1440, 1050, RES_1440X1050_60HZ_PIXCLOCK, 60},
+        {1600, 1200, RES_1600X1200_60HZ_PIXCLOCK, 60},
+        {1600, 1200, RES_1600X1200_75HZ_PIXCLOCK, 75},
+        {1280, 720, RES_1280X720_60HZ_PIXCLOCK, 60},
+        {1920, 1080, RES_1920X1080_60HZ_PIXCLOCK, 60},
+        {1400, 1050, RES_1400X1050_60HZ_PIXCLOCK, 60},
+        {1400, 1050, RES_1400X1050_75HZ_PIXCLOCK, 75},
+        {1368, 768, RES_1368X768_60HZ_PIXCLOCK, 60},
+        {960, 600, RES_960X600_60HZ_PIXCLOCK, 60},
+        {1000, 600, RES_1000X600_60HZ_PIXCLOCK, 60},
+        {1024, 576, RES_1024X576_60HZ_PIXCLOCK, 60},
+        {1088, 612, RES_1088X612_60HZ_PIXCLOCK, 60},
+        {1152, 720, RES_1152X720_60HZ_PIXCLOCK, 60},
+        {1200, 720, RES_1200X720_60HZ_PIXCLOCK, 60},
+        {1280, 600, RES_1280X600_60HZ_PIXCLOCK, 60},
+        {1280, 720, RES_1280X720_50HZ_PIXCLOCK, 50},
+        {1280, 768, RES_1280X768_50HZ_PIXCLOCK, 50},
+        {1360, 768, RES_1360X768_60HZ_PIXCLOCK, 60},
+        {1366, 768, RES_1366X768_50HZ_PIXCLOCK, 50},
+        {1366, 768, RES_1366X768_60HZ_PIXCLOCK, 60},
+        {1440, 900, RES_1440X900_60HZ_PIXCLOCK, 60},
+        {1440, 900, RES_1440X900_75HZ_PIXCLOCK, 75},
+        {1600, 900, RES_1600X900_60HZ_PIXCLOCK, 60},
+        {1600, 1024, RES_1600X1024_60HZ_PIXCLOCK, 60},
+        {1680, 1050, RES_1680X1050_60HZ_PIXCLOCK, 60},
+        {1680, 1050, RES_1680X1050_75HZ_PIXCLOCK, 75},
+        {1792, 1344, RES_1792X1344_60HZ_PIXCLOCK, 60},
+        {1856, 1392, RES_1856X1392_60HZ_PIXCLOCK, 60},
+        {1920, 1200, RES_1920X1200_60HZ_PIXCLOCK, 60},
+        {1920, 1440, RES_1920X1440_60HZ_PIXCLOCK, 60},
+        {1920, 1440, RES_1920X1440_75HZ_PIXCLOCK, 75},
+        {2048, 1536, RES_2048X1536_60HZ_PIXCLOCK, 60}
+};
+
+struct io_reg CN400_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+{VIASR, SR1E, 0x0F, 0x01},
+{VIASR, SR2A, 0xFF, 0x00},
+{VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                        */
+{VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                          */
+{VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High                */
+{VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low                */
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1                */
+{VIACR, CR8B, 0xFF, 0x69},      /* LCD Power Sequence Control 0        */
+{VIACR, CR8C, 0xFF, 0x57},      /* LCD Power Sequence Control 1        */
+{VIACR, CR8D, 0xFF, 0x00},      /* LCD Power Sequence Control 2        */
+{VIACR, CR8E, 0xFF, 0x7B},      /* LCD Power Sequence Control 3        */
+{VIACR, CR8F, 0xFF, 0x03},      /* LCD Power Sequence Control 4        */
+{VIACR, CR90, 0xFF, 0x30},      /* LCD Power Sequence Control 5        */
+{VIACR, CR91, 0xFF, 0xA0},      /* 24/12 bit LVDS Data off             */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00}
+};
+
+/* Video Mode Table for VT3314 chipset*/
+/* Common Setting for Video Mode */
+struct io_reg CN700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x82},
+{VIASR, SR1B, 0xFF, 0xF0},
+{VIASR, SR1F, 0xFF, 0x00},
+{VIASR, SR1E, 0xFF, 0x01},
+{VIASR, SR22, 0xFF, 0x1F},
+{VIASR, SR2A, 0x0F, 0x00},
+{VIASR, SR2E, 0xFF, 0xFF},
+{VIASR, SR3F, 0xFF, 0xFF},
+{VIASR, SR40, 0xF7, 0x00},
+{VIASR, CR30, 0xFF, 0x04},
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0x7F, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0xFF, 0x31},
+{VIACR, CR41, 0xFF, 0x80},
+{VIACR, CR42, 0xFF, 0x00},
+{VIACR, CR55, 0x80, 0x00},
+{VIACR, CR5D, 0x80, 0x00},      /*Horizontal Retrace Start bit[11] should be 0*/
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address */
+{VIACR, CR68, 0xFF, 0x67},      /* Default FIFO For IGA2 */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFD, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR77, 0xFF, 0x00},      /* LCD scaling Factor */
+{VIACR, CR78, 0xFF, 0x00},      /* LCD scaling Factor */
+{VIACR, CR79, 0xFF, 0x00},      /* LCD scaling Factor */
+{VIACR, CR9F, 0x03, 0x00},      /* LCD scaling Factor */
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1 */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2 */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3 */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4 */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5 */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6 */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7 */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8 */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9 */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10 */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11 */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12 */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13 */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14 */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0 */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1 */
+{VIACR, CR8B, 0xFF, 0x5D},      /* LCD Power Sequence Control 0 */
+{VIACR, CR8C, 0xFF, 0x2B},      /* LCD Power Sequence Control 1 */
+{VIACR, CR8D, 0xFF, 0x6F},      /* LCD Power Sequence Control 2 */
+{VIACR, CR8E, 0xFF, 0x2B},      /* LCD Power Sequence Control 3 */
+{VIACR, CR8F, 0xFF, 0x01},      /* LCD Power Sequence Control 4 */
+{VIACR, CR90, 0xFF, 0x01},      /* LCD Power Sequence Control 5 */
+{VIACR, CR91, 0xFF, 0xA0},      /* 24/12 bit LVDS Data off */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00},
+{VIACR, CR9D, 0xFF, 0x80},
+{VIACR, CR9E, 0xFF, 0x80}
+};
+
+struct io_reg KM400_ModeXregs[] = {
+        {VIASR, SR10, 0xFF, 0x01},      /* Unlock Register                 */
+        {VIASR, SR16, 0xFF, 0x08},      /* Display FIFO threshold Control  */
+        {VIASR, SR17, 0xFF, 0x1F},      /* Display FIFO Control            */
+        {VIASR, SR18, 0xFF, 0x4E},      /* GFX PREQ threshold              */
+        {VIASR, SR1A, 0xFF, 0x0a},      /* GFX PREQ threshold              */
+        {VIASR, SR1F, 0xFF, 0x00},      /* Memory Control 0                */
+        {VIASR, SR1B, 0xFF, 0xF0},      /* Power Management Control 0      */
+        {VIASR, SR1E, 0xFF, 0x01},      /* Power Management Control        */
+        {VIASR, SR20, 0xFF, 0x00},      /* Sequencer Arbiter Control 0     */
+        {VIASR, SR21, 0xFF, 0x00},      /* Sequencer Arbiter Control 1     */
+        {VIASR, SR22, 0xFF, 0x1F},      /* Display Arbiter Control 1       */
+        {VIASR, SR2A, 0xFF, 0x00},      /* Power Management Control 5      */
+        {VIASR, SR2D, 0xFF, 0xFF},      /* Power Management Control 1      */
+        {VIASR, SR2E, 0xFF, 0xFF},      /* Power Management Control 2      */
+        {VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                    */
+        {VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                      */
+        {VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High            */
+        {VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low            */
+        {VIACR, CR33, 0xFF, 0x00},
+        {VIACR, CR55, 0x80, 0x00},
+        {VIACR, CR5D, 0x80, 0x00},
+        {VIACR, CR36, 0xFF, 0x01},      /* Power Mangement 3                  */
+        {VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address */
+        {VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address */
+        {VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address */
+        {VIACR, CR68, 0xFF, 0x67},      /* Default FIFO For IGA2              */
+        {VIACR, CR6A, 0x20, 0x20},      /* Extended FIFO On                   */
+        {VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1            */
+        {VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2            */
+        {VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3            */
+        {VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4            */
+        {VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5            */
+        {VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6            */
+        {VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7            */
+        {VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8            */
+        {VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9            */
+        {VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10           */
+        {VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11           */
+        {VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12           */
+        {VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13           */
+        {VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14           */
+        {VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                     */
+        {VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0               */
+        {VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1               */
+        {VIACR, CR8B, 0xFF, 0x2D},      /* LCD Power Sequence Control 0       */
+        {VIACR, CR8C, 0xFF, 0x2D},      /* LCD Power Sequence Control 1       */
+        {VIACR, CR8D, 0xFF, 0xC8},      /* LCD Power Sequence Control 2       */
+        {VIACR, CR8E, 0xFF, 0x36},      /* LCD Power Sequence Control 3       */
+        {VIACR, CR8F, 0xFF, 0x00},      /* LCD Power Sequence Control 4       */
+        {VIACR, CR90, 0xFF, 0x10},      /* LCD Power Sequence Control 5       */
+        {VIACR, CR91, 0xFF, 0xA0},      /* 24/12 bit LVDS Data off            */
+        {VIACR, CR96, 0xFF, 0x03},      /* DVP0        ; DVP0 Clock Skew */
+        {VIACR, CR97, 0xFF, 0x03},      /* DFP high    ; DFPH Clock Skew */
+        {VIACR, CR99, 0xFF, 0x03},      /* DFP low           ; DFPL Clock Skew*/
+        {VIACR, CR9B, 0xFF, 0x07}       /* DVI on DVP1       ; DVP1 Clock Skew*/
+};
+
+/* For VT3324: Common Setting for Video Mode */
+struct io_reg CX700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+{VIASR, SR1B, 0xFF, 0xF0},
+{VIASR, SR1E, 0xFF, 0x01},
+{VIASR, SR2A, 0xFF, 0x00},
+{VIASR, SR2D, 0xFF, 0xFF},      /* VCK and LCK PLL power on.           */
+{VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                        */
+{VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                          */
+{VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High                */
+{VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low                */
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR47, 0xC8, 0x00},      /* Clear VCK Plus. */
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CRA3, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1                */
+{VIACR, CRD4, 0xFF, 0x81},      /* Second power sequence control       */
+{VIACR, CR8B, 0xFF, 0x5D},      /* LCD Power Sequence Control 0        */
+{VIACR, CR8C, 0xFF, 0x2B},      /* LCD Power Sequence Control 1        */
+{VIACR, CR8D, 0xFF, 0x6F},      /* LCD Power Sequence Control 2        */
+{VIACR, CR8E, 0xFF, 0x2B},      /* LCD Power Sequence Control 3        */
+{VIACR, CR8F, 0xFF, 0x01},      /* LCD Power Sequence Control 4        */
+{VIACR, CR90, 0xFF, 0x01},      /* LCD Power Sequence Control 5        */
+{VIACR, CR91, 0xFF, 0x80},      /* 24/12 bit LVDS Data off             */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00},
+{VIACR, CRD2, 0xFF, 0xFF}       /* TMDS/LVDS control register.         */
+};
+
+/* For VT3353: Common Setting for Video Mode */
+struct io_reg VX800_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+{VIASR, SR1B, 0xFF, 0xF0},
+{VIASR, SR1E, 0xFF, 0x01},
+{VIASR, SR2A, 0xFF, 0x00},
+{VIASR, SR2D, 0xFF, 0xFF},      /* VCK and LCK PLL power on.           */
+{VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                        */
+{VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                          */
+{VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High                */
+{VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low                */
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR47, 0xC8, 0x00},      /* Clear VCK Plus. */
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CRA3, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1                */
+{VIACR, CRD4, 0xFF, 0x81},      /* Second power sequence control       */
+{VIACR, CR8B, 0xFF, 0x5D},      /* LCD Power Sequence Control 0        */
+{VIACR, CR8C, 0xFF, 0x2B},      /* LCD Power Sequence Control 1        */
+{VIACR, CR8D, 0xFF, 0x6F},      /* LCD Power Sequence Control 2        */
+{VIACR, CR8E, 0xFF, 0x2B},      /* LCD Power Sequence Control 3        */
+{VIACR, CR8F, 0xFF, 0x01},      /* LCD Power Sequence Control 4        */
+{VIACR, CR90, 0xFF, 0x01},      /* LCD Power Sequence Control 5        */
+{VIACR, CR91, 0xFF, 0x80},      /* 24/12 bit LVDS Data off             */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00},
+{VIACR, CRD2, 0xFF, 0xFF}       /* TMDS/LVDS control register.         */
+};
+
+/* Video Mode Table */
+/* Common Setting for Video Mode */
+struct io_reg CLE266_ModeXregs[] = { {VIASR, SR1E, 0xF0, 0x00},
+{VIASR, SR2A, 0x0F, 0x00},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR6A, 0xFF, 0x80},
+{VIACR, CR6A, 0xFF, 0xC0},
+
+{VIACR, CR55, 0x80, 0x00},
+{VIACR, CR5D, 0x80, 0x00},
+
+{VIAGR, GR20, 0xFF, 0x00},
+{VIAGR, GR21, 0xFF, 0x00},
+{VIAGR, GR22, 0xFF, 0x00},
+        /* LCD Parameters */
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Parameter 1 */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Parameter 2 */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Parameter 3 */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Parameter 4 */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Parameter 5 */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Parameter 6 */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Parameter 7 */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Parameter 8 */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Parameter 9 */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Parameter 10 */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Parameter 11 */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Parameter 12 */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Parameter 13 */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Parameter 14 */
+
+};
+
+/* Mode:1024X768 */
+struct io_reg PM1024x768[] = { {VIASR, 0x16, 0xBF, 0x0C},
+{VIASR, 0x18, 0xFF, 0x4C}
+};
+
+struct patch_table res_patch_table[] = {
+        {VIA_RES_1024X768, ARRAY_SIZE(PM1024x768), PM1024x768}
+};
+
+/* struct VPITTable {
+        unsigned char  Misc;
+        unsigned char  SR[StdSR];
+        unsigned char  CR[StdCR];
+        unsigned char  GR[StdGR];
+        unsigned char  AR[StdAR];
+ };*/
+
+struct VPITTable VPIT = {
+        /* Msic */
+        0xC7,
+        /* Sequencer */
+        {0x01, 0x0F, 0x00, 0x0E},
+        /* Graphic Controller */
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF},
+        /* Attribute Controller */
+        {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+         0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+         0x01, 0x00, 0x0F, 0x00}
+};
+
+/********************/
+/* Mode Table       */
+/********************/
+
+/* 480x640 */
+struct crt_mode_table CRTM480x640[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_25_175M, M480X640_R60_HSP, M480X640_R60_VSP,
+         {624, 480, 480, 144, 504, 48, 663, 640, 640, 23, 641, 3} }     /* GTF*/
+};
+
+/* 640x480*/
+struct crt_mode_table CRTM640x480[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_25_175M, M640X480_R60_HSP, M640X480_R60_VSP,
+         {800, 640, 648, 144, 656, 96, 525, 480, 480, 45, 490, 2} },
+        {REFRESH_75, CLK_31_500M, M640X480_R75_HSP, M640X480_R75_VSP,
+         {840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} },
+        {REFRESH_85, CLK_36_000M, M640X480_R85_HSP, M640X480_R85_VSP,
+         {832, 640, 640, 192, 696, 56, 509, 480, 480, 29, 481, 3} },
+        {REFRESH_100, CLK_43_163M, M640X480_R100_HSP, M640X480_R100_VSP,
+         {848, 640, 640, 208, 680, 64, 509, 480, 480, 29, 481, 3} }, /*GTF*/
+            {REFRESH_120, CLK_52_406M, M640X480_R120_HSP,
+             M640X480_R120_VSP,
+             {848, 640, 640, 208, 680, 64, 515, 480, 480, 35, 481,
+              3} } /*GTF*/
+};
+
+/*720x480 (GTF)*/
+struct crt_mode_table CRTM720x480[] = {
+        /*r_rate,vclk,hsp,vsp      */
+        /*HT, HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_26_880M, M720X480_R60_HSP, M720X480_R60_VSP,
+         {896, 720, 720, 176, 736, 72, 497, 480, 480, 17, 481, 3} }
+
+};
+
+/*720x576 (GTF)*/
+struct crt_mode_table CRTM720x576[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_32_668M, M720X576_R60_HSP, M720X576_R60_VSP,
+         {912, 720, 720, 192, 744, 72, 597, 576, 576, 21, 577, 3} }
+};
+
+/* 800x480 (CVT) */
+struct crt_mode_table CRTM800x480[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_29_581M, M800X480_R60_HSP, M800X480_R60_VSP,
+         {992, 800, 800, 192, 824, 72, 500, 480, 480, 20, 483, 7} }
+};
+
+/* 800x600*/
+struct crt_mode_table CRTM800x600[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_40_000M, M800X600_R60_HSP, M800X600_R60_VSP,
+         {1056, 800, 800, 256, 840, 128, 628, 600, 600, 28, 601, 4} },
+        {REFRESH_75, CLK_49_500M, M800X600_R75_HSP, M800X600_R75_VSP,
+         {1056, 800, 800, 256, 816, 80, 625, 600, 600, 25, 601, 3} },
+        {REFRESH_85, CLK_56_250M, M800X600_R85_HSP, M800X600_R85_VSP,
+         {1048, 800, 800, 248, 832, 64, 631, 600, 600, 31, 601, 3} },
+        {REFRESH_100, CLK_68_179M, M800X600_R100_HSP, M800X600_R100_VSP,
+         {1072, 800, 800, 272, 848, 88, 636, 600, 600, 36, 601, 3} },
+        {REFRESH_120, CLK_83_950M, M800X600_R120_HSP,
+                  M800X600_R120_VSP,
+                  {1088, 800, 800, 288, 856, 88, 643, 600, 600, 43, 601,
+                   3} }
+};
+
+/* 848x480 (CVT) */
+struct crt_mode_table CRTM848x480[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_31_500M, M848X480_R60_HSP, M848X480_R60_VSP,
+         {1056, 848, 848, 208, 872, 80, 500, 480, 480, 20, 483, 5} }
+};
+
+/*856x480 (GTF) convert to 852x480*/
+struct crt_mode_table CRTM852x480[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_31_728M, M852X480_R60_HSP, M852X480_R60_VSP,
+        {1064, 856, 856, 208, 872, 88, 497, 480, 480, 17, 481, 3} }
+};
+
+/*1024x512 (GTF)*/
+struct crt_mode_table CRTM1024x512[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_41_291M, M1024X512_R60_HSP, M1024X512_R60_VSP,
+         {1296, 1024, 1024, 272, 1056, 104, 531, 512, 512, 19, 513, 3} }
+
+};
+
+/* 1024x600*/
+struct crt_mode_table CRTM1024x600[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_48_875M, M1024X600_R60_HSP, M1024X600_R60_VSP,
+         {1312, 1024, 1024, 288, 1064, 104, 622, 600, 600, 22, 601, 3} },
+};
+
+/* 1024x768*/
+struct crt_mode_table CRTM1024x768[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_65_000M, M1024X768_R60_HSP, M1024X768_R60_VSP,
+        {1344, 1024, 1024, 320, 1048, 136, 806, 768, 768, 38, 771, 6} },
+        {REFRESH_75, CLK_78_750M, M1024X768_R75_HSP, M1024X768_R75_VSP,
+        {1312, 1024, 1024, 288, 1040, 96, 800, 768, 768, 32, 769, 3} },
+        {REFRESH_85, CLK_94_500M, M1024X768_R85_HSP, M1024X768_R85_VSP,
+        {1376, 1024, 1024, 352, 1072, 96, 808, 768, 768, 40, 769, 3} },
+        {REFRESH_100, CLK_113_309M, M1024X768_R100_HSP, M1024X768_R100_VSP,
+        {1392, 1024, 1024, 368, 1096, 112, 814, 768, 768, 46, 769, 3} }
+};
+
+/* 1152x864*/
+struct crt_mode_table CRTM1152x864[] = {
+        /*r_rate,vclk,hsp,vsp      */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_75, CLK_108_000M, M1152X864_R75_HSP, M1152X864_R75_VSP,
+         {1600, 1152, 1152, 448, 1216, 128, 900, 864, 864, 36, 865, 3} }
+
+};
+
+/* 1280x720 (HDMI 720P)*/
+struct crt_mode_table CRTM1280x720[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE      */
+        {REFRESH_60, CLK_74_481M, M1280X720_R60_HSP, M1280X720_R60_VSP,
+         {1648, 1280, 1280, 368, 1392, 40, 750, 720, 720, 30, 725, 5} },
+        {REFRESH_50, CLK_60_466M, M1280X720_R50_HSP, M1280X720_R50_VSP,
+         {1632, 1280, 1280, 352, 1328, 128, 741, 720, 720, 21, 721, 3} }
+};
+
+/*1280x768 (GTF)*/
+struct crt_mode_table CRTM1280x768[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_80_136M, M1280X768_R60_HSP, M1280X768_R60_VSP,
+         {1680, 1280, 1280, 400, 1344, 136, 795, 768, 768, 27, 769, 3} },
+        {REFRESH_50, CLK_65_178M, M1280X768_R50_HSP, M1280X768_R50_VSP,
+         {1648, 1280, 1280, 368, 1336, 128, 791, 768, 768, 23, 769, 3} }
+};
+
+/* 1280x800 (CVT) */
+struct crt_mode_table CRTM1280x800[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_83_375M, M1280X800_R60_HSP, M1280X800_R60_VSP,
+         {1680, 1280, 1280, 400, 1352, 128, 831, 800, 800, 31, 803, 6} }
+};
+
+/*1280x960*/
+struct crt_mode_table CRTM1280x960[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_108_000M, M1280X960_R60_HSP, M1280X960_R60_VSP,
+         {1800, 1280, 1280, 520, 1376, 112, 1000, 960, 960, 40, 961, 3} }
+};
+
+/* 1280x1024*/
+struct crt_mode_table CRTM1280x1024[] = {
+        /*r_rate,vclk,,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_108_000M, M1280X1024_R60_HSP, M1280X1024_R60_VSP,
+         {1688, 1280, 1280, 408, 1328, 112, 1066, 1024, 1024, 42, 1025,
+          3} },
+        {REFRESH_75, CLK_135_000M, M1280X1024_R75_HSP, M1280X1024_R75_VSP,
+         {1688, 1280, 1280, 408, 1296, 144, 1066, 1024, 1024, 42, 1025,
+          3} },
+        {REFRESH_85, CLK_157_500M, M1280X1024_R85_HSP, M1280X1024_R85_VSP,
+         {1728, 1280, 1280, 448, 1344, 160, 1072, 1024, 1024, 48, 1025, 3} }
+};
+
+/* 1368x768 (GTF) */
+struct crt_mode_table CRTM1368x768[] = {
+        /* r_rate,  vclk, hsp, vsp */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,
+         {1800, 1368, 1368, 432, 1440, 144, 795, 768, 768, 27, 769, 3} }
+};
+
+/*1440x1050 (GTF)*/
+struct crt_mode_table CRTM1440x1050[] = {
+        /*r_rate,vclk,hsp,vsp      */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_125_104M, M1440X1050_R60_HSP, M1440X1050_R60_VSP,
+         {1936, 1440, 1440, 496, 1536, 152, 1077, 1040, 1040, 37, 1041, 3} }
+};
+
+/* 1600x1200*/
+struct crt_mode_table CRTM1600x1200[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_162_000M, M1600X1200_R60_HSP, M1600X1200_R60_VSP,
+         {2160, 1600, 1600, 560, 1664, 192, 1250, 1200, 1200, 50, 1201,
+          3} },
+        {REFRESH_75, CLK_202_500M, M1600X1200_R75_HSP, M1600X1200_R75_VSP,
+         {2160, 1600, 1600, 560, 1664, 192, 1250, 1200, 1200, 50, 1201, 3} }
+
+};
+
+/* 1680x1050 (CVT) */
+struct crt_mode_table CRTM1680x1050[] = {
+        /* r_rate,          vclk,              hsp,             vsp  */
+        /* HT,  HA,  HBS, HBE, HSS, HSE,    VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_146_760M, M1680x1050_R60_HSP, M1680x1050_R60_VSP,
+         {2240, 1680, 1680, 560, 1784, 176, 1089, 1050, 1050, 39, 1053,
+          6} },
+        {REFRESH_75, CLK_187_000M, M1680x1050_R75_HSP, M1680x1050_R75_VSP,
+         {2272, 1680, 1680, 592, 1800, 176, 1099, 1050, 1050, 49, 1053, 6} }
+};
+
+/* 1680x1050 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1680x1050_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE,    VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_119_000M, M1680x1050_RB_R60_HSP,
+         M1680x1050_RB_R60_VSP,
+         {1840, 1680, 1680, 160, 1728, 32, 1080, 1050, 1050, 30, 1053, 6} }
+};
+
+/* 1920x1080 (CVT)*/
+struct crt_mode_table CRTM1920x1080[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_172_798M, M1920X1080_R60_HSP, M1920X1080_R60_VSP,
+         {2576, 1920, 1920, 656, 2048, 200, 1120, 1080, 1080, 40, 1083, 5} }
+};
+
+/* 1920x1080 (CVT with Reduce Blanking) */
+struct crt_mode_table CRTM1920x1080_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_138_400M, M1920X1080_RB_R60_HSP,
+         M1920X1080_RB_R60_VSP,
+         {2080, 1920, 1920, 160, 1968, 32, 1111, 1080, 1080, 31, 1083, 5} }
+};
+
+/* 1920x1440*/
+struct crt_mode_table CRTM1920x1440[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_234_000M, M1920X1440_R60_HSP, M1920X1440_R60_VSP,
+         {2600, 1920, 1920, 680, 2048, 208, 1500, 1440, 1440, 60, 1441,
+          3} },
+        {REFRESH_75, CLK_297_500M, M1920X1440_R75_HSP, M1920X1440_R75_VSP,
+         {2640, 1920, 1920, 720, 2064, 224, 1500, 1440, 1440, 60, 1441, 3} }
+};
+
+/* 1400x1050 (CVT) */
+struct crt_mode_table CRTM1400x1050[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_121_750M, M1400X1050_R60_HSP, M1400X1050_R60_VSP,
+         {1864, 1400, 1400, 464, 1488, 144, 1089, 1050, 1050, 39, 1053,
+          4} },
+        {REFRESH_75, CLK_156_000M, M1400X1050_R75_HSP, M1400X1050_R75_VSP,
+         {1896, 1400, 1400, 496, 1504, 144, 1099, 1050, 1050, 49, 1053, 4} }
+};
+
+/* 1400x1050 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1400x1050_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_101_000M, M1400X1050_RB_R60_HSP,
+         M1400X1050_RB_R60_VSP,
+         {1560, 1400, 1400, 160, 1448, 32, 1080, 1050, 1050, 30, 1053, 4} }
+};
+
+/* 960x600 (CVT) */
+struct crt_mode_table CRTM960x600[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_45_250M, M960X600_R60_HSP, M960X600_R60_VSP,
+         {1216, 960, 960, 256, 992, 96, 624, 600, 600, 24, 603, 6} }
+};
+
+/* 1000x600 (GTF) */
+struct crt_mode_table CRTM1000x600[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_48_000M, M1000X600_R60_HSP, M1000X600_R60_VSP,
+         {1288, 1000, 1000, 288, 1040, 104, 622, 600, 600, 22, 601, 3} }
+};
+
+/* 1024x576 (GTF) */
+struct crt_mode_table CRTM1024x576[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_46_996M, M1024X576_R60_HSP, M1024X576_R60_VSP,
+         {1312, 1024, 1024, 288, 1064, 104, 597, 576, 576, 21, 577, 3} }
+};
+
+/* 1088x612 (CVT) */
+struct crt_mode_table CRTM1088x612[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_52_977M, M1088X612_R60_HSP, M1088X612_R60_VSP,
+         {1392, 1088, 1088, 304, 1136, 104, 636, 612, 612, 24, 615, 5} }
+};
+
+/* 1152x720 (CVT) */
+struct crt_mode_table CRTM1152x720[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_66_750M, M1152X720_R60_HSP, M1152X720_R60_VSP,
+         {1488, 1152, 1152, 336, 1208, 112, 748, 720, 720, 28, 723, 6} }
+};
+
+/* 1200x720 (GTF) */
+struct crt_mode_table CRTM1200x720[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_70_159M, M1200X720_R60_HSP, M1200X720_R60_VSP,
+         {1568, 1200, 1200, 368, 1256, 128, 746, 720, 720, 26, 721, 3} }
+};
+
+/* 1280x600 (GTF) */
+struct crt_mode_table CRTM1280x600[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE, VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_61_500M, M1280x600_R60_HSP, M1280x600_R60_VSP,
+         {1648, 1280, 1280, 368, 1336, 128, 622, 600, 600, 22, 601, 3} }
+};
+
+/* 1360x768 (CVT) */
+struct crt_mode_table CRTM1360x768[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_84_750M, M1360X768_R60_HSP, M1360X768_R60_VSP,
+         {1776, 1360, 1360, 416, 1432, 136, 798, 768, 768, 30, 771, 5} }
+};
+
+/* 1360x768 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1360x768_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_72_000M, M1360X768_RB_R60_HSP,
+         M1360X768_RB_R60_VSP,
+         {1520, 1360, 1360, 160, 1408, 32, 790, 768, 768, 22, 771, 5} }
+};
+
+/* 1366x768 (GTF) */
+struct crt_mode_table CRTM1366x768[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,
+         {1800, 1368, 1368, 432, 1440, 144, 795, 768, 768, 27, 769, 3} },
+        {REFRESH_50, CLK_69_924M, M1368X768_R50_HSP, M1368X768_R50_VSP,
+         {1768, 1368, 1368, 400, 1424, 144, 791, 768, 768, 23, 769, 3} }
+};
+
+/* 1440x900 (CVT) */
+struct crt_mode_table CRTM1440x900[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_106_500M, M1440X900_R60_HSP, M1440X900_R60_VSP,
+         {1904, 1440, 1440, 464, 1520, 152, 934, 900, 900, 34, 903, 6} },
+        {REFRESH_75, CLK_136_700M, M1440X900_R75_HSP, M1440X900_R75_VSP,
+         {1936, 1440, 1440, 496, 1536, 152, 942, 900, 900, 42, 903, 6} }
+};
+
+/* 1440x900 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1440x900_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_88_750M, M1440X900_RB_R60_HSP,
+         M1440X900_RB_R60_VSP,
+         {1600, 1440, 1440, 160, 1488, 32, 926, 900, 900, 26, 903, 6} }
+};
+
+/* 1600x900 (CVT) */
+struct crt_mode_table CRTM1600x900[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_118_840M, M1600X900_R60_HSP, M1600X900_R60_VSP,
+         {2112, 1600, 1600, 512, 1688, 168, 934, 900, 900, 34, 903, 5} }
+};
+
+/* 1600x900 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1600x900_RB[] = {
+        /* r_rate,        vclk,           hsp,        vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_97_750M, M1600X900_RB_R60_HSP,
+         M1600X900_RB_R60_VSP,
+         {1760, 1600, 1600, 160, 1648, 32, 926, 900, 900, 26, 903, 5} }
+};
+
+/* 1600x1024 (GTF) */
+struct crt_mode_table CRTM1600x1024[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_136_700M, M1600X1024_R60_HSP, M1600X1024_R60_VSP,
+         {2144, 1600, 1600, 544, 1704, 168, 1060, 1024, 1024, 36, 1025, 3} }
+};
+
+/* 1792x1344 (DMT) */
+struct crt_mode_table CRTM1792x1344[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_204_000M, M1792x1344_R60_HSP, M1792x1344_R60_VSP,
+         {2448, 1792, 1792, 656, 1920, 200, 1394, 1344, 1344, 50, 1345, 3} }
+};
+
+/* 1856x1392 (DMT) */
+struct crt_mode_table CRTM1856x1392[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_218_500M, M1856x1392_R60_HSP, M1856x1392_R60_VSP,
+         {2528, 1856, 1856, 672, 1952, 224, 1439, 1392, 1392, 47, 1393, 3} }
+};
+
+/* 1920x1200 (CVT) */
+struct crt_mode_table CRTM1920x1200[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_193_295M, M1920X1200_R60_HSP, M1920X1200_R60_VSP,
+         {2592, 1920, 1920, 672, 2056, 200, 1245, 1200, 1200, 45, 1203, 6} }
+};
+
+/* 1920x1200 (CVT with Reduce Blanking) */
+struct crt_mode_table CRTM1920x1200_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_153_920M, M1920X1200_RB_R60_HSP,
+         M1920X1200_RB_R60_VSP,
+         {2080, 1920, 1920, 160, 1968, 32, 1235, 1200, 1200, 35, 1203, 6} }
+};
+
+/* 2048x1536 (CVT) */
+struct crt_mode_table CRTM2048x1536[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_267_250M, M2048x1536_R60_HSP, M2048x1536_R60_VSP,
+         {2800, 2048, 2048, 752, 2200, 224, 1592, 1536, 1536, 56, 1539, 4} }
+};
+
+/* Video Mode Table */
+/* struct VideoModeTable {*/
+/*  int                               ModeIndex;*/
+/*  struct crt_mode_table             *crtc;*/
+/*  int                               mode_array;*/
+/* };*/
+struct VideoModeTable CLE266Modes[] = {
+        /* Display : 480x640 (GTF) */
+        {VIA_RES_480X640, CRTM480x640, ARRAY_SIZE(CRTM480x640)},
+
+        /* Display : 640x480 */
+        {VIA_RES_640X480, CRTM640x480, ARRAY_SIZE(CRTM640x480)},
+
+        /* Display : 720x480 (GTF) */
+        {VIA_RES_720X480, CRTM720x480, ARRAY_SIZE(CRTM720x480)},
+
+        /* Display : 720x576 (GTF) */
+        {VIA_RES_720X576, CRTM720x576, ARRAY_SIZE(CRTM720x576)},
+
+        /* Display : 800x600 */
+        {VIA_RES_800X600, CRTM800x600, ARRAY_SIZE(CRTM800x600)},
+
+        /* Display : 800x480 (CVT) */
+        {VIA_RES_800X480, CRTM800x480, ARRAY_SIZE(CRTM800x480)},
+
+        /* Display : 848x480 (CVT) */
+        {VIA_RES_848X480, CRTM848x480, ARRAY_SIZE(CRTM848x480)},
+
+        /* Display : 852x480 (GTF) */
+        {VIA_RES_856X480, CRTM852x480, ARRAY_SIZE(CRTM852x480)},
+
+        /* Display : 1024x512 (GTF) */
+        {VIA_RES_1024X512, CRTM1024x512, ARRAY_SIZE(CRTM1024x512)},
+
+        /* Display : 1024x600 */
+        {VIA_RES_1024X600, CRTM1024x600, ARRAY_SIZE(CRTM1024x600)},
+
+        /* Display : 1024x576 (GTF) */
+        /*{ VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)}, */
+
+        /* Display : 1024x768 */
+        {VIA_RES_1024X768, CRTM1024x768, ARRAY_SIZE(CRTM1024x768)},
+
+        /* Display : 1152x864 */
+        {VIA_RES_1152X864, CRTM1152x864, ARRAY_SIZE(CRTM1152x864)},
+
+        /* Display : 1280x768 (GTF) */
+        {VIA_RES_1280X768, CRTM1280x768, ARRAY_SIZE(CRTM1280x768)},
+
+        /* Display : 960x600 (CVT) */
+        {VIA_RES_960X600, CRTM960x600, ARRAY_SIZE(CRTM960x600)},
+
+        /* Display : 1000x600 (GTF) */
+        {VIA_RES_1000X600, CRTM1000x600, ARRAY_SIZE(CRTM1000x600)},
+
+        /* Display : 1024x576 (GTF) */
+        {VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)},
+
+        /* Display : 1088x612 (GTF) */
+        {VIA_RES_1088X612, CRTM1088x612, ARRAY_SIZE(CRTM1088x612)},
+
+        /* Display : 1152x720 (CVT) */
+        {VIA_RES_1152X720, CRTM1152x720, ARRAY_SIZE(CRTM1152x720)},
+
+        /* Display : 1200x720 (GTF) */
+        {VIA_RES_1200X720, CRTM1200x720, ARRAY_SIZE(CRTM1200x720)},
+
+        /* Display : 1280x600 (GTF) */
+        {VIA_RES_1280X600, CRTM1280x600, ARRAY_SIZE(CRTM1280x600)},
+
+        /* Display : 1280x800 (CVT) */
+        {VIA_RES_1280X800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)},
+
+        /* Display : 1280x800 (GTF) */
+        /*{ M1280x800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)}, */
+
+        /* Display : 1280x960 */
+        {VIA_RES_1280X960, CRTM1280x960, ARRAY_SIZE(CRTM1280x960)},
+
+        /* Display : 1280x1024 */
+        {VIA_RES_1280X1024, CRTM1280x1024, ARRAY_SIZE(CRTM1280x1024)},
+
+        /* Display : 1360x768 (CVT) */
+        {VIA_RES_1360X768, CRTM1360x768, ARRAY_SIZE(CRTM1360x768)},
+
+        /* Display : 1360x768 (CVT Reduce Blanking) */
+        {VIA_RES_1360X768_RB, CRTM1360x768_RB,
+         ARRAY_SIZE(CRTM1360x768_RB)},
+
+        /* Display : 1366x768 */
+        {VIA_RES_1366X768, CRTM1366x768, ARRAY_SIZE(CRTM1366x768)},
+
+        /* Display : 1368x768 (GTF) */
+        /*{ M1368x768,CRTM1368x768,ARRAY_SIZE(CRTM1368x768)}, */
+        /* Display : 1368x768 (GTF) */
+        {VIA_RES_1368X768, CRTM1368x768, ARRAY_SIZE(CRTM1368x768)},
+
+        /* Display : 1440x900 (CVT) */
+        {VIA_RES_1440X900, CRTM1440x900, ARRAY_SIZE(CRTM1440x900)},
+
+        /* Display : 1440x900 (CVT Reduce Blanking) */
+        {VIA_RES_1440X900_RB, CRTM1440x900_RB,
+         ARRAY_SIZE(CRTM1440x900_RB)},
+
+        /* Display : 1440x1050 (GTF) */
+        {VIA_RES_1440X1050, CRTM1440x1050, ARRAY_SIZE(CRTM1440x1050)},
+
+        /* Display : 1400x1050 (CVT Reduce Blanking) */
+        {VIA_RES_1400X1050_RB, CRTM1400x1050_RB,
+         ARRAY_SIZE(CRTM1400x1050_RB)},
+
+        /* Display : 1600x900 (CVT) */
+        {VIA_RES_1600X900, CRTM1600x900, ARRAY_SIZE(CRTM1600x900)},
+
+        /* Display : 1600x900 (CVT Reduce Blanking) */
+        {VIA_RES_1600X900_RB, CRTM1600x900_RB,
+         ARRAY_SIZE(CRTM1600x900_RB)},
+
+        /* Display : 1600x1024 (GTF) */
+        {VIA_RES_1600X1024, CRTM1600x1024, ARRAY_SIZE(CRTM1600x1024)},
+
+        /* Display : 1600x1200 */
+        {VIA_RES_1600X1200, CRTM1600x1200, ARRAY_SIZE(CRTM1600x1200)},
+
+        /* Display : 1680x1050 (CVT) */
+        {VIA_RES_1680X1050, CRTM1680x1050, ARRAY_SIZE(CRTM1680x1050)},
+
+        /* Display : 1680x1050 (CVT Reduce Blanking) */
+        {VIA_RES_1680X1050_RB, CRTM1680x1050_RB,
+         ARRAY_SIZE(CRTM1680x1050_RB)},
+
+        /* Display : 1792x1344 (DMT) */
+        {VIA_RES_1792X1344, CRTM1792x1344, ARRAY_SIZE(CRTM1792x1344)},
+
+        /* Display : 1856x1392 (DMT) */
+        {VIA_RES_1856X1392, CRTM1856x1392, ARRAY_SIZE(CRTM1856x1392)},
+
+        /* Display : 1920x1440 */
+        {VIA_RES_1920X1440, CRTM1920x1440, ARRAY_SIZE(CRTM1920x1440)},
+
+        /* Display : 2048x1536 */
+        {VIA_RES_2048X1536, CRTM2048x1536, ARRAY_SIZE(CRTM2048x1536)},
+
+        /* Display : 1280x720 */
+        {VIA_RES_1280X720, CRTM1280x720, ARRAY_SIZE(CRTM1280x720)},
+
+        /* Display : 1920x1080 (CVT) */
+        {VIA_RES_1920X1080, CRTM1920x1080, ARRAY_SIZE(CRTM1920x1080)},
+
+        /* Display : 1920x1080 (CVT Reduce Blanking) */
+        {VIA_RES_1920X1080_RB, CRTM1920x1080_RB,
+         ARRAY_SIZE(CRTM1920x1080_RB)},
+
+        /* Display : 1920x1200 (CVT) */
+        {VIA_RES_1920X1200, CRTM1920x1200, ARRAY_SIZE(CRTM1920x1200)},
+
+        /* Display : 1920x1200 (CVT Reduce Blanking) */
+        {VIA_RES_1920X1200_RB, CRTM1920x1200_RB,
+         ARRAY_SIZE(CRTM1920x1200_RB)},
+
+        /* Display : 1400x1050 (CVT) */
+        {VIA_RES_1400X1050, CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)}
+};
+struct crt_mode_table CEAM1280x720[] = {
+        {REFRESH_60, CLK_74_270M, M1280X720_CEA_R60_HSP,
+         M1280X720_CEA_R60_VSP,
+         /* HT,    HA,   HBS,  HBE,  HSS, HSE,  VT,   VA,  VBS, VBE, VSS, VSE */
+         {1650, 1280, 1280, 370, 1390, 40, 750, 720, 720, 30, 725, 5} }
+};
+struct crt_mode_table CEAM1920x1080[] = {
+        {REFRESH_60, CLK_148_500M, M1920X1080_CEA_R60_HSP,
+         M1920X1080_CEA_R60_VSP,
+         /* HT,    HA,   HBS,  HBE,  HSS, HSE,  VT,  VA, VBS, VBE,  VSS, VSE */
+         {2200, 1920, 1920, 300, 2008, 44, 1125, 1080, 1080, 45, 1084, 5} }
+};
+struct VideoModeTable CEA_HDMI_Modes[] = {
+        /* Display : 1280x720 */
+        {VIA_RES_1280X720, CEAM1280x720, ARRAY_SIZE(CEAM1280x720)},
+        {VIA_RES_1920X1080, CEAM1920x1080, ARRAY_SIZE(CEAM1920x1080)}
+};
diff --git a/drivers/video/via/viamode.h b/drivers/video/via/viamode.h
new file mode 100644
index 000000000000..1a5de50a23a2
--- /dev/null
+++ b/drivers/video/via/viamode.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __VIAMODE_H__
+#define __VIAMODE_H__
+
+#include "global.h"
+
+struct VPITTable {
+        unsigned char Misc;
+        unsigned char SR[StdSR];
+        unsigned char GR[StdGR];
+        unsigned char AR[StdAR];
+};
+
+struct VideoModeTable {
+        int ModeIndex;
+        struct crt_mode_table *crtc;
+        int mode_array;
+};
+
+struct patch_table {
+        int mode_index;
+        int table_length;
+        struct io_reg *io_reg_table;
+};
+
+struct res_map_refresh {
+        int hres;
+        int vres;
+        int pixclock;
+        int vmode_refresh;
+};
+
+#define NUM_TOTAL_RES_MAP_REFRESH ARRAY_SIZE(res_map_refresh_tbl)
+#define NUM_TOTAL_CEA_MODES  ARRAY_SIZE(CEA_HDMI_Modes)
+#define NUM_TOTAL_CN400_ModeXregs ARRAY_SIZE(CN400_ModeXregs)
+#define NUM_TOTAL_CN700_ModeXregs ARRAY_SIZE(CN700_ModeXregs)
+#define NUM_TOTAL_KM400_ModeXregs ARRAY_SIZE(KM400_ModeXregs)
+#define NUM_TOTAL_CX700_ModeXregs ARRAY_SIZE(CX700_ModeXregs)
+#define NUM_TOTAL_VX800_ModeXregs ARRAY_SIZE(VX800_ModeXregs)
+#define NUM_TOTAL_CLE266_ModeXregs ARRAY_SIZE(CLE266_ModeXregs)
+#define NUM_TOTAL_PATCH_MODE ARRAY_SIZE(res_patch_table)
+#define NUM_TOTAL_MODETABLE ARRAY_SIZE(CLE266Modes)
+
+/********************/
+/* Mode Table       */
+/********************/
+
+/* 480x640 */
+extern struct crt_mode_table CRTM480x640[1];
+/* 640x480*/
+extern struct crt_mode_table CRTM640x480[5];
+/*720x480 (GTF)*/
+extern struct crt_mode_table CRTM720x480[1];
+/*720x576 (GTF)*/
+extern struct crt_mode_table CRTM720x576[1];
+/* 800x480 (CVT) */
+extern struct crt_mode_table CRTM800x480[1];
+/* 800x600*/
+extern struct crt_mode_table CRTM800x600[5];
+/* 848x480 (CVT) */
+extern struct crt_mode_table CRTM848x480[1];
+/*856x480 (GTF) convert to 852x480*/
+extern struct crt_mode_table CRTM852x480[1];
+/*1024x512 (GTF)*/
+extern struct crt_mode_table CRTM1024x512[1];
+/* 1024x600*/
+extern struct crt_mode_table CRTM1024x600[1];
+/* 1024x768*/
+extern struct crt_mode_table CRTM1024x768[4];
+/* 1152x864*/
+extern struct crt_mode_table CRTM1152x864[1];
+/* 1280x720 (HDMI 720P)*/
+extern struct crt_mode_table CRTM1280x720[2];
+/*1280x768 (GTF)*/
+extern struct crt_mode_table CRTM1280x768[2];
+/* 1280x800 (CVT) */
+extern struct crt_mode_table CRTM1280x800[1];
+/*1280x960*/
+extern struct crt_mode_table CRTM1280x960[1];
+/* 1280x1024*/
+extern struct crt_mode_table CRTM1280x1024[3];
+/* 1368x768 (GTF) */
+extern struct crt_mode_table CRTM1368x768[1];
+/*1440x1050 (GTF)*/
+extern struct crt_mode_table CRTM1440x1050[1];
+/* 1600x1200*/
+extern struct crt_mode_table CRTM1600x1200[2];
+/* 1680x1050 (CVT) */
+extern struct crt_mode_table CRTM1680x1050[2];
+/* 1680x1050 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1680x1050_RB[1];
+/* 1920x1080 (CVT)*/
+extern struct crt_mode_table CRTM1920x1080[1];
+/* 1920x1080 (CVT with Reduce Blanking) */
+extern struct crt_mode_table CRTM1920x1080_RB[1];
+/* 1920x1440*/
+extern struct crt_mode_table CRTM1920x1440[2];
+/* 1400x1050 (CVT) */
+extern struct crt_mode_table CRTM1400x1050[2];
+/* 1400x1050 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1400x1050_RB[1];
+/* 960x600 (CVT) */
+extern struct crt_mode_table CRTM960x600[1];
+/* 1000x600 (GTF) */
+extern struct crt_mode_table CRTM1000x600[1];
+/* 1024x576 (GTF) */
+extern struct crt_mode_table CRTM1024x576[1];
+/* 1088x612 (CVT) */
+extern struct crt_mode_table CRTM1088x612[1];
+/* 1152x720 (CVT) */
+extern struct crt_mode_table CRTM1152x720[1];
+/* 1200x720 (GTF) */
+extern struct crt_mode_table CRTM1200x720[1];
+/* 1280x600 (GTF) */
+extern struct crt_mode_table CRTM1280x600[1];
+/* 1360x768 (CVT) */
+extern struct crt_mode_table CRTM1360x768[1];
+/* 1360x768 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1360x768_RB[1];
+/* 1366x768 (GTF) */
+extern struct crt_mode_table CRTM1366x768[2];
+/* 1440x900 (CVT) */
+extern struct crt_mode_table CRTM1440x900[2];
+/* 1440x900 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1440x900_RB[1];
+/* 1600x900 (CVT) */
+extern struct crt_mode_table CRTM1600x900[1];
+/* 1600x900 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1600x900_RB[1];
+/* 1600x1024 (GTF) */
+extern struct crt_mode_table CRTM1600x1024[1];
+/* 1792x1344 (DMT) */
+extern struct crt_mode_table CRTM1792x1344[1];
+/* 1856x1392 (DMT) */
+extern struct crt_mode_table CRTM1856x1392[1];
+/* 1920x1200 (CVT) */
+extern struct crt_mode_table CRTM1920x1200[1];
+/* 1920x1200 (CVT with Reduce Blanking) */
+extern struct crt_mode_table CRTM1920x1200_RB[1];
+/* 2048x1536 (CVT) */
+extern struct crt_mode_table CRTM2048x1536[1];
+extern struct VideoModeTable CLE266Modes[47];
+extern struct crt_mode_table CEAM1280x720[1];
+extern struct crt_mode_table CEAM1920x1080[1];
+extern struct VideoModeTable CEA_HDMI_Modes[2];
+
+extern struct res_map_refresh res_map_refresh_tbl[61];
+extern struct io_reg CN400_ModeXregs[52];
+extern struct io_reg CN700_ModeXregs[66];
+extern struct io_reg KM400_ModeXregs[55];
+extern struct io_reg CX700_ModeXregs[58];
+extern struct io_reg VX800_ModeXregs[58];
+extern struct io_reg CLE266_ModeXregs[32];
+extern struct io_reg PM1024x768[2];
+extern struct patch_table res_patch_table[1];
+extern struct VPITTable VPIT;
+#endif /* __VIAMODE_H__ */
diff --git a/drivers/video/via/vt1636.c b/drivers/video/via/vt1636.c
new file mode 100644
index 000000000000..322a9f993550
--- /dev/null
+++ b/drivers/video/via/vt1636.c
@@ -0,0 +1,306 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "global.h"
+
+u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info,
+        u8 index)
+{
+        u8 data;
+
+        viaparinfo->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
+        viafb_i2c_readbyte(plvds_chip_info->lvds_chip_slave_addr, index, &data);
+
+        return data;
+}
+
+void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information
+                              *plvds_setting_info, struct lvds_chip_information
+                              *plvds_chip_info, struct IODATA io_data)
+{
+        int index, data;
+
+        viaparinfo->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
+
+        index = io_data.Index;
+        data = viafb_gpio_i2c_read_lvds(plvds_setting_info, plvds_chip_info,
+                index);
+        data = (data & (~io_data.Mask)) | io_data.Data;
+
+        viafb_i2c_writebyte(plvds_chip_info->lvds_chip_slave_addr, index, data);
+}
+
+void viafb_init_lvds_vt1636(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info)
+{
+        int reg_num, i;
+
+        /* Common settings: */
+        reg_num = ARRAY_SIZE(COMMON_INIT_TBL_VT1636);
+
+        for (i = 0; i < reg_num; i++) {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         COMMON_INIT_TBL_VT1636[i]);
+        }
+
+        /* Input Data Mode Select */
+        if (plvds_setting_info->device_lcd_dualedge) {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         DUAL_CHANNEL_ENABLE_TBL_VT1636[0]);
+        } else {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         SINGLE_CHANNEL_ENABLE_TBL_VT1636[0]);
+        }
+
+        if (plvds_setting_info->LCDDithering) {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         DITHERING_ENABLE_TBL_VT1636[0]);
+        } else {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         DITHERING_DISABLE_TBL_VT1636[0]);
+        }
+}
+
+void viafb_enable_lvds_vt1636(struct lvds_setting_information
+                        *plvds_setting_info,
+                        struct lvds_chip_information *plvds_chip_info)
+{
+
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,
+                                 VDD_ON_TBL_VT1636[0]);
+
+        /* Pad on: */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_DVP0:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0xC0, 0xC0);
+                        break;
+                }
+
+        case INTERFACE_DVP1:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0x30, 0x30);
+                        break;
+                }
+
+        case INTERFACE_DFP_LOW:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x03, 0x03);
+                        break;
+                }
+
+        case INTERFACE_DFP_HIGH:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x03, 0x0C);
+                        break;
+                }
+
+        }
+}
+
+void viafb_disable_lvds_vt1636(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info)
+{
+
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,
+                                 VDD_OFF_TBL_VT1636[0]);
+
+        /* Pad off: */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_DVP0:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0x00, 0xC0);
+                        break;
+                }
+
+        case INTERFACE_DVP1:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0x00, 0x30);
+                        break;
+                }
+
+        case INTERFACE_DFP_LOW:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x03);
+                        break;
+                }
+
+        case INTERFACE_DFP_HIGH:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x0C);
+                        break;
+                }
+
+        }
+}
+
+bool viafb_lvds_identify_vt1636(void)
+{
+        u8 Buffer[2];
+
+        DEBUG_MSG(KERN_INFO "viafb_lvds_identify_vt1636.\n");
+
+        /* Sense VT1636 LVDS Transmiter */
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =
+        VT1636_LVDS_I2C_ADDR;
+
+        /* Check vendor ID first: */
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+        lvds_chip_slave_addr,
+                    0x00, &Buffer[0]);
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+                lvds_chip_slave_addr,
+                    0x01, &Buffer[1]);
+
+        if (!((Buffer[0] == 0x06) && (Buffer[1] == 0x11)))
+                return false;
+
+        /* Check Chip ID: */
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+        lvds_chip_slave_addr,
+                    0x02, &Buffer[0]);
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+                lvds_chip_slave_addr,
+                    0x03, &Buffer[1]);
+        if ((Buffer[0] == 0x45) && (Buffer[1] == 0x33)) {
+                viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                        VT1636_LVDS;
+                return true;
+        }
+
+        return false;
+}
+
+static int get_clk_range_index(u32 Clk)
+{
+        if (Clk < DPA_CLK_30M)
+                return DPA_CLK_RANGE_30M;
+        else if (Clk < DPA_CLK_50M)
+                return DPA_CLK_RANGE_30_50M;
+        else if (Clk < DPA_CLK_70M)
+                return DPA_CLK_RANGE_50_70M;
+        else if (Clk < DPA_CLK_100M)
+                return DPA_CLK_RANGE_70_100M;
+        else if (Clk < DPA_CLK_150M)
+                return DPA_CLK_RANGE_100_150M;
+        else
+                return DPA_CLK_RANGE_150M;
+}
+
+static int get_lvds_dpa_setting_index(int panel_size_id,
+                             struct VT1636_DPA_SETTING *p_vt1636_dpasetting_tbl,
+                               int tbl_size)
+{
+        int i;
+
+        for (i = 0; i < tbl_size; i++) {
+                if (panel_size_id == p_vt1636_dpasetting_tbl->PanelSizeID)
+                        return i;
+
+                p_vt1636_dpasetting_tbl++;
+        }
+
+        return 0;
+}
+
+static void set_dpa_vt1636(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info,
+                    struct VT1636_DPA_SETTING *p_vt1636_dpa_setting)
+{
+        struct IODATA io_data;
+
+        io_data.Index = 0x09;
+        io_data.Mask = 0x1F;
+        io_data.Data = p_vt1636_dpa_setting->CLK_SEL_ST1;
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                plvds_chip_info, io_data);
+
+        io_data.Index = 0x08;
+        io_data.Mask = 0x0F;
+        io_data.Data = p_vt1636_dpa_setting->CLK_SEL_ST2;
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,
+                io_data);
+}
+
+void viafb_vt1636_patch_skew_on_vt3324(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info)
+{
+        int index, size;
+
+        DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3324.\n");
+
+        /* Graphics DPA settings: */
+        index = get_clk_range_index(plvds_setting_info->vclk);
+        viafb_set_dpa_gfx(plvds_chip_info->output_interface,
+                    &GFX_DPA_SETTING_TBL_VT3324[index]);
+
+        /* LVDS Transmitter DPA settings: */
+        size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3324);
+        index =
+            get_lvds_dpa_setting_index(plvds_setting_info->lcd_panel_id,
+                                       VT1636_DPA_SETTING_TBL_VT3324, size);
+        set_dpa_vt1636(plvds_setting_info, plvds_chip_info,
+                       &VT1636_DPA_SETTING_TBL_VT3324[index]);
+}
+
+void viafb_vt1636_patch_skew_on_vt3327(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info)
+{
+        int index, size;
+
+        DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3327.\n");
+
+        /* Graphics DPA settings: */
+        index = get_clk_range_index(plvds_setting_info->vclk);
+        viafb_set_dpa_gfx(plvds_chip_info->output_interface,
+                    &GFX_DPA_SETTING_TBL_VT3327[index]);
+
+        /* LVDS Transmitter DPA settings: */
+        size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3327);
+        index =
+            get_lvds_dpa_setting_index(plvds_setting_info->lcd_panel_id,
+                                       VT1636_DPA_SETTING_TBL_VT3327, size);
+        set_dpa_vt1636(plvds_setting_info, plvds_chip_info,
+                       &VT1636_DPA_SETTING_TBL_VT3327[index]);
+}
+
+void viafb_vt1636_patch_skew_on_vt3364(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info)
+{
+        int index;
+
+        DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3364.\n");
+
+        /* Graphics DPA settings: */
+        index = get_clk_range_index(plvds_setting_info->vclk);
+        viafb_set_dpa_gfx(plvds_chip_info->output_interface,
+                    &GFX_DPA_SETTING_TBL_VT3364[index]);
+}
diff --git a/drivers/video/via/vt1636.h b/drivers/video/via/vt1636.h
new file mode 100644
index 000000000000..2a150c58c7ed
--- /dev/null
+++ b/drivers/video/via/vt1636.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _VT1636_H_
+#define _VT1636_H_
+#include "chip.h"
+bool viafb_lvds_identify_vt1636(void);
+void viafb_init_lvds_vt1636(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info);
+void viafb_enable_lvds_vt1636(struct lvds_setting_information
+                        *plvds_setting_info,
+                        struct lvds_chip_information *plvds_chip_info);
+void viafb_disable_lvds_vt1636(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+void viafb_vt1636_patch_skew_on_vt3324(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info);
+void viafb_vt1636_patch_skew_on_vt3327(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info);
+void viafb_vt1636_patch_skew_on_vt3364(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info);
+
+#endif
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 536ab11623f0..3df17dc8c3d7 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -12,7 +12,6 @@
  * (http://davesdomain.org.uk/viafb/)
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -677,13 +676,13 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
 
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(info->dev, "cannot enable PCI device\n");
+                dev_err(info->device, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "vt8623fb");
         if (rc < 0) {
-                dev_err(info->dev, "cannot reserve framebuffer region\n");
+                dev_err(info->device, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
@@ -696,14 +695,14 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for framebuffer failed\n");
+                dev_err(info->device, "iomap for framebuffer failed\n");
                 goto err_iomap_1;
         }
 
         par->mmio_base = pci_iomap(dev, 1, 0);
         if (! par->mmio_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for MMIO failed\n");
+                dev_err(info->device, "iomap for MMIO failed\n");
                 goto err_iomap_2;
         }
 
@@ -714,7 +713,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
                 info->screen_size = memsize1 << 20;
         else {
-                dev_err(info->dev, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
+                dev_err(info->device, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
                 info->screen_size = 16 << 20;
         }
 
@@ -731,19 +730,19 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(info->dev, "mode %s not found\n", mode_option);
+                dev_err(info->device, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(info->dev, "cannot allocate colormap\n");
+                dev_err(info->device, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(info->dev, "cannot register framebugger\n");
+                dev_err(info->device, "cannot register framebugger\n");
                 goto err_reg_fb;
         }
 
@@ -817,7 +816,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct vt8623fb_info *par = info->par;
 
-        dev_info(info->dev, "suspend\n");
+        dev_info(info->device, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -848,16 +847,13 @@ static int vt8623_pci_resume(struct pci_dev* dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct vt8623fb_info *par = info->par;
 
-        dev_info(info->dev, "resume\n");
+        dev_info(info->device, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
 
-        if (par->ref_count == 0) {
-                mutex_unlock(&(par->open_lock));
-                release_console_sem();
-                return 0;
-        }
+        if (par->ref_count == 0)
+                goto fail;
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -870,8 +866,8 @@ static int vt8623_pci_resume(struct pci_dev* dev)
         vt8623fb_set_par(info);
         fb_set_suspend(info, 0);
 
-        mutex_unlock(&(par->open_lock));
 fail:
+        mutex_unlock(&(par->open_lock));
         release_console_sem();
 
         return 0;
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 47ed39b52f9c..a463b3dd837b 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -680,11 +680,11 @@ static struct xenbus_driver xenfb = {
 
 static int __init xenfb_init(void)
 {
-        if (!is_running_on_xen())
+        if (!xen_domain())
                 return -ENODEV;
 
         /* Nothing to do if running in dom0. */
-        if (is_initial_xendomain())
+        if (xen_initial_domain())
                 return -ENODEV;
 
         return xenbus_register_frontend(&xenfb);
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 7b3a8423f485..5da3d2423cc0 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -24,7 +24,6 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>