102 files changed, 6285 insertions, 5469 deletions

diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv24.xml b/Documentation/DocBook/media/v4l/pixfmt-nv24.xml
new file mode 100644
index 000000000000..fb255f2ca9dd
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/pixfmt-nv24.xml
@@ -0,0 +1,121 @@
+    <refentry>
+      <refmeta>
+        <refentrytitle>V4L2_PIX_FMT_NV24 ('NV24'), V4L2_PIX_FMT_NV42 ('NV42')</refentrytitle>
+        &manvol;
+      </refmeta>
+      <refnamediv>
+        <refname id="V4L2-PIX-FMT-NV24"><constant>V4L2_PIX_FMT_NV24</constant></refname>
+        <refname id="V4L2-PIX-FMT-NV42"><constant>V4L2_PIX_FMT_NV42</constant></refname>
+        <refpurpose>Formats with full horizontal and vertical
+chroma resolutions, also known as YUV 4:4:4. One luminance and one
+chrominance plane with alternating chroma samples as opposed to
+<constant>V4L2_PIX_FMT_YVU420</constant></refpurpose>
+      </refnamediv>
+      <refsect1>
+        <title>Description</title>
+
+        <para>These are two-plane versions of the YUV 4:4:4 format. The three
+        components are separated into two sub-images or planes. The Y plane is
+        first, with each Y sample stored in one byte per pixel. For
+        <constant>V4L2_PIX_FMT_NV24</constant>, a combined CbCr plane
+        immediately follows the Y plane in memory. The CbCr plane has the same
+        width and height, in pixels, as the Y plane (and the image). Each line
+        contains one CbCr pair per pixel, with each Cb and Cr sample stored in
+        one byte. <constant>V4L2_PIX_FMT_NV42</constant> is the same except that
+        the Cb and Cr samples are swapped, the CrCb plane starts with a Cr
+        sample.</para>
+
+        <para>If the Y plane has pad bytes after each row, then the CbCr plane
+        has twice as many pad bytes after its rows.</para>
+
+        <example>
+          <title><constant>V4L2_PIX_FMT_NV24</constant> 4 &times; 4
+pixel image</title>
+
+          <formalpara>
+            <title>Byte Order.</title>
+            <para>Each cell is one byte.
+                <informaltable frame="none">
+                <tgroup cols="9" align="center">
+                  <colspec align="left" colwidth="2*" />
+                  <tbody valign="top">
+                    <row>
+                      <entry>start&nbsp;+&nbsp;0:</entry>
+                      <entry>Y'<subscript>00</subscript></entry>
+                      <entry>Y'<subscript>01</subscript></entry>
+                      <entry>Y'<subscript>02</subscript></entry>
+                      <entry>Y'<subscript>03</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;4:</entry>
+                      <entry>Y'<subscript>10</subscript></entry>
+                      <entry>Y'<subscript>11</subscript></entry>
+                      <entry>Y'<subscript>12</subscript></entry>
+                      <entry>Y'<subscript>13</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;8:</entry>
+                      <entry>Y'<subscript>20</subscript></entry>
+                      <entry>Y'<subscript>21</subscript></entry>
+                      <entry>Y'<subscript>22</subscript></entry>
+                      <entry>Y'<subscript>23</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;12:</entry>
+                      <entry>Y'<subscript>30</subscript></entry>
+                      <entry>Y'<subscript>31</subscript></entry>
+                      <entry>Y'<subscript>32</subscript></entry>
+                      <entry>Y'<subscript>33</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;16:</entry>
+                      <entry>Cb<subscript>00</subscript></entry>
+                      <entry>Cr<subscript>00</subscript></entry>
+                      <entry>Cb<subscript>01</subscript></entry>
+                      <entry>Cr<subscript>01</subscript></entry>
+                      <entry>Cb<subscript>02</subscript></entry>
+                      <entry>Cr<subscript>02</subscript></entry>
+                      <entry>Cb<subscript>03</subscript></entry>
+                      <entry>Cr<subscript>03</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;24:</entry>
+                      <entry>Cb<subscript>10</subscript></entry>
+                      <entry>Cr<subscript>10</subscript></entry>
+                      <entry>Cb<subscript>11</subscript></entry>
+                      <entry>Cr<subscript>11</subscript></entry>
+                      <entry>Cb<subscript>12</subscript></entry>
+                      <entry>Cr<subscript>12</subscript></entry>
+                      <entry>Cb<subscript>13</subscript></entry>
+                      <entry>Cr<subscript>13</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;32:</entry>
+                      <entry>Cb<subscript>20</subscript></entry>
+                      <entry>Cr<subscript>20</subscript></entry>
+                      <entry>Cb<subscript>21</subscript></entry>
+                      <entry>Cr<subscript>21</subscript></entry>
+                      <entry>Cb<subscript>22</subscript></entry>
+                      <entry>Cr<subscript>22</subscript></entry>
+                      <entry>Cb<subscript>23</subscript></entry>
+                      <entry>Cr<subscript>23</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;40:</entry>
+                      <entry>Cb<subscript>30</subscript></entry>
+                      <entry>Cr<subscript>30</subscript></entry>
+                      <entry>Cb<subscript>31</subscript></entry>
+                      <entry>Cr<subscript>31</subscript></entry>
+                      <entry>Cb<subscript>32</subscript></entry>
+                      <entry>Cr<subscript>32</subscript></entry>
+                      <entry>Cb<subscript>33</subscript></entry>
+                      <entry>Cr<subscript>33</subscript></entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+                </informaltable>
+              </para>
+          </formalpara>
+        </example>
+      </refsect1>
+    </refentry>
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index 2ff6b7776d7f..aef4615fb07b 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -714,6 +714,7 @@ information.</para>
     &sub-nv12m;
     &sub-nv12mt;
     &sub-nv16;
+    &sub-nv24;
     &sub-m420;
   </section>
 
diff --git a/Documentation/fb/api.txt b/Documentation/fb/api.txt
new file mode 100644
index 000000000000..d4ff7de85700
--- /dev/null
+++ b/Documentation/fb/api.txt
@@ -0,0 +1,306 @@
+                        The Frame Buffer Device API
+                        ---------------------------
+
+Last revised: June 21, 2011
+
+
+0. Introduction
+---------------
+
+This document describes the frame buffer API used by applications to interact
+with frame buffer devices. In-kernel APIs between device drivers and the frame
+buffer core are not described.
+
+Due to a lack of documentation in the original frame buffer API, drivers
+behaviours differ in subtle (and not so subtle) ways. This document describes
+the recommended API implementation, but applications should be prepared to
+deal with different behaviours.
+
+
+1. Capabilities
+---------------
+
+Device and driver capabilities are reported in the fixed screen information
+capabilities field.
+
+struct fb_fix_screeninfo {
+        ...
+        __u16 capabilities;             /* see FB_CAP_*                 */
+        ...
+};
+
+Application should use those capabilities to find out what features they can
+expect from the device and driver.
+
+- FB_CAP_FOURCC
+
+The driver supports the four character code (FOURCC) based format setting API.
+When supported, formats are configured using a FOURCC instead of manually
+specifying color components layout.
+
+
+2. Types and visuals
+--------------------
+
+Pixels are stored in memory in hardware-dependent formats. Applications need
+to be aware of the pixel storage format in order to write image data to the
+frame buffer memory in the format expected by the hardware.
+
+Formats are described by frame buffer types and visuals. Some visuals require
+additional information, which are stored in the variable screen information
+bits_per_pixel, grayscale, red, green, blue and transp fields.
+
+Visuals describe how color information is encoded and assembled to create
+macropixels. Types describe how macropixels are stored in memory. The following
+types and visuals are supported.
+
+- FB_TYPE_PACKED_PIXELS
+
+Macropixels are stored contiguously in a single plane. If the number of bits
+per macropixel is not a multiple of 8, whether macropixels are padded to the
+next multiple of 8 bits or packed together into bytes depends on the visual.
+
+Padding at end of lines may be present and is then reported through the fixed
+screen information line_length field.
+
+- FB_TYPE_PLANES
+
+Macropixels are split across multiple planes. The number of planes is equal to
+the number of bits per macropixel, with plane i'th storing i'th bit from all
+macropixels.
+
+Planes are located contiguously in memory.
+
+- FB_TYPE_INTERLEAVED_PLANES
+
+Macropixels are split across multiple planes. The number of planes is equal to
+the number of bits per macropixel, with plane i'th storing i'th bit from all
+macropixels.
+
+Planes are interleaved in memory. The interleave factor, defined as the
+distance in bytes between the beginning of two consecutive interleaved blocks
+belonging to different planes, is stored in the fixed screen information
+type_aux field.
+
+- FB_TYPE_FOURCC
+
+Macropixels are stored in memory as described by the format FOURCC identifier
+stored in the variable screen information grayscale field.
+
+- FB_VISUAL_MONO01
+
+Pixels are black or white and stored on a number of bits (typically one)
+specified by the variable screen information bpp field.
+
+Black pixels are represented by all bits set to 1 and white pixels by all bits
+set to 0. When the number of bits per pixel is smaller than 8, several pixels
+are packed together in a byte.
+
+FB_VISUAL_MONO01 is currently used with FB_TYPE_PACKED_PIXELS only.
+
+- FB_VISUAL_MONO10
+
+Pixels are black or white and stored on a number of bits (typically one)
+specified by the variable screen information bpp field.
+
+Black pixels are represented by all bits set to 0 and white pixels by all bits
+set to 1. When the number of bits per pixel is smaller than 8, several pixels
+are packed together in a byte.
+
+FB_VISUAL_MONO01 is currently used with FB_TYPE_PACKED_PIXELS only.
+
+- FB_VISUAL_TRUECOLOR
+
+Pixels are broken into red, green and blue components, and each component
+indexes a read-only lookup table for the corresponding value. Lookup tables
+are device-dependent, and provide linear or non-linear ramps.
+
+Each component is stored in a macropixel according to the variable screen
+information red, green, blue and transp fields.
+
+- FB_VISUAL_PSEUDOCOLOR and FB_VISUAL_STATIC_PSEUDOCOLOR
+
+Pixel values are encoded as indices into a colormap that stores red, green and
+blue components. The colormap is read-only for FB_VISUAL_STATIC_PSEUDOCOLOR
+and read-write for FB_VISUAL_PSEUDOCOLOR.
+
+Each pixel value is stored in the number of bits reported by the variable
+screen information bits_per_pixel field.
+
+- FB_VISUAL_DIRECTCOLOR
+
+Pixels are broken into red, green and blue components, and each component
+indexes a programmable lookup table for the corresponding value.
+
+Each component is stored in a macropixel according to the variable screen
+information red, green, blue and transp fields.
+
+- FB_VISUAL_FOURCC
+
+Pixels are encoded and  interpreted as described by the format FOURCC
+identifier stored in the variable screen information grayscale field.
+
+
+3. Screen information
+---------------------
+
+Screen information are queried by applications using the FBIOGET_FSCREENINFO
+and FBIOGET_VSCREENINFO ioctls. Those ioctls take a pointer to a
+fb_fix_screeninfo and fb_var_screeninfo structure respectively.
+
+struct fb_fix_screeninfo stores device independent unchangeable information
+about the frame buffer device and the current format. Those information can't
+be directly modified by applications, but can be changed by the driver when an
+application modifies the format.
+
+struct fb_fix_screeninfo {
+        char id[16];                    /* identification string eg "TT Builtin" */
+        unsigned long smem_start;       /* Start of frame buffer mem */
+                                        /* (physical address) */
+        __u32 smem_len;                 /* Length of frame buffer mem */
+        __u32 type;                     /* see FB_TYPE_*                */
+        __u32 type_aux;                 /* Interleave for interleaved Planes */
+        __u32 visual;                   /* see FB_VISUAL_*              */
+        __u16 xpanstep;                 /* zero if no hardware panning  */
+        __u16 ypanstep;                 /* zero if no hardware panning  */
+        __u16 ywrapstep;                /* zero if no hardware ywrap    */
+        __u32 line_length;              /* length of a line in bytes    */
+        unsigned long mmio_start;       /* Start of Memory Mapped I/O   */
+                                        /* (physical address) */
+        __u32 mmio_len;                 /* Length of Memory Mapped I/O  */
+        __u32 accel;                    /* Indicate to driver which     */
+                                        /*  specific chip/card we have  */
+        __u16 capabilities;             /* see FB_CAP_*                 */
+        __u16 reserved[2];              /* Reserved for future compatibility */
+};
+
+struct fb_var_screeninfo stores device independent changeable information
+about a frame buffer device, its current format and video mode, as well as
+other miscellaneous parameters.
+
+struct fb_var_screeninfo {
+        __u32 xres;                     /* visible resolution           */
+        __u32 yres;
+        __u32 xres_virtual;             /* virtual resolution           */
+        __u32 yres_virtual;
+        __u32 xoffset;                  /* offset from virtual to visible */
+        __u32 yoffset;                  /* resolution                   */
+
+        __u32 bits_per_pixel;           /* guess what                   */
+        __u32 grayscale;                /* 0 = color, 1 = grayscale,    */
+                                        /* >1 = FOURCC                  */
+        struct fb_bitfield red;         /* bitfield in fb mem if true color, */
+        struct fb_bitfield green;       /* else only length is significant */
+        struct fb_bitfield blue;
+        struct fb_bitfield transp;      /* transparency                 */
+
+        __u32 nonstd;                   /* != 0 Non standard pixel format */
+
+        __u32 activate;                 /* see FB_ACTIVATE_*            */
+
+        __u32 height;                   /* height of picture in mm    */
+        __u32 width;                    /* width of picture in mm     */
+
+        __u32 accel_flags;              /* (OBSOLETE) see fb_info.flags */
+
+        /* Timing: All values in pixclocks, except pixclock (of course) */
+        __u32 pixclock;                 /* pixel clock in ps (pico seconds) */
+        __u32 left_margin;              /* time from sync to picture    */
+        __u32 right_margin;             /* time from picture to sync    */
+        __u32 upper_margin;             /* time from sync to picture    */
+        __u32 lower_margin;
+        __u32 hsync_len;                /* length of horizontal sync    */
+        __u32 vsync_len;                /* length of vertical sync      */
+        __u32 sync;                     /* see FB_SYNC_*                */
+        __u32 vmode;                    /* see FB_VMODE_*               */
+        __u32 rotate;                   /* angle we rotate counter clockwise */
+        __u32 colorspace;               /* colorspace for FOURCC-based modes */
+        __u32 reserved[4];              /* Reserved for future compatibility */
+};
+
+To modify variable information, applications call the FBIOPUT_VSCREENINFO
+ioctl with a pointer to a fb_var_screeninfo structure. If the call is
+successful, the driver will update the fixed screen information accordingly.
+
+Instead of filling the complete fb_var_screeninfo structure manually,
+applications should call the FBIOGET_VSCREENINFO ioctl and modify only the
+fields they care about.
+
+
+4. Format configuration
+-----------------------
+
+Frame buffer devices offer two ways to configure the frame buffer format: the
+legacy API and the FOURCC-based API.
+
+
+The legacy API has been the only frame buffer format configuration API for a
+long time and is thus widely used by application. It is the recommended API
+for applications when using RGB and grayscale formats, as well as legacy
+non-standard formats.
+
+To select a format, applications set the fb_var_screeninfo bits_per_pixel field
+to the desired frame buffer depth. Values up to 8 will usually map to
+monochrome, grayscale or pseudocolor visuals, although this is not required.
+
+- For grayscale formats, applications set the grayscale field to one. The red,
+  blue, green and transp fields must be set to 0 by applications and ignored by
+  drivers. Drivers must fill the red, blue and green offsets to 0 and lengths
+  to the bits_per_pixel value.
+
+- For pseudocolor formats, applications set the grayscale field to zero. The
+  red, blue, green and transp fields must be set to 0 by applications and
+  ignored by drivers. Drivers must fill the red, blue and green offsets to 0
+  and lengths to the bits_per_pixel value.
+
+- For truecolor and directcolor formats, applications set the grayscale field
+  to zero, and the red, blue, green and transp fields to describe the layout of
+  color components in memory.
+
+struct fb_bitfield {
+        __u32 offset;                   /* beginning of bitfield        */
+        __u32 length;                   /* length of bitfield           */
+        __u32 msb_right;                /* != 0 : Most significant bit is */
+                                        /* right */
+};
+
+  Pixel values are bits_per_pixel wide and are split in non-overlapping red,
+  green, blue and alpha (transparency) components. Location and size of each
+  component in the pixel value are described by the fb_bitfield offset and
+  length fields. Offset are computed from the right.
+
+  Pixels are always stored in an integer number of bytes. If the number of
+  bits per pixel is not a multiple of 8, pixel values are padded to the next
+  multiple of 8 bits.
+
+Upon successful format configuration, drivers update the fb_fix_screeninfo
+type, visual and line_length fields depending on the selected format.
+
+
+The FOURCC-based API replaces format descriptions by four character codes
+(FOURCC). FOURCCs are abstract identifiers that uniquely define a format
+without explicitly describing it. This is the only API that supports YUV
+formats. Drivers are also encouraged to implement the FOURCC-based API for RGB
+and grayscale formats.
+
+Drivers that support the FOURCC-based API report this capability by setting
+the FB_CAP_FOURCC bit in the fb_fix_screeninfo capabilities field.
+
+FOURCC definitions are located in the linux/videodev2.h header. However, and
+despite starting with the V4L2_PIX_FMT_prefix, they are not restricted to V4L2
+and don't require usage of the V4L2 subsystem. FOURCC documentation is
+available in Documentation/DocBook/v4l/pixfmt.xml.
+
+To select a format, applications set the grayscale field to the desired FOURCC.
+For YUV formats, they should also select the appropriate colorspace by setting
+the colorspace field to one of the colorspaces listed in linux/videodev2.h and
+documented in Documentation/DocBook/v4l/colorspaces.xml.
+
+The red, green, blue and transp fields are not used with the FOURCC-based API.
+For forward compatibility reasons applications must zero those fields, and
+drivers must ignore them. Values other than 0 may get a meaning in future
+extensions.
+
+Upon successful format configuration, drivers update the fb_fix_screeninfo
+type, visual and line_length fields depending on the selected format. The type
+and visual fields are set to FB_TYPE_FOURCC and FB_VISUAL_FOURCC respectively.
diff --git a/MAINTAINERS b/MAINTAINERS
index 4d1ba2022a95..ebbee877330f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5669,6 +5669,12 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/samsung
 
+SAMSUNG FRAMEBUFFER DRIVER
+M:      Jingoo Han <jg1.han@samsung.com>
+L:      linux-fbdev@vger.kernel.org
+S:      Maintained
+F:      drivers/video/s3c-fb.c
+
 SERIAL DRIVERS
 M:      Alan Cox <alan@linux.intel.com>
 L:      linux-serial@vger.kernel.org
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 2ceb75d21eb2..39fba9df17fb 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -602,20 +602,6 @@ static void __init omap_sfh7741prox_init(void)
                         __func__, OMAP4_SFH7741_ENABLE_GPIO, error);
 }
 
-static void sdp4430_hdmi_mux_init(void)
-{
-        /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-        omap_mux_init_signal("hdmi_hpd",
-                        OMAP_PIN_INPUT_PULLUP);
-        omap_mux_init_signal("hdmi_cec",
-                        OMAP_PIN_INPUT_PULLUP);
-        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
-        omap_mux_init_signal("hdmi_ddc_scl",
-                        OMAP_PIN_INPUT_PULLUP);
-        omap_mux_init_signal("hdmi_ddc_sda",
-                        OMAP_PIN_INPUT_PULLUP);
-}
-
 static struct gpio sdp4430_hdmi_gpios[] = {
         { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
         { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
@@ -833,9 +819,16 @@ static void omap_4430sdp_display_init(void)
                 pr_err("%s: Could not get display_sel GPIO\n", __func__);
 
         sdp4430_lcd_init();
-        sdp4430_hdmi_mux_init();
         sdp4430_picodlp_init();
         omap_display_init(&sdp4430_dss_data);
+        /*
+         * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
+         * later have external pull up on the HDMI I2C lines
+         */
+        if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2)
+                omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
+        else
+                omap_hdmi_init(0);
 }
 
 #ifdef CONFIG_OMAP_MUX
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index e96a2e7ad36f..30ad40db2cf3 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -412,21 +412,6 @@ int __init omap4_panda_dvi_init(void)
         return r;
 }
 
-
-static void omap4_panda_hdmi_mux_init(void)
-{
-        /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-        omap_mux_init_signal("hdmi_hpd",
-                        OMAP_PIN_INPUT_PULLUP);
-        omap_mux_init_signal("hdmi_cec",
-                        OMAP_PIN_INPUT_PULLUP);
-        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
-        omap_mux_init_signal("hdmi_ddc_scl",
-                        OMAP_PIN_INPUT_PULLUP);
-        omap_mux_init_signal("hdmi_ddc_sda",
-                        OMAP_PIN_INPUT_PULLUP);
-}
-
 static struct gpio panda_hdmi_gpios[] = {
         { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },
         { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
@@ -478,8 +463,16 @@ void omap4_panda_display_init(void)
         if (r)
                 pr_err("error initializing panda DVI\n");
 
-        omap4_panda_hdmi_mux_init();
         omap_display_init(&omap4_panda_dss_data);
+
+        /*
+         * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
+         * later have external pull up on the HDMI I2C lines
+         */
+        if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2)
+                omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
+        else
+                omap_hdmi_init(0);
 }
 
 static void __init omap4_panda_init(void)
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index bc6cf863a563..3c446d1a1781 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -30,6 +30,7 @@
 #include <plat/omap-pm.h>
 #include "common.h"
 
+#include "mux.h"
 #include "control.h"
 #include "display.h"
 
@@ -97,6 +98,36 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
         { "dss_hdmi", "omapdss_hdmi", -1 },
 };
 
+static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
+{
+        u32 reg;
+        u16 control_i2c_1;
+
+        /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
+        omap_mux_init_signal("hdmi_hpd",
+                        OMAP_PIN_INPUT_PULLUP);
+        omap_mux_init_signal("hdmi_cec",
+                        OMAP_PIN_INPUT_PULLUP);
+        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
+        omap_mux_init_signal("hdmi_ddc_scl",
+                        OMAP_PIN_INPUT_PULLUP);
+        omap_mux_init_signal("hdmi_ddc_sda",
+                        OMAP_PIN_INPUT_PULLUP);
+
+        /*
+         * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
+         * HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable
+         * internal pull up resistor.
+         */
+        if (flags & OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP) {
+                control_i2c_1 = OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1;
+                reg = omap4_ctrl_pad_readl(control_i2c_1);
+                reg |= (OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK |
+                        OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK);
+                        omap4_ctrl_pad_writel(reg, control_i2c_1);
+        }
+}
+
 static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
 {
         u32 enable_mask, enable_shift;
@@ -130,6 +161,14 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
         return 0;
 }
 
+int omap_hdmi_init(enum omap_hdmi_flags flags)
+{
+        if (cpu_is_omap44xx())
+                omap4_hdmi_mux_pads(flags);
+
+        return 0;
+}
+
 static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)
 {
         if (cpu_is_omap44xx())
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index a4e6ca04e319..eff8a96c75ee 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -271,7 +271,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = {
                 .flags = LCDC_FLAGS_DWPOL,
                 .lcd_size_cfg.width = 44,
                 .lcd_size_cfg.height = 79,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .lcd_cfg = lcdc0_modes,
                 .num_cfg = ARRAY_SIZE(lcdc0_modes),
                 .board_cfg = {
@@ -321,12 +321,46 @@ static struct resource mipidsi0_resources[] = {
         },
 };
 
+#define DSI0PHYCR       0xe615006c
+static int sh_mipi_set_dot_clock(struct platform_device *pdev,
+                                 void __iomem *base,
+                                 int enable)
+{
+        struct clk *pck;
+        int ret;
+
+        pck = clk_get(&pdev->dev, "dsip_clk");
+        if (IS_ERR(pck)) {
+                ret = PTR_ERR(pck);
+                goto sh_mipi_set_dot_clock_pck_err;
+        }
+
+        if (enable) {
+                clk_set_rate(pck, clk_round_rate(pck,  24000000));
+                __raw_writel(0x2a809010, DSI0PHYCR);
+                clk_enable(pck);
+        } else {
+                clk_disable(pck);
+        }
+
+        ret = 0;
+
+        clk_put(pck);
+
+sh_mipi_set_dot_clock_pck_err:
+        return ret;
+}
+
 static struct sh_mipi_dsi_info mipidsi0_info = {
         .data_format    = MIPI_RGB888,
         .lcd_chan       = &lcdc0_info.ch[0],
+        .lane           = 2,
         .vsynw_offset   = 20,
         .clksrc         = 1,
-        .flags          = SH_MIPI_DSI_HSABM,
+        .flags          = SH_MIPI_DSI_HSABM             |
+                          SH_MIPI_DSI_SYNC_PULSES_MODE  |
+                          SH_MIPI_DSI_HSbyteCLK,
+        .set_dot_clock  = sh_mipi_set_dot_clock,
 };
 
 static struct platform_device mipidsi0_device = {
@@ -472,8 +506,6 @@ static void __init ag5evm_map_io(void)
         shmobile_setup_console();
 }
 
-#define DSI0PHYCR       0xe615006c
-
 static void __init ag5evm_init(void)
 {
         sh73a0_pinmux_init();
@@ -554,9 +586,6 @@ static void __init ag5evm_init(void)
         gpio_direction_output(GPIO_PORT235, 0);
         lcd_backlight_reset();
 
-        /* MIPI-DSI clock setup */
-        __raw_writel(0x2a809010, DSI0PHYCR);
-
         /* enable SDHI0 on CN15 [SD I/F] */
         gpio_request(GPIO_FN_SDHICD0, NULL);
         gpio_request(GPIO_FN_SDHIWP0, NULL);
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index d2e7b73aa9b6..aab0a349f759 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -491,7 +491,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
         .meram_dev = &meram_info,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .lcd_cfg = ap4evb_lcdc_modes,
                 .num_cfg = ARRAY_SIZE(ap4evb_lcdc_modes),
                 .meram_cfg = &lcd_meram_cfg,
@@ -564,6 +564,30 @@ static struct platform_device keysc_device = {
 };
 
 /* MIPI-DSI */
+#define PHYCTRL         0x0070
+static int sh_mipi_set_dot_clock(struct platform_device *pdev,
+                                 void __iomem *base,
+                                 int enable)
+{
+        struct clk *pck = clk_get(&pdev->dev, "dsip_clk");
+        void __iomem *phy =  base + PHYCTRL;
+
+        if (IS_ERR(pck))
+                return PTR_ERR(pck);
+
+        if (enable) {
+                clk_set_rate(pck, clk_round_rate(pck, 24000000));
+                iowrite32(ioread32(phy) | (0xb << 8), phy);
+                clk_enable(pck);
+        } else {
+                clk_disable(pck);
+        }
+
+        clk_put(pck);
+
+        return 0;
+}
+
 static struct resource mipidsi0_resources[] = {
         [0] = {
                 .start  = 0xffc60000,
@@ -580,7 +604,11 @@ static struct resource mipidsi0_resources[] = {
 static struct sh_mipi_dsi_info mipidsi0_info = {
         .data_format    = MIPI_RGB888,
         .lcd_chan       = &lcdc_info.ch[0],
+        .lane           = 2,
         .vsynw_offset   = 17,
+        .flags          = SH_MIPI_DSI_SYNC_PULSES_MODE |
+                          SH_MIPI_DSI_HSbyteCLK,
+        .set_dot_clock  = sh_mipi_set_dot_clock,
 };
 
 static struct platform_device mipidsi0_device = {
@@ -798,7 +826,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = {
         .meram_dev = &meram_info,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = RGB24,
                 .clock_divider = 1,
                 .flags = LCDC_FLAGS_DWPOL,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index cbc5934ae03f..9b42fbd10f8e 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -388,7 +388,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
         .clock_source = LCDC_CLK_BUS,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .lcd_cfg = mackerel_lcdc_modes,
                 .num_cfg = ARRAY_SIZE(mackerel_lcdc_modes),
                 .interface_type         = RGB24,
@@ -451,7 +451,7 @@ static struct sh_mobile_lcdc_info hdmi_lcdc_info = {
         .clock_source = LCDC_CLK_EXTERNAL,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = RGB24,
                 .clock_divider = 1,
                 .flags = LCDC_FLAGS_DWPOL,
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index e349c22a0d71..293456d8dcfd 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -612,8 +612,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("hdmi_clk", &div6_reparent_clks[DIV6_HDMI]),
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
-        CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
-        CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
+        CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
+        CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
 
         /* MSTP32 clocks */
         CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index 34944d01bf1e..afbead6a6e17 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -427,8 +427,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("sdhi2_clk", &div6_clks[DIV6_SDHI2]),
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
-        CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
-        CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
+        CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
+        CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
 
         /* MSTP32 clocks */
         CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 74d49c01783b..6418e95c2b6b 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -207,7 +207,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
         .clock_source = LCDC_CLK_EXTERNAL,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = RGB18,
                 .clock_divider = 1,
                 .lcd_cfg = ap325rxa_lcdc_modes,
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 9a19fb07276c..033ef2ba621f 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -324,7 +324,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
         .ch[0] = {
                 .interface_type = RGB18,
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .lcd_size_cfg = { /* 7.0 inch */
                         .width = 152,
                         .height = 91,
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 5c3c71366848..2a18b06abdaf 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -143,7 +143,7 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
         .clock_source = LCDC_CLK_BUS,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = SYS18,
                 .clock_divider = 6,
                 .flags = LCDC_FLAGS_DWPOL,
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index f8f9377d5684..68c3d6f42896 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -241,7 +241,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
         .clock_source = LCDC_CLK_BUS,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = RGB16,
                 .clock_divider = 2,
                 .lcd_cfg = migor_lcd_modes,
@@ -255,7 +255,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
         .clock_source = LCDC_CLK_PERIPHERAL,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = SYS16A,
                 .clock_divider = 10,
                 .lcd_cfg = migor_lcd_modes,
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 2585733e9bce..036fe1adaef1 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -179,7 +179,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
         .clock_source = LCDC_CLK_EXTERNAL,
         .ch[0] = {
                 .chan = LCDC_CHAN_MAINLCD,
-                .bpp = 16,
+                .fourcc = V4L2_PIX_FMT_RGB565,
                 .clock_divider = 1,
                 .lcd_size_cfg = { /* 7.0 inch */
                         .width = 152,
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 0de598bf66bb..a378c2ce1273 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -424,7 +424,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
                 "%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"
                 "rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"
                 "out_height=%d rotation_type=%d screen_width=%d\n",
-                __func__, info.enabled, info.paddr, info.width, info.height,
+                __func__, ovl->is_enabled(ovl), info.paddr, info.width, info.height,
                 info.color_mode, info.rotation, info.mirror, info.pos_x,
                 info.pos_y, info.out_width, info.out_height, info.rotation_type,
                 info.screen_width);
@@ -943,12 +943,8 @@ static int omap_vout_release(struct file *file)
         /* Disable all the overlay managers connected with this interface */
         for (i = 0; i < ovid->num_overlays; i++) {
                 struct omap_overlay *ovl = ovid->overlays[i];
-                if (ovl->manager && ovl->manager->device) {
-                        struct omap_overlay_info info;
-                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 0;
-                        ovl->set_overlay_info(ovl, &info);
-                }
+                if (ovl->manager && ovl->manager->device)
+                        ovl->disable(ovl);
         }
         /* Turn off the pipeline */
         ret = omapvid_apply_changes(vout);
@@ -1668,7 +1664,6 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
                 if (ovl->manager && ovl->manager->device) {
                         struct omap_overlay_info info;
                         ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 1;
                         info.paddr = addr;
                         if (ovl->set_overlay_info(ovl, &info)) {
                                 ret = -EINVAL;
@@ -1687,6 +1682,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
         if (ret)
                 v4l2_err(&vout->vid_dev->v4l2_dev, "failed to change mode\n");
 
+        for (j = 0; j < ovid->num_overlays; j++) {
+                struct omap_overlay *ovl = ovid->overlays[j];
+
+                if (ovl->manager && ovl->manager->device) {
+                        ret = ovl->enable(ovl);
+                        if (ret)
+                                goto streamon_err1;
+                }
+        }
+
         ret = 0;
 
 streamon_err1:
@@ -1716,16 +1721,8 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
         for (j = 0; j < ovid->num_overlays; j++) {
                 struct omap_overlay *ovl = ovid->overlays[j];
 
-                if (ovl->manager && ovl->manager->device) {
-                        struct omap_overlay_info info;
-
-                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 0;
-                        ret = ovl->set_overlay_info(ovl, &info);
-                        if (ret)
-                                v4l2_err(&vout->vid_dev->v4l2_dev,
-                                "failed to update overlay info in streamoff\n");
-                }
+                if (ovl->manager && ovl->manager->device)
+                        ovl->disable(ovl);
         }
 
         /* Turn of the pipeline */
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index acd4ba555e3a..6ca0c407c144 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2413,7 +2413,6 @@ source "drivers/video/omap/Kconfig"
 source "drivers/video/omap2/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
-source "drivers/video/display/Kconfig"
 
 if VT
         source "drivers/video/console/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9b9d8fff7732..142606814d98 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -13,7 +13,7 @@ fb-objs                           := $(fb-y)
 
 obj-$(CONFIG_VT)                  += console/
 obj-$(CONFIG_LOGO)                += logo/
-obj-y                             += backlight/ display/
+obj-y                             += backlight/
 
 obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 5ea6596dd824..f23cae094f1b 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -152,10 +152,10 @@
 
       - hsstrt:   Start of horizontal synchronization pulse
       - hsstop:   End of horizontal synchronization pulse
-      - htotal:   Last value on the line (i.e. line length = htotal+1)
+      - htotal:   Last value on the line (i.e. line length = htotal + 1)
       - vsstrt:   Start of vertical synchronization pulse
       - vsstop:   End of vertical synchronization pulse
-      - vtotal:   Last line value (i.e. number of lines = vtotal+1)
+      - vtotal:   Last line value (i.e. number of lines = vtotal + 1)
       - hcenter:  Start of vertical retrace for interlace
 
    You can specify the blanking timings independently. Currently I just set
@@ -184,7 +184,7 @@
    clock):
 
       - diwstrt_h:   Horizontal start of the visible window
-      - diwstop_h:   Horizontal stop+1(*) of the visible window
+      - diwstop_h:   Horizontal stop + 1(*) of the visible window
       - diwstrt_v:   Vertical start of the visible window
       - diwstop_v:   Vertical stop of the visible window
       - ddfstrt:     Horizontal start of display DMA
@@ -193,7 +193,7 @@
 
    Sprite positioning:
 
-      - sprstrt_h:   Horizontal start-4 of sprite
+      - sprstrt_h:   Horizontal start - 4 of sprite
       - sprstrt_v:   Vertical start of sprite
 
    (*) Even Commodore did it wrong in the AGA monitor drivers by not adding 1.
@@ -212,21 +212,21 @@
    display parameters. Here's what I found out:
 
       - ddfstrt and ddfstop are best aligned to 64 pixels.
-      - the chipset needs 64+4 horizontal pixels after the DMA start before the
-        first pixel is output, so diwstrt_h = ddfstrt+64+4 if you want to
-        display the first pixel on the line too. Increase diwstrt_h for virtual
-        screen panning.
+      - the chipset needs 64 + 4 horizontal pixels after the DMA start before
+        the first pixel is output, so diwstrt_h = ddfstrt + 64 + 4 if you want
+        to display the first pixel on the line too. Increase diwstrt_h for
+        virtual screen panning.
       - the display DMA always fetches 64 pixels at a time (fmode = 3).
-      - ddfstop is ddfstrt+#pixels-64.
-      - diwstop_h = diwstrt_h+xres+1. Because of the additional 1 this can be 1
-        more than htotal.
+      - ddfstop is ddfstrt+#pixels - 64.
+      - diwstop_h = diwstrt_h + xres + 1. Because of the additional 1 this can
+        be 1 more than htotal.
       - hscroll simply adds a delay to the display output. Smooth horizontal
-        panning needs an extra 64 pixels on the left to prefetch the pixels that
-        `fall off' on the left.
+        panning needs an extra 64 pixels on the left to prefetch the pixels that
+        `fall off' on the left.
       - if ddfstrt < 192, the sprite DMA cycles are all stolen by the bitplane
-        DMA, so it's best to make the DMA start as late as possible.
+        DMA, so it's best to make the DMA start as late as possible.
       - you really don't want to make ddfstrt < 128, since this will steal DMA
-        cycles from the other DMA channels (audio, floppy and Chip RAM refresh).
+        cycles from the other DMA channels (audio, floppy and Chip RAM refresh).
       - I make diwstop_h and diwstop_v as large as possible.
 
    General dependencies
@@ -234,8 +234,8 @@
 
       - all values are SHRES pixel (35ns)
 
-                  table 1:fetchstart  table 2:prefetch    table 3:fetchsize
-                  ------------------  ----------------    -----------------
+                  table 1:fetchstart  table 2:prefetch    table 3:fetchsize
+                  ------------------  ----------------    -----------------
    Pixclock     # SHRES|HIRES|LORES # SHRES|HIRES|LORES # SHRES|HIRES|LORES
    -------------#------+-----+------#------+-----+------#------+-----+------
    Bus width 1x #   16 |  32 |  64  #   16 |  32 |  64  #   64 |  64 |  64
@@ -245,21 +245,21 @@
       - chipset needs 4 pixels before the first pixel is output
       - ddfstrt must be aligned to fetchstart (table 1)
       - chipset needs also prefetch (table 2) to get first pixel data, so
-        ddfstrt = ((diwstrt_h-4) & -fetchstart) - prefetch
+        ddfstrt = ((diwstrt_h - 4) & -fetchstart) - prefetch
       - for horizontal panning decrease diwstrt_h
       - the length of a fetchline must be aligned to fetchsize (table 3)
       - if fetchstart is smaller than fetchsize, then ddfstrt can a little bit
-        moved to optimize use of dma (useful for OCS/ECS overscan displays)
-      - ddfstop is ddfstrt+ddfsize-fetchsize
+        moved to optimize use of dma (useful for OCS/ECS overscan displays)
+      - ddfstop is ddfstrt + ddfsize - fetchsize
       - If C= didn't change anything for AGA, then at following positions the
-        dma bus is already used:
-        ddfstrt <  48 -> memory refresh
-                <  96 -> disk dma
-                < 160 -> audio dma
-                < 192 -> sprite 0 dma
-                < 416 -> sprite dma (32 per sprite)
+        dma bus is already used:
+        ddfstrt <  48 -> memory refresh
+                <  96 -> disk dma
+                < 160 -> audio dma
+                < 192 -> sprite 0 dma
+                < 416 -> sprite dma (32 per sprite)
       - in accordance with the hardware reference manual a hardware stop is at
-        192, but AGA (ECS?) can go below this.
+        192, but AGA (ECS?) can go below this.
 
    DMA priorities
    --------------
@@ -269,7 +269,7 @@
    the hardware cursor:
 
       - if you want to start display DMA too early, you lose the ability to
-        do smooth horizontal panning (xpanstep 1 -> 64).
+        do smooth horizontal panning (xpanstep 1 -> 64).
       - if you want to go even further, you lose the hardware cursor too.
 
    IMHO a hardware cursor is more important for X than horizontal scrolling,
@@ -286,8 +286,8 @@
    Standard VGA timings
    --------------------
 
-               xres  yres    left  right  upper  lower    hsync    vsync
-               ----  ----    ----  -----  -----  -----    -----    -----
+               xres  yres    left  right  upper  lower    hsync    vsync
+               ----  ----    ----  -----  -----  -----    -----    -----
       80x25     720   400      27     45     35     12      108        2
       80x30     720   480      27     45     30      9      108        2
 
@@ -297,8 +297,8 @@
 
    As a comparison, graphics/monitor.h suggests the following:
 
-               xres  yres    left  right  upper  lower    hsync    vsync
-               ----  ----    ----  -----  -----  -----    -----    -----
+               xres  yres    left  right  upper  lower    hsync    vsync
+               ----  ----    ----  -----  -----  -----    -----    -----
 
       VGA       640   480      52    112     24     19    112 -      2 +
       VGA70     640   400      52    112     27     21    112 -      2 -
@@ -309,10 +309,10 @@
 
       VSYNC    HSYNC    Vertical size    Vertical total
       -----    -----    -------------    --------------
-        +        +           Reserved          Reserved
-        +        -                400               414
-        -        +                350               362
-        -        -                480               496
+        +        +           Reserved          Reserved
+        +        -                400               414
+        -        +                350               362
+        -        -                480               496
 
    Source: CL-GD542X Technical Reference Manual, Cirrus Logic, Oct 1992
 
@@ -326,33 +326,34 @@
    -----------
 
       - a scanline is 64 µs long, of which 52.48 µs are visible. This is about
-        736 visible 70 ns pixels per line.
+        736 visible 70 ns pixels per line.
       - we have 625 scanlines, of which 575 are visible (interlaced); after
-        rounding this becomes 576.
+        rounding this becomes 576.
 
    RETMA -> NTSC
    -------------
 
       - a scanline is 63.5 µs long, of which 53.5 µs are visible.  This is about
-        736 visible 70 ns pixels per line.
+        736 visible 70 ns pixels per line.
       - we have 525 scanlines, of which 485 are visible (interlaced); after
-        rounding this becomes 484.
+        rounding this becomes 484.
 
    Thus if you want a PAL compatible display, you have to do the following:
 
       - set the FB_SYNC_BROADCAST flag to indicate that standard broadcast
-        timings are to be used.
-      - make sure upper_margin+yres+lower_margin+vsync_len = 625 for an
-        interlaced, 312 for a non-interlaced and 156 for a doublescanned
-        display.
-      - make sure left_margin+xres+right_margin+hsync_len = 1816 for a SHRES,
-        908 for a HIRES and 454 for a LORES display.
+        timings are to be used.
+      - make sure upper_margin + yres + lower_margin + vsync_len = 625 for an
+        interlaced, 312 for a non-interlaced and 156 for a doublescanned
+        display.
+      - make sure left_margin + xres + right_margin + hsync_len = 1816 for a
+        SHRES, 908 for a HIRES and 454 for a LORES display.
       - the left visible part begins at 360 (SHRES; HIRES:180, LORES:90),
-        left_margin+2*hsync_len must be greater or equal.
+        left_margin + 2 * hsync_len must be greater or equal.
       - the upper visible part begins at 48 (interlaced; non-interlaced:24,
-        doublescanned:12), upper_margin+2*vsync_len must be greater or equal.
+        doublescanned:12), upper_margin + 2 * vsync_len must be greater or
+        equal.
       - ami_encode_var() calculates margins with a hsync of 5320 ns and a vsync
-        of 4 scanlines
+        of 4 scanlines
 
    The settings for a NTSC compatible display are straightforward.
 
@@ -361,7 +362,7 @@
    anything about horizontal/vertical synchronization nor refresh rates.
 
 
-                                                            -- Geert --
+                                                            -- Geert --
 
 *******************************************************************************/
 
@@ -540,45 +541,45 @@ static u_short maxfmode, chipset;
          * Various macros
          */
 
-#define up2(v)          (((v)+1) & -2)
+#define up2(v)          (((v) + 1) & -2)
 #define down2(v)        ((v) & -2)
 #define div2(v)         ((v)>>1)
 #define mod2(v)         ((v) & 1)
 
-#define up4(v)          (((v)+3) & -4)
+#define up4(v)          (((v) + 3) & -4)
 #define down4(v)        ((v) & -4)
-#define mul4(v)         ((v)<<2)
+#define mul4(v)         ((v) << 2)
 #define div4(v)         ((v)>>2)
 #define mod4(v)         ((v) & 3)
 
-#define up8(v)          (((v)+7) & -8)
+#define up8(v)          (((v) + 7) & -8)
 #define down8(v)        ((v) & -8)
 #define div8(v)         ((v)>>3)
 #define mod8(v)         ((v) & 7)
 
-#define up16(v)         (((v)+15) & -16)
+#define up16(v)         (((v) + 15) & -16)
 #define down16(v)       ((v) & -16)
 #define div16(v)        ((v)>>4)
 #define mod16(v)        ((v) & 15)
 
-#define up32(v)         (((v)+31) & -32)
+#define up32(v)         (((v) + 31) & -32)
 #define down32(v)       ((v) & -32)
 #define div32(v)        ((v)>>5)
 #define mod32(v)        ((v) & 31)
 
-#define up64(v)         (((v)+63) & -64)
+#define up64(v)         (((v) + 63) & -64)
 #define down64(v)       ((v) & -64)
 #define div64(v)        ((v)>>6)
 #define mod64(v)        ((v) & 63)
 
-#define upx(x,v)        (((v)+(x)-1) & -(x))
-#define downx(x,v)      ((v) & -(x))
-#define modx(x,v)       ((v) & ((x)-1))
+#define upx(x, v)       (((v) + (x) - 1) & -(x))
+#define downx(x, v)     ((v) & -(x))
+#define modx(x, v)      ((v) & ((x) - 1))
 
 /* if x1 is not a constant, this macro won't make real sense :-) */
 #ifdef __mc68000__
 #define DIVUL(x1, x2) ({int res; asm("divul %1,%2,%3": "=d" (res): \
-        "d" (x2), "d" ((long)((x1)/0x100000000ULL)), "0" ((long)(x1))); res;})
+        "d" (x2), "d" ((long)((x1) / 0x100000000ULL)), "0" ((long)(x1))); res;})
 #else
 /* We know a bit about the numbers, so we can do it this way */
 #define DIVUL(x1, x2) ((((long)((unsigned long long)x1 >> 8) / x2) << 8) + \
@@ -607,7 +608,7 @@ static u_short maxfmode, chipset;
 #define VIDEOMEMSIZE_ECS_1M     (393216)  /* ECS (1MB) : max 1024*768*16    */
 #define VIDEOMEMSIZE_OCS        (262144)  /* OCS       : max ca. 800*600*16 */
 
-#define SPRITEMEMSIZE           (64*64/4) /* max 64*64*4 */
+#define SPRITEMEMSIZE           (64 * 64 / 4) /* max 64*64*4 */
 #define DUMMYSPRITEMEMSIZE      (8)
 static u_long spritememory;
 
@@ -634,9 +635,9 @@ static u_long min_fstrt = 192;
          * Copper Instructions
          */
 
-#define CMOVE(val, reg)         (CUSTOM_OFS(reg)<<16 | (val))
-#define CMOVE2(val, reg)        ((CUSTOM_OFS(reg)+2)<<16 | (val))
-#define CWAIT(x, y)             (((y) & 0x1fe)<<23 | ((x) & 0x7f0)<<13 | 0x0001fffe)
+#define CMOVE(val, reg)         (CUSTOM_OFS(reg) << 16 | (val))
+#define CMOVE2(val, reg)        ((CUSTOM_OFS(reg) + 2) << 16 | (val))
+#define CWAIT(x, y)             (((y) & 0x1fe) << 23 | ((x) & 0x7f0) << 13 | 0x0001fffe)
 #define CEND                    (0xfffffffe)
 
 
@@ -709,7 +710,7 @@ static u_short *lofsprite, *shfsprite, *dummysprite;
          * Current Video Mode
          */
 
-static struct amifb_par {
+struct amifb_par {
 
         /* General Values */
 
@@ -772,15 +773,6 @@ static struct amifb_par {
         /* Additional AGA Hardware Registers */
 
         u_short fmode;          /* vmode */
-} currentpar;
-
-
-static struct fb_info fb_info = {
-    .fix = {
-        .id             = "Amiga ",
-        .visual         = FB_VISUAL_PSEUDOCOLOR,
-        .accel          = FB_ACCEL_AMIGABLITT
-    }
 };
 
 
@@ -820,116 +812,123 @@ static u_short is_lace = 0;		/* Screen is laced */
 
 static struct fb_videomode ami_modedb[] __initdata = {
 
-    /*
-     *  AmigaOS Video Modes
-     *
-     *  If you change these, make sure to update DEFMODE_* as well!
-     */
-
-    {
-        /* 640x200, 15 kHz, 60 Hz (NTSC) */
-        "ntsc", 60, 640, 200, TAG_HIRES, 106, 86, 44, 16, 76, 2,
-        FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x400, 15 kHz, 60 Hz interlaced (NTSC) */
-        "ntsc-lace", 60, 640, 400, TAG_HIRES, 106, 86, 88, 33, 76, 4,
-        FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x256, 15 kHz, 50 Hz (PAL) */
-        "pal", 50, 640, 256, TAG_HIRES, 106, 86, 40, 14, 76, 2,
-        FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x512, 15 kHz, 50 Hz interlaced (PAL) */
-        "pal-lace", 50, 640, 512, TAG_HIRES, 106, 86, 80, 29, 76, 4,
-        FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x480, 29 kHz, 57 Hz */
-        "multiscan", 57, 640, 480, TAG_SHRES, 96, 112, 29, 8, 72, 8,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x960, 29 kHz, 57 Hz interlaced */
-        "multiscan-lace", 57, 640, 960, TAG_SHRES, 96, 112, 58, 16, 72, 16,
-        0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x200, 15 kHz, 72 Hz */
-        "euro36", 72, 640, 200, TAG_HIRES, 92, 124, 6, 6, 52, 5,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x400, 15 kHz, 72 Hz interlaced */
-        "euro36-lace", 72, 640, 400, TAG_HIRES, 92, 124, 12, 12, 52, 10,
-        0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x400, 29 kHz, 68 Hz */
-        "euro72", 68, 640, 400, TAG_SHRES, 164, 92, 9, 9, 80, 8,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x800, 29 kHz, 68 Hz interlaced */
-        "euro72-lace", 68, 640, 800, TAG_SHRES, 164, 92, 18, 18, 80, 16,
-        0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 800x300, 23 kHz, 70 Hz */
-        "super72", 70, 800, 300, TAG_SHRES, 212, 140, 10, 11, 80, 7,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 800x600, 23 kHz, 70 Hz interlaced */
-        "super72-lace", 70, 800, 600, TAG_SHRES, 212, 140, 20, 22, 80, 14,
-        0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x200, 27 kHz, 57 Hz doublescan */
-        "dblntsc", 57, 640, 200, TAG_SHRES, 196, 124, 18, 17, 80, 4,
-        0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
-    }, {
-        /* 640x400, 27 kHz, 57 Hz */
-        "dblntsc-ff", 57, 640, 400, TAG_SHRES, 196, 124, 36, 35, 80, 7,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x800, 27 kHz, 57 Hz interlaced */
-        "dblntsc-lace", 57, 640, 800, TAG_SHRES, 196, 124, 72, 70, 80, 14,
-        0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x256, 27 kHz, 47 Hz doublescan */
-        "dblpal", 47, 640, 256, TAG_SHRES, 196, 124, 14, 13, 80, 4,
-        0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
-    }, {
-        /* 640x512, 27 kHz, 47 Hz */
-        "dblpal-ff", 47, 640, 512, TAG_SHRES, 196, 124, 28, 27, 80, 7,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x1024, 27 kHz, 47 Hz interlaced */
-        "dblpal-lace", 47, 640, 1024, TAG_SHRES, 196, 124, 56, 54, 80, 14,
-        0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
-    },
-
-    /*
-     *  VGA Video Modes
-     */
-
-    {
-        /* 640x480, 31 kHz, 60 Hz (VGA) */
-        "vga", 60, 640, 480, TAG_SHRES, 64, 96, 30, 9, 112, 2,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 640x400, 31 kHz, 70 Hz (VGA) */
-        "vga70", 70, 640, 400, TAG_SHRES, 64, 96, 35, 12, 112, 2,
-        FB_SYNC_VERT_HIGH_ACT | FB_SYNC_COMP_HIGH_ACT, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    },
+        /*
+         *  AmigaOS Video Modes
+         *
+         *  If you change these, make sure to update DEFMODE_* as well!
+         */
+
+        {
+                /* 640x200, 15 kHz, 60 Hz (NTSC) */
+                "ntsc", 60, 640, 200, TAG_HIRES, 106, 86, 44, 16, 76, 2,
+                FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 15 kHz, 60 Hz interlaced (NTSC) */
+                "ntsc-lace", 60, 640, 400, TAG_HIRES, 106, 86, 88, 33, 76, 4,
+                FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x256, 15 kHz, 50 Hz (PAL) */
+                "pal", 50, 640, 256, TAG_HIRES, 106, 86, 40, 14, 76, 2,
+                FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x512, 15 kHz, 50 Hz interlaced (PAL) */
+                "pal-lace", 50, 640, 512, TAG_HIRES, 106, 86, 80, 29, 76, 4,
+                FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x480, 29 kHz, 57 Hz */
+                "multiscan", 57, 640, 480, TAG_SHRES, 96, 112, 29, 8, 72, 8,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x960, 29 kHz, 57 Hz interlaced */
+                "multiscan-lace", 57, 640, 960, TAG_SHRES, 96, 112, 58, 16, 72,
+                16,
+                0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x200, 15 kHz, 72 Hz */
+                "euro36", 72, 640, 200, TAG_HIRES, 92, 124, 6, 6, 52, 5,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 15 kHz, 72 Hz interlaced */
+                "euro36-lace", 72, 640, 400, TAG_HIRES, 92, 124, 12, 12, 52,
+                10,
+                0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 29 kHz, 68 Hz */
+                "euro72", 68, 640, 400, TAG_SHRES, 164, 92, 9, 9, 80, 8,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x800, 29 kHz, 68 Hz interlaced */
+                "euro72-lace", 68, 640, 800, TAG_SHRES, 164, 92, 18, 18, 80,
+                16,
+                0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 800x300, 23 kHz, 70 Hz */
+                "super72", 70, 800, 300, TAG_SHRES, 212, 140, 10, 11, 80, 7,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 800x600, 23 kHz, 70 Hz interlaced */
+                "super72-lace", 70, 800, 600, TAG_SHRES, 212, 140, 20, 22, 80,
+                14,
+                0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x200, 27 kHz, 57 Hz doublescan */
+                "dblntsc", 57, 640, 200, TAG_SHRES, 196, 124, 18, 17, 80, 4,
+                0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 27 kHz, 57 Hz */
+                "dblntsc-ff", 57, 640, 400, TAG_SHRES, 196, 124, 36, 35, 80, 7,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x800, 27 kHz, 57 Hz interlaced */
+                "dblntsc-lace", 57, 640, 800, TAG_SHRES, 196, 124, 72, 70, 80,
+                14,
+                0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x256, 27 kHz, 47 Hz doublescan */
+                "dblpal", 47, 640, 256, TAG_SHRES, 196, 124, 14, 13, 80, 4,
+                0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
+        }, {
+                /* 640x512, 27 kHz, 47 Hz */
+                "dblpal-ff", 47, 640, 512, TAG_SHRES, 196, 124, 28, 27, 80, 7,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x1024, 27 kHz, 47 Hz interlaced */
+                "dblpal-lace", 47, 640, 1024, TAG_SHRES, 196, 124, 56, 54, 80,
+                14,
+                0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
+        },
+
+        /*
+         *  VGA Video Modes
+         */
+
+        {
+                /* 640x480, 31 kHz, 60 Hz (VGA) */
+                "vga", 60, 640, 480, TAG_SHRES, 64, 96, 30, 9, 112, 2,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 31 kHz, 70 Hz (VGA) */
+                "vga70", 70, 640, 400, TAG_SHRES, 64, 96, 35, 12, 112, 2,
+                FB_SYNC_VERT_HIGH_ACT | FB_SYNC_COMP_HIGH_ACT,
+                FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        },
 
 #if 0
 
-    /*
-     *  A2024 video modes
-     *  These modes don't work yet because there's no A2024 driver.
-     */
-
-    {
-        /* 1024x800, 10 Hz */
-        "a2024-10", 10, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }, {
-        /* 1024x800, 15 Hz */
-        "a2024-15", 15, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
-        0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
-    }
+        /*
+         *  A2024 video modes
+         *  These modes don't work yet because there's no A2024 driver.
+         */
+
+        {
+                /* 1024x800, 10 Hz */
+                "a2024-10", 10, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 1024x800, 15 Hz */
+                "a2024-15", 15, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }
 #endif
 };
 
@@ -953,6 +952,11 @@ static int round_down_bpp = 1;	/* for mode probing */
 static int amifb_ilbm = 0;      /* interleaved or normal bitplanes */
 static int amifb_inverse = 0;
 
+static u32 amifb_hfmin __initdata;      /* monitor hfreq lower limit (Hz) */
+static u32 amifb_hfmax __initdata;      /* monitor hfreq upper limit (Hz) */
+static u16 amifb_vfmin __initdata;      /* monitor vfreq lower limit (Hz) */
+static u16 amifb_vfmax __initdata;      /* monitor vfreq upper limit (Hz) */
+
 
         /*
          * Macros for the conversion from real world values to hardware register
@@ -992,19 +996,20 @@ static int amifb_inverse = 0;
 /* bplcon1 (smooth scrolling) */
 
 #define hscroll2hw(hscroll) \
-        (((hscroll)<<12 & 0x3000) | ((hscroll)<<8 & 0xc300) | \
-         ((hscroll)<<4 & 0x0c00) | ((hscroll)<<2 & 0x00f0) | ((hscroll)>>2 & 0x000f))
+        (((hscroll) << 12 & 0x3000) | ((hscroll) << 8 & 0xc300) | \
+         ((hscroll) << 4 & 0x0c00) | ((hscroll) << 2 & 0x00f0) | \
+         ((hscroll)>>2 & 0x000f))
 
 /* diwstrt/diwstop/diwhigh (visible display window) */
 
 #define diwstrt2hw(diwstrt_h, diwstrt_v) \
-        (((diwstrt_v)<<7 & 0xff00) | ((diwstrt_h)>>2 & 0x00ff))
+        (((diwstrt_v) << 7 & 0xff00) | ((diwstrt_h)>>2 & 0x00ff))
 #define diwstop2hw(diwstop_h, diwstop_v) \
-        (((diwstop_v)<<7 & 0xff00) | ((diwstop_h)>>2 & 0x00ff))
+        (((diwstop_v) << 7 & 0xff00) | ((diwstop_h)>>2 & 0x00ff))
 #define diwhigh2hw(diwstrt_h, diwstrt_v, diwstop_h, diwstop_v) \
-        (((diwstop_h)<<3 & 0x2000) | ((diwstop_h)<<11 & 0x1800) | \
+        (((diwstop_h) << 3 & 0x2000) | ((diwstop_h) << 11 & 0x1800) | \
          ((diwstop_v)>>1 & 0x0700) | ((diwstrt_h)>>5 & 0x0020) | \
-         ((diwstrt_h)<<3 & 0x0018) | ((diwstrt_v)>>9 & 0x0007))
+         ((diwstrt_h) << 3 & 0x0018) | ((diwstrt_v)>>9 & 0x0007))
 
 /* ddfstrt/ddfstop (display DMA) */
 
@@ -1015,38 +1020,39 @@ static int amifb_inverse = 0;
 
 #define hsstrt2hw(hsstrt)       (div8(hsstrt))
 #define hsstop2hw(hsstop)       (div8(hsstop))
-#define htotal2hw(htotal)       (div8(htotal)-1)
+#define htotal2hw(htotal)       (div8(htotal) - 1)
 #define vsstrt2hw(vsstrt)       (div2(vsstrt))
 #define vsstop2hw(vsstop)       (div2(vsstop))
-#define vtotal2hw(vtotal)       (div2(vtotal)-1)
+#define vtotal2hw(vtotal)       (div2(vtotal) - 1)
 #define hcenter2hw(htotal)      (div8(htotal))
 
 /* hbstrt/hbstop/vbstrt/vbstop (blanking timings) */
 
-#define hbstrt2hw(hbstrt)       (((hbstrt)<<8 & 0x0700) | ((hbstrt)>>3 & 0x00ff))
-#define hbstop2hw(hbstop)       (((hbstop)<<8 & 0x0700) | ((hbstop)>>3 & 0x00ff))
+#define hbstrt2hw(hbstrt)       (((hbstrt) << 8 & 0x0700) | ((hbstrt)>>3 & 0x00ff))
+#define hbstop2hw(hbstop)       (((hbstop) << 8 & 0x0700) | ((hbstop)>>3 & 0x00ff))
 #define vbstrt2hw(vbstrt)       (div2(vbstrt))
 #define vbstop2hw(vbstop)       (div2(vbstop))
 
 /* colour */
 
 #define rgb2hw8_high(red, green, blue) \
-        (((red & 0xf0)<<4) | (green & 0xf0) | ((blue & 0xf0)>>4))
+        (((red & 0xf0) << 4) | (green & 0xf0) | ((blue & 0xf0)>>4))
 #define rgb2hw8_low(red, green, blue) \
-        (((red & 0x0f)<<8) | ((green & 0x0f)<<4) | (blue & 0x0f))
+        (((red & 0x0f) << 8) | ((green & 0x0f) << 4) | (blue & 0x0f))
 #define rgb2hw4(red, green, blue) \
-        (((red & 0xf0)<<4) | (green & 0xf0) | ((blue & 0xf0)>>4))
+        (((red & 0xf0) << 4) | (green & 0xf0) | ((blue & 0xf0)>>4))
 #define rgb2hw2(red, green, blue) \
-        (((red & 0xc0)<<4) | (green & 0xc0) | ((blue & 0xc0)>>4))
+        (((red & 0xc0) << 4) | (green & 0xc0) | ((blue & 0xc0)>>4))
 
 /* sprpos/sprctl (sprite positioning) */
 
 #define spr2hw_pos(start_v, start_h) \
-        (((start_v)<<7&0xff00) | ((start_h)>>3&0x00ff))
+        (((start_v) << 7 & 0xff00) | ((start_h)>>3 & 0x00ff))
 #define spr2hw_ctl(start_v, start_h, stop_v) \
-        (((stop_v)<<7&0xff00) | ((start_v)>>4&0x0040) | ((stop_v)>>5&0x0020) | \
-         ((start_h)<<3&0x0018) | ((start_v)>>7&0x0004) | ((stop_v)>>8&0x0002) | \
-         ((start_h)>>2&0x0001))
+        (((stop_v) << 7 & 0xff00) | ((start_v)>>4 & 0x0040) | \
+         ((stop_v)>>5 & 0x0020) | ((start_h) << 3 & 0x0018) | \
+         ((start_v)>>7 & 0x0004) | ((stop_v)>>8 & 0x0002) | \
+         ((start_h)>>2 & 0x0001))
 
 /* get current vertical position of beam */
 #define get_vbpos()     ((u_short)((*(u_long volatile *)&custom.vposr >> 7) & 0xffe))
@@ -1055,7 +1061,7 @@ static int amifb_inverse = 0;
          * Copper Initialisation List
          */
 
-#define COPINITSIZE (sizeof(copins)*40)
+#define COPINITSIZE (sizeof(copins) * 40)
 
 enum {
         cip_bplcon0
@@ -1066,7 +1072,7 @@ enum {
          * Don't change the order, build_copper()/rebuild_copper() rely on this
          */
 
-#define COPLISTSIZE (sizeof(copins)*64)
+#define COPLISTSIZE (sizeof(copins) * 64)
 
 enum {
         cop_wait, cop_bplcon0,
@@ -1108,82 +1114,1199 @@ static u_short sprfetchmode[3] = {
 };
 
 
+/* --------------------------- Hardware routines --------------------------- */
+
         /*
-         * Interface used by the world
+         * Get the video params out of `var'. If a value doesn't fit, round
+         * it up, if it's too big, return -EINVAL.
          */
 
-int amifb_setup(char*);
+static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
+                          const struct fb_info *info)
+{
+        u_short clk_shift, line_shift;
+        u_long maxfetchstop, fstrt, fsize, fconst, xres_n, yres_n;
+        u_int htotal, vtotal;
 
-static int amifb_check_var(struct fb_var_screeninfo *var,
-                           struct fb_info *info);
-static int amifb_set_par(struct fb_info *info);
-static int amifb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                           unsigned blue, unsigned transp,
-                           struct fb_info *info);
-static int amifb_blank(int blank, struct fb_info *info);
-static int amifb_pan_display(struct fb_var_screeninfo *var,
-                             struct fb_info *info);
-static void amifb_fillrect(struct fb_info *info,
-                           const struct fb_fillrect *rect);
-static void amifb_copyarea(struct fb_info *info,
-                           const struct fb_copyarea *region);
-static void amifb_imageblit(struct fb_info *info,
-                            const struct fb_image *image);
-static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg);
+        /*
+         * Find a matching Pixel Clock
+         */
 
+        for (clk_shift = TAG_SHRES; clk_shift <= TAG_LORES; clk_shift++)
+                if (var->pixclock <= pixclock[clk_shift])
+                        break;
+        if (clk_shift > TAG_LORES) {
+                DPRINTK("pixclock too high\n");
+                return -EINVAL;
+        }
+        par->clk_shift = clk_shift;
 
         /*
-         * Interface to the low level console driver
+         * Check the Geometry Values
          */
 
-static void amifb_deinit(struct platform_device *pdev);
+        if ((par->xres = var->xres) < 64)
+                par->xres = 64;
+        if ((par->yres = var->yres) < 64)
+                par->yres = 64;
+        if ((par->vxres = var->xres_virtual) < par->xres)
+                par->vxres = par->xres;
+        if ((par->vyres = var->yres_virtual) < par->yres)
+                par->vyres = par->yres;
+
+        par->bpp = var->bits_per_pixel;
+        if (!var->nonstd) {
+                if (par->bpp < 1)
+                        par->bpp = 1;
+                if (par->bpp > maxdepth[clk_shift]) {
+                        if (round_down_bpp && maxdepth[clk_shift])
+                                par->bpp = maxdepth[clk_shift];
+                        else {
+                                DPRINTK("invalid bpp\n");
+                                return -EINVAL;
+                        }
+                }
+        } else if (var->nonstd == FB_NONSTD_HAM) {
+                if (par->bpp < 6)
+                        par->bpp = 6;
+                if (par->bpp != 6) {
+                        if (par->bpp < 8)
+                                par->bpp = 8;
+                        if (par->bpp != 8 || !IS_AGA) {
+                                DPRINTK("invalid bpp for ham mode\n");
+                                return -EINVAL;
+                        }
+                }
+        } else {
+                DPRINTK("unknown nonstd mode\n");
+                return -EINVAL;
+        }
 
         /*
-         * Internal routines
+         * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing
+         * checks failed and smooth scrolling is not possible
          */
 
-static int flash_cursor(void);
-static irqreturn_t amifb_interrupt(int irq, void *dev_id);
-static u_long chipalloc(u_long size);
-static void chipfree(void);
+        par->vmode = var->vmode | FB_VMODE_SMOOTH_XPAN;
+        switch (par->vmode & FB_VMODE_MASK) {
+        case FB_VMODE_INTERLACED:
+                line_shift = 0;
+                break;
+        case FB_VMODE_NONINTERLACED:
+                line_shift = 1;
+                break;
+        case FB_VMODE_DOUBLE:
+                if (!IS_AGA) {
+                        DPRINTK("double mode only possible with aga\n");
+                        return -EINVAL;
+                }
+                line_shift = 2;
+                break;
+        default:
+                DPRINTK("unknown video mode\n");
+                return -EINVAL;
+                break;
+        }
+        par->line_shift = line_shift;
 
         /*
-         * Hardware routines
+         * Vertical and Horizontal Timings
          */
 
-static int ami_decode_var(struct fb_var_screeninfo *var,
-                          struct amifb_par *par);
-static int ami_encode_var(struct fb_var_screeninfo *var,
-                          struct amifb_par *par);
-static void ami_pan_var(struct fb_var_screeninfo *var);
-static int ami_update_par(void);
-static void ami_update_display(void);
-static void ami_init_display(void);
-static void ami_do_blank(void);
-static int ami_get_fix_cursorinfo(struct fb_fix_cursorinfo *fix);
-static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data);
-static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data);
-static int ami_get_cursorstate(struct fb_cursorstate *state);
-static int ami_set_cursorstate(struct fb_cursorstate *state);
-static void ami_set_sprite(void);
-static void ami_init_copper(void);
-static void ami_reinit_copper(void);
-static void ami_build_copper(void);
-static void ami_rebuild_copper(void);
+        xres_n = par->xres << clk_shift;
+        yres_n = par->yres << line_shift;
+        par->htotal = down8((var->left_margin + par->xres + var->right_margin +
+                             var->hsync_len) << clk_shift);
+        par->vtotal =
+                down2(((var->upper_margin + par->yres + var->lower_margin +
+                        var->vsync_len) << line_shift) + 1);
 
+        if (IS_AGA)
+                par->bplcon3 = sprpixmode[clk_shift];
+        else
+                par->bplcon3 = 0;
+        if (var->sync & FB_SYNC_BROADCAST) {
+                par->diwstop_h = par->htotal -
+                        ((var->right_margin - var->hsync_len) << clk_shift);
+                if (IS_AGA)
+                        par->diwstop_h += mod4(var->hsync_len);
+                else
+                        par->diwstop_h = down4(par->diwstop_h);
+
+                par->diwstrt_h = par->diwstop_h - xres_n;
+                par->diwstop_v = par->vtotal -
+                        ((var->lower_margin - var->vsync_len) << line_shift);
+                par->diwstrt_v = par->diwstop_v - yres_n;
+                if (par->diwstop_h >= par->htotal + 8) {
+                        DPRINTK("invalid diwstop_h\n");
+                        return -EINVAL;
+                }
+                if (par->diwstop_v > par->vtotal) {
+                        DPRINTK("invalid diwstop_v\n");
+                        return -EINVAL;
+                }
+
+                if (!IS_OCS) {
+                        /* Initialize sync with some reasonable values for pwrsave */
+                        par->hsstrt = 160;
+                        par->hsstop = 320;
+                        par->vsstrt = 30;
+                        par->vsstop = 34;
+                } else {
+                        par->hsstrt = 0;
+                        par->hsstop = 0;
+                        par->vsstrt = 0;
+                        par->vsstop = 0;
+                }
+                if (par->vtotal > (PAL_VTOTAL + NTSC_VTOTAL) / 2) {
+                        /* PAL video mode */
+                        if (par->htotal != PAL_HTOTAL) {
+                                DPRINTK("htotal invalid for pal\n");
+                                return -EINVAL;
+                        }
+                        if (par->diwstrt_h < PAL_DIWSTRT_H) {
+                                DPRINTK("diwstrt_h too low for pal\n");
+                                return -EINVAL;
+                        }
+                        if (par->diwstrt_v < PAL_DIWSTRT_V) {
+                                DPRINTK("diwstrt_v too low for pal\n");
+                                return -EINVAL;
+                        }
+                        htotal = PAL_HTOTAL>>clk_shift;
+                        vtotal = PAL_VTOTAL>>1;
+                        if (!IS_OCS) {
+                                par->beamcon0 = BMC0_PAL;
+                                par->bplcon3 |= BPC3_BRDRBLNK;
+                        } else if (AMIGAHW_PRESENT(AGNUS_HR_PAL) ||
+                                   AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
+                                par->beamcon0 = BMC0_PAL;
+                                par->hsstop = 1;
+                        } else if (amiga_vblank != 50) {
+                                DPRINTK("pal not supported by this chipset\n");
+                                return -EINVAL;
+                        }
+                } else {
+                        /* NTSC video mode
+                         * In the AGA chipset seems to be hardware bug with BPC3_BRDRBLNK
+                         * and NTSC activated, so than better let diwstop_h <= 1812
+                         */
+                        if (par->htotal != NTSC_HTOTAL) {
+                                DPRINTK("htotal invalid for ntsc\n");
+                                return -EINVAL;
+                        }
+                        if (par->diwstrt_h < NTSC_DIWSTRT_H) {
+                                DPRINTK("diwstrt_h too low for ntsc\n");
+                                return -EINVAL;
+                        }
+                        if (par->diwstrt_v < NTSC_DIWSTRT_V) {
+                                DPRINTK("diwstrt_v too low for ntsc\n");
+                                return -EINVAL;
+                        }
+                        htotal = NTSC_HTOTAL>>clk_shift;
+                        vtotal = NTSC_VTOTAL>>1;
+                        if (!IS_OCS) {
+                                par->beamcon0 = 0;
+                                par->bplcon3 |= BPC3_BRDRBLNK;
+                        } else if (AMIGAHW_PRESENT(AGNUS_HR_PAL) ||
+                                   AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
+                                par->beamcon0 = 0;
+                                par->hsstop = 1;
+                        } else if (amiga_vblank != 60) {
+                                DPRINTK("ntsc not supported by this chipset\n");
+                                return -EINVAL;
+                        }
+                }
+                if (IS_OCS) {
+                        if (par->diwstrt_h >= 1024 || par->diwstop_h < 1024 ||
+                            par->diwstrt_v >=  512 || par->diwstop_v <  256) {
+                                DPRINTK("invalid position for display on ocs\n");
+                                return -EINVAL;
+                        }
+                }
+        } else if (!IS_OCS) {
+                /* Programmable video mode */
+                par->hsstrt = var->right_margin << clk_shift;
+                par->hsstop = (var->right_margin + var->hsync_len) << clk_shift;
+                par->diwstop_h = par->htotal - mod8(par->hsstrt) + 8 - (1 << clk_shift);
+                if (!IS_AGA)
+                        par->diwstop_h = down4(par->diwstop_h) - 16;
+                par->diwstrt_h = par->diwstop_h - xres_n;
+                par->hbstop = par->diwstrt_h + 4;
+                par->hbstrt = par->diwstop_h + 4;
+                if (par->hbstrt >= par->htotal + 8)
+                        par->hbstrt -= par->htotal;
+                par->hcenter = par->hsstrt + (par->htotal >> 1);
+                par->vsstrt = var->lower_margin << line_shift;
+                par->vsstop = (var->lower_margin + var->vsync_len) << line_shift;
+                par->diwstop_v = par->vtotal;
+                if ((par->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
+                        par->diwstop_v -= 2;
+                par->diwstrt_v = par->diwstop_v - yres_n;
+                par->vbstop = par->diwstrt_v - 2;
+                par->vbstrt = par->diwstop_v - 2;
+                if (par->vtotal > 2048) {
+                        DPRINTK("vtotal too high\n");
+                        return -EINVAL;
+                }
+                if (par->htotal > 2048) {
+                        DPRINTK("htotal too high\n");
+                        return -EINVAL;
+                }
+                par->bplcon3 |= BPC3_EXTBLKEN;
+                par->beamcon0 = BMC0_HARDDIS | BMC0_VARVBEN | BMC0_LOLDIS |
+                                BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARBEAMEN |
+                                BMC0_PAL | BMC0_VARCSYEN;
+                if (var->sync & FB_SYNC_HOR_HIGH_ACT)
+                        par->beamcon0 |= BMC0_HSYTRUE;
+                if (var->sync & FB_SYNC_VERT_HIGH_ACT)
+                        par->beamcon0 |= BMC0_VSYTRUE;
+                if (var->sync & FB_SYNC_COMP_HIGH_ACT)
+                        par->beamcon0 |= BMC0_CSYTRUE;
+                htotal = par->htotal>>clk_shift;
+                vtotal = par->vtotal>>1;
+        } else {
+                DPRINTK("only broadcast modes possible for ocs\n");
+                return -EINVAL;
+        }
+
+        /*
+         * Checking the DMA timing
+         */
+
+        fconst = 16 << maxfmode << clk_shift;
+
+        /*
+         * smallest window start value without turn off other dma cycles
+         * than sprite1-7, unless you change min_fstrt
+         */
+
+
+        fsize = ((maxfmode + clk_shift <= 1) ? fconst : 64);
+        fstrt = downx(fconst, par->diwstrt_h - 4) - fsize;
+        if (fstrt < min_fstrt) {
+                DPRINTK("fetch start too low\n");
+                return -EINVAL;
+        }
+
+        /*
+         * smallest window start value where smooth scrolling is possible
+         */
+
+        fstrt = downx(fconst, par->diwstrt_h - fconst + (1 << clk_shift) - 4) -
+                fsize;
+        if (fstrt < min_fstrt)
+                par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
+
+        maxfetchstop = down16(par->htotal - 80);
+
+        fstrt = downx(fconst, par->diwstrt_h - 4) - 64 - fconst;
+        fsize = upx(fconst, xres_n +
+                    modx(fconst, downx(1 << clk_shift, par->diwstrt_h - 4)));
+        if (fstrt + fsize > maxfetchstop)
+                par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
+
+        fsize = upx(fconst, xres_n);
+        if (fstrt + fsize > maxfetchstop) {
+                DPRINTK("fetch stop too high\n");
+                return -EINVAL;
+        }
+
+        if (maxfmode + clk_shift <= 1) {
+                fsize = up64(xres_n + fconst - 1);
+                if (min_fstrt + fsize - 64 > maxfetchstop)
+                        par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
+
+                fsize = up64(xres_n);
+                if (min_fstrt + fsize - 64 > maxfetchstop) {
+                        DPRINTK("fetch size too high\n");
+                        return -EINVAL;
+                }
+
+                fsize -= 64;
+        } else
+                fsize -= fconst;
+
+        /*
+         * Check if there is enough time to update the bitplane pointers for ywrap
+         */
+
+        if (par->htotal - fsize - 64 < par->bpp * 64)
+                par->vmode &= ~FB_VMODE_YWRAP;
+
+        /*
+         * Bitplane calculations and check the Memory Requirements
+         */
+
+        if (amifb_ilbm) {
+                par->next_plane = div8(upx(16 << maxfmode, par->vxres));
+                par->next_line = par->bpp * par->next_plane;
+                if (par->next_line * par->vyres > info->fix.smem_len) {
+                        DPRINTK("too few video mem\n");
+                        return -EINVAL;
+                }
+        } else {
+                par->next_line = div8(upx(16 << maxfmode, par->vxres));
+                par->next_plane = par->vyres * par->next_line;
+                if (par->next_plane * par->bpp > info->fix.smem_len) {
+                        DPRINTK("too few video mem\n");
+                        return -EINVAL;
+                }
+        }
+
+        /*
+         * Hardware Register Values
+         */
+
+        par->bplcon0 = BPC0_COLOR | bplpixmode[clk_shift];
+        if (!IS_OCS)
+                par->bplcon0 |= BPC0_ECSENA;
+        if (par->bpp == 8)
+                par->bplcon0 |= BPC0_BPU3;
+        else
+                par->bplcon0 |= par->bpp << 12;
+        if (var->nonstd == FB_NONSTD_HAM)
+                par->bplcon0 |= BPC0_HAM;
+        if (var->sync & FB_SYNC_EXT)
+                par->bplcon0 |= BPC0_ERSY;
+
+        if (IS_AGA)
+                par->fmode = bplfetchmode[maxfmode];
+
+        switch (par->vmode & FB_VMODE_MASK) {
+        case FB_VMODE_INTERLACED:
+                par->bplcon0 |= BPC0_LACE;
+                break;
+        case FB_VMODE_DOUBLE:
+                if (IS_AGA)
+                        par->fmode |= FMODE_SSCAN2 | FMODE_BSCAN2;
+                break;
+        }
+
+        if (!((par->vmode ^ var->vmode) & FB_VMODE_YWRAP)) {
+                par->xoffset = var->xoffset;
+                par->yoffset = var->yoffset;
+                if (par->vmode & FB_VMODE_YWRAP) {
+                        if (par->xoffset || par->yoffset < 0 ||
+                            par->yoffset >= par->vyres)
+                                par->xoffset = par->yoffset = 0;
+                } else {
+                        if (par->xoffset < 0 ||
+                            par->xoffset > upx(16 << maxfmode, par->vxres - par->xres) ||
+                            par->yoffset < 0 || par->yoffset > par->vyres - par->yres)
+                                par->xoffset = par->yoffset = 0;
+                }
+        } else
+                par->xoffset = par->yoffset = 0;
+
+        par->crsr.crsr_x = par->crsr.crsr_y = 0;
+        par->crsr.spot_x = par->crsr.spot_y = 0;
+        par->crsr.height = par->crsr.width = 0;
+
+        return 0;
+}
+
+        /*
+         * Fill the `var' structure based on the values in `par' and maybe
+         * other values read out of the hardware.
+         */
+
+static void ami_encode_var(struct fb_var_screeninfo *var,
+                           struct amifb_par *par)
+{
+        u_short clk_shift, line_shift;
+
+        memset(var, 0, sizeof(struct fb_var_screeninfo));
+
+        clk_shift = par->clk_shift;
+        line_shift = par->line_shift;
+
+        var->xres = par->xres;
+        var->yres = par->yres;
+        var->xres_virtual = par->vxres;
+        var->yres_virtual = par->vyres;
+        var->xoffset = par->xoffset;
+        var->yoffset = par->yoffset;
+
+        var->bits_per_pixel = par->bpp;
+        var->grayscale = 0;
+
+        var->red.offset = 0;
+        var->red.msb_right = 0;
+        var->red.length = par->bpp;
+        if (par->bplcon0 & BPC0_HAM)
+                var->red.length -= 2;
+        var->blue = var->green = var->red;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->transp.msb_right = 0;
+
+        if (par->bplcon0 & BPC0_HAM)
+                var->nonstd = FB_NONSTD_HAM;
+        else
+                var->nonstd = 0;
+        var->activate = 0;
+
+        var->height = -1;
+        var->width = -1;
+
+        var->pixclock = pixclock[clk_shift];
+
+        if (IS_AGA && par->fmode & FMODE_BSCAN2)
+                var->vmode = FB_VMODE_DOUBLE;
+        else if (par->bplcon0 & BPC0_LACE)
+                var->vmode = FB_VMODE_INTERLACED;
+        else
+                var->vmode = FB_VMODE_NONINTERLACED;
+
+        if (!IS_OCS && par->beamcon0 & BMC0_VARBEAMEN) {
+                var->hsync_len = (par->hsstop - par->hsstrt)>>clk_shift;
+                var->right_margin = par->hsstrt>>clk_shift;
+                var->left_margin = (par->htotal>>clk_shift) - var->xres - var->right_margin - var->hsync_len;
+                var->vsync_len = (par->vsstop - par->vsstrt)>>line_shift;
+                var->lower_margin = par->vsstrt>>line_shift;
+                var->upper_margin = (par->vtotal>>line_shift) - var->yres - var->lower_margin - var->vsync_len;
+                var->sync = 0;
+                if (par->beamcon0 & BMC0_HSYTRUE)
+                        var->sync |= FB_SYNC_HOR_HIGH_ACT;
+                if (par->beamcon0 & BMC0_VSYTRUE)
+                        var->sync |= FB_SYNC_VERT_HIGH_ACT;
+                if (par->beamcon0 & BMC0_CSYTRUE)
+                        var->sync |= FB_SYNC_COMP_HIGH_ACT;
+        } else {
+                var->sync = FB_SYNC_BROADCAST;
+                var->hsync_len = (152>>clk_shift) + mod4(par->diwstop_h);
+                var->right_margin = ((par->htotal - down4(par->diwstop_h))>>clk_shift) + var->hsync_len;
+                var->left_margin = (par->htotal>>clk_shift) - var->xres - var->right_margin - var->hsync_len;
+                var->vsync_len = 4>>line_shift;
+                var->lower_margin = ((par->vtotal - par->diwstop_v)>>line_shift) + var->vsync_len;
+                var->upper_margin = (((par->vtotal - 2)>>line_shift) + 1) - var->yres -
+                                    var->lower_margin - var->vsync_len;
+        }
+
+        if (par->bplcon0 & BPC0_ERSY)
+                var->sync |= FB_SYNC_EXT;
+        if (par->vmode & FB_VMODE_YWRAP)
+                var->vmode |= FB_VMODE_YWRAP;
+}
+
+
+        /*
+         * Update hardware
+         */
+
+static void ami_update_par(struct fb_info *info)
+{
+        struct amifb_par *par = info->par;
+        short clk_shift, vshift, fstrt, fsize, fstop, fconst,  shift, move, mod;
+
+        clk_shift = par->clk_shift;
+
+        if (!(par->vmode & FB_VMODE_SMOOTH_XPAN))
+                par->xoffset = upx(16 << maxfmode, par->xoffset);
+
+        fconst = 16 << maxfmode << clk_shift;
+        vshift = modx(16 << maxfmode, par->xoffset);
+        fstrt = par->diwstrt_h - (vshift << clk_shift) - 4;
+        fsize = (par->xres + vshift) << clk_shift;
+        shift = modx(fconst, fstrt);
+        move = downx(2 << maxfmode, div8(par->xoffset));
+        if (maxfmode + clk_shift > 1) {
+                fstrt = downx(fconst, fstrt) - 64;
+                fsize = upx(fconst, fsize);
+                fstop = fstrt + fsize - fconst;
+        } else {
+                mod = fstrt = downx(fconst, fstrt) - fconst;
+                fstop = fstrt + upx(fconst, fsize) - 64;
+                fsize = up64(fsize);
+                fstrt = fstop - fsize + 64;
+                if (fstrt < min_fstrt) {
+                        fstop += min_fstrt - fstrt;
+                        fstrt = min_fstrt;
+                }
+                move = move - div8((mod - fstrt)>>clk_shift);
+        }
+        mod = par->next_line - div8(fsize>>clk_shift);
+        par->ddfstrt = fstrt;
+        par->ddfstop = fstop;
+        par->bplcon1 = hscroll2hw(shift);
+        par->bpl2mod = mod;
+        if (par->bplcon0 & BPC0_LACE)
+                par->bpl2mod += par->next_line;
+        if (IS_AGA && (par->fmode & FMODE_BSCAN2))
+                par->bpl1mod = -div8(fsize>>clk_shift);
+        else
+                par->bpl1mod = par->bpl2mod;
+
+        if (par->yoffset) {
+                par->bplpt0 = info->fix.smem_start +
+                              par->next_line * par->yoffset + move;
+                if (par->vmode & FB_VMODE_YWRAP) {
+                        if (par->yoffset > par->vyres - par->yres) {
+                                par->bplpt0wrap = info->fix.smem_start + move;
+                                if (par->bplcon0 & BPC0_LACE &&
+                                    mod2(par->diwstrt_v + par->vyres -
+                                         par->yoffset))
+                                        par->bplpt0wrap += par->next_line;
+                        }
+                }
+        } else
+                par->bplpt0 = info->fix.smem_start + move;
+
+        if (par->bplcon0 & BPC0_LACE && mod2(par->diwstrt_v))
+                par->bplpt0 += par->next_line;
+}
+
+
+        /*
+         * Pan or Wrap the Display
+         *
+         * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
+         * in `var'.
+         */
+
+static void ami_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct amifb_par *par = info->par;
+
+        par->xoffset = var->xoffset;
+        par->yoffset = var->yoffset;
+        if (var->vmode & FB_VMODE_YWRAP)
+                par->vmode |= FB_VMODE_YWRAP;
+        else
+                par->vmode &= ~FB_VMODE_YWRAP;
+
+        do_vmode_pan = 0;
+        ami_update_par(info);
+        do_vmode_pan = 1;
+}
+
+
+static void ami_update_display(const struct amifb_par *par)
+{
+        custom.bplcon1 = par->bplcon1;
+        custom.bpl1mod = par->bpl1mod;
+        custom.bpl2mod = par->bpl2mod;
+        custom.ddfstrt = ddfstrt2hw(par->ddfstrt);
+        custom.ddfstop = ddfstop2hw(par->ddfstop);
+}
+
+        /*
+         * Change the video mode (called by VBlank interrupt)
+         */
+
+static void ami_init_display(const struct amifb_par *par)
+{
+        int i;
+
+        custom.bplcon0 = par->bplcon0 & ~BPC0_LACE;
+        custom.bplcon2 = (IS_OCS ? 0 : BPC2_KILLEHB) | BPC2_PF2P2 | BPC2_PF1P2;
+        if (!IS_OCS) {
+                custom.bplcon3 = par->bplcon3;
+                if (IS_AGA)
+                        custom.bplcon4 = BPC4_ESPRM4 | BPC4_OSPRM4;
+                if (par->beamcon0 & BMC0_VARBEAMEN) {
+                        custom.htotal = htotal2hw(par->htotal);
+                        custom.hbstrt = hbstrt2hw(par->hbstrt);
+                        custom.hbstop = hbstop2hw(par->hbstop);
+                        custom.hsstrt = hsstrt2hw(par->hsstrt);
+                        custom.hsstop = hsstop2hw(par->hsstop);
+                        custom.hcenter = hcenter2hw(par->hcenter);
+                        custom.vtotal = vtotal2hw(par->vtotal);
+                        custom.vbstrt = vbstrt2hw(par->vbstrt);
+                        custom.vbstop = vbstop2hw(par->vbstop);
+                        custom.vsstrt = vsstrt2hw(par->vsstrt);
+                        custom.vsstop = vsstop2hw(par->vsstop);
+                }
+        }
+        if (!IS_OCS || par->hsstop)
+                custom.beamcon0 = par->beamcon0;
+        if (IS_AGA)
+                custom.fmode = par->fmode;
+
+        /*
+         * The minimum period for audio depends on htotal
+         */
+
+        amiga_audio_min_period = div16(par->htotal);
+
+        is_lace = par->bplcon0 & BPC0_LACE ? 1 : 0;
+#if 1
+        if (is_lace) {
+                i = custom.vposr >> 15;
+        } else {
+                custom.vposw = custom.vposr | 0x8000;
+                i = 1;
+        }
+#else
+        i = 1;
+        custom.vposw = custom.vposr | 0x8000;
+#endif
+        custom.cop2lc = (u_short *)ZTWO_PADDR(copdisplay.list[currentcop][i]);
+}
+
+        /*
+         * (Un)Blank the screen (called by VBlank interrupt)
+         */
+
+static void ami_do_blank(const struct amifb_par *par)
+{
+#if defined(CONFIG_FB_AMIGA_AGA)
+        u_short bplcon3 = par->bplcon3;
+#endif
+        u_char red, green, blue;
+
+        if (do_blank > 0) {
+                custom.dmacon = DMAF_RASTER | DMAF_SPRITE;
+                red = green = blue = 0;
+                if (!IS_OCS && do_blank > 1) {
+                        switch (do_blank) {
+                        case FB_BLANK_VSYNC_SUSPEND:
+                                custom.hsstrt = hsstrt2hw(par->hsstrt);
+                                custom.hsstop = hsstop2hw(par->hsstop);
+                                custom.vsstrt = vsstrt2hw(par->vtotal + 4);
+                                custom.vsstop = vsstop2hw(par->vtotal + 4);
+                                break;
+                        case FB_BLANK_HSYNC_SUSPEND:
+                                custom.hsstrt = hsstrt2hw(par->htotal + 16);
+                                custom.hsstop = hsstop2hw(par->htotal + 16);
+                                custom.vsstrt = vsstrt2hw(par->vsstrt);
+                                custom.vsstop = vsstrt2hw(par->vsstop);
+                                break;
+                        case FB_BLANK_POWERDOWN:
+                                custom.hsstrt = hsstrt2hw(par->htotal + 16);
+                                custom.hsstop = hsstop2hw(par->htotal + 16);
+                                custom.vsstrt = vsstrt2hw(par->vtotal + 4);
+                                custom.vsstop = vsstop2hw(par->vtotal + 4);
+                                break;
+                        }
+                        if (!(par->beamcon0 & BMC0_VARBEAMEN)) {
+                                custom.htotal = htotal2hw(par->htotal);
+                                custom.vtotal = vtotal2hw(par->vtotal);
+                                custom.beamcon0 = BMC0_HARDDIS | BMC0_VARBEAMEN |
+                                                  BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARCSYEN;
+                        }
+                }
+        } else {
+                custom.dmacon = DMAF_SETCLR | DMAF_RASTER | DMAF_SPRITE;
+                red = red0;
+                green = green0;
+                blue = blue0;
+                if (!IS_OCS) {
+                        custom.hsstrt = hsstrt2hw(par->hsstrt);
+                        custom.hsstop = hsstop2hw(par->hsstop);
+                        custom.vsstrt = vsstrt2hw(par->vsstrt);
+                        custom.vsstop = vsstop2hw(par->vsstop);
+                        custom.beamcon0 = par->beamcon0;
+                }
+        }
+#if defined(CONFIG_FB_AMIGA_AGA)
+        if (IS_AGA) {
+                custom.bplcon3 = bplcon3;
+                custom.color[0] = rgb2hw8_high(red, green, blue);
+                custom.bplcon3 = bplcon3 | BPC3_LOCT;
+                custom.color[0] = rgb2hw8_low(red, green, blue);
+                custom.bplcon3 = bplcon3;
+        } else
+#endif
+#if defined(CONFIG_FB_AMIGA_ECS)
+        if (par->bplcon0 & BPC0_SHRES) {
+                u_short color, mask;
+                int i;
+
+                mask = 0x3333;
+                color = rgb2hw2(red, green, blue);
+                for (i = 12; i >= 0; i -= 4)
+                        custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
+                mask <<= 2; color >>= 2;
+                for (i = 3; i >= 0; i--)
+                        custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
+        } else
+#endif
+                custom.color[0] = rgb2hw4(red, green, blue);
+        is_blanked = do_blank > 0 ? do_blank : 0;
+}
+
+static int ami_get_fix_cursorinfo(struct fb_fix_cursorinfo *fix,
+                                  const struct amifb_par *par)
+{
+        fix->crsr_width = fix->crsr_xsize = par->crsr.width;
+        fix->crsr_height = fix->crsr_ysize = par->crsr.height;
+        fix->crsr_color1 = 17;
+        fix->crsr_color2 = 18;
+        return 0;
+}
+
+static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var,
+                                  u_char __user *data,
+                                  const struct amifb_par *par)
+{
+        register u_short *lspr, *sspr;
+#ifdef __mc68000__
+        register u_long datawords asm ("d2");
+#else
+        register u_long datawords;
+#endif
+        register short delta;
+        register u_char color;
+        short height, width, bits, words;
+        int size, alloc;
+
+        size = par->crsr.height * par->crsr.width;
+        alloc = var->height * var->width;
+        var->height = par->crsr.height;
+        var->width = par->crsr.width;
+        var->xspot = par->crsr.spot_x;
+        var->yspot = par->crsr.spot_y;
+        if (size > var->height * var->width)
+                return -ENAMETOOLONG;
+        if (!access_ok(VERIFY_WRITE, data, size))
+                return -EFAULT;
+        delta = 1 << par->crsr.fmode;
+        lspr = lofsprite + (delta << 1);
+        if (par->bplcon0 & BPC0_LACE)
+                sspr = shfsprite + (delta << 1);
+        else
+                sspr = NULL;
+        for (height = (short)var->height - 1; height >= 0; height--) {
+                bits = 0; words = delta; datawords = 0;
+                for (width = (short)var->width - 1; width >= 0; width--) {
+                        if (bits == 0) {
+                                bits = 16; --words;
+#ifdef __mc68000__
+                                asm volatile ("movew %1@(%3:w:2),%0 ; swap %0 ; movew %1@+,%0"
+                                        : "=d" (datawords), "=a" (lspr) : "1" (lspr), "d" (delta));
+#else
+                                datawords = (*(lspr + delta) << 16) | (*lspr++);
+#endif
+                        }
+                        --bits;
+#ifdef __mc68000__
+                        asm volatile (
+                                "clrb %0 ; swap %1 ; lslw #1,%1 ; roxlb #1,%0 ; "
+                                "swap %1 ; lslw #1,%1 ; roxlb #1,%0"
+                                : "=d" (color), "=d" (datawords) : "1" (datawords));
+#else
+                        color = (((datawords >> 30) & 2)
+                                 | ((datawords >> 15) & 1));
+                        datawords <<= 1;
+#endif
+                        put_user(color, data++);
+                }
+                if (bits > 0) {
+                        --words; ++lspr;
+                }
+                while (--words >= 0)
+                        ++lspr;
+#ifdef __mc68000__
+                asm volatile ("lea %0@(%4:w:2),%0 ; tstl %1 ; jeq 1f ; exg %0,%1\n1:"
+                        : "=a" (lspr), "=a" (sspr) : "0" (lspr), "1" (sspr), "d" (delta));
+#else
+                lspr += delta;
+                if (sspr) {
+                        u_short *tmp = lspr;
+                        lspr = sspr;
+                        sspr = tmp;
+                }
+#endif
+        }
+        return 0;
+}
+
+static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var,
+                                  u_char __user *data, struct amifb_par *par)
+{
+        register u_short *lspr, *sspr;
+#ifdef __mc68000__
+        register u_long datawords asm ("d2");
+#else
+        register u_long datawords;
+#endif
+        register short delta;
+        u_short fmode;
+        short height, width, bits, words;
+
+        if (!var->width)
+                return -EINVAL;
+        else if (var->width <= 16)
+                fmode = TAG_FMODE_1;
+        else if (var->width <= 32)
+                fmode = TAG_FMODE_2;
+        else if (var->width <= 64)
+                fmode = TAG_FMODE_4;
+        else
+                return -EINVAL;
+        if (fmode > maxfmode)
+                return -EINVAL;
+        if (!var->height)
+                return -EINVAL;
+        if (!access_ok(VERIFY_READ, data, var->width * var->height))
+                return -EFAULT;
+        delta = 1 << fmode;
+        lofsprite = shfsprite = (u_short *)spritememory;
+        lspr = lofsprite + (delta << 1);
+        if (par->bplcon0 & BPC0_LACE) {
+                if (((var->height + 4) << fmode << 2) > SPRITEMEMSIZE)
+                        return -EINVAL;
+                memset(lspr, 0, (var->height + 4) << fmode << 2);
+                shfsprite += ((var->height + 5)&-2) << fmode;
+                sspr = shfsprite + (delta << 1);
+        } else {
+                if (((var->height + 2) << fmode << 2) > SPRITEMEMSIZE)
+                        return -EINVAL;
+                memset(lspr, 0, (var->height + 2) << fmode << 2);
+                sspr = NULL;
+        }
+        for (height = (short)var->height - 1; height >= 0; height--) {
+                bits = 16; words = delta; datawords = 0;
+                for (width = (short)var->width - 1; width >= 0; width--) {
+                        unsigned long tdata = 0;
+                        get_user(tdata, data);
+                        data++;
+#ifdef __mc68000__
+                        asm volatile (
+                                "lsrb #1,%2 ; roxlw #1,%0 ; swap %0 ; "
+                                "lsrb #1,%2 ; roxlw #1,%0 ; swap %0"
+                                : "=d" (datawords)
+                                : "0" (datawords), "d" (tdata));
+#else
+                        datawords = ((datawords << 1) & 0xfffefffe);
+                        datawords |= tdata & 1;
+                        datawords |= (tdata & 2) << (16 - 1);
+#endif
+                        if (--bits == 0) {
+                                bits = 16; --words;
+#ifdef __mc68000__
+                                asm volatile ("swap %2 ; movew %2,%0@(%3:w:2) ; swap %2 ; movew %2,%0@+"
+                                        : "=a" (lspr) : "0" (lspr), "d" (datawords), "d" (delta));
+#else
+                                *(lspr + delta) = (u_short) (datawords >> 16);
+                                *lspr++ = (u_short) (datawords & 0xffff);
+#endif
+                        }
+                }
+                if (bits < 16) {
+                        --words;
+#ifdef __mc68000__
+                        asm volatile (
+                                "swap %2 ; lslw %4,%2 ; movew %2,%0@(%3:w:2) ; "
+                                "swap %2 ; lslw %4,%2 ; movew %2,%0@+"
+                                : "=a" (lspr) : "0" (lspr), "d" (datawords), "d" (delta), "d" (bits));
+#else
+                        *(lspr + delta) = (u_short) (datawords >> (16 + bits));
+                        *lspr++ = (u_short) ((datawords & 0x0000ffff) >> bits);
+#endif
+                }
+                while (--words >= 0) {
+#ifdef __mc68000__
+                        asm volatile ("moveql #0,%%d0 ; movew %%d0,%0@(%2:w:2) ; movew %%d0,%0@+"
+                                : "=a" (lspr) : "0" (lspr), "d" (delta) : "d0");
+#else
+                        *(lspr + delta) = 0;
+                        *lspr++ = 0;
+#endif
+                }
+#ifdef __mc68000__
+                asm volatile ("lea %0@(%4:w:2),%0 ; tstl %1 ; jeq 1f ; exg %0,%1\n1:"
+                        : "=a" (lspr), "=a" (sspr) : "0" (lspr), "1" (sspr), "d" (delta));
+#else
+                lspr += delta;
+                if (sspr) {
+                        u_short *tmp = lspr;
+                        lspr = sspr;
+                        sspr = tmp;
+                }
+#endif
+        }
+        par->crsr.height = var->height;
+        par->crsr.width = var->width;
+        par->crsr.spot_x = var->xspot;
+        par->crsr.spot_y = var->yspot;
+        par->crsr.fmode = fmode;
+        if (IS_AGA) {
+                par->fmode &= ~(FMODE_SPAGEM | FMODE_SPR32);
+                par->fmode |= sprfetchmode[fmode];
+                custom.fmode = par->fmode;
+        }
+        return 0;
+}
+
+static int ami_get_cursorstate(struct fb_cursorstate *state,
+                               const struct amifb_par *par)
+{
+        state->xoffset = par->crsr.crsr_x;
+        state->yoffset = par->crsr.crsr_y;
+        state->mode = cursormode;
+        return 0;
+}
+
+static int ami_set_cursorstate(struct fb_cursorstate *state,
+                               struct amifb_par *par)
+{
+        par->crsr.crsr_x = state->xoffset;
+        par->crsr.crsr_y = state->yoffset;
+        if ((cursormode = state->mode) == FB_CURSOR_OFF)
+                cursorstate = -1;
+        do_cursor = 1;
+        return 0;
+}
+
+static void ami_set_sprite(const struct amifb_par *par)
+{
+        copins *copl, *cops;
+        u_short hs, vs, ve;
+        u_long pl, ps, pt;
+        short mx, my;
+
+        cops = copdisplay.list[currentcop][0];
+        copl = copdisplay.list[currentcop][1];
+        ps = pl = ZTWO_PADDR(dummysprite);
+        mx = par->crsr.crsr_x - par->crsr.spot_x;
+        my = par->crsr.crsr_y - par->crsr.spot_y;
+        if (!(par->vmode & FB_VMODE_YWRAP)) {
+                mx -= par->xoffset;
+                my -= par->yoffset;
+        }
+        if (!is_blanked && cursorstate > 0 && par->crsr.height > 0 &&
+            mx > -(short)par->crsr.width && mx < par->xres &&
+            my > -(short)par->crsr.height && my < par->yres) {
+                pl = ZTWO_PADDR(lofsprite);
+                hs = par->diwstrt_h + (mx << par->clk_shift) - 4;
+                vs = par->diwstrt_v + (my << par->line_shift);
+                ve = vs + (par->crsr.height << par->line_shift);
+                if (par->bplcon0 & BPC0_LACE) {
+                        ps = ZTWO_PADDR(shfsprite);
+                        lofsprite[0] = spr2hw_pos(vs, hs);
+                        shfsprite[0] = spr2hw_pos(vs + 1, hs);
+                        if (mod2(vs)) {
+                                lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
+                                shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve + 1);
+                                pt = pl; pl = ps; ps = pt;
+                        } else {
+                                lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve + 1);
+                                shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve);
+                        }
+                } else {
+                        lofsprite[0] = spr2hw_pos(vs, hs) | (IS_AGA && (par->fmode & FMODE_BSCAN2) ? 0x80 : 0);
+                        lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
+                }
+        }
+        copl[cop_spr0ptrh].w[1] = highw(pl);
+        copl[cop_spr0ptrl].w[1] = loww(pl);
+        if (par->bplcon0 & BPC0_LACE) {
+                cops[cop_spr0ptrh].w[1] = highw(ps);
+                cops[cop_spr0ptrl].w[1] = loww(ps);
+        }
+}
+
+
+        /*
+         * Initialise the Copper Initialisation List
+         */
+
+static void __init ami_init_copper(void)
+{
+        copins *cop = copdisplay.init;
+        u_long p;
+        int i;
+
+        if (!IS_OCS) {
+                (cop++)->l = CMOVE(BPC0_COLOR | BPC0_SHRES | BPC0_ECSENA, bplcon0);
+                (cop++)->l = CMOVE(0x0181, diwstrt);
+                (cop++)->l = CMOVE(0x0281, diwstop);
+                (cop++)->l = CMOVE(0x0000, diwhigh);
+        } else
+                (cop++)->l = CMOVE(BPC0_COLOR, bplcon0);
+        p = ZTWO_PADDR(dummysprite);
+        for (i = 0; i < 8; i++) {
+                (cop++)->l = CMOVE(0, spr[i].pos);
+                (cop++)->l = CMOVE(highw(p), sprpt[i]);
+                (cop++)->l = CMOVE2(loww(p), sprpt[i]);
+        }
+
+        (cop++)->l = CMOVE(IF_SETCLR | IF_COPER, intreq);
+        copdisplay.wait = cop;
+        (cop++)->l = CEND;
+        (cop++)->l = CMOVE(0, copjmp2);
+        cop->l = CEND;
+
+        custom.cop1lc = (u_short *)ZTWO_PADDR(copdisplay.init);
+        custom.copjmp1 = 0;
+}
+
+static void ami_reinit_copper(const struct amifb_par *par)
+{
+        copdisplay.init[cip_bplcon0].w[1] = ~(BPC0_BPU3 | BPC0_BPU2 | BPC0_BPU1 | BPC0_BPU0) & par->bplcon0;
+        copdisplay.wait->l = CWAIT(32, par->diwstrt_v - 4);
+}
+
+
+        /*
+         * Rebuild the Copper List
+         *
+         * We only change the things that are not static
+         */
+
+static void ami_rebuild_copper(const struct amifb_par *par)
+{
+        copins *copl, *cops;
+        u_short line, h_end1, h_end2;
+        short i;
+        u_long p;
+
+        if (IS_AGA && maxfmode + par->clk_shift == 0)
+                h_end1 = par->diwstrt_h - 64;
+        else
+                h_end1 = par->htotal - 32;
+        h_end2 = par->ddfstop + 64;
+
+        ami_set_sprite(par);
+
+        copl = copdisplay.rebuild[1];
+        p = par->bplpt0;
+        if (par->vmode & FB_VMODE_YWRAP) {
+                if ((par->vyres - par->yoffset) != 1 || !mod2(par->diwstrt_v)) {
+                        if (par->yoffset > par->vyres - par->yres) {
+                                for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
+                                        (copl++)->l = CMOVE(highw(p), bplpt[i]);
+                                        (copl++)->l = CMOVE2(loww(p), bplpt[i]);
+                                }
+                                line = par->diwstrt_v + ((par->vyres - par->yoffset) << par->line_shift) - 1;
+                                while (line >= 512) {
+                                        (copl++)->l = CWAIT(h_end1, 510);
+                                        line -= 512;
+                                }
+                                if (line >= 510 && IS_AGA && maxfmode + par->clk_shift == 0)
+                                        (copl++)->l = CWAIT(h_end1, line);
+                                else
+                                        (copl++)->l = CWAIT(h_end2, line);
+                                p = par->bplpt0wrap;
+                        }
+                } else
+                        p = par->bplpt0wrap;
+        }
+        for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
+                (copl++)->l = CMOVE(highw(p), bplpt[i]);
+                (copl++)->l = CMOVE2(loww(p), bplpt[i]);
+        }
+        copl->l = CEND;
+
+        if (par->bplcon0 & BPC0_LACE) {
+                cops = copdisplay.rebuild[0];
+                p = par->bplpt0;
+                if (mod2(par->diwstrt_v))
+                        p -= par->next_line;
+                else
+                        p += par->next_line;
+                if (par->vmode & FB_VMODE_YWRAP) {
+                        if ((par->vyres - par->yoffset) != 1 || mod2(par->diwstrt_v)) {
+                                if (par->yoffset > par->vyres - par->yres + 1) {
+                                        for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
+                                                (cops++)->l = CMOVE(highw(p), bplpt[i]);
+                                                (cops++)->l = CMOVE2(loww(p), bplpt[i]);
+                                        }
+                                        line = par->diwstrt_v + ((par->vyres - par->yoffset) << par->line_shift) - 2;
+                                        while (line >= 512) {
+                                                (cops++)->l = CWAIT(h_end1, 510);
+                                                line -= 512;
+                                        }
+                                        if (line > 510 && IS_AGA && maxfmode + par->clk_shift == 0)
+                                                (cops++)->l = CWAIT(h_end1, line);
+                                        else
+                                                (cops++)->l = CWAIT(h_end2, line);
+                                        p = par->bplpt0wrap;
+                                        if (mod2(par->diwstrt_v + par->vyres -
+                                            par->yoffset))
+                                                p -= par->next_line;
+                                        else
+                                                p += par->next_line;
+                                }
+                        } else
+                                p = par->bplpt0wrap - par->next_line;
+                }
+                for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
+                        (cops++)->l = CMOVE(highw(p), bplpt[i]);
+                        (cops++)->l = CMOVE2(loww(p), bplpt[i]);
+                }
+                cops->l = CEND;
+        }
+}
+
+
+        /*
+         * Build the Copper List
+         */
+
+static void ami_build_copper(struct fb_info *info)
+{
+        struct amifb_par *par = info->par;
+        copins *copl, *cops;
+        u_long p;
+
+        currentcop = 1 - currentcop;
+
+        copl = copdisplay.list[currentcop][1];
+
+        (copl++)->l = CWAIT(0, 10);
+        (copl++)->l = CMOVE(par->bplcon0, bplcon0);
+        (copl++)->l = CMOVE(0, sprpt[0]);
+        (copl++)->l = CMOVE2(0, sprpt[0]);
+
+        if (par->bplcon0 & BPC0_LACE) {
+                cops = copdisplay.list[currentcop][0];
+
+                (cops++)->l = CWAIT(0, 10);
+                (cops++)->l = CMOVE(par->bplcon0, bplcon0);
+                (cops++)->l = CMOVE(0, sprpt[0]);
+                (cops++)->l = CMOVE2(0, sprpt[0]);
+
+                (copl++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v + 1), diwstrt);
+                (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v + 1), diwstop);
+                (cops++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v), diwstrt);
+                (cops++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v), diwstop);
+                if (!IS_OCS) {
+                        (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v + 1,
+                                            par->diwstop_h, par->diwstop_v + 1), diwhigh);
+                        (cops++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v,
+                                            par->diwstop_h, par->diwstop_v), diwhigh);
+#if 0
+                        if (par->beamcon0 & BMC0_VARBEAMEN) {
+                                (copl++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
+                                (copl++)->l = CMOVE(vbstrt2hw(par->vbstrt + 1), vbstrt);
+                                (copl++)->l = CMOVE(vbstop2hw(par->vbstop + 1), vbstop);
+                                (cops++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
+                                (cops++)->l = CMOVE(vbstrt2hw(par->vbstrt), vbstrt);
+                                (cops++)->l = CMOVE(vbstop2hw(par->vbstop), vbstop);
+                        }
+#endif
+                }
+                p = ZTWO_PADDR(copdisplay.list[currentcop][0]);
+                (copl++)->l = CMOVE(highw(p), cop2lc);
+                (copl++)->l = CMOVE2(loww(p), cop2lc);
+                p = ZTWO_PADDR(copdisplay.list[currentcop][1]);
+                (cops++)->l = CMOVE(highw(p), cop2lc);
+                (cops++)->l = CMOVE2(loww(p), cop2lc);
+                copdisplay.rebuild[0] = cops;
+        } else {
+                (copl++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v), diwstrt);
+                (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v), diwstop);
+                if (!IS_OCS) {
+                        (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v,
+                                            par->diwstop_h, par->diwstop_v), diwhigh);
+#if 0
+                        if (par->beamcon0 & BMC0_VARBEAMEN) {
+                                (copl++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
+                                (copl++)->l = CMOVE(vbstrt2hw(par->vbstrt), vbstrt);
+                                (copl++)->l = CMOVE(vbstop2hw(par->vbstop), vbstop);
+                        }
+#endif
+                }
+        }
+        copdisplay.rebuild[1] = copl;
+
+        ami_update_par(info);
+        ami_rebuild_copper(info->par);
+}
 
-static struct fb_ops amifb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_check_var   = amifb_check_var,
-        .fb_set_par     = amifb_set_par,
-        .fb_setcolreg   = amifb_setcolreg,
-        .fb_blank       = amifb_blank,
-        .fb_pan_display = amifb_pan_display,
-        .fb_fillrect    = amifb_fillrect,
-        .fb_copyarea    = amifb_copyarea,
-        .fb_imageblit   = amifb_imageblit,
-        .fb_ioctl       = amifb_ioctl,
-};
 
 static void __init amifb_setup_mcap(char *spec)
 {
@@ -1216,13 +2339,13 @@ static void __init amifb_setup_mcap(char *spec)
         if (hmax <= 0 || hmax <= hmin)
                 return;
 
-        fb_info.monspecs.vfmin = vmin;
-        fb_info.monspecs.vfmax = vmax;
-        fb_info.monspecs.hfmin = hmin;
-        fb_info.monspecs.hfmax = hmax;
+        amifb_hfmin = hmin;
+        amifb_hfmax = hmax;
+        amifb_vfmin = vmin;
+        amifb_vfmax = vmax;
 }
 
-int __init amifb_setup(char *options)
+static int __init amifb_setup(char *options)
 {
         char *this_opt;
 
@@ -1238,9 +2361,9 @@ int __init amifb_setup(char *options)
                 } else if (!strcmp(this_opt, "ilbm"))
                         amifb_ilbm = 1;
                 else if (!strncmp(this_opt, "monitorcap:", 11))
-                        amifb_setup_mcap(this_opt+11);
+                        amifb_setup_mcap(this_opt + 11);
                 else if (!strncmp(this_opt, "fstart:", 7))
-                        min_fstrt = simple_strtoul(this_opt+7, NULL, 0);
+                        min_fstrt = simple_strtoul(this_opt + 7, NULL, 0);
                 else
                         mode_option = this_opt;
         }
@@ -1259,7 +2382,8 @@ static int amifb_check_var(struct fb_var_screeninfo *var,
         struct amifb_par par;
 
         /* Validate wanted screen parameters */
-        if ((err = ami_decode_var(var, &par)))
+        err = ami_decode_var(var, &par, info);
+        if (err)
                 return err;
 
         /* Encode (possibly rounded) screen parameters */
@@ -1270,16 +2394,19 @@ static int amifb_check_var(struct fb_var_screeninfo *var,
 
 static int amifb_set_par(struct fb_info *info)
 {
-        struct amifb_par *par = (struct amifb_par *)info->par;
+        struct amifb_par *par = info->par;
+        int error;
 
         do_vmode_pan = 0;
         do_vmode_full = 0;
 
         /* Decode wanted screen parameters */
-        ami_decode_var(&info->var, par);
+        error = ami_decode_var(&info->var, par, info);
+        if (error)
+                return error;
 
         /* Set new videomode */
-        ami_build_copper();
+        ami_build_copper(info);
 
         /* Set VBlank trigger */
         do_vmode_full = 1;
@@ -1295,20 +2422,20 @@ static int amifb_set_par(struct fb_info *info)
                 info->fix.type = FB_TYPE_PLANES;
                 info->fix.type_aux = 0;
         }
-        info->fix.line_length = div8(upx(16<<maxfmode, par->vxres));
+        info->fix.line_length = div8(upx(16 << maxfmode, par->vxres));
 
         if (par->vmode & FB_VMODE_YWRAP) {
                 info->fix.ywrapstep = 1;
                 info->fix.xpanstep = 0;
                 info->fix.ypanstep = 0;
                 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YWRAP |
-                    FBINFO_READS_FAST; /* override SCROLL_REDRAW */
+                        FBINFO_READS_FAST; /* override SCROLL_REDRAW */
         } else {
                 info->fix.ywrapstep = 0;
                 if (par->vmode & FB_VMODE_SMOOTH_XPAN)
                         info->fix.xpanstep = 1;
                 else
-                        info->fix.xpanstep = 16<<maxfmode;
+                        info->fix.xpanstep = 16 << maxfmode;
                 info->fix.ypanstep = 1;
                 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
         }
@@ -1317,6 +2444,95 @@ static int amifb_set_par(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.
+         */
+
+static int amifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                           u_int transp, struct fb_info *info)
+{
+        const struct amifb_par *par = info->par;
+
+        if (IS_AGA) {
+                if (regno > 255)
+                        return 1;
+        } else if (par->bplcon0 & BPC0_SHRES) {
+                if (regno > 3)
+                        return 1;
+        } else {
+                if (regno > 31)
+                        return 1;
+        }
+        red >>= 8;
+        green >>= 8;
+        blue >>= 8;
+        if (!regno) {
+                red0 = red;
+                green0 = green;
+                blue0 = blue;
+        }
+
+        /*
+         * Update the corresponding Hardware Color Register, unless it's Color
+         * Register 0 and the screen is blanked.
+         *
+         * VBlank is switched off to protect bplcon3 or ecs_palette[] from
+         * being changed by ami_do_blank() during the VBlank.
+         */
+
+        if (regno || !is_blanked) {
+#if defined(CONFIG_FB_AMIGA_AGA)
+                if (IS_AGA) {
+                        u_short bplcon3 = par->bplcon3;
+                        VBlankOff();
+                        custom.bplcon3 = bplcon3 | (regno << 8 & 0xe000);
+                        custom.color[regno & 31] = rgb2hw8_high(red, green,
+                                                                blue);
+                        custom.bplcon3 = bplcon3 | (regno << 8 & 0xe000) |
+                                         BPC3_LOCT;
+                        custom.color[regno & 31] = rgb2hw8_low(red, green,
+                                                               blue);
+                        custom.bplcon3 = bplcon3;
+                        VBlankOn();
+                } else
+#endif
+#if defined(CONFIG_FB_AMIGA_ECS)
+                if (par->bplcon0 & BPC0_SHRES) {
+                        u_short color, mask;
+                        int i;
+
+                        mask = 0x3333;
+                        color = rgb2hw2(red, green, blue);
+                        VBlankOff();
+                        for (i = regno + 12; i >= (int)regno; i -= 4)
+                                custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
+                        mask <<= 2; color >>= 2;
+                        regno = down16(regno) + mul4(mod4(regno));
+                        for (i = regno + 3; i >= (int)regno; i--)
+                                custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
+                        VBlankOn();
+                } else
+#endif
+                        custom.color[regno] = rgb2hw4(red, green, blue);
+        }
+        return 0;
+}
+
+
+        /*
+         * Blank the display.
+         */
+
+static int amifb_blank(int blank, struct fb_info *info)
+{
+        do_blank = blank ? blank : -1;
+
+        return 0;
+}
+
+
+        /*
          * Pan or Wrap the Display
          *
          * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
@@ -1327,18 +2543,19 @@ static int amifb_pan_display(struct fb_var_screeninfo *var,
 {
         if (var->vmode & FB_VMODE_YWRAP) {
                 if (var->yoffset < 0 ||
-                    var->yoffset >= info->var.yres_virtual || var->xoffset)
-                        return -EINVAL;
+                        var->yoffset >= info->var.yres_virtual || var->xoffset)
+                                return -EINVAL;
         } else {
                 /*
                  * TODO: There will be problems when xpan!=1, so some columns
                  * on the right side will never be seen
                  */
-                if (var->xoffset+info->var.xres > upx(16<<maxfmode, info->var.xres_virtual) ||
-                    var->yoffset+info->var.yres > info->var.yres_virtual)
+                if (var->xoffset + info->var.xres >
+                    upx(16 << maxfmode, info->var.xres_virtual) ||
+                    var->yoffset + info->var.yres > info->var.yres_virtual)
                         return -EINVAL;
         }
-        ami_pan_var(var);
+        ami_pan_var(var, info);
         info->var.xoffset = var->xoffset;
         info->var.yoffset = var->yoffset;
         if (var->vmode & FB_VMODE_YWRAP)
@@ -1360,10 +2577,10 @@ static int amifb_pan_display(struct fb_var_screeninfo *var,
 #endif
 
 
-    /*
-     *  Compose two values, using a bitmask as decision value
-     *  This is equivalent to (a & mask) | (b & ~mask)
-     */
+        /*
+         *  Compose two values, using a bitmask as decision value
+         *  This is equivalent to (a & mask) | (b & ~mask)
+         */
 
 static inline unsigned long comp(unsigned long a, unsigned long b,
                                  unsigned long mask)
@@ -1379,29 +2596,29 @@ static inline unsigned long xor(unsigned long a, unsigned long b,
 }
 
 
-    /*
-     *  Unaligned forward bit copy using 32-bit or 64-bit memory accesses
-     */
+        /*
+         *  Unaligned forward bit copy using 32-bit or 64-bit memory accesses
+         */
 
 static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
                    int src_idx, u32 n)
 {
         unsigned long first, last;
-        int shift = dst_idx-src_idx, left, right;
+        int shift = dst_idx - src_idx, left, right;
         unsigned long d0, d1;
         int m;
 
         if (!n)
                 return;
 
-        shift = dst_idx-src_idx;
+        shift = dst_idx - src_idx;
         first = ~0UL >> dst_idx;
-        last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+        last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
 
         if (!shift) {
                 // Same alignment for source and dest
 
-                if (dst_idx+n <= BITS_PER_LONG) {
+                if (dst_idx + n <= BITS_PER_LONG) {
                         // Single word
                         if (last)
                                 first &= last;
@@ -1413,7 +2630,7 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
                                 *dst = comp(*src, *dst, first);
                                 dst++;
                                 src++;
-                                n -= BITS_PER_LONG-dst_idx;
+                                n -= BITS_PER_LONG - dst_idx;
                         }
 
                         // Main chunk
@@ -1439,17 +2656,17 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
         } else {
                 // Different alignment for source and dest
 
-                right = shift & (BITS_PER_LONG-1);
-                left = -shift & (BITS_PER_LONG-1);
+                right = shift & (BITS_PER_LONG - 1);
+                left = -shift & (BITS_PER_LONG - 1);
 
-                if (dst_idx+n <= BITS_PER_LONG) {
+                if (dst_idx + n <= BITS_PER_LONG) {
                         // Single destination word
                         if (last)
                                 first &= last;
                         if (shift > 0) {
                                 // Single source word
                                 *dst = comp(*src >> right, *dst, first);
-                        } else if (src_idx+n <= BITS_PER_LONG) {
+                        } else if (src_idx + n <= BITS_PER_LONG) {
                                 // Single source word
                                 *dst = comp(*src << left, *dst, first);
                         } else {
@@ -1467,7 +2684,7 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
                                 // Single source word
                                 *dst = comp(d0 >> right, *dst, first);
                                 dst++;
-                                n -= BITS_PER_LONG-dst_idx;
+                                n -= BITS_PER_LONG - dst_idx;
                         } else {
                                 // 2 source words
                                 d1 = *src++;
@@ -1475,7 +2692,7 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
                                             first);
                                 d0 = d1;
                                 dst++;
-                                n -= BITS_PER_LONG-dst_idx;
+                                n -= BITS_PER_LONG - dst_idx;
                         }
 
                         // Main chunk
@@ -1519,40 +2736,40 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
 }
 
 
-    /*
-     *  Unaligned reverse bit copy using 32-bit or 64-bit memory accesses
-     */
+        /*
+         *  Unaligned reverse bit copy using 32-bit or 64-bit memory accesses
+         */
 
 static void bitcpy_rev(unsigned long *dst, int dst_idx,
                        const unsigned long *src, int src_idx, u32 n)
 {
         unsigned long first, last;
-        int shift = dst_idx-src_idx, left, right;
+        int shift = dst_idx - src_idx, left, right;
         unsigned long d0, d1;
         int m;
 
         if (!n)
                 return;
 
-        dst += (n-1)/BITS_PER_LONG;
-        src += (n-1)/BITS_PER_LONG;
-        if ((n-1) % BITS_PER_LONG) {
-                dst_idx += (n-1) % BITS_PER_LONG;
+        dst += (n - 1) / BITS_PER_LONG;
+        src += (n - 1) / BITS_PER_LONG;
+        if ((n - 1) % BITS_PER_LONG) {
+                dst_idx += (n - 1) % BITS_PER_LONG;
                 dst += dst_idx >> SHIFT_PER_LONG;
-                dst_idx &= BITS_PER_LONG-1;
-                src_idx += (n-1) % BITS_PER_LONG;
+                dst_idx &= BITS_PER_LONG - 1;
+                src_idx += (n - 1) % BITS_PER_LONG;
                 src += src_idx >> SHIFT_PER_LONG;
-                src_idx &= BITS_PER_LONG-1;
+                src_idx &= BITS_PER_LONG - 1;
         }
 
-        shift = dst_idx-src_idx;
-        first = ~0UL << (BITS_PER_LONG-1-dst_idx);
-        last = ~(~0UL << (BITS_PER_LONG-1-((dst_idx-n) % BITS_PER_LONG)));
+        shift = dst_idx - src_idx;
+        first = ~0UL << (BITS_PER_LONG - 1 - dst_idx);
+        last = ~(~0UL << (BITS_PER_LONG - 1 - ((dst_idx - n) % BITS_PER_LONG)));
 
         if (!shift) {
                 // Same alignment for source and dest
 
-                if ((unsigned long)dst_idx+1 >= n) {
+                if ((unsigned long)dst_idx + 1 >= n) {
                         // Single word
                         if (last)
                                 first &= last;
@@ -1564,7 +2781,7 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
                                 *dst = comp(*src, *dst, first);
                                 dst--;
                                 src--;
-                                n -= dst_idx+1;
+                                n -= dst_idx + 1;
                         }
 
                         // Main chunk
@@ -1590,17 +2807,17 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
         } else {
                 // Different alignment for source and dest
 
-                right = shift & (BITS_PER_LONG-1);
-                left = -shift & (BITS_PER_LONG-1);
+                right = shift & (BITS_PER_LONG - 1);
+                left = -shift & (BITS_PER_LONG - 1);
 
-                if ((unsigned long)dst_idx+1 >= n) {
+                if ((unsigned long)dst_idx + 1 >= n) {
                         // Single destination word
                         if (last)
                                 first &= last;
                         if (shift < 0) {
                                 // Single source word
                                 *dst = comp(*src << left, *dst, first);
-                        } else if (1+(unsigned long)src_idx >= n) {
+                        } else if (1 + (unsigned long)src_idx >= n) {
                                 // Single source word
                                 *dst = comp(*src >> right, *dst, first);
                         } else {
@@ -1618,7 +2835,7 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
                                 // Single source word
                                 *dst = comp(d0 << left, *dst, first);
                                 dst--;
-                                n -= dst_idx+1;
+                                n -= dst_idx + 1;
                         } else {
                                 // 2 source words
                                 d1 = *src--;
@@ -1626,7 +2843,7 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
                                             first);
                                 d0 = d1;
                                 dst--;
-                                n -= dst_idx+1;
+                                n -= dst_idx + 1;
                         }
 
                         // Main chunk
@@ -1670,30 +2887,30 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
 }
 
 
-    /*
-     *  Unaligned forward inverting bit copy using 32-bit or 64-bit memory
-     *  accesses
-     */
+        /*
+         *  Unaligned forward inverting bit copy using 32-bit or 64-bit memory
+         *  accesses
+         */
 
 static void bitcpy_not(unsigned long *dst, int dst_idx,
                        const unsigned long *src, int src_idx, u32 n)
 {
         unsigned long first, last;
-        int shift = dst_idx-src_idx, left, right;
+        int shift = dst_idx - src_idx, left, right;
         unsigned long d0, d1;
         int m;
 
         if (!n)
                 return;
 
-        shift = dst_idx-src_idx;
+        shift = dst_idx - src_idx;
         first = ~0UL >> dst_idx;
-        last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+        last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
 
         if (!shift) {
                 // Same alignment for source and dest
 
-                if (dst_idx+n <= BITS_PER_LONG) {
+                if (dst_idx + n <= BITS_PER_LONG) {
                         // Single word
                         if (last)
                                 first &= last;
@@ -1705,7 +2922,7 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
                                 *dst = comp(~*src, *dst, first);
                                 dst++;
                                 src++;
-                                n -= BITS_PER_LONG-dst_idx;
+                                n -= BITS_PER_LONG - dst_idx;
                         }
 
                         // Main chunk
@@ -1731,17 +2948,17 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
         } else {
                 // Different alignment for source and dest
 
-                right = shift & (BITS_PER_LONG-1);
-                left = -shift & (BITS_PER_LONG-1);
+                right = shift & (BITS_PER_LONG - 1);
+                left = -shift & (BITS_PER_LONG - 1);
 
-                if (dst_idx+n <= BITS_PER_LONG) {
+                if (dst_idx + n <= BITS_PER_LONG) {
                         // Single destination word
                         if (last)
                                 first &= last;
                         if (shift > 0) {
                                 // Single source word
                                 *dst = comp(~*src >> right, *dst, first);
-                        } else if (src_idx+n <= BITS_PER_LONG) {
+                        } else if (src_idx + n <= BITS_PER_LONG) {
                                 // Single source word
                                 *dst = comp(~*src << left, *dst, first);
                         } else {
@@ -1759,7 +2976,7 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
                                 // Single source word
                                 *dst = comp(d0 >> right, *dst, first);
                                 dst++;
-                                n -= BITS_PER_LONG-dst_idx;
+                                n -= BITS_PER_LONG - dst_idx;
                         } else {
                                 // 2 source words
                                 d1 = ~*src++;
@@ -1767,7 +2984,7 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
                                             first);
                                 d0 = d1;
                                 dst++;
-                                n -= BITS_PER_LONG-dst_idx;
+                                n -= BITS_PER_LONG - dst_idx;
                         }
 
                         // Main chunk
@@ -1811,9 +3028,9 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
 }
 
 
-    /*
-     *  Unaligned 32-bit pattern fill using 32/64-bit memory accesses
-     */
+        /*
+         *  Unaligned 32-bit pattern fill using 32/64-bit memory accesses
+         */
 
 static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 {
@@ -1828,9 +3045,9 @@ static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 #endif
 
         first = ~0UL >> dst_idx;
-        last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+        last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
 
-        if (dst_idx+n <= BITS_PER_LONG) {
+        if (dst_idx + n <= BITS_PER_LONG) {
                 // Single word
                 if (last)
                         first &= last;
@@ -1841,7 +3058,7 @@ static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
                 if (first) {
                         *dst = comp(val, *dst, first);
                         dst++;
-                        n -= BITS_PER_LONG-dst_idx;
+                        n -= BITS_PER_LONG - dst_idx;
                 }
 
                 // Main chunk
@@ -1867,9 +3084,9 @@ static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 }
 
 
-    /*
-     *  Unaligned 32-bit pattern xor using 32/64-bit memory accesses
-     */
+        /*
+         *  Unaligned 32-bit pattern xor using 32/64-bit memory accesses
+         */
 
 static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 {
@@ -1884,9 +3101,9 @@ static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 #endif
 
         first = ~0UL >> dst_idx;
-        last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+        last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
 
-        if (dst_idx+n <= BITS_PER_LONG) {
+        if (dst_idx + n <= BITS_PER_LONG) {
                 // Single word
                 if (last)
                         first &= last;
@@ -1897,7 +3114,7 @@ static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
                 if (first) {
                         *dst = xor(val, *dst, first);
                         dst++;
-                        n -= BITS_PER_LONG-dst_idx;
+                        n -= BITS_PER_LONG - dst_idx;
                 }
 
                 // Main chunk
@@ -1924,12 +3141,12 @@ static inline void fill_one_line(int bpp, unsigned long next_plane,
 {
         while (1) {
                 dst += dst_idx >> SHIFT_PER_LONG;
-                dst_idx &= (BITS_PER_LONG-1);
+                dst_idx &= (BITS_PER_LONG - 1);
                 bitfill32(dst, dst_idx, color & 1 ? ~0 : 0, n);
                 if (!--bpp)
                         break;
                 color >>= 1;
-                dst_idx += next_plane*8;
+                dst_idx += next_plane * 8;
         }
 }
 
@@ -1939,12 +3156,12 @@ static inline void xor_one_line(int bpp, unsigned long next_plane,
 {
         while (color) {
                 dst += dst_idx >> SHIFT_PER_LONG;
-                dst_idx &= (BITS_PER_LONG-1);
+                dst_idx &= (BITS_PER_LONG - 1);
                 bitxor32(dst, dst_idx, color & 1 ? ~0 : 0, n);
                 if (!--bpp)
                         break;
                 color >>= 1;
-                dst_idx += next_plane*8;
+                dst_idx += next_plane * 8;
         }
 }
 
@@ -1952,7 +3169,7 @@ static inline void xor_one_line(int bpp, unsigned long next_plane,
 static void amifb_fillrect(struct fb_info *info,
                            const struct fb_fillrect *rect)
 {
-        struct amifb_par *par = (struct amifb_par *)info->par;
+        struct amifb_par *par = info->par;
         int dst_idx, x2, y2;
         unsigned long *dst;
         u32 width, height;
@@ -1972,23 +3189,23 @@ static void amifb_fillrect(struct fb_info *info,
         height = y2 - rect->dy;
 
         dst = (unsigned long *)
-                ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
-        dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;
-        dst_idx += rect->dy*par->next_line*8+rect->dx;
+                ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
+        dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
+        dst_idx += rect->dy * par->next_line * 8 + rect->dx;
         while (height--) {
                 switch (rect->rop) {
-                    case ROP_COPY:
+                case ROP_COPY:
                         fill_one_line(info->var.bits_per_pixel,
                                       par->next_plane, dst, dst_idx, width,
                                       rect->color);
                         break;
 
-                    case ROP_XOR:
+                case ROP_XOR:
                         xor_one_line(info->var.bits_per_pixel, par->next_plane,
                                      dst, dst_idx, width, rect->color);
                         break;
                 }
-                dst_idx += par->next_line*8;
+                dst_idx += par->next_line * 8;
         }
 }
 
@@ -1998,14 +3215,14 @@ static inline void copy_one_line(int bpp, unsigned long next_plane,
 {
         while (1) {
                 dst += dst_idx >> SHIFT_PER_LONG;
-                dst_idx &= (BITS_PER_LONG-1);
+                dst_idx &= (BITS_PER_LONG - 1);
                 src += src_idx >> SHIFT_PER_LONG;
-                src_idx &= (BITS_PER_LONG-1);
+                src_idx &= (BITS_PER_LONG - 1);
                 bitcpy(dst, dst_idx, src, src_idx, n);
                 if (!--bpp)
                         break;
-                dst_idx += next_plane*8;
-                src_idx += next_plane*8;
+                dst_idx += next_plane * 8;
+                src_idx += next_plane * 8;
         }
 }
 
@@ -2015,14 +3232,14 @@ static inline void copy_one_line_rev(int bpp, unsigned long next_plane,
 {
         while (1) {
                 dst += dst_idx >> SHIFT_PER_LONG;
-                dst_idx &= (BITS_PER_LONG-1);
+                dst_idx &= (BITS_PER_LONG - 1);
                 src += src_idx >> SHIFT_PER_LONG;
-                src_idx &= (BITS_PER_LONG-1);
+                src_idx &= (BITS_PER_LONG - 1);
                 bitcpy_rev(dst, dst_idx, src, src_idx, n);
                 if (!--bpp)
                         break;
-                dst_idx += next_plane*8;
-                src_idx += next_plane*8;
+                dst_idx += next_plane * 8;
+                src_idx += next_plane * 8;
         }
 }
 
@@ -2030,7 +3247,7 @@ static inline void copy_one_line_rev(int bpp, unsigned long next_plane,
 static void amifb_copyarea(struct fb_info *info,
                            const struct fb_copyarea *area)
 {
-        struct amifb_par *par = (struct amifb_par *)info->par;
+        struct amifb_par *par = info->par;
         int x2, y2;
         u32 dx, dy, sx, sy, width, height;
         unsigned long *dst, *src;
@@ -2065,16 +3282,16 @@ static void amifb_copyarea(struct fb_info *info,
                 rev_copy = 1;
         }
         dst = (unsigned long *)
-                ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
+                ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
         src = dst;
-        dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;
+        dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
         src_idx = dst_idx;
-        dst_idx += dy*par->next_line*8+dx;
-        src_idx += sy*par->next_line*8+sx;
+        dst_idx += dy * par->next_line * 8 + dx;
+        src_idx += sy * par->next_line * 8 + sx;
         if (rev_copy) {
                 while (height--) {
-                        dst_idx -= par->next_line*8;
-                        src_idx -= par->next_line*8;
+                        dst_idx -= par->next_line * 8;
+                        src_idx -= par->next_line * 8;
                         copy_one_line_rev(info->var.bits_per_pixel,
                                           par->next_plane, dst, dst_idx, src,
                                           src_idx, width);
@@ -2084,8 +3301,8 @@ static void amifb_copyarea(struct fb_info *info,
                         copy_one_line(info->var.bits_per_pixel,
                                       par->next_plane, dst, dst_idx, src,
                                       src_idx, width);
-                        dst_idx += par->next_line*8;
-                        src_idx += par->next_line*8;
+                        dst_idx += par->next_line * 8;
+                        src_idx += par->next_line * 8;
                 }
         }
 }
@@ -2095,34 +3312,35 @@ static inline void expand_one_line(int bpp, unsigned long next_plane,
                                    unsigned long *dst, int dst_idx, u32 n,
                                    const u8 *data, u32 bgcolor, u32 fgcolor)
 {
-    const unsigned long *src;
-    int src_idx;
-
-    while (1) {
-        dst += dst_idx >> SHIFT_PER_LONG;
-        dst_idx &= (BITS_PER_LONG-1);
-        if ((bgcolor ^ fgcolor) & 1) {
-            src = (unsigned long *)((unsigned long)data & ~(BYTES_PER_LONG-1));
-            src_idx = ((unsigned long)data & (BYTES_PER_LONG-1))*8;
-            if (fgcolor & 1)
-                bitcpy(dst, dst_idx, src, src_idx, n);
-            else
-                bitcpy_not(dst, dst_idx, src, src_idx, n);
-            /* set or clear */
-        } else
-            bitfill32(dst, dst_idx, fgcolor & 1 ? ~0 : 0, n);
-        if (!--bpp)
-            break;
-        bgcolor >>= 1;
-        fgcolor >>= 1;
-        dst_idx += next_plane*8;
-    }
+        const unsigned long *src;
+        int src_idx;
+
+        while (1) {
+                dst += dst_idx >> SHIFT_PER_LONG;
+                dst_idx &= (BITS_PER_LONG - 1);
+                if ((bgcolor ^ fgcolor) & 1) {
+                        src = (unsigned long *)
+                                ((unsigned long)data & ~(BYTES_PER_LONG - 1));
+                        src_idx = ((unsigned long)data & (BYTES_PER_LONG - 1)) * 8;
+                        if (fgcolor & 1)
+                                bitcpy(dst, dst_idx, src, src_idx, n);
+                        else
+                                bitcpy_not(dst, dst_idx, src, src_idx, n);
+                        /* set or clear */
+                } else
+                        bitfill32(dst, dst_idx, fgcolor & 1 ? ~0 : 0, n);
+                if (!--bpp)
+                        break;
+                bgcolor >>= 1;
+                fgcolor >>= 1;
+                dst_idx += next_plane * 8;
+        }
 }
 
 
 static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-        struct amifb_par *par = (struct amifb_par *)info->par;
+        struct amifb_par *par = info->par;
         int x2, y2;
         unsigned long *dst;
         int dst_idx;
@@ -2145,17 +3363,17 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
 
         if (image->depth == 1) {
                 dst = (unsigned long *)
-                        ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
-                dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;
-                dst_idx += dy*par->next_line*8+dx;
+                        ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
+                dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
+                dst_idx += dy * par->next_line * 8 + dx;
                 src = image->data;
-                pitch = (image->width+7)/8;
+                pitch = (image->width + 7) / 8;
                 while (height--) {
                         expand_one_line(info->var.bits_per_pixel,
                                         par->next_plane, dst, dst_idx, width,
                                         src, image->bg_color,
                                         image->fg_color);
-                        dst_idx += par->next_line*8;
+                        dst_idx += par->next_line * 8;
                         src += pitch;
                 }
         } else {
@@ -2182,45 +3400,119 @@ static int amifb_ioctl(struct fb_info *info,
         int i;
 
         switch (cmd) {
-                case FBIOGET_FCURSORINFO:
-                        i = ami_get_fix_cursorinfo(&crsr.fix);
-                        if (i)
-                                return i;
-                        return copy_to_user(argp, &crsr.fix,
-                                            sizeof(crsr.fix)) ? -EFAULT : 0;
-
-                case FBIOGET_VCURSORINFO:
-                        i = ami_get_var_cursorinfo(&crsr.var,
-                                ((struct fb_var_cursorinfo __user *)arg)->data);
-                        if (i)
-                                return i;
-                        return copy_to_user(argp, &crsr.var,
-                                            sizeof(crsr.var)) ? -EFAULT : 0;
-
-                case FBIOPUT_VCURSORINFO:
-                        if (copy_from_user(&crsr.var, argp, sizeof(crsr.var)))
-                                return -EFAULT;
-                        return ami_set_var_cursorinfo(&crsr.var,
-                                ((struct fb_var_cursorinfo __user *)arg)->data);
-
-                case FBIOGET_CURSORSTATE:
-                        i = ami_get_cursorstate(&crsr.state);
-                        if (i)
-                                return i;
-                        return copy_to_user(argp, &crsr.state,
-                                            sizeof(crsr.state)) ? -EFAULT : 0;
-
-                case FBIOPUT_CURSORSTATE:
-                        if (copy_from_user(&crsr.state, argp,
-                                           sizeof(crsr.state)))
-                                return -EFAULT;
-                        return ami_set_cursorstate(&crsr.state);
+        case FBIOGET_FCURSORINFO:
+                i = ami_get_fix_cursorinfo(&crsr.fix, info->par);
+                if (i)
+                        return i;
+                return copy_to_user(argp, &crsr.fix,
+                                    sizeof(crsr.fix)) ? -EFAULT : 0;
+
+        case FBIOGET_VCURSORINFO:
+                i = ami_get_var_cursorinfo(&crsr.var,
+                        ((struct fb_var_cursorinfo __user *)arg)->data,
+                        info->par);
+                if (i)
+                        return i;
+                return copy_to_user(argp, &crsr.var,
+                                    sizeof(crsr.var)) ? -EFAULT : 0;
+
+        case FBIOPUT_VCURSORINFO:
+                if (copy_from_user(&crsr.var, argp, sizeof(crsr.var)))
+                        return -EFAULT;
+                return ami_set_var_cursorinfo(&crsr.var,
+                        ((struct fb_var_cursorinfo __user *)arg)->data,
+                        info->par);
+
+        case FBIOGET_CURSORSTATE:
+                i = ami_get_cursorstate(&crsr.state, info->par);
+                if (i)
+                        return i;
+                return copy_to_user(argp, &crsr.state,
+                                    sizeof(crsr.state)) ? -EFAULT : 0;
+
+        case FBIOPUT_CURSORSTATE:
+                if (copy_from_user(&crsr.state, argp, sizeof(crsr.state)))
+                        return -EFAULT;
+                return ami_set_cursorstate(&crsr.state, info->par);
         }
         return -EINVAL;
 }
 
 
         /*
+         * Flash the cursor (called by VBlank interrupt)
+         */
+
+static int flash_cursor(void)
+{
+        static int cursorcount = 1;
+
+        if (cursormode == FB_CURSOR_FLASH) {
+                if (!--cursorcount) {
+                        cursorstate = -cursorstate;
+                        cursorcount = cursorrate;
+                        if (!is_blanked)
+                                return 1;
+                }
+        }
+        return 0;
+}
+
+        /*
+         * VBlank Display Interrupt
+         */
+
+static irqreturn_t amifb_interrupt(int irq, void *dev_id)
+{
+        struct amifb_par *par = dev_id;
+
+        if (do_vmode_pan || do_vmode_full)
+                ami_update_display(par);
+
+        if (do_vmode_full)
+                ami_init_display(par);
+
+        if (do_vmode_pan) {
+                flash_cursor();
+                ami_rebuild_copper(par);
+                do_cursor = do_vmode_pan = 0;
+        } else if (do_cursor) {
+                flash_cursor();
+                ami_set_sprite(par);
+                do_cursor = 0;
+        } else {
+                if (flash_cursor())
+                        ami_set_sprite(par);
+        }
+
+        if (do_blank) {
+                ami_do_blank(par);
+                do_blank = 0;
+        }
+
+        if (do_vmode_full) {
+                ami_reinit_copper(par);
+                do_vmode_full = 0;
+        }
+        return IRQ_HANDLED;
+}
+
+
+static struct fb_ops amifb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = amifb_check_var,
+        .fb_set_par     = amifb_set_par,
+        .fb_setcolreg   = amifb_setcolreg,
+        .fb_blank       = amifb_blank,
+        .fb_pan_display = amifb_pan_display,
+        .fb_fillrect    = amifb_fillrect,
+        .fb_copyarea    = amifb_copyarea,
+        .fb_imageblit   = amifb_imageblit,
+        .fb_ioctl       = amifb_ioctl,
+};
+
+
+        /*
          * Allocate, Clear and Align a Block of Chip Memory
          */
 
@@ -2250,6 +3542,7 @@ static inline void chipfree(void)
 
 static int __init amifb_probe(struct platform_device *pdev)
 {
+        struct fb_info *info;
         int tag, i, err = 0;
         u_long chipptr;
         u_int defmode;
@@ -2265,71 +3558,80 @@ static int __init amifb_probe(struct platform_device *pdev)
 #endif
         custom.dmacon = DMAF_ALL | DMAF_MASTER;
 
+        info = framebuffer_alloc(sizeof(struct amifb_par), &pdev->dev);
+        if (!info) {
+                dev_err(&pdev->dev, "framebuffer_alloc failed\n");
+                return -ENOMEM;
+        }
+
+        strcpy(info->fix.id, "Amiga ");
+        info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+        info->fix.accel = FB_ACCEL_AMIGABLITT;
+
         switch (amiga_chipset) {
 #ifdef CONFIG_FB_AMIGA_OCS
-                case CS_OCS:
-                        strcat(fb_info.fix.id, "OCS");
+        case CS_OCS:
+                strcat(info->fix.id, "OCS");
 default_chipset:
-                        chipset = TAG_OCS;
-                        maxdepth[TAG_SHRES] = 0;        /* OCS means no SHRES */
-                        maxdepth[TAG_HIRES] = 4;
-                        maxdepth[TAG_LORES] = 6;
-                        maxfmode = TAG_FMODE_1;
-                        defmode = amiga_vblank == 50 ? DEFMODE_PAL
-                                                     : DEFMODE_NTSC;
-                        fb_info.fix.smem_len = VIDEOMEMSIZE_OCS;
-                        break;
+                chipset = TAG_OCS;
+                maxdepth[TAG_SHRES] = 0;        /* OCS means no SHRES */
+                maxdepth[TAG_HIRES] = 4;
+                maxdepth[TAG_LORES] = 6;
+                maxfmode = TAG_FMODE_1;
+                defmode = amiga_vblank == 50 ? DEFMODE_PAL : DEFMODE_NTSC;
+                info->fix.smem_len = VIDEOMEMSIZE_OCS;
+                break;
 #endif /* CONFIG_FB_AMIGA_OCS */
 
 #ifdef CONFIG_FB_AMIGA_ECS
-                case CS_ECS:
-                        strcat(fb_info.fix.id, "ECS");
-                        chipset = TAG_ECS;
-                        maxdepth[TAG_SHRES] = 2;
-                        maxdepth[TAG_HIRES] = 4;
-                        maxdepth[TAG_LORES] = 6;
-                        maxfmode = TAG_FMODE_1;
-                        if (AMIGAHW_PRESENT(AMBER_FF))
-                            defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL
-                                                         : DEFMODE_AMBER_NTSC;
-                        else
-                            defmode = amiga_vblank == 50 ? DEFMODE_PAL
-                                                         : DEFMODE_NTSC;
-                        if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
-                            VIDEOMEMSIZE_ECS_2M)
-                                fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M;
-                        else
-                                fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M;
-                        break;
+        case CS_ECS:
+                strcat(info->fix.id, "ECS");
+                chipset = TAG_ECS;
+                maxdepth[TAG_SHRES] = 2;
+                maxdepth[TAG_HIRES] = 4;
+                maxdepth[TAG_LORES] = 6;
+                maxfmode = TAG_FMODE_1;
+                if (AMIGAHW_PRESENT(AMBER_FF))
+                        defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL
+                                                     : DEFMODE_AMBER_NTSC;
+                else
+                        defmode = amiga_vblank == 50 ? DEFMODE_PAL
+                                                     : DEFMODE_NTSC;
+                if (amiga_chip_avail() - CHIPRAM_SAFETY_LIMIT >
+                    VIDEOMEMSIZE_ECS_2M)
+                        info->fix.smem_len = VIDEOMEMSIZE_ECS_2M;
+                else
+                        info->fix.smem_len = VIDEOMEMSIZE_ECS_1M;
+                break;
 #endif /* CONFIG_FB_AMIGA_ECS */
 
 #ifdef CONFIG_FB_AMIGA_AGA
-                case CS_AGA:
-                        strcat(fb_info.fix.id, "AGA");
-                        chipset = TAG_AGA;
-                        maxdepth[TAG_SHRES] = 8;
-                        maxdepth[TAG_HIRES] = 8;
-                        maxdepth[TAG_LORES] = 8;
-                        maxfmode = TAG_FMODE_4;
-                        defmode = DEFMODE_AGA;
-                        if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
-                            VIDEOMEMSIZE_AGA_2M)
-                                fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M;
-                        else
-                                fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;
-                        break;
+        case CS_AGA:
+                strcat(info->fix.id, "AGA");
+                chipset = TAG_AGA;
+                maxdepth[TAG_SHRES] = 8;
+                maxdepth[TAG_HIRES] = 8;
+                maxdepth[TAG_LORES] = 8;
+                maxfmode = TAG_FMODE_4;
+                defmode = DEFMODE_AGA;
+                if (amiga_chip_avail() - CHIPRAM_SAFETY_LIMIT >
+                    VIDEOMEMSIZE_AGA_2M)
+                        info->fix.smem_len = VIDEOMEMSIZE_AGA_2M;
+                else
+                        info->fix.smem_len = VIDEOMEMSIZE_AGA_1M;
+                break;
 #endif /* CONFIG_FB_AMIGA_AGA */
 
-                default:
+        default:
 #ifdef CONFIG_FB_AMIGA_OCS
-                        printk("Unknown graphics chipset, defaulting to OCS\n");
-                        strcat(fb_info.fix.id, "Unknown");
-                        goto default_chipset;
+                printk("Unknown graphics chipset, defaulting to OCS\n");
+                strcat(info->fix.id, "Unknown");
+                goto default_chipset;
 #else /* CONFIG_FB_AMIGA_OCS */
-                        err = -ENODEV;
-                        goto amifb_error;
+                err = -ENODEV;
+                goto release;
 #endif /* CONFIG_FB_AMIGA_OCS */
-                        break;
+                break;
         }
 
         /*
@@ -2356,42 +3658,44 @@ default_chipset:
                 }
         }
 
-        /*
-         *  These monitor specs are for a typical Amiga monitor (e.g. A1960)
-         */
-        if (fb_info.monspecs.hfmin == 0) {
-            fb_info.monspecs.hfmin = 15000;
-            fb_info.monspecs.hfmax = 38000;
-            fb_info.monspecs.vfmin = 49;
-            fb_info.monspecs.vfmax = 90;
+        if (amifb_hfmin) {
+                info->monspecs.hfmin = amifb_hfmin;
+                info->monspecs.hfmax = amifb_hfmax;
+                info->monspecs.vfmin = amifb_vfmin;
+                info->monspecs.vfmax = amifb_vfmax;
+        } else {
+                /*
+                 *  These are for a typical Amiga monitor (e.g. A1960)
+                 */
+                info->monspecs.hfmin = 15000;
+                info->monspecs.hfmax = 38000;
+                info->monspecs.vfmin = 49;
+                info->monspecs.vfmax = 90;
         }
 
-        fb_info.fbops = &amifb_ops;
-        fb_info.par = &currentpar;
-        fb_info.flags = FBINFO_DEFAULT;
-        fb_info.device = &pdev->dev;
+        info->fbops = &amifb_ops;
+        info->flags = FBINFO_DEFAULT;
+        info->device = &pdev->dev;
 
-        if (!fb_find_mode(&fb_info.var, &fb_info, mode_option, ami_modedb,
+        if (!fb_find_mode(&info->var, info, mode_option, ami_modedb,
                           NUM_TOTAL_MODES, &ami_modedb[defmode], 4)) {
                 err = -EINVAL;
-                goto amifb_error;
+                goto release;
         }
 
         fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
-                                 &fb_info.modelist);
+                                 &info->modelist);
 
         round_down_bpp = 0;
-        chipptr = chipalloc(fb_info.fix.smem_len+
-                            SPRITEMEMSIZE+
-                            DUMMYSPRITEMEMSIZE+
-                            COPINITSIZE+
-                            4*COPLISTSIZE);
+        chipptr = chipalloc(info->fix.smem_len + SPRITEMEMSIZE +
+                            DUMMYSPRITEMEMSIZE + COPINITSIZE +
+                            4 * COPLISTSIZE);
         if (!chipptr) {
                 err = -ENOMEM;
-                goto amifb_error;
+                goto release;
         }
 
-        assignchunk(videomemory, u_long, chipptr, fb_info.fix.smem_len);
+        assignchunk(videomemory, u_long, chipptr, info->fix.smem_len);
         assignchunk(spritememory, u_long, chipptr, SPRITEMEMSIZE);
         assignchunk(dummysprite, u_short *, chipptr, DUMMYSPRITEMEMSIZE);
         assignchunk(copdisplay.init, copins *, chipptr, COPINITSIZE);
@@ -2403,1398 +3707,78 @@ default_chipset:
         /*
          * access the videomem with writethrough cache
          */
-        fb_info.fix.smem_start = (u_long)ZTWO_PADDR(videomemory);
-        videomemory = (u_long)ioremap_writethrough(fb_info.fix.smem_start,
-                                                   fb_info.fix.smem_len);
+        info->fix.smem_start = (u_long)ZTWO_PADDR(videomemory);
+        videomemory = (u_long)ioremap_writethrough(info->fix.smem_start,
+                                                   info->fix.smem_len);
         if (!videomemory) {
-                printk("amifb: WARNING! unable to map videomem cached writethrough\n");
-                fb_info.screen_base = (char *)ZTWO_VADDR(fb_info.fix.smem_start);
+                dev_warn(&pdev->dev,
+                         "Unable to map videomem cached writethrough\n");
+                info->screen_base = (char *)ZTWO_VADDR(info->fix.smem_start);
         } else
-                fb_info.screen_base = (char *)videomemory;
+                info->screen_base = (char *)videomemory;
 
         memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
 
         /*
-         * Enable Display DMA
-         */
-
-        custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
-                        DMAF_BLITTER | DMAF_SPRITE;
-
-        /*
          * Make sure the Copper has something to do
          */
-
         ami_init_copper();
 
-        if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
-                        "fb vertb handler", &currentpar)) {
-                err = -EBUSY;
-                goto amifb_error;
-        }
-
-        err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
-        if (err)
-                goto amifb_error;
-
-        if (register_framebuffer(&fb_info) < 0) {
-                err = -EINVAL;
-                goto amifb_error;
-        }
-
-        printk("fb%d: %s frame buffer device, using %dK of video memory\n",
-               fb_info.node, fb_info.fix.id, fb_info.fix.smem_len>>10);
-
-        return 0;
-
-amifb_error:
-        amifb_deinit(pdev);
-        return err;
-}
-
-static void amifb_deinit(struct platform_device *pdev)
-{
-        if (fb_info.cmap.len)
-                fb_dealloc_cmap(&fb_info.cmap);
-        fb_dealloc_cmap(&fb_info.cmap);
-        chipfree();
-        if (videomemory)
-                iounmap((void*)videomemory);
-        custom.dmacon = DMAF_ALL | DMAF_MASTER;
-}
-
-
-        /*
-         * Blank the display.
-         */
-
-static int amifb_blank(int blank, struct fb_info *info)
-{
-        do_blank = blank ? blank : -1;
-
-        return 0;
-}
-
-        /*
-         * Flash the cursor (called by VBlank interrupt)
-         */
-
-static int flash_cursor(void)
-{
-        static int cursorcount = 1;
-
-        if (cursormode == FB_CURSOR_FLASH) {
-                if (!--cursorcount) {
-                        cursorstate = -cursorstate;
-                        cursorcount = cursorrate;
-                        if (!is_blanked)
-                                return 1;
-                }
-        }
-        return 0;
-}
-
-        /*
-         * VBlank Display Interrupt
-         */
-
-static irqreturn_t amifb_interrupt(int irq, void *dev_id)
-{
-        if (do_vmode_pan || do_vmode_full)
-                ami_update_display();
-
-        if (do_vmode_full)
-                ami_init_display();
-
-        if (do_vmode_pan) {
-                flash_cursor();
-                ami_rebuild_copper();
-                do_cursor = do_vmode_pan = 0;
-        } else if (do_cursor) {
-                flash_cursor();
-                ami_set_sprite();
-                do_cursor = 0;
-        } else {
-                if (flash_cursor())
-                        ami_set_sprite();
-        }
-
-        if (do_blank) {
-                ami_do_blank();
-                do_blank = 0;
-        }
-
-        if (do_vmode_full) {
-                ami_reinit_copper();
-                do_vmode_full = 0;
-        }
-        return IRQ_HANDLED;
-}
-
-/* --------------------------- Hardware routines --------------------------- */
-
-        /*
-         * Get the video params out of `var'. If a value doesn't fit, round
-         * it up, if it's too big, return -EINVAL.
-         */
-
-static int ami_decode_var(struct fb_var_screeninfo *var,
-                          struct amifb_par *par)
-{
-        u_short clk_shift, line_shift;
-        u_long maxfetchstop, fstrt, fsize, fconst, xres_n, yres_n;
-        u_int htotal, vtotal;
-
-        /*
-         * Find a matching Pixel Clock
-         */
-
-        for (clk_shift = TAG_SHRES; clk_shift <= TAG_LORES; clk_shift++)
-                if (var->pixclock <= pixclock[clk_shift])
-                        break;
-        if (clk_shift > TAG_LORES) {
-                DPRINTK("pixclock too high\n");
-                return -EINVAL;
-        }
-        par->clk_shift = clk_shift;
-
-        /*
-         * Check the Geometry Values
-         */
-
-        if ((par->xres = var->xres) < 64)
-                par->xres = 64;
-        if ((par->yres = var->yres) < 64)
-                par->yres = 64;
-        if ((par->vxres = var->xres_virtual) < par->xres)
-                par->vxres = par->xres;
-        if ((par->vyres = var->yres_virtual) < par->yres)
-                par->vyres = par->yres;
-
-        par->bpp = var->bits_per_pixel;
-        if (!var->nonstd) {
-                if (par->bpp < 1)
-                        par->bpp = 1;
-                if (par->bpp > maxdepth[clk_shift]) {
-                        if (round_down_bpp && maxdepth[clk_shift])
-                                par->bpp = maxdepth[clk_shift];
-                        else {
-                                DPRINTK("invalid bpp\n");
-                                return -EINVAL;
-                        }
-                }
-        } else if (var->nonstd == FB_NONSTD_HAM) {
-                if (par->bpp < 6)
-                        par->bpp = 6;
-                if (par->bpp != 6) {
-                        if (par->bpp < 8)
-                                par->bpp = 8;
-                        if (par->bpp != 8 || !IS_AGA) {
-                                DPRINTK("invalid bpp for ham mode\n");
-                                return -EINVAL;
-                        }
-                }
-        } else {
-                DPRINTK("unknown nonstd mode\n");
-                return -EINVAL;
-        }
-
-        /*
-         * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing
-         * checks failed and smooth scrolling is not possible
-         */
-
-        par->vmode = var->vmode | FB_VMODE_SMOOTH_XPAN;
-        switch (par->vmode & FB_VMODE_MASK) {
-                case FB_VMODE_INTERLACED:
-                        line_shift = 0;
-                        break;
-                case FB_VMODE_NONINTERLACED:
-                        line_shift = 1;
-                        break;
-                case FB_VMODE_DOUBLE:
-                        if (!IS_AGA) {
-                                DPRINTK("double mode only possible with aga\n");
-                                return -EINVAL;
-                        }
-                        line_shift = 2;
-                        break;
-                default:
-                        DPRINTK("unknown video mode\n");
-                        return -EINVAL;
-                        break;
-        }
-        par->line_shift = line_shift;
-
-        /*
-         * Vertical and Horizontal Timings
-         */
-
-        xres_n = par->xres<<clk_shift;
-        yres_n = par->yres<<line_shift;
-        par->htotal = down8((var->left_margin+par->xres+var->right_margin+var->hsync_len)<<clk_shift);
-        par->vtotal = down2(((var->upper_margin+par->yres+var->lower_margin+var->vsync_len)<<line_shift)+1);
-
-        if (IS_AGA)
-                par->bplcon3 = sprpixmode[clk_shift];
-        else
-                par->bplcon3 = 0;
-        if (var->sync & FB_SYNC_BROADCAST) {
-                par->diwstop_h = par->htotal-((var->right_margin-var->hsync_len)<<clk_shift);
-                if (IS_AGA)
-                        par->diwstop_h += mod4(var->hsync_len);
-                else
-                        par->diwstop_h = down4(par->diwstop_h);
-
-                par->diwstrt_h = par->diwstop_h - xres_n;
-                par->diwstop_v = par->vtotal-((var->lower_margin-var->vsync_len)<<line_shift);
-                par->diwstrt_v = par->diwstop_v - yres_n;
-                if (par->diwstop_h >= par->htotal+8) {
-                        DPRINTK("invalid diwstop_h\n");
-                        return -EINVAL;
-                }
-                if (par->diwstop_v > par->vtotal) {
-                        DPRINTK("invalid diwstop_v\n");
-                        return -EINVAL;
-                }
-
-                if (!IS_OCS) {
-                        /* Initialize sync with some reasonable values for pwrsave */
-                        par->hsstrt = 160;
-                        par->hsstop = 320;
-                        par->vsstrt = 30;
-                        par->vsstop = 34;
-                } else {
-                        par->hsstrt = 0;
-                        par->hsstop = 0;
-                        par->vsstrt = 0;
-                        par->vsstop = 0;
-                }
-                if (par->vtotal > (PAL_VTOTAL+NTSC_VTOTAL)/2) {
-                        /* PAL video mode */
-                        if (par->htotal != PAL_HTOTAL) {
-                                DPRINTK("htotal invalid for pal\n");
-                                return -EINVAL;
-                        }
-                        if (par->diwstrt_h < PAL_DIWSTRT_H) {
-                                DPRINTK("diwstrt_h too low for pal\n");
-                                return -EINVAL;
-                        }
-                        if (par->diwstrt_v < PAL_DIWSTRT_V) {
-                                DPRINTK("diwstrt_v too low for pal\n");
-                                return -EINVAL;
-                        }
-                        htotal = PAL_HTOTAL>>clk_shift;
-                        vtotal = PAL_VTOTAL>>1;
-                        if (!IS_OCS) {
-                                par->beamcon0 = BMC0_PAL;
-                                par->bplcon3 |= BPC3_BRDRBLNK;
-                        } else if (AMIGAHW_PRESENT(AGNUS_HR_PAL) ||
-                                   AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
-                                par->beamcon0 = BMC0_PAL;
-                                par->hsstop = 1;
-                        } else if (amiga_vblank != 50) {
-                                DPRINTK("pal not supported by this chipset\n");
-                                return -EINVAL;
-                        }
-                } else {
-                        /* NTSC video mode
-                         * In the AGA chipset seems to be hardware bug with BPC3_BRDRBLNK
-                         * and NTSC activated, so than better let diwstop_h <= 1812
-                         */
-                        if (par->htotal != NTSC_HTOTAL) {
-                                DPRINTK("htotal invalid for ntsc\n");
-                                return -EINVAL;
-                        }
-                        if (par->diwstrt_h < NTSC_DIWSTRT_H) {
-                                DPRINTK("diwstrt_h too low for ntsc\n");
-                                return -EINVAL;
-                        }
-                        if (par->diwstrt_v < NTSC_DIWSTRT_V) {
-                                DPRINTK("diwstrt_v too low for ntsc\n");
-                                return -EINVAL;
-                        }
-                        htotal = NTSC_HTOTAL>>clk_shift;
-                        vtotal = NTSC_VTOTAL>>1;
-                        if (!IS_OCS) {
-                                par->beamcon0 = 0;
-                                par->bplcon3 |= BPC3_BRDRBLNK;
-                        } else if (AMIGAHW_PRESENT(AGNUS_HR_PAL) ||
-                                   AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
-                                par->beamcon0 = 0;
-                                par->hsstop = 1;
-                        } else if (amiga_vblank != 60) {
-                                DPRINTK("ntsc not supported by this chipset\n");
-                                return -EINVAL;
-                        }
-                }
-                if (IS_OCS) {
-                        if (par->diwstrt_h >= 1024 || par->diwstop_h < 1024 ||
-                            par->diwstrt_v >=  512 || par->diwstop_v <  256) {
-                                DPRINTK("invalid position for display on ocs\n");
-                                return -EINVAL;
-                        }
-                }
-        } else if (!IS_OCS) {
-                /* Programmable video mode */
-                par->hsstrt = var->right_margin<<clk_shift;
-                par->hsstop = (var->right_margin+var->hsync_len)<<clk_shift;
-                par->diwstop_h = par->htotal - mod8(par->hsstrt) + 8 - (1 << clk_shift);
-                if (!IS_AGA)
-                        par->diwstop_h = down4(par->diwstop_h) - 16;
-                par->diwstrt_h = par->diwstop_h - xres_n;
-                par->hbstop = par->diwstrt_h + 4;
-                par->hbstrt = par->diwstop_h + 4;
-                if (par->hbstrt >= par->htotal + 8)
-                        par->hbstrt -= par->htotal;
-                par->hcenter = par->hsstrt + (par->htotal >> 1);
-                par->vsstrt = var->lower_margin<<line_shift;
-                par->vsstop = (var->lower_margin+var->vsync_len)<<line_shift;
-                par->diwstop_v = par->vtotal;
-                if ((par->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
-                        par->diwstop_v -= 2;
-                par->diwstrt_v = par->diwstop_v - yres_n;
-                par->vbstop = par->diwstrt_v - 2;
-                par->vbstrt = par->diwstop_v - 2;
-                if (par->vtotal > 2048) {
-                        DPRINTK("vtotal too high\n");
-                        return -EINVAL;
-                }
-                if (par->htotal > 2048) {
-                        DPRINTK("htotal too high\n");
-                        return -EINVAL;
-                }
-                par->bplcon3 |= BPC3_EXTBLKEN;
-                par->beamcon0 = BMC0_HARDDIS | BMC0_VARVBEN | BMC0_LOLDIS |
-                                BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARBEAMEN |
-                                BMC0_PAL | BMC0_VARCSYEN;
-                if (var->sync & FB_SYNC_HOR_HIGH_ACT)
-                        par->beamcon0 |= BMC0_HSYTRUE;
-                if (var->sync & FB_SYNC_VERT_HIGH_ACT)
-                        par->beamcon0 |= BMC0_VSYTRUE;
-                if (var->sync & FB_SYNC_COMP_HIGH_ACT)
-                        par->beamcon0 |= BMC0_CSYTRUE;
-                htotal = par->htotal>>clk_shift;
-                vtotal = par->vtotal>>1;
-        } else {
-                DPRINTK("only broadcast modes possible for ocs\n");
-                return -EINVAL;
-        }
-
-        /*
-         * Checking the DMA timing
-         */
-
-        fconst = 16<<maxfmode<<clk_shift;
-
-        /*
-         * smallest window start value without turn off other dma cycles
-         * than sprite1-7, unless you change min_fstrt
-         */
-
-
-        fsize = ((maxfmode+clk_shift <= 1) ? fconst : 64);
-        fstrt = downx(fconst, par->diwstrt_h-4) - fsize;
-        if (fstrt < min_fstrt) {
-                DPRINTK("fetch start too low\n");
-                return -EINVAL;
-        }
-
-        /*
-         * smallest window start value where smooth scrolling is possible
-         */
-
-        fstrt = downx(fconst, par->diwstrt_h-fconst+(1<<clk_shift)-4) - fsize;
-        if (fstrt < min_fstrt)
-                par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
-
-        maxfetchstop = down16(par->htotal - 80);
-
-        fstrt = downx(fconst, par->diwstrt_h-4) - 64 - fconst;
-        fsize = upx(fconst, xres_n + modx(fconst, downx(1<<clk_shift, par->diwstrt_h-4)));
-        if (fstrt + fsize > maxfetchstop)
-                par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
-
-        fsize = upx(fconst, xres_n);
-        if (fstrt + fsize > maxfetchstop) {
-                DPRINTK("fetch stop too high\n");
-                return -EINVAL;
-        }
-
-        if (maxfmode + clk_shift <= 1) {
-                fsize = up64(xres_n + fconst - 1);
-                if (min_fstrt + fsize - 64 > maxfetchstop)
-                        par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
-
-                fsize = up64(xres_n);
-                if (min_fstrt + fsize - 64 > maxfetchstop) {
-                        DPRINTK("fetch size too high\n");
-                        return -EINVAL;
-                }
-
-                fsize -= 64;
-        } else
-                fsize -= fconst;
-
-        /*
-         * Check if there is enough time to update the bitplane pointers for ywrap
-         */
-
-        if (par->htotal-fsize-64 < par->bpp*64)
-                par->vmode &= ~FB_VMODE_YWRAP;
-
-        /*
-         * Bitplane calculations and check the Memory Requirements
-         */
-
-        if (amifb_ilbm) {
-                par->next_plane = div8(upx(16<<maxfmode, par->vxres));
-                par->next_line = par->bpp*par->next_plane;
-                if (par->next_line * par->vyres > fb_info.fix.smem_len) {
-                        DPRINTK("too few video mem\n");
-                        return -EINVAL;
-                }
-        } else {
-                par->next_line = div8(upx(16<<maxfmode, par->vxres));
-                par->next_plane = par->vyres*par->next_line;
-                if (par->next_plane * par->bpp > fb_info.fix.smem_len) {
-                        DPRINTK("too few video mem\n");
-                        return -EINVAL;
-                }
-        }
-
-        /*
-         * Hardware Register Values
-         */
-
-        par->bplcon0 = BPC0_COLOR | bplpixmode[clk_shift];
-        if (!IS_OCS)
-                par->bplcon0 |= BPC0_ECSENA;
-        if (par->bpp == 8)
-                par->bplcon0 |= BPC0_BPU3;
-        else
-                par->bplcon0 |= par->bpp<<12;
-        if (var->nonstd == FB_NONSTD_HAM)
-                par->bplcon0 |= BPC0_HAM;
-        if (var->sync & FB_SYNC_EXT)
-                par->bplcon0 |= BPC0_ERSY;
-
-        if (IS_AGA)
-                par->fmode = bplfetchmode[maxfmode];
-
-        switch (par->vmode & FB_VMODE_MASK) {
-                case FB_VMODE_INTERLACED:
-                        par->bplcon0 |= BPC0_LACE;
-                        break;
-                case FB_VMODE_DOUBLE:
-                        if (IS_AGA)
-                                par->fmode |= FMODE_SSCAN2 | FMODE_BSCAN2;
-                        break;
-        }
-
-        if (!((par->vmode ^ var->vmode) & FB_VMODE_YWRAP)) {
-                par->xoffset = var->xoffset;
-                par->yoffset = var->yoffset;
-                if (par->vmode & FB_VMODE_YWRAP) {
-                        if (par->xoffset || par->yoffset < 0 || par->yoffset >= par->vyres)
-                                par->xoffset = par->yoffset = 0;
-                } else {
-                        if (par->xoffset < 0 || par->xoffset > upx(16<<maxfmode, par->vxres-par->xres) ||
-                            par->yoffset < 0 || par->yoffset > par->vyres-par->yres)
-                                par->xoffset = par->yoffset = 0;
-                }
-        } else
-                par->xoffset = par->yoffset = 0;
-
-        par->crsr.crsr_x = par->crsr.crsr_y = 0;
-        par->crsr.spot_x = par->crsr.spot_y = 0;
-        par->crsr.height = par->crsr.width = 0;
-
-        return 0;
-}
-
-        /*
-         * Fill the `var' structure based on the values in `par' and maybe
-         * other values read out of the hardware.
-         */
-
-static int ami_encode_var(struct fb_var_screeninfo *var,
-                          struct amifb_par *par)
-{
-        u_short clk_shift, line_shift;
-
-        memset(var, 0, sizeof(struct fb_var_screeninfo));
-
-        clk_shift = par->clk_shift;
-        line_shift = par->line_shift;
-
-        var->xres = par->xres;
-        var->yres = par->yres;
-        var->xres_virtual = par->vxres;
-        var->yres_virtual = par->vyres;
-        var->xoffset = par->xoffset;
-        var->yoffset = par->yoffset;
-
-        var->bits_per_pixel = par->bpp;
-        var->grayscale = 0;
-
-        var->red.offset = 0;
-        var->red.msb_right = 0;
-        var->red.length = par->bpp;
-        if (par->bplcon0 & BPC0_HAM)
-            var->red.length -= 2;
-        var->blue = var->green = var->red;
-        var->transp.offset = 0;
-        var->transp.length = 0;
-        var->transp.msb_right = 0;
-
-        if (par->bplcon0 & BPC0_HAM)
-                var->nonstd = FB_NONSTD_HAM;
-        else
-                var->nonstd = 0;
-        var->activate = 0;
-
-        var->height = -1;
-        var->width = -1;
-
-        var->pixclock = pixclock[clk_shift];
-
-        if (IS_AGA && par->fmode & FMODE_BSCAN2)
-                var->vmode = FB_VMODE_DOUBLE;
-        else if (par->bplcon0 & BPC0_LACE)
-                var->vmode = FB_VMODE_INTERLACED;
-        else
-                var->vmode = FB_VMODE_NONINTERLACED;
-
-        if (!IS_OCS && par->beamcon0 & BMC0_VARBEAMEN) {
-                var->hsync_len = (par->hsstop-par->hsstrt)>>clk_shift;
-                var->right_margin = par->hsstrt>>clk_shift;
-                var->left_margin = (par->htotal>>clk_shift) - var->xres - var->right_margin - var->hsync_len;
-                var->vsync_len = (par->vsstop-par->vsstrt)>>line_shift;
-                var->lower_margin = par->vsstrt>>line_shift;
-                var->upper_margin = (par->vtotal>>line_shift) - var->yres - var->lower_margin - var->vsync_len;
-                var->sync = 0;
-                if (par->beamcon0 & BMC0_HSYTRUE)
-                        var->sync |= FB_SYNC_HOR_HIGH_ACT;
-                if (par->beamcon0 & BMC0_VSYTRUE)
-                        var->sync |= FB_SYNC_VERT_HIGH_ACT;
-                if (par->beamcon0 & BMC0_CSYTRUE)
-                        var->sync |= FB_SYNC_COMP_HIGH_ACT;
-        } else {
-                var->sync = FB_SYNC_BROADCAST;
-                var->hsync_len = (152>>clk_shift) + mod4(par->diwstop_h);
-                var->right_margin = ((par->htotal - down4(par->diwstop_h))>>clk_shift) + var->hsync_len;
-                var->left_margin = (par->htotal>>clk_shift) - var->xres - var->right_margin - var->hsync_len;
-                var->vsync_len = 4>>line_shift;
-                var->lower_margin = ((par->vtotal - par->diwstop_v)>>line_shift) + var->vsync_len;
-                var->upper_margin = (((par->vtotal - 2)>>line_shift) + 1) - var->yres -
-                                    var->lower_margin - var->vsync_len;
-        }
-
-        if (par->bplcon0 & BPC0_ERSY)
-                var->sync |= FB_SYNC_EXT;
-        if (par->vmode & FB_VMODE_YWRAP)
-                var->vmode |= FB_VMODE_YWRAP;
-
-        return 0;
-}
-
-
         /*
-         * Pan or Wrap the Display
-         *
-         * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-         * in `var'.
-         */
-
-static void ami_pan_var(struct fb_var_screeninfo *var)
-{
-        struct amifb_par *par = &currentpar;
-
-        par->xoffset = var->xoffset;
-        par->yoffset = var->yoffset;
-        if (var->vmode & FB_VMODE_YWRAP)
-                par->vmode |= FB_VMODE_YWRAP;
-        else
-                par->vmode &= ~FB_VMODE_YWRAP;
-
-        do_vmode_pan = 0;
-        ami_update_par();
-        do_vmode_pan = 1;
-}
-
-        /*
-         * Update hardware
-         */
-
-static int ami_update_par(void)
-{
-        struct amifb_par *par = &currentpar;
-        short clk_shift, vshift, fstrt, fsize, fstop, fconst,  shift, move, mod;
-
-        clk_shift = par->clk_shift;
-
-        if (!(par->vmode & FB_VMODE_SMOOTH_XPAN))
-                par->xoffset = upx(16<<maxfmode, par->xoffset);
-
-        fconst = 16<<maxfmode<<clk_shift;
-        vshift = modx(16<<maxfmode, par->xoffset);
-        fstrt = par->diwstrt_h - (vshift<<clk_shift) - 4;
-        fsize = (par->xres+vshift)<<clk_shift;
-        shift = modx(fconst, fstrt);
-        move = downx(2<<maxfmode, div8(par->xoffset));
-        if (maxfmode + clk_shift > 1) {
-                fstrt = downx(fconst, fstrt) - 64;
-                fsize = upx(fconst, fsize);
-                fstop = fstrt + fsize - fconst;
-        } else {
-                mod = fstrt = downx(fconst, fstrt) - fconst;
-                fstop = fstrt + upx(fconst, fsize) - 64;
-                fsize = up64(fsize);
-                fstrt = fstop - fsize + 64;
-                if (fstrt < min_fstrt) {
-                        fstop += min_fstrt - fstrt;
-                        fstrt = min_fstrt;
-                }
-                move = move - div8((mod-fstrt)>>clk_shift);
-        }
-        mod = par->next_line - div8(fsize>>clk_shift);
-        par->ddfstrt = fstrt;
-        par->ddfstop = fstop;
-        par->bplcon1 = hscroll2hw(shift);
-        par->bpl2mod = mod;
-        if (par->bplcon0 & BPC0_LACE)
-                par->bpl2mod += par->next_line;
-        if (IS_AGA && (par->fmode & FMODE_BSCAN2))
-                par->bpl1mod = -div8(fsize>>clk_shift);
-        else
-                par->bpl1mod = par->bpl2mod;
-
-        if (par->yoffset) {
-                par->bplpt0 = fb_info.fix.smem_start + par->next_line*par->yoffset + move;
-                if (par->vmode & FB_VMODE_YWRAP) {
-                        if (par->yoffset > par->vyres-par->yres) {
-                                par->bplpt0wrap = fb_info.fix.smem_start + move;
-                                if (par->bplcon0 & BPC0_LACE && mod2(par->diwstrt_v+par->vyres-par->yoffset))
-                                        par->bplpt0wrap += par->next_line;
-                        }
-                }
-        } else
-                par->bplpt0 = fb_info.fix.smem_start + move;
-
-        if (par->bplcon0 & BPC0_LACE && mod2(par->diwstrt_v))
-                par->bplpt0 += par->next_line;
-
-        return 0;
-}
-
-
-        /*
-         * 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.
-         */
-
-static int amifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-                           u_int transp, struct fb_info *info)
-{
-        if (IS_AGA) {
-                if (regno > 255)
-                        return 1;
-        } else if (currentpar.bplcon0 & BPC0_SHRES) {
-                if (regno > 3)
-                        return 1;
-        } else {
-                if (regno > 31)
-                        return 1;
-        }
-        red >>= 8;
-        green >>= 8;
-        blue >>= 8;
-        if (!regno) {
-                red0 = red;
-                green0 = green;
-                blue0 = blue;
-        }
-
-        /*
-         * Update the corresponding Hardware Color Register, unless it's Color
-         * Register 0 and the screen is blanked.
-         *
-         * VBlank is switched off to protect bplcon3 or ecs_palette[] from
-         * being changed by ami_do_blank() during the VBlank.
-         */
-
-        if (regno || !is_blanked) {
-#if defined(CONFIG_FB_AMIGA_AGA)
-                if (IS_AGA) {
-                        u_short bplcon3 = currentpar.bplcon3;
-                        VBlankOff();
-                        custom.bplcon3 = bplcon3 | (regno<<8 & 0xe000);
-                        custom.color[regno&31] = rgb2hw8_high(red, green, blue);
-                        custom.bplcon3 = bplcon3 | (regno<<8 & 0xe000) | BPC3_LOCT;
-                        custom.color[regno&31] = rgb2hw8_low(red, green, blue);
-                        custom.bplcon3 = bplcon3;
-                        VBlankOn();
-                } else
-#endif
-#if defined(CONFIG_FB_AMIGA_ECS)
-                if (currentpar.bplcon0 & BPC0_SHRES) {
-                        u_short color, mask;
-                        int i;
-
-                        mask = 0x3333;
-                        color = rgb2hw2(red, green, blue);
-                        VBlankOff();
-                        for (i = regno+12; i >= (int)regno; i -= 4)
-                                custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
-                        mask <<=2; color >>= 2;
-                        regno = down16(regno)+mul4(mod4(regno));
-                        for (i = regno+3; i >= (int)regno; i--)
-                                custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
-                        VBlankOn();
-                } else
-#endif
-                        custom.color[regno] = rgb2hw4(red, green, blue);
-        }
-        return 0;
-}
-
-static void ami_update_display(void)
-{
-        struct amifb_par *par = &currentpar;
-
-        custom.bplcon1 = par->bplcon1;
-        custom.bpl1mod = par->bpl1mod;
-        custom.bpl2mod = par->bpl2mod;
-        custom.ddfstrt = ddfstrt2hw(par->ddfstrt);
-        custom.ddfstop = ddfstop2hw(par->ddfstop);
-}
-
-        /*
-         * Change the video mode (called by VBlank interrupt)
-         */
-
-static void ami_init_display(void)
-{
-        struct amifb_par *par = &currentpar;
-        int i;
-
-        custom.bplcon0 = par->bplcon0 & ~BPC0_LACE;
-        custom.bplcon2 = (IS_OCS ? 0 : BPC2_KILLEHB) | BPC2_PF2P2 | BPC2_PF1P2;
-        if (!IS_OCS) {
-                custom.bplcon3 = par->bplcon3;
-                if (IS_AGA)
-                        custom.bplcon4 = BPC4_ESPRM4 | BPC4_OSPRM4;
-                if (par->beamcon0 & BMC0_VARBEAMEN) {
-                        custom.htotal = htotal2hw(par->htotal);
-                        custom.hbstrt = hbstrt2hw(par->hbstrt);
-                        custom.hbstop = hbstop2hw(par->hbstop);
-                        custom.hsstrt = hsstrt2hw(par->hsstrt);
-                        custom.hsstop = hsstop2hw(par->hsstop);
-                        custom.hcenter = hcenter2hw(par->hcenter);
-                        custom.vtotal = vtotal2hw(par->vtotal);
-                        custom.vbstrt = vbstrt2hw(par->vbstrt);
-                        custom.vbstop = vbstop2hw(par->vbstop);
-                        custom.vsstrt = vsstrt2hw(par->vsstrt);
-                        custom.vsstop = vsstop2hw(par->vsstop);
-                }
-        }
-        if (!IS_OCS || par->hsstop)
-                custom.beamcon0 = par->beamcon0;
-        if (IS_AGA)
-                custom.fmode = par->fmode;
-
-        /*
-         * The minimum period for audio depends on htotal
-         */
-
-        amiga_audio_min_period = div16(par->htotal);
-
-        is_lace = par->bplcon0 & BPC0_LACE ? 1 : 0;
-#if 1
-        if (is_lace) {
-                i = custom.vposr >> 15;
-        } else {
-                custom.vposw = custom.vposr | 0x8000;
-                i = 1;
-        }
-#else
-        i = 1;
-        custom.vposw = custom.vposr | 0x8000;
-#endif
-        custom.cop2lc = (u_short *)ZTWO_PADDR(copdisplay.list[currentcop][i]);
-}
-
-        /*
-         * (Un)Blank the screen (called by VBlank interrupt)
+         * Enable Display DMA
          */
+        custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
+                        DMAF_BLITTER | DMAF_SPRITE;
 
-static void ami_do_blank(void)
-{
-        struct amifb_par *par = &currentpar;
-#if defined(CONFIG_FB_AMIGA_AGA)
-        u_short bplcon3 = par->bplcon3;
-#endif
-        u_char red, green, blue;
-
-        if (do_blank > 0) {
-                custom.dmacon = DMAF_RASTER | DMAF_SPRITE;
-                red = green = blue = 0;
-                if (!IS_OCS && do_blank > 1) {
-                        switch (do_blank) {
-                                case FB_BLANK_VSYNC_SUSPEND:
-                                        custom.hsstrt = hsstrt2hw(par->hsstrt);
-                                        custom.hsstop = hsstop2hw(par->hsstop);
-                                        custom.vsstrt = vsstrt2hw(par->vtotal+4);
-                                        custom.vsstop = vsstop2hw(par->vtotal+4);
-                                        break;
-                                case FB_BLANK_HSYNC_SUSPEND:
-                                        custom.hsstrt = hsstrt2hw(par->htotal+16);
-                                        custom.hsstop = hsstop2hw(par->htotal+16);
-                                        custom.vsstrt = vsstrt2hw(par->vsstrt);
-                                        custom.vsstop = vsstrt2hw(par->vsstop);
-                                        break;
-                                case FB_BLANK_POWERDOWN:
-                                        custom.hsstrt = hsstrt2hw(par->htotal+16);
-                                        custom.hsstop = hsstop2hw(par->htotal+16);
-                                        custom.vsstrt = vsstrt2hw(par->vtotal+4);
-                                        custom.vsstop = vsstop2hw(par->vtotal+4);
-                                        break;
-                        }
-                        if (!(par->beamcon0 & BMC0_VARBEAMEN)) {
-                                custom.htotal = htotal2hw(par->htotal);
-                                custom.vtotal = vtotal2hw(par->vtotal);
-                                custom.beamcon0 = BMC0_HARDDIS | BMC0_VARBEAMEN |
-                                                  BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARCSYEN;
-                        }
-                }
-        } else {
-                custom.dmacon = DMAF_SETCLR | DMAF_RASTER | DMAF_SPRITE;
-                red = red0;
-                green = green0;
-                blue = blue0;
-                if (!IS_OCS) {
-                        custom.hsstrt = hsstrt2hw(par->hsstrt);
-                        custom.hsstop = hsstop2hw(par->hsstop);
-                        custom.vsstrt = vsstrt2hw(par->vsstrt);
-                        custom.vsstop = vsstop2hw(par->vsstop);
-                        custom.beamcon0 = par->beamcon0;
-                }
-        }
-#if defined(CONFIG_FB_AMIGA_AGA)
-        if (IS_AGA) {
-                custom.bplcon3 = bplcon3;
-                custom.color[0] = rgb2hw8_high(red, green, blue);
-                custom.bplcon3 = bplcon3 | BPC3_LOCT;
-                custom.color[0] = rgb2hw8_low(red, green, blue);
-                custom.bplcon3 = bplcon3;
-        } else
-#endif
-#if defined(CONFIG_FB_AMIGA_ECS)
-        if (par->bplcon0 & BPC0_SHRES) {
-                u_short color, mask;
-                int i;
-
-                mask = 0x3333;
-                color = rgb2hw2(red, green, blue);
-                for (i = 12; i >= 0; i -= 4)
-                        custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
-                mask <<=2; color >>= 2;
-                for (i = 3; i >= 0; i--)
-                        custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
-        } else
-#endif
-                custom.color[0] = rgb2hw4(red, green, blue);
-        is_blanked = do_blank > 0 ? do_blank : 0;
-}
-
-static int ami_get_fix_cursorinfo(struct fb_fix_cursorinfo *fix)
-{
-        struct amifb_par *par = &currentpar;
-
-        fix->crsr_width = fix->crsr_xsize = par->crsr.width;
-        fix->crsr_height = fix->crsr_ysize = par->crsr.height;
-        fix->crsr_color1 = 17;
-        fix->crsr_color2 = 18;
-        return 0;
-}
-
-static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data)
-{
-        struct amifb_par *par = &currentpar;
-        register u_short *lspr, *sspr;
-#ifdef __mc68000__
-        register u_long datawords asm ("d2");
-#else
-        register u_long datawords;
-#endif
-        register short delta;
-        register u_char color;
-        short height, width, bits, words;
-        int size, alloc;
-
-        size = par->crsr.height*par->crsr.width;
-        alloc = var->height*var->width;
-        var->height = par->crsr.height;
-        var->width = par->crsr.width;
-        var->xspot = par->crsr.spot_x;
-        var->yspot = par->crsr.spot_y;
-        if (size > var->height*var->width)
-                return -ENAMETOOLONG;
-        if (!access_ok(VERIFY_WRITE, data, size))
-                return -EFAULT;
-        delta = 1<<par->crsr.fmode;
-        lspr = lofsprite + (delta<<1);
-        if (par->bplcon0 & BPC0_LACE)
-                sspr = shfsprite + (delta<<1);
-        else
-                sspr = NULL;
-        for (height = (short)var->height-1; height >= 0; height--) {
-                bits = 0; words = delta; datawords = 0;
-                for (width = (short)var->width-1; width >= 0; width--) {
-                        if (bits == 0) {
-                                bits = 16; --words;
-#ifdef __mc68000__
-                                asm volatile ("movew %1@(%3:w:2),%0 ; swap %0 ; movew %1@+,%0"
-                                        : "=d" (datawords), "=a" (lspr) : "1" (lspr), "d" (delta));
-#else
-                                datawords = (*(lspr+delta) << 16) | (*lspr++);
-#endif
-                        }
-                        --bits;
-#ifdef __mc68000__
-                        asm volatile (
-                                "clrb %0 ; swap %1 ; lslw #1,%1 ; roxlb #1,%0 ; "
-                                "swap %1 ; lslw #1,%1 ; roxlb #1,%0"
-                                : "=d" (color), "=d" (datawords) : "1" (datawords));
-#else
-                        color = (((datawords >> 30) & 2)
-                                 | ((datawords >> 15) & 1));
-                        datawords <<= 1;
-#endif
-                        put_user(color, data++);
-                }
-                if (bits > 0) {
-                        --words; ++lspr;
-                }
-                while (--words >= 0)
-                        ++lspr;
-#ifdef __mc68000__
-                asm volatile ("lea %0@(%4:w:2),%0 ; tstl %1 ; jeq 1f ; exg %0,%1\n1:"
-                        : "=a" (lspr), "=a" (sspr) : "0" (lspr), "1" (sspr), "d" (delta));
-#else
-                lspr += delta;
-                if (sspr) {
-                        u_short *tmp = lspr;
-                        lspr = sspr;
-                        sspr = tmp;
-                }
-#endif
-        }
-        return 0;
-}
-
-static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data)
-{
-        struct amifb_par *par = &currentpar;
-        register u_short *lspr, *sspr;
-#ifdef __mc68000__
-        register u_long datawords asm ("d2");
-#else
-        register u_long datawords;
-#endif
-        register short delta;
-        u_short fmode;
-        short height, width, bits, words;
+        err = request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
+                          "fb vertb handler", info->par);
+        if (err)
+                goto disable_dma;
 
-        if (!var->width)
-                return -EINVAL;
-        else if (var->width <= 16)
-                fmode = TAG_FMODE_1;
-        else if (var->width <= 32)
-                fmode = TAG_FMODE_2;
-        else if (var->width <= 64)
-                fmode = TAG_FMODE_4;
-        else
-                return -EINVAL;
-        if (fmode > maxfmode)
-                return -EINVAL;
-        if (!var->height)
-                return -EINVAL;
-        if (!access_ok(VERIFY_READ, data, var->width*var->height))
-                return -EFAULT;
-        delta = 1<<fmode;
-        lofsprite = shfsprite = (u_short *)spritememory;
-        lspr = lofsprite + (delta<<1);
-        if (par->bplcon0 & BPC0_LACE) {
-                if (((var->height+4)<<fmode<<2) > SPRITEMEMSIZE)
-                        return -EINVAL;
-                memset(lspr, 0, (var->height+4)<<fmode<<2);
-                shfsprite += ((var->height+5)&-2)<<fmode;
-                sspr = shfsprite + (delta<<1);
-        } else {
-                if (((var->height+2)<<fmode<<2) > SPRITEMEMSIZE)
-                        return -EINVAL;
-                memset(lspr, 0, (var->height+2)<<fmode<<2);
-                sspr = NULL;
-        }
-        for (height = (short)var->height-1; height >= 0; height--) {
-                bits = 16; words = delta; datawords = 0;
-                for (width = (short)var->width-1; width >= 0; width--) {
-                        unsigned long tdata = 0;
-                        get_user(tdata, data);
-                        data++;
-#ifdef __mc68000__
-                        asm volatile (
-                                "lsrb #1,%2 ; roxlw #1,%0 ; swap %0 ; "
-                                "lsrb #1,%2 ; roxlw #1,%0 ; swap %0"
-                                : "=d" (datawords)
-                                : "0" (datawords), "d" (tdata));
-#else
-                        datawords = ((datawords << 1) & 0xfffefffe);
-                        datawords |= tdata & 1;
-                        datawords |= (tdata & 2) << (16-1);
-#endif
-                        if (--bits == 0) {
-                                bits = 16; --words;
-#ifdef __mc68000__
-                                asm volatile ("swap %2 ; movew %2,%0@(%3:w:2) ; swap %2 ; movew %2,%0@+"
-                                        : "=a" (lspr) : "0" (lspr), "d" (datawords), "d" (delta));
-#else
-                                *(lspr+delta) = (u_short) (datawords >> 16);
-                                *lspr++ = (u_short) (datawords & 0xffff);
-#endif
-                        }
-                }
-                if (bits < 16) {
-                        --words;
-#ifdef __mc68000__
-                        asm volatile (
-                                "swap %2 ; lslw %4,%2 ; movew %2,%0@(%3:w:2) ; "
-                                "swap %2 ; lslw %4,%2 ; movew %2,%0@+"
-                                : "=a" (lspr) : "0" (lspr), "d" (datawords), "d" (delta), "d" (bits));
-#else
-                        *(lspr+delta) = (u_short) (datawords >> (16+bits));
-                        *lspr++ = (u_short) ((datawords & 0x0000ffff) >> bits);
-#endif
-                }
-                while (--words >= 0) {
-#ifdef __mc68000__
-                        asm volatile ("moveql #0,%%d0 ; movew %%d0,%0@(%2:w:2) ; movew %%d0,%0@+"
-                                : "=a" (lspr) : "0" (lspr), "d" (delta) : "d0");
-#else
-                        *(lspr+delta) = 0;
-                        *lspr++ = 0;
-#endif
-                }
-#ifdef __mc68000__
-                asm volatile ("lea %0@(%4:w:2),%0 ; tstl %1 ; jeq 1f ; exg %0,%1\n1:"
-                        : "=a" (lspr), "=a" (sspr) : "0" (lspr), "1" (sspr), "d" (delta));
-#else
-                lspr += delta;
-                if (sspr) {
-                        u_short *tmp = lspr;
-                        lspr = sspr;
-                        sspr = tmp;
-                }
-#endif
-        }
-        par->crsr.height = var->height;
-        par->crsr.width = var->width;
-        par->crsr.spot_x = var->xspot;
-        par->crsr.spot_y = var->yspot;
-        par->crsr.fmode = fmode;
-        if (IS_AGA) {
-                par->fmode &= ~(FMODE_SPAGEM | FMODE_SPR32);
-                par->fmode |= sprfetchmode[fmode];
-                custom.fmode = par->fmode;
-        }
-        return 0;
-}
+        err = fb_alloc_cmap(&info->cmap, 1 << info->var.bits_per_pixel, 0);
+        if (err)
+                goto free_irq;
 
-static int ami_get_cursorstate(struct fb_cursorstate *state)
-{
-        struct amifb_par *par = &currentpar;
+        dev_set_drvdata(&pdev->dev, info);
 
-        state->xoffset = par->crsr.crsr_x;
-        state->yoffset = par->crsr.crsr_y;
-        state->mode = cursormode;
-        return 0;
-}
+        err = register_framebuffer(info);
+        if (err)
+                goto unset_drvdata;
 
-static int ami_set_cursorstate(struct fb_cursorstate *state)
-{
-        struct amifb_par *par = &currentpar;
+        printk("fb%d: %s frame buffer device, using %dK of video memory\n",
+               info->node, info->fix.id, info->fix.smem_len>>10);
 
-        par->crsr.crsr_x = state->xoffset;
-        par->crsr.crsr_y = state->yoffset;
-        if ((cursormode = state->mode) == FB_CURSOR_OFF)
-                cursorstate = -1;
-        do_cursor = 1;
         return 0;
-}
-
-static void ami_set_sprite(void)
-{
-        struct amifb_par *par = &currentpar;
-        copins *copl, *cops;
-        u_short hs, vs, ve;
-        u_long pl, ps, pt;
-        short mx, my;
-
-        cops = copdisplay.list[currentcop][0];
-        copl = copdisplay.list[currentcop][1];
-        ps = pl = ZTWO_PADDR(dummysprite);
-        mx = par->crsr.crsr_x-par->crsr.spot_x;
-        my = par->crsr.crsr_y-par->crsr.spot_y;
-        if (!(par->vmode & FB_VMODE_YWRAP)) {
-                mx -= par->xoffset;
-                my -= par->yoffset;
-        }
-        if (!is_blanked && cursorstate > 0 && par->crsr.height > 0 &&
-            mx > -(short)par->crsr.width && mx < par->xres &&
-            my > -(short)par->crsr.height && my < par->yres) {
-                pl = ZTWO_PADDR(lofsprite);
-                hs = par->diwstrt_h + (mx<<par->clk_shift) - 4;
-                vs = par->diwstrt_v + (my<<par->line_shift);
-                ve = vs + (par->crsr.height<<par->line_shift);
-                if (par->bplcon0 & BPC0_LACE) {
-                        ps = ZTWO_PADDR(shfsprite);
-                        lofsprite[0] = spr2hw_pos(vs, hs);
-                        shfsprite[0] = spr2hw_pos(vs+1, hs);
-                        if (mod2(vs)) {
-                                lofsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
-                                shfsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs+1, hs, ve+1);
-                                pt = pl; pl = ps; ps = pt;
-                        } else {
-                                lofsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs, hs, ve+1);
-                                shfsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs+1, hs, ve);
-                        }
-                } else {
-                        lofsprite[0] = spr2hw_pos(vs, hs) | (IS_AGA && (par->fmode & FMODE_BSCAN2) ? 0x80 : 0);
-                        lofsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
-                }
-        }
-        copl[cop_spr0ptrh].w[1] = highw(pl);
-        copl[cop_spr0ptrl].w[1] = loww(pl);
-        if (par->bplcon0 & BPC0_LACE) {
-                cops[cop_spr0ptrh].w[1] = highw(ps);
-                cops[cop_spr0ptrl].w[1] = loww(ps);
-        }
-}
-
-
-        /*
-         * Initialise the Copper Initialisation List
-         */
-
-static void __init ami_init_copper(void)
-{
-        copins *cop = copdisplay.init;
-        u_long p;
-        int i;
-
-        if (!IS_OCS) {
-                (cop++)->l = CMOVE(BPC0_COLOR | BPC0_SHRES | BPC0_ECSENA, bplcon0);
-                (cop++)->l = CMOVE(0x0181, diwstrt);
-                (cop++)->l = CMOVE(0x0281, diwstop);
-                (cop++)->l = CMOVE(0x0000, diwhigh);
-        } else
-                (cop++)->l = CMOVE(BPC0_COLOR, bplcon0);
-        p = ZTWO_PADDR(dummysprite);
-        for (i = 0; i < 8; i++) {
-                (cop++)->l = CMOVE(0, spr[i].pos);
-                (cop++)->l = CMOVE(highw(p), sprpt[i]);
-                (cop++)->l = CMOVE2(loww(p), sprpt[i]);
-        }
-
-        (cop++)->l = CMOVE(IF_SETCLR | IF_COPER, intreq);
-        copdisplay.wait = cop;
-        (cop++)->l = CEND;
-        (cop++)->l = CMOVE(0, copjmp2);
-        cop->l = CEND;
-
-        custom.cop1lc = (u_short *)ZTWO_PADDR(copdisplay.init);
-        custom.copjmp1 = 0;
-}
 
-static void ami_reinit_copper(void)
-{
-        struct amifb_par *par = &currentpar;
-
-        copdisplay.init[cip_bplcon0].w[1] = ~(BPC0_BPU3 | BPC0_BPU2 | BPC0_BPU1 | BPC0_BPU0) & par->bplcon0;
-        copdisplay.wait->l = CWAIT(32, par->diwstrt_v-4);
+unset_drvdata:
+        dev_set_drvdata(&pdev->dev, NULL);
+        fb_dealloc_cmap(&info->cmap);
+free_irq:
+        free_irq(IRQ_AMIGA_COPPER, info->par);
+disable_dma:
+        custom.dmacon = DMAF_ALL | DMAF_MASTER;
+        if (videomemory)
+                iounmap((void *)videomemory);
+        chipfree();
+release:
+        framebuffer_release(info);
+        return err;
 }
 
-        /*
-         * Build the Copper List
-         */
-
-static void ami_build_copper(void)
-{
-        struct amifb_par *par = &currentpar;
-        copins *copl, *cops;
-        u_long p;
-
-        currentcop = 1 - currentcop;
-
-        copl = copdisplay.list[currentcop][1];
-
-        (copl++)->l = CWAIT(0, 10);
-        (copl++)->l = CMOVE(par->bplcon0, bplcon0);
-        (copl++)->l = CMOVE(0, sprpt[0]);
-        (copl++)->l = CMOVE2(0, sprpt[0]);
-
-        if (par->bplcon0 & BPC0_LACE) {
-                cops = copdisplay.list[currentcop][0];
-
-                (cops++)->l = CWAIT(0, 10);
-                (cops++)->l = CMOVE(par->bplcon0, bplcon0);
-                (cops++)->l = CMOVE(0, sprpt[0]);
-                (cops++)->l = CMOVE2(0, sprpt[0]);
-
-                (copl++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v+1), diwstrt);
-                (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v+1), diwstop);
-                (cops++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v), diwstrt);
-                (cops++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v), diwstop);
-                if (!IS_OCS) {
-                        (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v+1,
-                                            par->diwstop_h, par->diwstop_v+1), diwhigh);
-                        (cops++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v,
-                                            par->diwstop_h, par->diwstop_v), diwhigh);
-#if 0
-                        if (par->beamcon0 & BMC0_VARBEAMEN) {
-                                (copl++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
-                                (copl++)->l = CMOVE(vbstrt2hw(par->vbstrt+1), vbstrt);
-                                (copl++)->l = CMOVE(vbstop2hw(par->vbstop+1), vbstop);
-                                (cops++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
-                                (cops++)->l = CMOVE(vbstrt2hw(par->vbstrt), vbstrt);
-                                (cops++)->l = CMOVE(vbstop2hw(par->vbstop), vbstop);
-                        }
-#endif
-                }
-                p = ZTWO_PADDR(copdisplay.list[currentcop][0]);
-                (copl++)->l = CMOVE(highw(p), cop2lc);
-                (copl++)->l = CMOVE2(loww(p), cop2lc);
-                p = ZTWO_PADDR(copdisplay.list[currentcop][1]);
-                (cops++)->l = CMOVE(highw(p), cop2lc);
-                (cops++)->l = CMOVE2(loww(p), cop2lc);
-                copdisplay.rebuild[0] = cops;
-        } else {
-                (copl++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v), diwstrt);
-                (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v), diwstop);
-                if (!IS_OCS) {
-                        (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v,
-                                            par->diwstop_h, par->diwstop_v), diwhigh);
-#if 0
-                        if (par->beamcon0 & BMC0_VARBEAMEN) {
-                                (copl++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
-                                (copl++)->l = CMOVE(vbstrt2hw(par->vbstrt), vbstrt);
-                                (copl++)->l = CMOVE(vbstop2hw(par->vbstop), vbstop);
-                        }
-#endif
-                }
-        }
-        copdisplay.rebuild[1] = copl;
-
-        ami_update_par();
-        ami_rebuild_copper();
-}
-
-        /*
-         * Rebuild the Copper List
-         *
-         * We only change the things that are not static
-         */
-
-static void ami_rebuild_copper(void)
-{
-        struct amifb_par *par = &currentpar;
-        copins *copl, *cops;
-        u_short line, h_end1, h_end2;
-        short i;
-        u_long p;
-
-        if (IS_AGA && maxfmode + par->clk_shift == 0)
-                h_end1 = par->diwstrt_h-64;
-        else
-                h_end1 = par->htotal-32;
-        h_end2 = par->ddfstop+64;
-
-        ami_set_sprite();
-
-        copl = copdisplay.rebuild[1];
-        p = par->bplpt0;
-        if (par->vmode & FB_VMODE_YWRAP) {
-                if ((par->vyres-par->yoffset) != 1 || !mod2(par->diwstrt_v)) {
-                        if (par->yoffset > par->vyres-par->yres) {
-                                for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
-                                        (copl++)->l = CMOVE(highw(p), bplpt[i]);
-                                        (copl++)->l = CMOVE2(loww(p), bplpt[i]);
-                                }
-                                line = par->diwstrt_v + ((par->vyres-par->yoffset)<<par->line_shift) - 1;
-                                while (line >= 512) {
-                                        (copl++)->l = CWAIT(h_end1, 510);
-                                        line -= 512;
-                                }
-                                if (line >= 510 && IS_AGA && maxfmode + par->clk_shift == 0)
-                                        (copl++)->l = CWAIT(h_end1, line);
-                                else
-                                        (copl++)->l = CWAIT(h_end2, line);
-                                p = par->bplpt0wrap;
-                        }
-                } else p = par->bplpt0wrap;
-        }
-        for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
-                (copl++)->l = CMOVE(highw(p), bplpt[i]);
-                (copl++)->l = CMOVE2(loww(p), bplpt[i]);
-        }
-        copl->l = CEND;
-
-        if (par->bplcon0 & BPC0_LACE) {
-                cops = copdisplay.rebuild[0];
-                p = par->bplpt0;
-                if (mod2(par->diwstrt_v))
-                        p -= par->next_line;
-                else
-                        p += par->next_line;
-                if (par->vmode & FB_VMODE_YWRAP) {
-                        if ((par->vyres-par->yoffset) != 1 || mod2(par->diwstrt_v)) {
-                                if (par->yoffset > par->vyres-par->yres+1) {
-                                        for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
-                                                (cops++)->l = CMOVE(highw(p), bplpt[i]);
-                                                (cops++)->l = CMOVE2(loww(p), bplpt[i]);
-                                        }
-                                        line = par->diwstrt_v + ((par->vyres-par->yoffset)<<par->line_shift) - 2;
-                                        while (line >= 512) {
-                                                (cops++)->l = CWAIT(h_end1, 510);
-                                                line -= 512;
-                                        }
-                                        if (line > 510 && IS_AGA && maxfmode + par->clk_shift == 0)
-                                                (cops++)->l = CWAIT(h_end1, line);
-                                        else
-                                                (cops++)->l = CWAIT(h_end2, line);
-                                        p = par->bplpt0wrap;
-                                        if (mod2(par->diwstrt_v+par->vyres-par->yoffset))
-                                                p -= par->next_line;
-                                        else
-                                                p += par->next_line;
-                                }
-                        } else p = par->bplpt0wrap - par->next_line;
-                }
-                for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
-                        (cops++)->l = CMOVE(highw(p), bplpt[i]);
-                        (cops++)->l = CMOVE2(loww(p), bplpt[i]);
-                }
-                cops->l = CEND;
-        }
-}
 
 static int __exit amifb_remove(struct platform_device *pdev)
 {
-        unregister_framebuffer(&fb_info);
-        amifb_deinit(pdev);
+        struct fb_info *info = dev_get_drvdata(&pdev->dev);
+
+        unregister_framebuffer(info);
+        dev_set_drvdata(&pdev->dev, NULL);
+        fb_dealloc_cmap(&info->cmap);
+        free_irq(IRQ_AMIGA_COPPER, info->par);
+        custom.dmacon = DMAF_ALL | DMAF_MASTER;
+        if (videomemory)
+                iounmap((void *)videomemory);
+        chipfree();
+        framebuffer_release(info);
         amifb_video_off();
         return 0;
 }
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 63409c122ae8..0d7b20d4285d 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -100,8 +100,11 @@ static int atmel_bl_update_status(struct backlight_device *bl)
                 brightness = 0;
 
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, brightness);
-        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR,
+        if (contrast_ctr & ATMEL_LCDC_POL_POSITIVE)
+                lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR,
                         brightness ? contrast_ctr : 0);
+        else
+                lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);
 
         bl->props.fb_blank = bl->props.power = sinfo->bl_power = power;
 
@@ -682,14 +685,30 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
 
         case FB_VISUAL_PSEUDOCOLOR:
                 if (regno < 256) {
-                        val  = ((red   >> 11) & 0x001f);
-                        val |= ((green >>  6) & 0x03e0);
-                        val |= ((blue  >>  1) & 0x7c00);
-
-                        /*
-                         * TODO: intensity bit. Maybe something like
-                         *   ~(red[10] ^ green[10] ^ blue[10]) & 1
-                         */
+                        if (cpu_is_at91sam9261() || cpu_is_at91sam9263()
+                            || cpu_is_at91sam9rl()) {
+                                /* old style I+BGR:555 */
+                                val  = ((red   >> 11) & 0x001f);
+                                val |= ((green >>  6) & 0x03e0);
+                                val |= ((blue  >>  1) & 0x7c00);
+
+                                /*
+                                 * TODO: intensity bit. Maybe something like
+                                 *   ~(red[10] ^ green[10] ^ blue[10]) & 1
+                                 */
+                        } else {
+                                /* new style BGR:565 / RGB:565 */
+                                if (sinfo->lcd_wiring_mode ==
+                                    ATMEL_LCDC_WIRING_RGB) {
+                                        val  = ((blue >> 11) & 0x001f);
+                                        val |= ((red  >>  0) & 0xf800);
+                                } else {
+                                        val  = ((red  >> 11) & 0x001f);
+                                        val |= ((blue >>  0) & 0xf800);
+                                }
+
+                                val |= ((green >>  5) & 0x07e0);
+                        }
 
                         lcdc_writel(sinfo, ATMEL_LCDC_LUT(regno), val);
                         ret = 0;
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 6fb499e7678f..738c8ce7d132 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -280,52 +280,74 @@ MODULE_DEVICE_TABLE(pci, cirrusfb_pci_table);
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static const struct zorro_device_id cirrusfb_zorro_table[] = {
+struct zorrocl {
+        enum cirrus_board type; /* Board type */
+        u32 regoffset;          /* Offset of registers in first Zorro device */
+        u32 ramsize;            /* Size of video RAM in first Zorro device */
+                                /* If zero, use autoprobe on RAM device */
+        u32 ramoffset;          /* Offset of video RAM in first Zorro device */
+        zorro_id ramid;         /* Zorro ID of RAM device */
+        zorro_id ramid2;        /* Zorro ID of optional second RAM device */
+};
+
+static const struct zorrocl zcl_sd64 __devinitconst = {
+        .type           = BT_SD64,
+        .ramid          = ZORRO_PROD_HELFRICH_SD64_RAM,
+};
+
+static const struct zorrocl zcl_piccolo __devinitconst = {
+        .type           = BT_PICCOLO,
+        .ramid          = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
+};
+
+static const struct zorrocl zcl_picasso __devinitconst = {
+        .type           = BT_PICASSO,
+        .ramid          = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
+};
+
+static const struct zorrocl zcl_spectrum __devinitconst = {
+        .type           = BT_SPECTRUM,
+        .ramid          = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
+};
+
+static const struct zorrocl zcl_picasso4_z3 __devinitconst = {
+        .type           = BT_PICASSO4,
+        .regoffset      = 0x00600000,
+        .ramsize        = 4 * MB_,
+        .ramoffset      = 0x01000000,   /* 0x02000000 for 64 MiB boards */
+};
+
+static const struct zorrocl zcl_picasso4_z2 __devinitconst = {
+        .type           = BT_PICASSO4,
+        .regoffset      = 0x10000,
+        .ramid          = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1,
+        .ramid2         = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM2,
+};
+
+
+static const struct zorro_device_id cirrusfb_zorro_table[] __devinitconst = {
         {
-                .id             = ZORRO_PROD_HELFRICH_SD64_RAM,
-                .driver_data    = BT_SD64,
+                .id             = ZORRO_PROD_HELFRICH_SD64_REG,
+                .driver_data    = (unsigned long)&zcl_sd64,
         }, {
-                .id             = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
-                .driver_data    = BT_PICCOLO,
+                .id             = ZORRO_PROD_HELFRICH_PICCOLO_REG,
+                .driver_data    = (unsigned long)&zcl_piccolo,
         }, {
-                .id     = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
-                .driver_data    = BT_PICASSO,
+                .id     = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
+                .driver_data    = (unsigned long)&zcl_picasso,
         }, {
-                .id             = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
-                .driver_data    = BT_SPECTRUM,
+                .id             = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
+                .driver_data    = (unsigned long)&zcl_spectrum,
         }, {
                 .id             = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
-                .driver_data    = BT_PICASSO4,
+                .driver_data    = (unsigned long)&zcl_picasso4_z3,
+        }, {
+                .id             = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_REG,
+                .driver_data    = (unsigned long)&zcl_picasso4_z2,
         },
         { 0 }
 };
 MODULE_DEVICE_TABLE(zorro, cirrusfb_zorro_table);
-
-static const struct {
-        zorro_id id2;
-        unsigned long size;
-} cirrusfb_zorro_table2[] = {
-        [BT_SD64] = {
-                .id2    = ZORRO_PROD_HELFRICH_SD64_REG,
-                .size   = 0x400000
-        },
-        [BT_PICCOLO] = {
-                .id2    = ZORRO_PROD_HELFRICH_PICCOLO_REG,
-                .size   = 0x200000
-        },
-        [BT_PICASSO] = {
-                .id2    = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
-                .size   = 0x200000
-        },
-        [BT_SPECTRUM] = {
-                .id2    = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
-                .size   = 0x200000
-        },
-        [BT_PICASSO4] = {
-                .id2    = 0,
-                .size   = 0x400000
-        }
-};
 #endif /* CONFIG_ZORRO */
 
 #ifdef CIRRUSFB_DEBUG
@@ -1956,16 +1978,12 @@ static void cirrusfb_zorro_unmap(struct fb_info *info)
         struct cirrusfb_info *cinfo = info->par;
         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);
+        if (info->fix.smem_start > 16 * MB_)
                 iounmap(info->screen_base);
-        } else {
-                if (zorro_resource_start(zdev) > 0x01000000)
-                        iounmap(info->screen_base);
-        }
+        if (info->fix.mmio_start > 16 * MB_)
+                iounmap(cinfo->regbase);
+
+        zorro_release_device(zdev);
 }
 #endif /* CONFIG_ZORRO */
 
@@ -2222,115 +2240,116 @@ static struct pci_driver cirrusfb_pci_driver = {
 static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
                                              const struct zorro_device_id *ent)
 {
-        struct cirrusfb_info *cinfo;
         struct fb_info *info;
+        int error;
+        const struct zorrocl *zcl;
         enum cirrus_board btype;
-        struct zorro_dev *z2 = NULL;
-        unsigned long board_addr, board_size, size;
-        int ret;
-
-        btype = ent->driver_data;
-        if (cirrusfb_zorro_table2[btype].id2)
-                z2 = zorro_find_device(cirrusfb_zorro_table2[btype].id2, NULL);
-        size = cirrusfb_zorro_table2[btype].size;
+        unsigned long regbase, ramsize, rambase;
+        struct cirrusfb_info *cinfo;
 
         info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
         if (!info) {
                 printk(KERN_ERR "cirrusfb: could not allocate memory\n");
-                ret = -ENOMEM;
-                goto err_out;
+                return -ENOMEM;
+        }
+
+        zcl = (const struct zorrocl *)ent->driver_data;
+        btype = zcl->type;
+        regbase = zorro_resource_start(z) + zcl->regoffset;
+        ramsize = zcl->ramsize;
+        if (ramsize) {
+                rambase = zorro_resource_start(z) + zcl->ramoffset;
+                if (zorro_resource_len(z) == 64 * MB_) {
+                        /* Quirk for 64 MiB Picasso IV */
+                        rambase += zcl->ramoffset;
+                }
+        } else {
+                struct zorro_dev *ram = zorro_find_device(zcl->ramid, NULL);
+                if (!ram || !zorro_resource_len(ram)) {
+                        dev_err(info->device, "No video RAM found\n");
+                        error = -ENODEV;
+                        goto err_release_fb;
+                }
+                rambase = zorro_resource_start(ram);
+                ramsize = zorro_resource_len(ram);
+                if (zcl->ramid2 &&
+                    (ram = zorro_find_device(zcl->ramid2, NULL))) {
+                        if (zorro_resource_start(ram) != rambase + ramsize) {
+                                dev_warn(info->device,
+                                         "Skipping non-contiguous RAM at %pR\n",
+                                         &ram->resource);
+                        } else {
+                                ramsize += zorro_resource_len(ram);
+                        }
+                }
         }
 
-        dev_info(info->device, "%s board detected\n",
-                 cirrusfb_board_info[btype].name);
-
-        cinfo = info->par;
-        cinfo->btype = btype;
-
-        assert(z);
-        assert(btype != BT_NONE);
-
-        board_addr = zorro_resource_start(z);
-        board_size = zorro_resource_len(z);
-        info->screen_size = size;
+        dev_info(info->device,
+                 "%s board detected, REG at 0x%lx, %lu MiB RAM at 0x%lx\n",
+                 cirrusfb_board_info[btype].name, regbase, ramsize / MB_,
+                 rambase);
 
         if (!zorro_request_device(z, "cirrusfb")) {
-                dev_err(info->device, "cannot reserve region 0x%lx, abort\n",
-                        board_addr);
-                ret = -EBUSY;
+                dev_err(info->device, "Cannot reserve %pR\n", &z->resource);
+                error = -EBUSY;
                 goto err_release_fb;
         }
 
-        ret = -EIO;
-
-        if (btype == BT_PICASSO4) {
-                dev_info(info->device, " REG at $%lx\n", board_addr + 0x600000);
-
-                /* To be precise, for the P4 this is not the */
-                /* begin of the board, but the begin of RAM. */
-                /* for P4, map in its address space in 2 chunks (### TEST! ) */
-                /* (note the ugly hardcoded 16M number) */
-                cinfo->regbase = ioremap(board_addr, 16777216);
-                if (!cinfo->regbase)
-                        goto err_release_region;
-
-                dev_dbg(info->device, "Virtual address for board set to: $%p\n",
-                        cinfo->regbase);
-                cinfo->regbase += 0x600000;
-                info->fix.mmio_start = board_addr + 0x600000;
-
-                info->fix.smem_start = board_addr + 16777216;
-                info->screen_base = ioremap(info->fix.smem_start, 16777216);
-                if (!info->screen_base)
-                        goto err_unmap_regbase;
-        } else {
-                dev_info(info->device, " REG at $%lx\n",
-                         (unsigned long) z2->resource.start);
-
-                info->fix.smem_start = board_addr;
-                if (board_addr > 0x01000000)
-                        info->screen_base = ioremap(board_addr, board_size);
-                else
-                        info->screen_base = (caddr_t) ZTWO_VADDR(board_addr);
-                if (!info->screen_base)
-                        goto err_release_region;
+        cinfo = info->par;
+        cinfo->btype = btype;
 
-                /* set address for REG area of board */
-                cinfo->regbase = (caddr_t) ZTWO_VADDR(z2->resource.start);
-                info->fix.mmio_start = z2->resource.start;
+        info->fix.mmio_start = regbase;
+        cinfo->regbase = regbase > 16 * MB_ ? ioremap(regbase, 64 * 1024)
+                                            : (caddr_t)ZTWO_VADDR(regbase);
+        if (!cinfo->regbase) {
+                dev_err(info->device, "Cannot map registers\n");
+                error = -EIO;
+                goto err_release_dev;
+        }
 
-                dev_dbg(info->device, "Virtual address for board set to: $%p\n",
-                        cinfo->regbase);
+        info->fix.smem_start = rambase;
+        info->screen_size = ramsize;
+        info->screen_base = rambase > 16 * MB_ ? ioremap(rambase, ramsize)
+                                               : (caddr_t)ZTWO_VADDR(rambase);
+        if (!info->screen_base) {
+                dev_err(info->device, "Cannot map video RAM\n");
+                error = -EIO;
+                goto err_unmap_reg;
         }
+
         cinfo->unmap = cirrusfb_zorro_unmap;
 
         dev_info(info->device,
-                 "Cirrus Logic chipset on Zorro bus, RAM (%lu MB) at $%lx\n",
-                 board_size / MB_, board_addr);
-
-        zorro_set_drvdata(z, info);
+                 "Cirrus Logic chipset on Zorro bus, RAM (%lu MiB) at 0x%lx\n",
+                 ramsize / MB_, rambase);
 
         /* MCLK select etc. */
         if (cirrusfb_board_info[btype].init_sr1f)
                 vga_wseq(cinfo->regbase, CL_SEQR1F,
                          cirrusfb_board_info[btype].sr1f);
 
-        ret = cirrusfb_register(info);
-        if (!ret)
-                return 0;
+        error = cirrusfb_register(info);
+        if (error) {
+                dev_err(info->device, "Failed to register device, error %d\n",
+                        error);
+                goto err_unmap_ram;
+        }
 
-        if (btype == BT_PICASSO4 || board_addr > 0x01000000)
+        zorro_set_drvdata(z, info);
+        return 0;
+
+err_unmap_ram:
+        if (rambase > 16 * MB_)
                 iounmap(info->screen_base);
 
-err_unmap_regbase:
-        if (btype == BT_PICASSO4)
-                iounmap(cinfo->regbase - 0x600000);
-err_release_region:
-        release_region(board_addr, board_size);
+err_unmap_reg:
+        if (regbase > 16 * MB_)
+                iounmap(cinfo->regbase);
+err_release_dev:
+        zorro_release_device(z);
 err_release_fb:
         framebuffer_release(info);
-err_out:
-        return ret;
+        return error;
 }
 
 void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
@@ -2338,6 +2357,7 @@ void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
         struct fb_info *info = zorro_get_drvdata(z);
 
         cirrusfb_cleanup(info);
+        zorro_set_drvdata(z, NULL);
 }
 
 static struct zorro_driver cirrusfb_zorro_driver = {
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 7b2c40abae15..0c189b32a4c5 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -420,7 +420,7 @@ static int __init init_control(struct fb_info_control *p)
 
         /* Try to pick a video mode out of NVRAM if we have one. */
 #ifdef CONFIG_NVRAM
-        if (default_cmode == CMODE_NVRAM){
+        if (default_cmode == CMODE_NVRAM) {
                 cmode = nvram_read_byte(NV_CMODE);
                 if(cmode < CMODE_8 || cmode > CMODE_32)
                         cmode = CMODE_8;
diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
deleted file mode 100644
index f99af931d4f8..000000000000
--- a/drivers/video/display/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Display drivers configuration
-#
-
-menu "Display device support"
-
-config DISPLAY_SUPPORT
-        tristate "Display panel/monitor support"
-        ---help---
-          This framework adds support for low-level control of a display.
-          This includes support for power.
-
-          Enable this to be able to choose the drivers for controlling the
-          physical display panel/monitor on some platforms. This not only
-          covers LCD displays for PDAs but also other types of displays
-          such as CRT, TVout etc.
-
-          To have support for your specific display panel you will have to
-          select the proper drivers which depend on this option.
-
-comment "Display hardware drivers"
-        depends on DISPLAY_SUPPORT
-
-endmenu
diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile
deleted file mode 100644
index c0ea832bf171..000000000000
--- a/drivers/video/display/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Display drivers
-
-display-objs                            := display-sysfs.o
-
-obj-$(CONFIG_DISPLAY_SUPPORT)           += display.o
-
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
deleted file mode 100644
index 0c647d7af0ee..000000000000
--- a/drivers/video/display/display-sysfs.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  display-sysfs.c - Display output driver sysfs interface
- *
- *  Copyright (C) 2007 James Simmons <jsimmons@infradead.org>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-#include <linux/module.h>
-#include <linux/display.h>
-#include <linux/ctype.h>
-#include <linux/idr.h>
-#include <linux/err.h>
-#include <linux/kdev_t.h>
-#include <linux/slab.h>
-
-static ssize_t display_show_name(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        return snprintf(buf, PAGE_SIZE, "%s\n", dsp->name);
-}
-
-static ssize_t display_show_type(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        return snprintf(buf, PAGE_SIZE, "%s\n", dsp->type);
-}
-
-static ssize_t display_show_contrast(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        ssize_t rc = -ENXIO;
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver) && dsp->driver->get_contrast)
-                rc = sprintf(buf, "%d\n", dsp->driver->get_contrast(dsp));
-        mutex_unlock(&dsp->lock);
-        return rc;
-}
-
-static ssize_t display_store_contrast(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        ssize_t ret = -EINVAL, size;
-        int contrast;
-        char *endp;
-
-        contrast = simple_strtoul(buf, &endp, 0);
-        size = endp - buf;
-
-        if (isspace(*endp))
-                size++;
-
-        if (size != count)
-                return ret;
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver && dsp->driver->set_contrast)) {
-                pr_debug("display: set contrast to %d\n", contrast);
-                dsp->driver->set_contrast(dsp, contrast);
-                ret = count;
-        }
-        mutex_unlock(&dsp->lock);
-        return ret;
-}
-
-static ssize_t display_show_max_contrast(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        ssize_t rc = -ENXIO;
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver))
-                rc = sprintf(buf, "%d\n", dsp->driver->max_contrast);
-        mutex_unlock(&dsp->lock);
-        return rc;
-}
-
-static struct device_attribute display_attrs[] = {
-        __ATTR(name, S_IRUGO, display_show_name, NULL),
-        __ATTR(type, S_IRUGO, display_show_type, NULL),
-        __ATTR(contrast, S_IRUGO | S_IWUSR, display_show_contrast, display_store_contrast),
-        __ATTR(max_contrast, S_IRUGO, display_show_max_contrast, NULL),
-};
-
-static int display_suspend(struct device *dev, pm_message_t state)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver->suspend))
-                dsp->driver->suspend(dsp, state);
-        mutex_unlock(&dsp->lock);
-        return 0;
-};
-
-static int display_resume(struct device *dev)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver->resume))
-                dsp->driver->resume(dsp);
-        mutex_unlock(&dsp->lock);
-        return 0;
-};
-
-static struct mutex allocated_dsp_lock;
-static DEFINE_IDR(allocated_dsp);
-static struct class *display_class;
-
-struct display_device *display_device_register(struct display_driver *driver,
-                                                struct device *parent, void *devdata)
-{
-        struct display_device *new_dev = NULL;
-        int ret = -EINVAL;
-
-        if (unlikely(!driver))
-                return ERR_PTR(ret);
-
-        mutex_lock(&allocated_dsp_lock);
-        ret = idr_pre_get(&allocated_dsp, GFP_KERNEL);
-        mutex_unlock(&allocated_dsp_lock);
-        if (!ret)
-                return ERR_PTR(ret);
-
-        new_dev = kzalloc(sizeof(struct display_device), GFP_KERNEL);
-        if (likely(new_dev) && unlikely(driver->probe(new_dev, devdata))) {
-                // Reserve the index for this display
-                mutex_lock(&allocated_dsp_lock);
-                ret = idr_get_new(&allocated_dsp, new_dev, &new_dev->idx);
-                mutex_unlock(&allocated_dsp_lock);
-
-                if (!ret) {
-                        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;
-                                mutex_init(&new_dev->lock);
-                                return new_dev;
-                        }
-                        mutex_lock(&allocated_dsp_lock);
-                        idr_remove(&allocated_dsp, new_dev->idx);
-                        mutex_unlock(&allocated_dsp_lock);
-                        ret = -EINVAL;
-                }
-        }
-        kfree(new_dev);
-        return ERR_PTR(ret);
-}
-EXPORT_SYMBOL(display_device_register);
-
-void display_device_unregister(struct display_device *ddev)
-{
-        if (!ddev)
-                return;
-        // Free device
-        mutex_lock(&ddev->lock);
-        device_unregister(ddev->dev);
-        mutex_unlock(&ddev->lock);
-        // Mark device index as available
-        mutex_lock(&allocated_dsp_lock);
-        idr_remove(&allocated_dsp, ddev->idx);
-        mutex_unlock(&allocated_dsp_lock);
-        kfree(ddev);
-}
-EXPORT_SYMBOL(display_device_unregister);
-
-static int __init display_class_init(void)
-{
-        display_class = class_create(THIS_MODULE, "display");
-        if (IS_ERR(display_class)) {
-                printk(KERN_ERR "Failed to create display class\n");
-                display_class = NULL;
-                return -EINVAL;
-        }
-        display_class->dev_attrs = display_attrs;
-        display_class->suspend = display_suspend;
-        display_class->resume = display_resume;
-        mutex_init(&allocated_dsp_lock);
-        return 0;
-}
-
-static void __exit display_class_exit(void)
-{
-        class_destroy(display_class);
-}
-
-module_init(display_class_init);
-module_exit(display_class_exit);
-
-MODULE_DESCRIPTION("Display Hardware handling");
-MODULE_AUTHOR("James Simmons <jsimmons@infradead.org>");
-MODULE_LICENSE("GPL");
-
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index ad936295d8f4..ac9141b85356 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -967,6 +967,20 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
             memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
                 u32 activate = var->activate;
 
+                /* When using FOURCC mode, make sure the red, green, blue and
+                 * transp fields are set to 0.
+                 */
+                if ((info->fix.capabilities & FB_CAP_FOURCC) &&
+                    var->grayscale > 1) {
+                        if (var->red.offset     || var->green.offset    ||
+                            var->blue.offset    || var->transp.offset   ||
+                            var->red.length     || var->green.length    ||
+                            var->blue.length    || var->transp.length   ||
+                            var->red.msb_right  || var->green.msb_right ||
+                            var->blue.msb_right || var->transp.msb_right)
+                                return -EINVAL;
+                }
+
                 if (!info->fbops->fb_check_var) {
                         *var = info->var;
                         goto done;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index a16beeb5f548..acf292bfba02 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -36,8 +36,7 @@
 #include <linux/fsl-diu-fb.h>
 #include "edid.h"
 
-#define FSL_AOI_NUM     6       /* 5 AOIs and one dummy AOI */
-                                /* 1 for plane 0, 2 for plane 1&2 each */
+#define NUM_AOIS        5       /* 1 for plane 0, 2 for planes 1 & 2 each */
 
 /* HW cursor parameters */
 #define MAX_CURS                32
@@ -49,12 +48,6 @@
 #define INT_PARERR      0x08    /* Display parameters error interrupt */
 #define INT_LS_BF_VS    0x10    /* Lines before vsync. interrupt */
 
-struct diu_addr {
-        void *vaddr;            /* Virtual address */
-        dma_addr_t paddr;       /* Physical address */
-        __u32 offset;
-};
-
 /*
  * List of supported video modes
  *
@@ -330,23 +323,6 @@ static unsigned int d_cache_line_size;
 
 static DEFINE_SPINLOCK(diu_lock);
 
-struct fsl_diu_data {
-        struct fb_info *fsl_diu_info[FSL_AOI_NUM - 1];
-                                /*FSL_AOI_NUM has one dummy AOI */
-        struct device_attribute dev_attr;
-        struct diu_ad *dummy_ad;
-        void *dummy_aoi_virt;
-        unsigned int irq;
-        int fb_enabled;
-        enum fsl_diu_monitor_port monitor_port;
-        struct diu __iomem *diu_reg;
-        spinlock_t reg_lock;
-        struct diu_addr ad;
-        struct diu_addr gamma;
-        struct diu_addr pallete;
-        struct diu_addr cursor;
-};
-
 enum mfb_index {
         PLANE0 = 0,     /* Plane 0, only one AOI that fills the screen */
         PLANE1_AOI0,    /* Plane 1, first AOI */
@@ -370,6 +346,42 @@ struct mfb_info {
         u8 *edid_data;
 };
 
+/**
+ * struct fsl_diu_data - per-DIU data structure
+ * @dma_addr: DMA address of this structure
+ * @fsl_diu_info: fb_info objects, one per AOI
+ * @dev_attr: sysfs structure
+ * @irq: IRQ
+ * @monitor_port: the monitor port this DIU is connected to
+ * @diu_reg: pointer to the DIU hardware registers
+ * @reg_lock: spinlock for register access
+ * @dummy_aoi: video buffer for the 4x4 32-bit dummy AOI
+ * dummy_ad: DIU Area Descriptor for the dummy AOI
+ * @ad[]: Area Descriptors for each real AOI
+ * @gamma: gamma color table
+ * @cursor: hardware cursor data
+ *
+ * This data structure must be allocated with 32-byte alignment, so that the
+ * internal fields can be aligned properly.
+ */
+struct fsl_diu_data {
+        dma_addr_t dma_addr;
+        struct fb_info fsl_diu_info[NUM_AOIS];
+        struct mfb_info mfb[NUM_AOIS];
+        struct device_attribute dev_attr;
+        unsigned int irq;
+        enum fsl_diu_monitor_port monitor_port;
+        struct diu __iomem *diu_reg;
+        spinlock_t reg_lock;
+        u8 dummy_aoi[4 * 4 * 4];
+        struct diu_ad dummy_ad __aligned(8);
+        struct diu_ad ad[NUM_AOIS] __aligned(8);
+        u8 gamma[256 * 3] __aligned(32);
+        u8 cursor[MAX_CURS * MAX_CURS * 2] __aligned(32);
+} __aligned(32);
+
+/* Determine the DMA address of a member of the fsl_diu_data structure */
+#define DMA_ADDR(p, f) ((p)->dma_addr + offsetof(struct fsl_diu_data, f))
 
 static struct mfb_info mfb_template[] = {
         {
@@ -449,37 +461,6 @@ static enum fsl_diu_monitor_port fsl_diu_name_to_port(const char *s)
         return diu_ops.valid_monitor_port(port);
 }
 
-/**
- * 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(size_t size, phys_addr_t *phys)
-{
-        void *virt;
-
-        virt = alloc_pages_exact(size, GFP_DMA | __GFP_ZERO);
-        if (virt)
-                *phys = virt_to_phys(virt);
-
-        return virt;
-}
-
-/**
- * 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)
-{
-        if (virt && size)
-                free_pages_exact(virt, size);
-}
-
 /*
  * Workaround for failed writing desc register of planes.
  * Needed with MPC5121 DIU rev 2.0 silicon.
@@ -495,8 +476,8 @@ static void fsl_diu_enable_panel(struct fb_info *info)
 {
         struct mfb_info *pmfbi, *cmfbi, *mfbi = info->par;
         struct diu_ad *ad = mfbi->ad;
-        struct fsl_diu_data *machine_data = mfbi->parent;
-        struct diu __iomem *hw = machine_data->diu_reg;
+        struct fsl_diu_data *data = mfbi->parent;
+        struct diu __iomem *hw = data->diu_reg;
 
         switch (mfbi->index) {
         case PLANE0:
@@ -504,7 +485,7 @@ static void fsl_diu_enable_panel(struct fb_info *info)
                         wr_reg_wa(&hw->desc[0], ad->paddr);
                 break;
         case PLANE1_AOI0:
-                cmfbi = machine_data->fsl_diu_info[2]->par;
+                cmfbi = &data->mfb[2];
                 if (hw->desc[1] != ad->paddr) { /* AOI0 closed */
                         if (cmfbi->count > 0)   /* AOI1 open */
                                 ad->next_ad =
@@ -515,7 +496,7 @@ static void fsl_diu_enable_panel(struct fb_info *info)
                 }
                 break;
         case PLANE2_AOI0:
-                cmfbi = machine_data->fsl_diu_info[4]->par;
+                cmfbi = &data->mfb[4];
                 if (hw->desc[2] != ad->paddr) { /* AOI0 closed */
                         if (cmfbi->count > 0)   /* AOI1 open */
                                 ad->next_ad =
@@ -526,17 +507,17 @@ static void fsl_diu_enable_panel(struct fb_info *info)
                 }
                 break;
         case PLANE1_AOI1:
-                pmfbi = machine_data->fsl_diu_info[1]->par;
+                pmfbi = &data->mfb[1];
                 ad->next_ad = 0;
-                if (hw->desc[1] == machine_data->dummy_ad->paddr)
+                if (hw->desc[1] == data->dummy_ad.paddr)
                         wr_reg_wa(&hw->desc[1], ad->paddr);
                 else                                    /* AOI0 open */
                         pmfbi->ad->next_ad = cpu_to_le32(ad->paddr);
                 break;
         case PLANE2_AOI1:
-                pmfbi = machine_data->fsl_diu_info[3]->par;
+                pmfbi = &data->mfb[3];
                 ad->next_ad = 0;
-                if (hw->desc[2] == machine_data->dummy_ad->paddr)
+                if (hw->desc[2] == data->dummy_ad.paddr)
                         wr_reg_wa(&hw->desc[2], ad->paddr);
                 else                            /* AOI0 was open */
                         pmfbi->ad->next_ad = cpu_to_le32(ad->paddr);
@@ -548,52 +529,52 @@ static void fsl_diu_disable_panel(struct fb_info *info)
 {
         struct mfb_info *pmfbi, *cmfbi, *mfbi = info->par;
         struct diu_ad *ad = mfbi->ad;
-        struct fsl_diu_data *machine_data = mfbi->parent;
-        struct diu __iomem *hw = machine_data->diu_reg;
+        struct fsl_diu_data *data = mfbi->parent;
+        struct diu __iomem *hw = data->diu_reg;
 
         switch (mfbi->index) {
         case PLANE0:
-                if (hw->desc[0] != machine_data->dummy_ad->paddr)
-                        wr_reg_wa(&hw->desc[0], machine_data->dummy_ad->paddr);
+                if (hw->desc[0] != data->dummy_ad.paddr)
+                        wr_reg_wa(&hw->desc[0], data->dummy_ad.paddr);
                 break;
         case PLANE1_AOI0:
-                cmfbi = machine_data->fsl_diu_info[2]->par;
+                cmfbi = &data->mfb[2];
                 if (cmfbi->count > 0)   /* AOI1 is open */
                         wr_reg_wa(&hw->desc[1], cmfbi->ad->paddr);
                                         /* move AOI1 to the first */
                 else                    /* AOI1 was closed */
-                        wr_reg_wa(&hw->desc[1], machine_data->dummy_ad->paddr);
+                        wr_reg_wa(&hw->desc[1], data->dummy_ad.paddr);
                                         /* close AOI 0 */
                 break;
         case PLANE2_AOI0:
-                cmfbi = machine_data->fsl_diu_info[4]->par;
+                cmfbi = &data->mfb[4];
                 if (cmfbi->count > 0)   /* AOI1 is open */
                         wr_reg_wa(&hw->desc[2], cmfbi->ad->paddr);
                                         /* move AOI1 to the first */
                 else                    /* AOI1 was closed */
-                        wr_reg_wa(&hw->desc[2], machine_data->dummy_ad->paddr);
+                        wr_reg_wa(&hw->desc[2], data->dummy_ad.paddr);
                                         /* close AOI 0 */
                 break;
         case PLANE1_AOI1:
-                pmfbi = machine_data->fsl_diu_info[1]->par;
+                pmfbi = &data->mfb[1];
                 if (hw->desc[1] != ad->paddr) {
                                 /* AOI1 is not the first in the chain */
                         if (pmfbi->count > 0)
                                         /* AOI0 is open, must be the first */
                                 pmfbi->ad->next_ad = 0;
                 } else                  /* AOI1 is the first in the chain */
-                        wr_reg_wa(&hw->desc[1], machine_data->dummy_ad->paddr);
+                        wr_reg_wa(&hw->desc[1], data->dummy_ad.paddr);
                                         /* close AOI 1 */
                 break;
         case PLANE2_AOI1:
-                pmfbi = machine_data->fsl_diu_info[3]->par;
+                pmfbi = &data->mfb[3];
                 if (hw->desc[2] != ad->paddr) {
                                 /* AOI1 is not the first in the chain */
                         if (pmfbi->count > 0)
                                 /* AOI0 is open, must be the first */
                                 pmfbi->ad->next_ad = 0;
                 } else          /* AOI1 is the first in the chain */
-                        wr_reg_wa(&hw->desc[2], machine_data->dummy_ad->paddr);
+                        wr_reg_wa(&hw->desc[2], data->dummy_ad.paddr);
                                 /* close AOI 1 */
                 break;
         }
@@ -602,39 +583,33 @@ static void fsl_diu_disable_panel(struct fb_info *info)
 static void enable_lcdc(struct fb_info *info)
 {
         struct mfb_info *mfbi = info->par;
-        struct fsl_diu_data *machine_data = mfbi->parent;
-        struct diu __iomem *hw = machine_data->diu_reg;
+        struct fsl_diu_data *data = mfbi->parent;
+        struct diu __iomem *hw = data->diu_reg;
 
-        if (!machine_data->fb_enabled) {
-                out_be32(&hw->diu_mode, MFB_MODE1);
-                machine_data->fb_enabled++;
-        }
+        out_be32(&hw->diu_mode, MFB_MODE1);
 }
 
 static void disable_lcdc(struct fb_info *info)
 {
         struct mfb_info *mfbi = info->par;
-        struct fsl_diu_data *machine_data = mfbi->parent;
-        struct diu __iomem *hw = machine_data->diu_reg;
+        struct fsl_diu_data *data = mfbi->parent;
+        struct diu __iomem *hw = data->diu_reg;
 
-        if (machine_data->fb_enabled) {
-                out_be32(&hw->diu_mode, 0);
-                machine_data->fb_enabled = 0;
-        }
+        out_be32(&hw->diu_mode, 0);
 }
 
 static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
                                 struct fb_info *info)
 {
         struct mfb_info *lower_aoi_mfbi, *upper_aoi_mfbi, *mfbi = info->par;
-        struct fsl_diu_data *machine_data = mfbi->parent;
+        struct fsl_diu_data *data = mfbi->parent;
         int available_height, upper_aoi_bottom;
         enum mfb_index index = mfbi->index;
         int lower_aoi_is_open, upper_aoi_is_open;
         __u32 base_plane_width, base_plane_height, upper_aoi_height;
 
-        base_plane_width = machine_data->fsl_diu_info[0]->var.xres;
-        base_plane_height = machine_data->fsl_diu_info[0]->var.yres;
+        base_plane_width = data->fsl_diu_info[0].var.xres;
+        base_plane_height = data->fsl_diu_info[0].var.yres;
 
         if (mfbi->x_aoi_d < 0)
                 mfbi->x_aoi_d = 0;
@@ -649,7 +624,7 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
                 break;
         case PLANE1_AOI0:
         case PLANE2_AOI0:
-                lower_aoi_mfbi = machine_data->fsl_diu_info[index+1]->par;
+                lower_aoi_mfbi = data->fsl_diu_info[index+1].par;
                 lower_aoi_is_open = lower_aoi_mfbi->count > 0 ? 1 : 0;
                 if (var->xres > base_plane_width)
                         var->xres = base_plane_width;
@@ -667,9 +642,8 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
                 break;
         case PLANE1_AOI1:
         case PLANE2_AOI1:
-                upper_aoi_mfbi = machine_data->fsl_diu_info[index-1]->par;
-                upper_aoi_height =
-                                machine_data->fsl_diu_info[index-1]->var.yres;
+                upper_aoi_mfbi = data->fsl_diu_info[index-1].par;
+                upper_aoi_height = data->fsl_diu_info[index-1].var.yres;
                 upper_aoi_bottom = upper_aoi_mfbi->y_aoi_d + upper_aoi_height;
                 upper_aoi_is_open = upper_aoi_mfbi->count > 0 ? 1 : 0;
                 if (var->xres > base_plane_width)
@@ -809,33 +783,33 @@ static void update_lcdc(struct fb_info *info)
 {
         struct fb_var_screeninfo *var = &info->var;
         struct mfb_info *mfbi = info->par;
-        struct fsl_diu_data *machine_data = mfbi->parent;
+        struct fsl_diu_data *data = mfbi->parent;
         struct diu __iomem *hw;
         int i, j;
-        char __iomem *cursor_base, *gamma_table_base;
+        u8 *gamma_table_base;
 
         u32 temp;
 
-        hw = machine_data->diu_reg;
+        hw = data->diu_reg;
+
+        diu_ops.set_monitor_port(data->monitor_port);
+        gamma_table_base = data->gamma;
 
-        diu_ops.set_monitor_port(machine_data->monitor_port);
-        gamma_table_base = machine_data->gamma.vaddr;
-        cursor_base = machine_data->cursor.vaddr;
         /* Prep for DIU init  - gamma table, cursor table */
 
         for (i = 0; i <= 2; i++)
                 for (j = 0; j <= 255; j++)
                         *gamma_table_base++ = j;
 
-        diu_ops.set_gamma_table(machine_data->monitor_port,
-                                machine_data->gamma.vaddr);
+        if (diu_ops.set_gamma_table)
+                diu_ops.set_gamma_table(data->monitor_port, data->gamma);
 
         disable_lcdc(info);
 
         /* Program DIU registers */
 
-        out_be32(&hw->gamma, machine_data->gamma.paddr);
-        out_be32(&hw->cursor, machine_data->cursor.paddr);
+        out_be32(&hw->gamma, DMA_ADDR(data, gamma));
+        out_be32(&hw->cursor, DMA_ADDR(data, cursor));
 
         out_be32(&hw->bgnd, 0x007F7F7F);        /* BGND */
         out_be32(&hw->bgnd_wb, 0);              /* BGND_WB */
@@ -870,16 +844,17 @@ static void update_lcdc(struct fb_info *info)
 
 static int map_video_memory(struct fb_info *info)
 {
-        phys_addr_t phys;
         u32 smem_len = info->fix.line_length * info->var.yres_virtual;
+        void *p;
 
-        info->screen_base = fsl_diu_alloc(smem_len, &phys);
-        if (info->screen_base == NULL) {
+        p = alloc_pages_exact(smem_len, GFP_DMA | __GFP_ZERO);
+        if (!p) {
                 dev_err(info->dev, "unable to allocate fb memory\n");
                 return -ENOMEM;
         }
         mutex_lock(&info->mm_lock);
-        info->fix.smem_start = (unsigned long) phys;
+        info->screen_base = p;
+        info->fix.smem_start = virt_to_phys(info->screen_base);
         info->fix.smem_len = smem_len;
         mutex_unlock(&info->mm_lock);
         info->screen_size = info->fix.smem_len;
@@ -889,12 +864,17 @@ static int map_video_memory(struct fb_info *info)
 
 static void unmap_video_memory(struct fb_info *info)
 {
-        fsl_diu_free(info->screen_base, info->fix.smem_len);
+        void *p = info->screen_base;
+        size_t l = info->fix.smem_len;
+
         mutex_lock(&info->mm_lock);
         info->screen_base = NULL;
         info->fix.smem_start = 0;
         info->fix.smem_len = 0;
         mutex_unlock(&info->mm_lock);
+
+        if (p)
+                free_pages_exact(p, l);
 }
 
 /*
@@ -913,6 +893,59 @@ static int fsl_diu_set_aoi(struct fb_info *info)
         return 0;
 }
 
+/**
+ * fsl_diu_get_pixel_format: return the pixel format for a given color depth
+ *
+ * The pixel format is a 32-bit value that determine which bits in each
+ * pixel are to be used for each color.  This is the default function used
+ * if the platform does not define its own version.
+ */
+static u32 fsl_diu_get_pixel_format(unsigned int bits_per_pixel)
+{
+#define PF_BYTE_F               0x10000000
+#define PF_ALPHA_C_MASK         0x0E000000
+#define PF_ALPHA_C_SHIFT        25
+#define PF_BLUE_C_MASK          0x01800000
+#define PF_BLUE_C_SHIFT         23
+#define PF_GREEN_C_MASK         0x00600000
+#define PF_GREEN_C_SHIFT        21
+#define PF_RED_C_MASK           0x00180000
+#define PF_RED_C_SHIFT          19
+#define PF_PALETTE              0x00040000
+#define PF_PIXEL_S_MASK         0x00030000
+#define PF_PIXEL_S_SHIFT        16
+#define PF_COMP_3_MASK          0x0000F000
+#define PF_COMP_3_SHIFT         12
+#define PF_COMP_2_MASK          0x00000F00
+#define PF_COMP_2_SHIFT         8
+#define PF_COMP_1_MASK          0x000000F0
+#define PF_COMP_1_SHIFT         4
+#define PF_COMP_0_MASK          0x0000000F
+#define PF_COMP_0_SHIFT         0
+
+#define MAKE_PF(alpha, red, blue, green, size, c0, c1, c2, c3) \
+        cpu_to_le32(PF_BYTE_F | (alpha << PF_ALPHA_C_SHIFT) | \
+        (blue << PF_BLUE_C_SHIFT) | (green << PF_GREEN_C_SHIFT) | \
+        (red << PF_RED_C_SHIFT) | (c3 << PF_COMP_3_SHIFT) | \
+        (c2 << PF_COMP_2_SHIFT) | (c1 << PF_COMP_1_SHIFT) | \
+        (c0 << PF_COMP_0_SHIFT) | (size << PF_PIXEL_S_SHIFT))
+
+        switch (bits_per_pixel) {
+        case 32:
+                /* 0x88883316 */
+                return MAKE_PF(3, 2, 0, 1, 3, 8, 8, 8, 8);
+        case 24:
+                /* 0x88082219 */
+                return MAKE_PF(4, 0, 1, 2, 2, 0, 8, 8, 8);
+        case 16:
+                /* 0x65053118 */
+                return MAKE_PF(4, 2, 1, 0, 1, 5, 6, 5, 0);
+        default:
+                pr_err("fsl-diu: unsupported color depth %u\n", bits_per_pixel);
+                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
@@ -926,11 +959,11 @@ static int fsl_diu_set_par(struct fb_info *info)
         unsigned long len;
         struct fb_var_screeninfo *var = &info->var;
         struct mfb_info *mfbi = info->par;
-        struct fsl_diu_data *machine_data = mfbi->parent;
+        struct fsl_diu_data *data = mfbi->parent;
         struct diu_ad *ad = mfbi->ad;
         struct diu __iomem *hw;
 
-        hw = machine_data->diu_reg;
+        hw = data->diu_reg;
 
         set_fix(info);
         mfbi->cursor_reset = 1;
@@ -948,8 +981,12 @@ static int fsl_diu_set_par(struct fb_info *info)
                 }
         }
 
-        ad->pix_fmt = diu_ops.get_pixel_format(machine_data->monitor_port,
-                                               var->bits_per_pixel);
+        if (diu_ops.get_pixel_format)
+                ad->pix_fmt = diu_ops.get_pixel_format(data->monitor_port,
+                                                       var->bits_per_pixel);
+        else
+                ad->pix_fmt = fsl_diu_get_pixel_format(var->bits_per_pixel);
+
         ad->addr    = cpu_to_le32(info->fix.smem_start);
         ad->src_size_g_alpha = cpu_to_le32((var->yres_virtual << 12) |
                                 var->xres_virtual) | mfbi->g_alpha;
@@ -1208,21 +1245,6 @@ static struct fb_ops fsl_diu_ops = {
         .fb_release = fsl_diu_release,
 };
 
-static int init_fbinfo(struct fb_info *info)
-{
-        struct mfb_info *mfbi = info->par;
-
-        info->device = NULL;
-        info->var.activate = FB_ACTIVATE_NOW;
-        info->fbops = &fsl_diu_ops;
-        info->flags = FBINFO_FLAG_DEFAULT;
-        info->pseudo_palette = &mfbi->pseudo_palette;
-
-        /* Allocate colormap */
-        fb_alloc_cmap(&info->cmap, 16, 0);
-        return 0;
-}
-
 static int __devinit install_fb(struct fb_info *info)
 {
         int rc;
@@ -1232,8 +1254,15 @@ static int __devinit install_fb(struct fb_info *info)
         unsigned int dbsize = ARRAY_SIZE(fsl_diu_mode_db);
         int has_default_mode = 1;
 
-        if (init_fbinfo(info))
-                return -EINVAL;
+        info->var.activate = FB_ACTIVATE_NOW;
+        info->fbops = &fsl_diu_ops;
+        info->flags = FBINFO_DEFAULT | FBINFO_VIRTFB | FBINFO_PARTIAL_PAN_OK |
+                FBINFO_READS_FAST;
+        info->pseudo_palette = mfbi->pseudo_palette;
+
+        rc = fb_alloc_cmap(&info->cmap, 16, 0);
+        if (rc)
+                return rc;
 
         if (mfbi->index == PLANE0) {
                 if (mfbi->edid_data) {
@@ -1359,16 +1388,16 @@ static irqreturn_t fsl_diu_isr(int irq, void *dev_id)
         return IRQ_NONE;
 }
 
-static int request_irq_local(struct fsl_diu_data *machine_data)
+static int request_irq_local(struct fsl_diu_data *data)
 {
-        struct diu __iomem *hw = machine_data->diu_reg;
+        struct diu __iomem *hw = data->diu_reg;
         u32 ints;
         int ret;
 
         /* Read to clear the status */
         in_be32(&hw->int_status);
 
-        ret = request_irq(machine_data->irq, fsl_diu_isr, 0, "fsl-diu-fb", hw);
+        ret = request_irq(data->irq, fsl_diu_isr, 0, "fsl-diu-fb", hw);
         if (!ret) {
                 ints = INT_PARERR | INT_LS_BF_VS;
 #if !defined(CONFIG_NOT_COHERENT_CACHE)
@@ -1383,14 +1412,14 @@ static int request_irq_local(struct fsl_diu_data *machine_data)
         return ret;
 }
 
-static void free_irq_local(struct fsl_diu_data *machine_data)
+static void free_irq_local(struct fsl_diu_data *data)
 {
-        struct diu __iomem *hw = machine_data->diu_reg;
+        struct diu __iomem *hw = data->diu_reg;
 
         /* Disable all LCDC interrupt */
         out_be32(&hw->int_mask, 0x1f);
 
-        free_irq(machine_data->irq, NULL);
+        free_irq(data->irq, NULL);
 }
 
 #ifdef CONFIG_PM
@@ -1400,20 +1429,20 @@ static void free_irq_local(struct fsl_diu_data *machine_data)
  */
 static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state)
 {
-        struct fsl_diu_data *machine_data;
+        struct fsl_diu_data *data;
 
-        machine_data = dev_get_drvdata(&ofdev->dev);
-        disable_lcdc(machine_data->fsl_diu_info[0]);
+        data = dev_get_drvdata(&ofdev->dev);
+        disable_lcdc(data->fsl_diu_info[0]);
 
         return 0;
 }
 
 static int fsl_diu_resume(struct platform_device *ofdev)
 {
-        struct fsl_diu_data *machine_data;
+        struct fsl_diu_data *data;
 
-        machine_data = dev_get_drvdata(&ofdev->dev);
-        enable_lcdc(machine_data->fsl_diu_info[0]);
+        data = dev_get_drvdata(&ofdev->dev);
+        enable_lcdc(data->fsl_diu_info[0]);
 
         return 0;
 }
@@ -1423,56 +1452,24 @@ static int fsl_diu_resume(struct platform_device *ofdev)
 #define fsl_diu_resume NULL
 #endif                          /* CONFIG_PM */
 
-/* Align to 64-bit(8-byte), 32-byte, etc. */
-static int allocate_buf(struct device *dev, struct diu_addr *buf, u32 size,
-                        u32 bytes_align)
-{
-        u32 offset;
-        dma_addr_t mask;
-
-        buf->vaddr =
-                dma_alloc_coherent(dev, size + bytes_align, &buf->paddr,
-                                   GFP_DMA | __GFP_ZERO);
-        if (!buf->vaddr)
-                return -ENOMEM;
-
-        mask = bytes_align - 1;
-        offset = buf->paddr & mask;
-        if (offset) {
-                buf->offset = bytes_align - offset;
-                buf->paddr = buf->paddr + offset;
-        } else
-                buf->offset = 0;
-
-        return 0;
-}
-
-static void free_buf(struct device *dev, struct diu_addr *buf, u32 size,
-                     u32 bytes_align)
-{
-        dma_free_coherent(dev, size + bytes_align, buf->vaddr,
-                          buf->paddr - buf->offset);
-}
-
 static ssize_t store_monitor(struct device *device,
         struct device_attribute *attr, const char *buf, size_t count)
 {
         enum fsl_diu_monitor_port old_monitor_port;
-        struct fsl_diu_data *machine_data =
+        struct fsl_diu_data *data =
                 container_of(attr, struct fsl_diu_data, dev_attr);
 
-        old_monitor_port = machine_data->monitor_port;
-        machine_data->monitor_port = fsl_diu_name_to_port(buf);
+        old_monitor_port = data->monitor_port;
+        data->monitor_port = fsl_diu_name_to_port(buf);
 
-        if (old_monitor_port != machine_data->monitor_port) {
+        if (old_monitor_port != data->monitor_port) {
                 /* All AOIs need adjust pixel format
                  * fsl_diu_set_par only change the pixsel format here
                  * unlikely to fail. */
-                fsl_diu_set_par(machine_data->fsl_diu_info[0]);
-                fsl_diu_set_par(machine_data->fsl_diu_info[1]);
-                fsl_diu_set_par(machine_data->fsl_diu_info[2]);
-                fsl_diu_set_par(machine_data->fsl_diu_info[3]);
-                fsl_diu_set_par(machine_data->fsl_diu_info[4]);
+                unsigned int i;
+
+                for (i=0; i < NUM_AOIS; i++)
+                        fsl_diu_set_par(&data->fsl_diu_info[i]);
         }
         return count;
 }
@@ -1480,10 +1477,10 @@ static ssize_t store_monitor(struct device *device,
 static ssize_t show_monitor(struct device *device,
         struct device_attribute *attr, char *buf)
 {
-        struct fsl_diu_data *machine_data =
+        struct fsl_diu_data *data =
                 container_of(attr, struct fsl_diu_data, dev_attr);
 
-        switch (machine_data->monitor_port) {
+        switch (data->monitor_port) {
         case FSL_DIU_PORT_DVI:
                 return sprintf(buf, "DVI\n");
         case FSL_DIU_PORT_LVDS:
@@ -1499,28 +1496,52 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
         struct mfb_info *mfbi;
-        phys_addr_t dummy_ad_addr = 0;
-        int ret, i, error = 0;
-        struct fsl_diu_data *machine_data;
+        struct fsl_diu_data *data;
         int diu_mode;
+        dma_addr_t dma_addr; /* DMA addr of fsl_diu_data struct */
+        unsigned int i;
+        int ret;
 
-        machine_data = kzalloc(sizeof(struct fsl_diu_data), GFP_KERNEL);
-        if (!machine_data)
+        data = dma_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data),
+                                  &dma_addr, GFP_DMA | __GFP_ZERO);
+        if (!data)
                 return -ENOMEM;
+        data->dma_addr = dma_addr;
+
+        /*
+         * dma_alloc_coherent() uses a page allocator, so the address is
+         * always page-aligned.  We need the memory to be 32-byte aligned,
+         * so that's good.  However, if one day the allocator changes, we
+         * need to catch that.  It's not worth the effort to handle unaligned
+         * alloctions now because it's highly unlikely to ever be a problem.
+         */
+        if ((unsigned long)data & 31) {
+                dev_err(&pdev->dev, "misaligned allocation");
+                ret = -ENOMEM;
+                goto error;
+        }
 
-        spin_lock_init(&machine_data->reg_lock);
+        spin_lock_init(&data->reg_lock);
 
-        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++) {
-                machine_data->fsl_diu_info[i] =
-                        framebuffer_alloc(sizeof(struct mfb_info), &pdev->dev);
-                if (!machine_data->fsl_diu_info[i]) {
-                        dev_err(&pdev->dev, "cannot allocate memory\n");
-                        ret = -ENOMEM;
-                        goto error2;
-                }
-                mfbi = machine_data->fsl_diu_info[i]->par;
+        for (i = 0; i < NUM_AOIS; i++) {
+                struct fb_info *info = &data->fsl_diu_info[i];
+
+                info->device = &pdev->dev;
+                info->par = &data->mfb[i];
+
+                /*
+                 * We store the physical address of the AD in the reserved
+                 * 'paddr' field of the AD itself.
+                 */
+                data->ad[i].paddr = DMA_ADDR(data, ad[i]);
+
+                info->fix.smem_start = 0;
+
+                /* Initialize the AOI data structure */
+                mfbi = info->par;
                 memcpy(mfbi, &mfb_template[i], sizeof(struct mfb_info));
-                mfbi->parent = machine_data;
+                mfbi->parent = data;
+                mfbi->ad = &data->ad[i];
 
                 if (mfbi->index == PLANE0) {
                         const u8 *prop;
@@ -1534,158 +1555,102 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev)
                 }
         }
 
-        machine_data->diu_reg = of_iomap(np, 0);
-        if (!machine_data->diu_reg) {
+        data->diu_reg = of_iomap(np, 0);
+        if (!data->diu_reg) {
                 dev_err(&pdev->dev, "cannot map DIU registers\n");
                 ret = -EFAULT;
-                goto error2;
+                goto error;
         }
 
-        diu_mode = in_be32(&machine_data->diu_reg->diu_mode);
+        diu_mode = in_be32(&data->diu_reg->diu_mode);
         if (diu_mode == MFB_MODE0)
-                out_be32(&machine_data->diu_reg->diu_mode, 0); /* disable DIU */
+                out_be32(&data->diu_reg->diu_mode, 0); /* disable DIU */
 
         /* Get the IRQ of the DIU */
-        machine_data->irq = irq_of_parse_and_map(np, 0);
+        data->irq = irq_of_parse_and_map(np, 0);
 
-        if (!machine_data->irq) {
+        if (!data->irq) {
                 dev_err(&pdev->dev, "could not get DIU IRQ\n");
                 ret = -EINVAL;
                 goto error;
         }
-        machine_data->monitor_port = monitor_port;
-
-        /* Area descriptor memory pool aligns to 64-bit boundary */
-        if (allocate_buf(&pdev->dev, &machine_data->ad,
-                         sizeof(struct diu_ad) * FSL_AOI_NUM, 8))
-                return -ENOMEM;
-
-        /* Get memory for Gamma Table  - 32-byte aligned memory */
-        if (allocate_buf(&pdev->dev, &machine_data->gamma, 768, 32)) {
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        /* For performance, cursor bitmap buffer aligns to 32-byte boundary */
-        if (allocate_buf(&pdev->dev, &machine_data->cursor,
-                         MAX_CURS * MAX_CURS * 2, 32)) {
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        i = ARRAY_SIZE(machine_data->fsl_diu_info);
-        machine_data->dummy_ad = (struct diu_ad *)((u32)machine_data->ad.vaddr +
-                        machine_data->ad.offset) + i;
-        machine_data->dummy_ad->paddr = machine_data->ad.paddr +
-                        i * sizeof(struct diu_ad);
-        machine_data->dummy_aoi_virt = fsl_diu_alloc(64, &dummy_ad_addr);
-        if (!machine_data->dummy_aoi_virt) {
-                ret = -ENOMEM;
-                goto error;
-        }
-        machine_data->dummy_ad->addr = cpu_to_le32(dummy_ad_addr);
-        machine_data->dummy_ad->pix_fmt = 0x88882317;
-        machine_data->dummy_ad->src_size_g_alpha = cpu_to_le32((4 << 12) | 4);
-        machine_data->dummy_ad->aoi_size = cpu_to_le32((4 << 16) |  2);
-        machine_data->dummy_ad->offset_xyi = 0;
-        machine_data->dummy_ad->offset_xyd = 0;
-        machine_data->dummy_ad->next_ad = 0;
+        data->monitor_port = monitor_port;
+
+        /* Initialize the dummy Area Descriptor */
+        data->dummy_ad.addr = cpu_to_le32(DMA_ADDR(data, dummy_aoi));
+        data->dummy_ad.pix_fmt = 0x88882317;
+        data->dummy_ad.src_size_g_alpha = cpu_to_le32((4 << 12) | 4);
+        data->dummy_ad.aoi_size = cpu_to_le32((4 << 16) |  2);
+        data->dummy_ad.offset_xyi = 0;
+        data->dummy_ad.offset_xyd = 0;
+        data->dummy_ad.next_ad = 0;
+        data->dummy_ad.paddr = DMA_ADDR(data, dummy_ad);
 
         /*
          * Let DIU display splash screen if it was pre-initialized
          * by the bootloader, set dummy area descriptor otherwise.
          */
         if (diu_mode == MFB_MODE0)
-                out_be32(&machine_data->diu_reg->desc[0],
-                         machine_data->dummy_ad->paddr);
-
-        out_be32(&machine_data->diu_reg->desc[1], machine_data->dummy_ad->paddr);
-        out_be32(&machine_data->diu_reg->desc[2], machine_data->dummy_ad->paddr);
-
-        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++) {
-                machine_data->fsl_diu_info[i]->fix.smem_start = 0;
-                mfbi = machine_data->fsl_diu_info[i]->par;
-                mfbi->ad = (struct diu_ad *)((u32)machine_data->ad.vaddr
-                                        + machine_data->ad.offset) + i;
-                mfbi->ad->paddr =
-                        machine_data->ad.paddr + i * sizeof(struct diu_ad);
-                ret = install_fb(machine_data->fsl_diu_info[i]);
+                out_be32(&data->diu_reg->desc[0], data->dummy_ad.paddr);
+
+        out_be32(&data->diu_reg->desc[1], data->dummy_ad.paddr);
+        out_be32(&data->diu_reg->desc[2], data->dummy_ad.paddr);
+
+        for (i = 0; i < NUM_AOIS; i++) {
+                ret = install_fb(&data->fsl_diu_info[i]);
                 if (ret) {
                         dev_err(&pdev->dev, "could not register fb %d\n", i);
                         goto error;
                 }
         }
 
-        if (request_irq_local(machine_data)) {
+        if (request_irq_local(data)) {
                 dev_err(&pdev->dev, "could not claim irq\n");
                 goto error;
         }
 
-        sysfs_attr_init(&machine_data->dev_attr.attr);
-        machine_data->dev_attr.attr.name = "monitor";
-        machine_data->dev_attr.attr.mode = S_IRUGO|S_IWUSR;
-        machine_data->dev_attr.show = show_monitor;
-        machine_data->dev_attr.store = store_monitor;
-        error = device_create_file(machine_data->fsl_diu_info[0]->dev,
-                                  &machine_data->dev_attr);
-        if (error) {
+        sysfs_attr_init(&data->dev_attr.attr);
+        data->dev_attr.attr.name = "monitor";
+        data->dev_attr.attr.mode = S_IRUGO|S_IWUSR;
+        data->dev_attr.show = show_monitor;
+        data->dev_attr.store = store_monitor;
+        ret = device_create_file(&pdev->dev, &data->dev_attr);
+        if (ret) {
                 dev_err(&pdev->dev, "could not create sysfs file %s\n",
-                        machine_data->dev_attr.attr.name);
+                        data->dev_attr.attr.name);
         }
 
-        dev_set_drvdata(&pdev->dev, machine_data);
+        dev_set_drvdata(&pdev->dev, data);
         return 0;
 
 error:
-        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++)
-                uninstall_fb(machine_data->fsl_diu_info[i]);
-
-        if (machine_data->ad.vaddr)
-                free_buf(&pdev->dev, &machine_data->ad,
-                         sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
-        if (machine_data->gamma.vaddr)
-                free_buf(&pdev->dev, &machine_data->gamma, 768, 32);
-        if (machine_data->cursor.vaddr)
-                free_buf(&pdev->dev, &machine_data->cursor,
-                         MAX_CURS * MAX_CURS * 2, 32);
-        if (machine_data->dummy_aoi_virt)
-                fsl_diu_free(machine_data->dummy_aoi_virt, 64);
-        iounmap(machine_data->diu_reg);
-
-error2:
-        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++)
-                if (machine_data->fsl_diu_info[i])
-                        framebuffer_release(machine_data->fsl_diu_info[i]);
-        kfree(machine_data);
+        for (i = 0; i < NUM_AOIS; i++)
+                uninstall_fb(&data->fsl_diu_info[i]);
+
+        iounmap(data->diu_reg);
+
+        dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data,
+                          data->dma_addr);
 
         return ret;
 }
 
 static int fsl_diu_remove(struct platform_device *pdev)
 {
-        struct fsl_diu_data *machine_data;
+        struct fsl_diu_data *data;
         int i;
 
-        machine_data = dev_get_drvdata(&pdev->dev);
-        disable_lcdc(machine_data->fsl_diu_info[0]);
-        free_irq_local(machine_data);
-        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++)
-                uninstall_fb(machine_data->fsl_diu_info[i]);
-        if (machine_data->ad.vaddr)
-                free_buf(&pdev->dev, &machine_data->ad,
-                         sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
-        if (machine_data->gamma.vaddr)
-                free_buf(&pdev->dev, &machine_data->gamma, 768, 32);
-        if (machine_data->cursor.vaddr)
-                free_buf(&pdev->dev, &machine_data->cursor,
-                         MAX_CURS * MAX_CURS * 2, 32);
-        if (machine_data->dummy_aoi_virt)
-                fsl_diu_free(machine_data->dummy_aoi_virt, 64);
-        iounmap(machine_data->diu_reg);
-        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++)
-                if (machine_data->fsl_diu_info[i])
-                        framebuffer_release(machine_data->fsl_diu_info[i]);
-        kfree(machine_data);
+        data = dev_get_drvdata(&pdev->dev);
+        disable_lcdc(&data->fsl_diu_info[0]);
+        free_irq_local(data);
+
+        for (i = 0; i < NUM_AOIS; i++)
+                uninstall_fb(&data->fsl_diu_info[i]);
+
+        iounmap(data->diu_reg);
+
+        dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data,
+                          data->dma_addr);
 
         return 0;
 }
diff --git a/drivers/video/grvga.c b/drivers/video/grvga.c
index f37e02538203..da066c210923 100644
--- a/drivers/video/grvga.c
+++ b/drivers/video/grvga.c
@@ -70,7 +70,7 @@ static const struct fb_videomode grvga_modedb[] = {
     }
  };
 
-static struct fb_fix_screeninfo grvga_fix __initdata = {
+static struct fb_fix_screeninfo grvga_fix __devinitdata = {
         .id =           "AG SVGACTRL",
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
@@ -267,7 +267,7 @@ static struct fb_ops grvga_ops = {
         .fb_imageblit   = cfb_imageblit
 };
 
-static int __init grvga_parse_custom(char *options,
+static int __devinit grvga_parse_custom(char *options,
                                      struct fb_var_screeninfo *screendata)
 {
         char *this_opt;
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 318f6fb895b2..b83f36190cae 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -135,8 +135,8 @@ static struct pci_driver i810fb_driver = {
 static char *mode_option __devinitdata = NULL;
 static int vram       __devinitdata = 4;
 static int bpp        __devinitdata = 8;
-static int mtrr       __devinitdata;
-static int accel      __devinitdata;
+static bool mtrr      __devinitdata;
+static bool accel     __devinitdata;
 static int hsync1     __devinitdata;
 static int hsync2     __devinitdata;
 static int vsync1     __devinitdata;
@@ -144,10 +144,10 @@ static int vsync2     __devinitdata;
 static int xres       __devinitdata;
 static int yres;
 static int vyres      __devinitdata;
-static int sync       __devinitdata;
-static int extvga     __devinitdata;
-static int dcolor     __devinitdata;
-static int ddc3       __devinitdata = 2;
+static bool sync      __devinitdata;
+static bool extvga    __devinitdata;
+static bool dcolor    __devinitdata;
+static bool ddc3      __devinitdata;
 
 /*------------------------------------------------------------*/
 
@@ -1776,7 +1776,7 @@ static void __devinit i810_init_defaults(struct i810fb_par *par,
         if (sync) 
                 par->dev_flags |= ALWAYS_SYNC;
 
-        par->ddc_num = ddc3;
+        par->ddc_num = (ddc3 ? 3 : 2);
 
         if (bpp < 8)
                 bpp = 8;
@@ -1999,7 +1999,7 @@ static int __devinit i810fb_setup(char *options)
                 else if (!strncmp(this_opt, "dcolor", 6))
                         dcolor = 1;
                 else if (!strncmp(this_opt, "ddc3", 4))
-                        ddc3 = 3;
+                        ddc3 = true;
                 else
                         mode_option = this_opt;
         }
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 44bf8d4a216b..401a56e250bd 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -147,7 +147,6 @@ static struct fb_var_screeninfo vesafb_defined = {
         39721L,48L,16L,33L,10L,
         96L,2L,~0,      /* No sync info */
         FB_VMODE_NONINTERLACED,
-        0, {0,0,0,0,0}
 };
 
 
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index d7112c39614b..02796a4317a9 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -593,7 +593,6 @@ static struct fb_var_screeninfo matroxfb_dh_defined = {
                 39721L,48L,16L,33L,10L,
                 96L,2,0,        /* no sync info */
                 FB_VMODE_NONINTERLACED,
-                0, {0,0,0,0,0}
 };
 
 static int matroxfb_dh_regit(const struct matrox_fb_info *minfo,
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 6ce34160da78..55bf6196b7a0 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -1053,18 +1053,7 @@ static struct platform_driver mbxfb_driver = {
         },
 };
 
-int __devinit mbxfb_init(void)
-{
-        return platform_driver_register(&mbxfb_driver);
-}
-
-static void __devexit mbxfb_exit(void)
-{
-        platform_driver_unregister(&mbxfb_driver);
-}
-
-module_init(mbxfb_init);
-module_exit(mbxfb_exit);
+module_platform_driver(mbxfb_driver);
 
 MODULE_DESCRIPTION("loadable framebuffer driver for Marathon device");
 MODULE_AUTHOR("Mike Rapoport, Compulab");
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index eb3c5eea1a0f..4a89f889852d 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -902,18 +902,7 @@ static struct platform_driver mxsfb_driver = {
         },
 };
 
-static int __init mxsfb_init(void)
-{
-        return platform_driver_register(&mxsfb_driver);
-}
-
-static void __exit mxsfb_exit(void)
-{
-        platform_driver_unregister(&mxsfb_driver);
-}
-
-module_init(mxsfb_init);
-module_exit(mxsfb_exit);
+module_platform_driver(mxsfb_driver);
 
 MODULE_DESCRIPTION("Freescale mxs framebuffer driver");
 MODULE_AUTHOR("Sascha Hauer, Pengutronix");
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index d1fbbd888cf4..e10f551ade21 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -762,18 +762,7 @@ static struct platform_driver nuc900fb_driver = {
         },
 };
 
-int __devinit nuc900fb_init(void)
-{
-        return platform_driver_register(&nuc900fb_driver);
-}
-
-static void __exit nuc900fb_cleanup(void)
-{
-        platform_driver_unregister(&nuc900fb_driver);
-}
-
-module_init(nuc900fb_init);
-module_exit(nuc900fb_cleanup);
+module_platform_driver(nuc900fb_driver);
 
 MODULE_DESCRIPTION("Framebuffer driver for the NUC900");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 6978ae4ef83a..0fdd6f6873bf 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -198,7 +198,7 @@ static int ams_delta_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver ams_delta_panel_driver = {
+static struct platform_driver ams_delta_panel_driver = {
         .probe          = ams_delta_panel_probe,
         .remove         = ams_delta_panel_remove,
         .suspend        = ams_delta_panel_suspend,
@@ -209,15 +209,4 @@ struct platform_driver ams_delta_panel_driver = {
         },
 };
 
-static int __init ams_delta_panel_drv_init(void)
-{
-        return platform_driver_register(&ams_delta_panel_driver);
-}
-
-static void __exit ams_delta_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&ams_delta_panel_driver);
-}
-
-module_init(ams_delta_panel_drv_init);
-module_exit(ams_delta_panel_drv_cleanup);
+module_platform_driver(ams_delta_panel_driver);
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 622ad839fd9d..49bdeca81e50 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -113,7 +113,7 @@ static int h3_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver h3_panel_driver = {
+static struct platform_driver h3_panel_driver = {
         .probe          = h3_panel_probe,
         .remove         = h3_panel_remove,
         .suspend        = h3_panel_suspend,
@@ -124,16 +124,4 @@ struct platform_driver h3_panel_driver = {
         },
 };
 
-static int __init h3_panel_drv_init(void)
-{
-        return platform_driver_register(&h3_panel_driver);
-}
-
-static void __exit h3_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&h3_panel_driver);
-}
-
-module_init(h3_panel_drv_init);
-module_exit(h3_panel_drv_cleanup);
-
+module_platform_driver(h3_panel_driver);
diff --git a/drivers/video/omap/lcd_htcherald.c b/drivers/video/omap/lcd_htcherald.c
index 4802419da83b..20f477851d54 100644
--- a/drivers/video/omap/lcd_htcherald.c
+++ b/drivers/video/omap/lcd_htcherald.c
@@ -104,7 +104,7 @@ static int htcherald_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver htcherald_panel_driver = {
+static struct platform_driver htcherald_panel_driver = {
         .probe          = htcherald_panel_probe,
         .remove         = htcherald_panel_remove,
         .suspend        = htcherald_panel_suspend,
@@ -115,16 +115,4 @@ struct platform_driver htcherald_panel_driver = {
         },
 };
 
-static int __init htcherald_panel_drv_init(void)
-{
-        return platform_driver_register(&htcherald_panel_driver);
-}
-
-static void __exit htcherald_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&htcherald_panel_driver);
-}
-
-module_init(htcherald_panel_drv_init);
-module_exit(htcherald_panel_drv_cleanup);
-
+module_platform_driver(htcherald_panel_driver);
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c
index 3271f1643b26..b38b1dd15ce3 100644
--- a/drivers/video/omap/lcd_inn1510.c
+++ b/drivers/video/omap/lcd_inn1510.c
@@ -98,7 +98,7 @@ static int innovator1510_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver innovator1510_panel_driver = {
+static struct platform_driver innovator1510_panel_driver = {
         .probe          = innovator1510_panel_probe,
         .remove         = innovator1510_panel_remove,
         .suspend        = innovator1510_panel_suspend,
@@ -109,16 +109,4 @@ struct platform_driver innovator1510_panel_driver = {
         },
 };
 
-static int __init innovator1510_panel_drv_init(void)
-{
-        return platform_driver_register(&innovator1510_panel_driver);
-}
-
-static void __exit innovator1510_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&innovator1510_panel_driver);
-}
-
-module_init(innovator1510_panel_drv_init);
-module_exit(innovator1510_panel_drv_cleanup);
-
+module_platform_driver(innovator1510_panel_driver);
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 12cc52a70f96..7e8bd8e08a98 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -122,7 +122,7 @@ static int innovator1610_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver innovator1610_panel_driver = {
+static struct platform_driver innovator1610_panel_driver = {
         .probe          = innovator1610_panel_probe,
         .remove         = innovator1610_panel_remove,
         .suspend        = innovator1610_panel_suspend,
@@ -133,16 +133,4 @@ struct platform_driver innovator1610_panel_driver = {
         },
 };
 
-static int __init innovator1610_panel_drv_init(void)
-{
-        return platform_driver_register(&innovator1610_panel_driver);
-}
-
-static void __exit innovator1610_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&innovator1610_panel_driver);
-}
-
-module_init(innovator1610_panel_drv_init);
-module_exit(innovator1610_panel_drv_cleanup);
-
+module_platform_driver(innovator1610_panel_driver);
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index eb381db7fe51..8d546dd55e81 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -603,7 +603,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
         .driver = {
                 .name   = MIPID_MODULE_NAME,
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe  = mipid_spi_probe,
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index 6f8d13c41202..5914220dfa9c 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -116,7 +116,7 @@ static int osk_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver osk_panel_driver = {
+static struct platform_driver osk_panel_driver = {
         .probe          = osk_panel_probe,
         .remove         = osk_panel_remove,
         .suspend        = osk_panel_suspend,
@@ -127,16 +127,4 @@ struct platform_driver osk_panel_driver = {
         },
 };
 
-static int __init osk_panel_drv_init(void)
-{
-        return platform_driver_register(&osk_panel_driver);
-}
-
-static void __exit osk_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&osk_panel_driver);
-}
-
-module_init(osk_panel_drv_init);
-module_exit(osk_panel_drv_cleanup);
-
+module_platform_driver(osk_panel_driver);
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c
index 4cb301750d02..88c31eb0cd6c 100644
--- a/drivers/video/omap/lcd_palmte.c
+++ b/drivers/video/omap/lcd_palmte.c
@@ -97,7 +97,7 @@ static int palmte_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver palmte_panel_driver = {
+static struct platform_driver palmte_panel_driver = {
         .probe          = palmte_panel_probe,
         .remove         = palmte_panel_remove,
         .suspend        = palmte_panel_suspend,
@@ -108,16 +108,4 @@ struct platform_driver palmte_panel_driver = {
         },
 };
 
-static int __init palmte_panel_drv_init(void)
-{
-        return platform_driver_register(&palmte_panel_driver);
-}
-
-static void __exit palmte_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&palmte_panel_driver);
-}
-
-module_init(palmte_panel_drv_init);
-module_exit(palmte_panel_drv_cleanup);
-
+module_platform_driver(palmte_panel_driver);
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c
index b51b332e5a2b..aaf3c8ba1243 100644
--- a/drivers/video/omap/lcd_palmtt.c
+++ b/drivers/video/omap/lcd_palmtt.c
@@ -102,7 +102,7 @@ static int palmtt_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver palmtt_panel_driver = {
+static struct platform_driver palmtt_panel_driver = {
         .probe          = palmtt_panel_probe,
         .remove         = palmtt_panel_remove,
         .suspend        = palmtt_panel_suspend,
@@ -113,15 +113,4 @@ struct platform_driver palmtt_panel_driver = {
         },
 };
 
-static int __init palmtt_panel_drv_init(void)
-{
-        return platform_driver_register(&palmtt_panel_driver);
-}
-
-static void __exit palmtt_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&palmtt_panel_driver);
-}
-
-module_init(palmtt_panel_drv_init);
-module_exit(palmtt_panel_drv_cleanup);
+module_platform_driver(palmtt_panel_driver);
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c
index 2334e56536bc..3b7d8aa1cf34 100644
--- a/drivers/video/omap/lcd_palmz71.c
+++ b/drivers/video/omap/lcd_palmz71.c
@@ -98,7 +98,7 @@ static int palmz71_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver palmz71_panel_driver = {
+static struct platform_driver palmz71_panel_driver = {
         .probe          = palmz71_panel_probe,
         .remove         = palmz71_panel_remove,
         .suspend        = palmz71_panel_suspend,
@@ -109,15 +109,4 @@ struct platform_driver palmz71_panel_driver = {
         },
 };
 
-static int __init palmz71_panel_drv_init(void)
-{
-        return platform_driver_register(&palmz71_panel_driver);
-}
-
-static void __exit palmz71_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&palmz71_panel_driver);
-}
-
-module_init(palmz71_panel_drv_init);
-module_exit(palmz71_panel_drv_cleanup);
+module_platform_driver(palmz71_panel_driver);
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 8d8e1fe1901c..74d29b552901 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -41,7 +41,7 @@ config PANEL_NEC_NL8048HL11_01B
 
 config PANEL_PICODLP
         tristate "TI PICO DLP mini-projector"
-        depends on OMAP2_DSS && I2C
+        depends on OMAP2_DSS_DPI && I2C
         help
                 A mini-projector used in TI's SDP4430 and EVM boards
                 For more info please visit http://www.dlp.com/projector/
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index dbd59b8e5b36..51a87e149e24 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -803,7 +803,6 @@ static int acx565akm_spi_remove(struct spi_device *spi)
 static struct spi_driver acx565akm_spi_driver = {
         .driver = {
                 .name   = "acx565akm",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe  = acx565akm_spi_probe,
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 519c47d2057f..28b9a6d61b0f 100644
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -297,6 +297,72 @@ static struct panel_config generic_dpi_panels[] = {
 
                 .name                   = "apollon",
         },
+        /* FocalTech ETM070003DH6 */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 480,
+
+                        .pixel_clock    = 28000,
+
+                        .hsw            = 48,
+                        .hfp            = 40,
+                        .hbp            = 40,
+
+                        .vsw            = 3,
+                        .vfp            = 13,
+                        .vbp            = 29,
+                },
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS,
+                .name                   = "focaltech_etm070003dh6",
+        },
+
+        /* Microtips Technologies - UMSH-8173MD */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 480,
+
+                        .pixel_clock    = 34560,
+
+                        .hsw            = 13,
+                        .hfp            = 101,
+                        .hbp            = 101,
+
+                        .vsw            = 23,
+                        .vfp            = 1,
+                        .vbp            = 1,
+                },
+                .acbi                   = 0x0,
+                .acb                    = 0x0,
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC,
+                .power_on_delay         = 0,
+                .power_off_delay        = 0,
+                .name                   = "microtips_umsh_8173md",
+        },
+
+        /* OrtusTech COM43H4M10XTC */
+        {
+                {
+                        .x_res          = 480,
+                        .y_res          = 272,
+
+                        .pixel_clock    = 8000,
+
+                        .hsw            = 41,
+                        .hfp            = 8,
+                        .hbp            = 4,
+
+                        .vsw            = 10,
+                        .vfp            = 4,
+                        .vbp            = 2,
+                },
+                .config                 = OMAP_DSS_LCD_TFT,
+
+                .name                   = "ortustech_com43h4m10xtc",
+        },
 };
 
 struct panel_drv_data {
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index 150e8bae35a1..dc9408dc93d1 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -708,7 +708,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
         .driver = {
                 .name   = "lcd_mipid",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe  = mipid_spi_probe,
diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
index 2ba9d0ca187c..0eb31caddca8 100644
--- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
+++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -163,50 +163,93 @@ static void nec_8048_panel_remove(struct omap_dss_device *dssdev)
         kfree(necd);
 }
 
-static int nec_8048_panel_enable(struct omap_dss_device *dssdev)
+static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)
 {
-        int r = 0;
+        int r;
         struct nec_8048_data *necd = dev_get_drvdata(&dssdev->dev);
         struct backlight_device *bl = necd->bl;
 
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+                return 0;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
         if (dssdev->platform_enable) {
                 r = dssdev->platform_enable(dssdev);
                 if (r)
-                        return r;
+                        goto err1;
         }
 
         r = nec_8048_bl_update_status(bl);
         if (r < 0)
                 dev_err(&dssdev->dev, "failed to set lcd brightness\n");
 
-        r = omapdss_dpi_display_enable(dssdev);
-
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
         return r;
 }
 
-static void nec_8048_panel_disable(struct omap_dss_device *dssdev)
+static void nec_8048_panel_power_off(struct omap_dss_device *dssdev)
 {
         struct nec_8048_data *necd = dev_get_drvdata(&dssdev->dev);
         struct backlight_device *bl = necd->bl;
 
-        omapdss_dpi_display_disable(dssdev);
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+                return;
 
         bl->props.brightness = 0;
         nec_8048_bl_update_status(bl);
 
         if (dssdev->platform_disable)
                 dssdev->platform_disable(dssdev);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int nec_8048_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = nec_8048_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void nec_8048_panel_disable(struct omap_dss_device *dssdev)
+{
+        nec_8048_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
 static int nec_8048_panel_suspend(struct omap_dss_device *dssdev)
 {
-        nec_8048_panel_disable(dssdev);
+        nec_8048_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
         return 0;
 }
 
 static int nec_8048_panel_resume(struct omap_dss_device *dssdev)
 {
-        return nec_8048_panel_enable(dssdev);
+        int r;
+
+        r = nec_8048_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
 }
 
 static int nec_8048_recommended_bpp(struct omap_dss_device *dssdev)
@@ -303,7 +346,6 @@ static struct spi_driver nec_8048_spi_driver = {
         .resume         = nec_8048_spi_resume,
         .driver         = {
                 .name   = "nec_8048_spi",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
 };
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 80c3f6ab1a94..00c5c615585f 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -198,12 +198,6 @@ struct taal_data {
         bool te_enabled;
 
         atomic_t do_update;
-        struct {
-                u16 x;
-                u16 y;
-                u16 w;
-                u16 h;
-        } update_region;
         int channel;
 
         struct delayed_work te_timeout_work;
@@ -1188,6 +1182,10 @@ static int taal_power_on(struct omap_dss_device *dssdev)
         if (r)
                 goto err;
 
+        r = dsi_enable_video_output(dssdev, td->channel);
+        if (r)
+                goto err;
+
         td->enabled = 1;
 
         if (!td->intro_printed) {
@@ -1217,6 +1215,8 @@ static void taal_power_off(struct omap_dss_device *dssdev)
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
         int r;
 
+        dsi_disable_video_output(dssdev, td->channel);
+
         r = taal_dcs_write_0(td, MIPI_DCS_SET_DISPLAY_OFF);
         if (!r)
                 r = taal_sleep_in(td);
@@ -1394,12 +1394,8 @@ static irqreturn_t taal_te_isr(int irq, void *data)
         if (old) {
                 cancel_delayed_work(&td->te_timeout_work);
 
-                r = omap_dsi_update(dssdev, td->channel,
-                                td->update_region.x,
-                                td->update_region.y,
-                                td->update_region.w,
-                                td->update_region.h,
-                                taal_framedone_cb, dssdev);
+                r = omap_dsi_update(dssdev, td->channel, taal_framedone_cb,
+                                dssdev);
                 if (r)
                         goto err;
         }
@@ -1444,26 +1440,20 @@ static int taal_update(struct omap_dss_device *dssdev,
                 goto err;
         }
 
-        r = omap_dsi_prepare_update(dssdev, &x, &y, &w, &h, true);
-        if (r)
-                goto err;
-
-        r = taal_set_update_window(td, x, y, w, h);
+        /* XXX no need to send this every frame, but dsi break if not done */
+        r = taal_set_update_window(td, 0, 0,
+                        td->panel_config->timings.x_res,
+                        td->panel_config->timings.y_res);
         if (r)
                 goto err;
 
         if (td->te_enabled && panel_data->use_ext_te) {
-                td->update_region.x = x;
-                td->update_region.y = y;
-                td->update_region.w = w;
-                td->update_region.h = h;
-                barrier();
                 schedule_delayed_work(&td->te_timeout_work,
                                 msecs_to_jiffies(250));
                 atomic_set(&td->do_update, 1);
         } else {
-                r = omap_dsi_update(dssdev, td->channel, x, y, w, h,
-                                taal_framedone_cb, dssdev);
+                r = omap_dsi_update(dssdev, td->channel, taal_framedone_cb,
+                                dssdev);
                 if (r)
                         goto err;
         }
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index 2462b9ec6662..e6649aa89591 100644
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -512,7 +512,6 @@ static int __devexit tpo_td043_spi_remove(struct spi_device *spi)
 static struct spi_driver tpo_td043_spi_driver = {
         .driver = {
                 .name   = "tpo_td043mtea1_panel_spi",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe  = tpo_td043_spi_probe,
diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile
index bd34ac5b2026..5c450b0f94d0 100644
--- a/drivers/video/omap2/dss/Makefile
+++ b/drivers/video/omap2/dss/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_OMAP2_DSS) += omapdss.o
-omapdss-y := core.o dss.o dss_features.o dispc.o display.o manager.o overlay.o
+omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o display.o \
+        manager.o overlay.o apply.o
 omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
 omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
 omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
new file mode 100644
index 000000000000..052dc874cd3d
--- /dev/null
+++ b/drivers/video/omap2/dss/apply.c
@@ -0,0 +1,1324 @@
+/*
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Tomi Valkeinen <tomi.valkeinen@ti.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.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "APPLY"
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/jiffies.h>
+
+#include <video/omapdss.h>
+
+#include "dss.h"
+#include "dss_features.h"
+
+/*
+ * We have 4 levels of cache for the dispc settings. First two are in SW and
+ * the latter two in HW.
+ *
+ *       set_info()
+ *          v
+ * +--------------------+
+ * |     user_info      |
+ * +--------------------+
+ *          v
+ *        apply()
+ *          v
+ * +--------------------+
+ * |       info         |
+ * +--------------------+
+ *          v
+ *      write_regs()
+ *          v
+ * +--------------------+
+ * |  shadow registers  |
+ * +--------------------+
+ *          v
+ * VFP or lcd/digit_enable
+ *          v
+ * +--------------------+
+ * |      registers     |
+ * +--------------------+
+ */
+
+struct ovl_priv_data {
+
+        bool user_info_dirty;
+        struct omap_overlay_info user_info;
+
+        bool info_dirty;
+        struct omap_overlay_info info;
+
+        bool shadow_info_dirty;
+
+        bool extra_info_dirty;
+        bool shadow_extra_info_dirty;
+
+        bool enabled;
+        enum omap_channel channel;
+        u32 fifo_low, fifo_high;
+
+        /*
+         * True if overlay is to be enabled. Used to check and calculate configs
+         * for the overlay before it is enabled in the HW.
+         */
+        bool enabling;
+};
+
+struct mgr_priv_data {
+
+        bool user_info_dirty;
+        struct omap_overlay_manager_info user_info;
+
+        bool info_dirty;
+        struct omap_overlay_manager_info info;
+
+        bool shadow_info_dirty;
+
+        /* If true, GO bit is up and shadow registers cannot be written.
+         * Never true for manual update displays */
+        bool busy;
+
+        /* If true, dispc output is enabled */
+        bool updating;
+
+        /* If true, a display is enabled using this manager */
+        bool enabled;
+};
+
+static struct {
+        struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS];
+        struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS];
+
+        bool irq_enabled;
+} dss_data;
+
+/* protects dss_data */
+static spinlock_t data_lock;
+/* lock for blocking functions */
+static DEFINE_MUTEX(apply_lock);
+static DECLARE_COMPLETION(extra_updated_completion);
+
+static void dss_register_vsync_isr(void);
+
+static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl)
+{
+        return &dss_data.ovl_priv_data_array[ovl->id];
+}
+
+static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)
+{
+        return &dss_data.mgr_priv_data_array[mgr->id];
+}
+
+void dss_apply_init(void)
+{
+        const int num_ovls = dss_feat_get_num_ovls();
+        int i;
+
+        spin_lock_init(&data_lock);
+
+        for (i = 0; i < num_ovls; ++i) {
+                struct ovl_priv_data *op;
+
+                op = &dss_data.ovl_priv_data_array[i];
+
+                op->info.global_alpha = 255;
+
+                switch (i) {
+                case 0:
+                        op->info.zorder = 0;
+                        break;
+                case 1:
+                        op->info.zorder =
+                                dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 3 : 0;
+                        break;
+                case 2:
+                        op->info.zorder =
+                                dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 2 : 0;
+                        break;
+                case 3:
+                        op->info.zorder =
+                                dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 1 : 0;
+                        break;
+                }
+
+                op->user_info = op->info;
+        }
+}
+
+static bool ovl_manual_update(struct omap_overlay *ovl)
+{
+        return ovl->manager->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
+}
+
+static bool mgr_manual_update(struct omap_overlay_manager *mgr)
+{
+        return mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
+}
+
+static int dss_check_settings_low(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev, bool applying)
+{
+        struct omap_overlay_info *oi;
+        struct omap_overlay_manager_info *mi;
+        struct omap_overlay *ovl;
+        struct omap_overlay_info *ois[MAX_DSS_OVERLAYS];
+        struct ovl_priv_data *op;
+        struct mgr_priv_data *mp;
+
+        mp = get_mgr_priv(mgr);
+
+        if (applying && mp->user_info_dirty)
+                mi = &mp->user_info;
+        else
+                mi = &mp->info;
+
+        /* collect the infos to be tested into the array */
+        list_for_each_entry(ovl, &mgr->overlays, list) {
+                op = get_ovl_priv(ovl);
+
+                if (!op->enabled && !op->enabling)
+                        oi = NULL;
+                else if (applying && op->user_info_dirty)
+                        oi = &op->user_info;
+                else
+                        oi = &op->info;
+
+                ois[ovl->id] = oi;
+        }
+
+        return dss_mgr_check(mgr, dssdev, mi, ois);
+}
+
+/*
+ * check manager and overlay settings using overlay_info from data->info
+ */
+static int dss_check_settings(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev)
+{
+        return dss_check_settings_low(mgr, dssdev, false);
+}
+
+/*
+ * check manager and overlay settings using overlay_info from ovl->info if
+ * dirty and from data->info otherwise
+ */
+static int dss_check_settings_apply(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev)
+{
+        return dss_check_settings_low(mgr, dssdev, true);
+}
+
+static bool need_isr(void)
+{
+        const int num_mgrs = dss_feat_get_num_mgrs();
+        int i;
+
+        for (i = 0; i < num_mgrs; ++i) {
+                struct omap_overlay_manager *mgr;
+                struct mgr_priv_data *mp;
+                struct omap_overlay *ovl;
+
+                mgr = omap_dss_get_overlay_manager(i);
+                mp = get_mgr_priv(mgr);
+
+                if (!mp->enabled)
+                        continue;
+
+                if (mgr_manual_update(mgr)) {
+                        /* to catch FRAMEDONE */
+                        if (mp->updating)
+                                return true;
+                } else {
+                        /* to catch GO bit going down */
+                        if (mp->busy)
+                                return true;
+
+                        /* to write new values to registers */
+                        if (mp->info_dirty)
+                                return true;
+
+                        /* to set GO bit */
+                        if (mp->shadow_info_dirty)
+                                return true;
+
+                        list_for_each_entry(ovl, &mgr->overlays, list) {
+                                struct ovl_priv_data *op;
+
+                                op = get_ovl_priv(ovl);
+
+                                /*
+                                 * NOTE: we check extra_info flags even for
+                                 * disabled overlays, as extra_infos need to be
+                                 * always written.
+                                 */
+
+                                /* to write new values to registers */
+                                if (op->extra_info_dirty)
+                                        return true;
+
+                                /* to set GO bit */
+                                if (op->shadow_extra_info_dirty)
+                                        return true;
+
+                                if (!op->enabled)
+                                        continue;
+
+                                /* to write new values to registers */
+                                if (op->info_dirty)
+                                        return true;
+
+                                /* to set GO bit */
+                                if (op->shadow_info_dirty)
+                                        return true;
+                        }
+                }
+        }
+
+        return false;
+}
+
+static bool need_go(struct omap_overlay_manager *mgr)
+{
+        struct omap_overlay *ovl;
+        struct mgr_priv_data *mp;
+        struct ovl_priv_data *op;
+
+        mp = get_mgr_priv(mgr);
+
+        if (mp->shadow_info_dirty)
+                return true;
+
+        list_for_each_entry(ovl, &mgr->overlays, list) {
+                op = get_ovl_priv(ovl);
+                if (op->shadow_info_dirty || op->shadow_extra_info_dirty)
+                        return true;
+        }
+
+        return false;
+}
+
+/* returns true if an extra_info field is currently being updated */
+static bool extra_info_update_ongoing(void)
+{
+        const int num_ovls = omap_dss_get_num_overlays();
+        struct ovl_priv_data *op;
+        struct omap_overlay *ovl;
+        struct mgr_priv_data *mp;
+        int i;
+
+        for (i = 0; i < num_ovls; ++i) {
+                ovl = omap_dss_get_overlay(i);
+                op = get_ovl_priv(ovl);
+
+                if (!ovl->manager)
+                        continue;
+
+                mp = get_mgr_priv(ovl->manager);
+
+                if (!mp->enabled)
+                        continue;
+
+                if (!mp->updating)
+                        continue;
+
+                if (op->extra_info_dirty || op->shadow_extra_info_dirty)
+                        return true;
+        }
+
+        return false;
+}
+
+/* wait until no extra_info updates are pending */
+static void wait_pending_extra_info_updates(void)
+{
+        bool updating;
+        unsigned long flags;
+        unsigned long t;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        updating = extra_info_update_ongoing();
+
+        if (!updating) {
+                spin_unlock_irqrestore(&data_lock, flags);
+                return;
+        }
+
+        init_completion(&extra_updated_completion);
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        t = msecs_to_jiffies(500);
+        wait_for_completion_timeout(&extra_updated_completion, t);
+
+        updating = extra_info_update_ongoing();
+
+        WARN_ON(updating);
+}
+
+int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
+{
+        unsigned long timeout = msecs_to_jiffies(500);
+        struct mgr_priv_data *mp;
+        u32 irq;
+        int r;
+        int i;
+        struct omap_dss_device *dssdev = mgr->device;
+
+        if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+                return 0;
+
+        if (mgr_manual_update(mgr))
+                return 0;
+
+        irq = dispc_mgr_get_vsync_irq(mgr->id);
+
+        mp = get_mgr_priv(mgr);
+        i = 0;
+        while (1) {
+                unsigned long flags;
+                bool shadow_dirty, dirty;
+
+                spin_lock_irqsave(&data_lock, flags);
+                dirty = mp->info_dirty;
+                shadow_dirty = mp->shadow_info_dirty;
+                spin_unlock_irqrestore(&data_lock, flags);
+
+                if (!dirty && !shadow_dirty) {
+                        r = 0;
+                        break;
+                }
+
+                /* 4 iterations is the worst case:
+                 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
+                 * 2 - first VSYNC, dirty = true
+                 * 3 - dirty = false, shadow_dirty = true
+                 * 4 - shadow_dirty = false */
+                if (i++ == 3) {
+                        DSSERR("mgr(%d)->wait_for_go() not finishing\n",
+                                        mgr->id);
+                        r = 0;
+                        break;
+                }
+
+                r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
+                if (r == -ERESTARTSYS)
+                        break;
+
+                if (r) {
+                        DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id);
+                        break;
+                }
+        }
+
+        return r;
+}
+
+int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
+{
+        unsigned long timeout = msecs_to_jiffies(500);
+        struct ovl_priv_data *op;
+        struct omap_dss_device *dssdev;
+        u32 irq;
+        int r;
+        int i;
+
+        if (!ovl->manager)
+                return 0;
+
+        dssdev = ovl->manager->device;
+
+        if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+                return 0;
+
+        if (ovl_manual_update(ovl))
+                return 0;
+
+        irq = dispc_mgr_get_vsync_irq(ovl->manager->id);
+
+        op = get_ovl_priv(ovl);
+        i = 0;
+        while (1) {
+                unsigned long flags;
+                bool shadow_dirty, dirty;
+
+                spin_lock_irqsave(&data_lock, flags);
+                dirty = op->info_dirty;
+                shadow_dirty = op->shadow_info_dirty;
+                spin_unlock_irqrestore(&data_lock, flags);
+
+                if (!dirty && !shadow_dirty) {
+                        r = 0;
+                        break;
+                }
+
+                /* 4 iterations is the worst case:
+                 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
+                 * 2 - first VSYNC, dirty = true
+                 * 3 - dirty = false, shadow_dirty = true
+                 * 4 - shadow_dirty = false */
+                if (i++ == 3) {
+                        DSSERR("ovl(%d)->wait_for_go() not finishing\n",
+                                        ovl->id);
+                        r = 0;
+                        break;
+                }
+
+                r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
+                if (r == -ERESTARTSYS)
+                        break;
+
+                if (r) {
+                        DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id);
+                        break;
+                }
+        }
+
+        return r;
+}
+
+static void dss_ovl_write_regs(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        struct omap_overlay_info *oi;
+        bool ilace, replication;
+        struct mgr_priv_data *mp;
+        int r;
+
+        DSSDBGF("%d", ovl->id);
+
+        if (!op->enabled || !op->info_dirty)
+                return;
+
+        oi = &op->info;
+
+        replication = dss_use_replication(ovl->manager->device, oi->color_mode);
+
+        ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC;
+
+        r = dispc_ovl_setup(ovl->id, oi, ilace, replication);
+        if (r) {
+                /*
+                 * We can't do much here, as this function can be called from
+                 * vsync interrupt.
+                 */
+                DSSERR("dispc_ovl_setup failed for ovl %d\n", ovl->id);
+
+                /* This will leave fifo configurations in a nonoptimal state */
+                op->enabled = false;
+                dispc_ovl_enable(ovl->id, false);
+                return;
+        }
+
+        mp = get_mgr_priv(ovl->manager);
+
+        op->info_dirty = false;
+        if (mp->updating)
+                op->shadow_info_dirty = true;
+}
+
+static void dss_ovl_write_regs_extra(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        struct mgr_priv_data *mp;
+
+        DSSDBGF("%d", ovl->id);
+
+        if (!op->extra_info_dirty)
+                return;
+
+        /* note: write also when op->enabled == false, so that the ovl gets
+         * disabled */
+
+        dispc_ovl_enable(ovl->id, op->enabled);
+        dispc_ovl_set_channel_out(ovl->id, op->channel);
+        dispc_ovl_set_fifo_threshold(ovl->id, op->fifo_low, op->fifo_high);
+
+        mp = get_mgr_priv(ovl->manager);
+
+        op->extra_info_dirty = false;
+        if (mp->updating)
+                op->shadow_extra_info_dirty = true;
+}
+
+static void dss_mgr_write_regs(struct omap_overlay_manager *mgr)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+        struct omap_overlay *ovl;
+
+        DSSDBGF("%d", mgr->id);
+
+        if (!mp->enabled)
+                return;
+
+        WARN_ON(mp->busy);
+
+        /* Commit overlay settings */
+        list_for_each_entry(ovl, &mgr->overlays, list) {
+                dss_ovl_write_regs(ovl);
+                dss_ovl_write_regs_extra(ovl);
+        }
+
+        if (mp->info_dirty) {
+                dispc_mgr_setup(mgr->id, &mp->info);
+
+                mp->info_dirty = false;
+                if (mp->updating)
+                        mp->shadow_info_dirty = true;
+        }
+}
+
+static void dss_write_regs(void)
+{
+        const int num_mgrs = omap_dss_get_num_overlay_managers();
+        int i;
+
+        for (i = 0; i < num_mgrs; ++i) {
+                struct omap_overlay_manager *mgr;
+                struct mgr_priv_data *mp;
+                int r;
+
+                mgr = omap_dss_get_overlay_manager(i);
+                mp = get_mgr_priv(mgr);
+
+                if (!mp->enabled || mgr_manual_update(mgr) || mp->busy)
+                        continue;
+
+                r = dss_check_settings(mgr, mgr->device);
+                if (r) {
+                        DSSERR("cannot write registers for manager %s: "
+                                        "illegal configuration\n", mgr->name);
+                        continue;
+                }
+
+                dss_mgr_write_regs(mgr);
+        }
+}
+
+static void dss_set_go_bits(void)
+{
+        const int num_mgrs = omap_dss_get_num_overlay_managers();
+        int i;
+
+        for (i = 0; i < num_mgrs; ++i) {
+                struct omap_overlay_manager *mgr;
+                struct mgr_priv_data *mp;
+
+                mgr = omap_dss_get_overlay_manager(i);
+                mp = get_mgr_priv(mgr);
+
+                if (!mp->enabled || mgr_manual_update(mgr) || mp->busy)
+                        continue;
+
+                if (!need_go(mgr))
+                        continue;
+
+                mp->busy = true;
+
+                if (!dss_data.irq_enabled && need_isr())
+                        dss_register_vsync_isr();
+
+                dispc_mgr_go(mgr->id);
+        }
+
+}
+
+void dss_mgr_start_update(struct omap_overlay_manager *mgr)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+        unsigned long flags;
+        int r;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        WARN_ON(mp->updating);
+
+        r = dss_check_settings(mgr, mgr->device);
+        if (r) {
+                DSSERR("cannot start manual update: illegal configuration\n");
+                spin_unlock_irqrestore(&data_lock, flags);
+                return;
+        }
+
+        dss_mgr_write_regs(mgr);
+
+        mp->updating = true;
+
+        if (!dss_data.irq_enabled && need_isr())
+                dss_register_vsync_isr();
+
+        dispc_mgr_enable(mgr->id, true);
+
+        spin_unlock_irqrestore(&data_lock, flags);
+}
+
+static void dss_apply_irq_handler(void *data, u32 mask);
+
+static void dss_register_vsync_isr(void)
+{
+        const int num_mgrs = dss_feat_get_num_mgrs();
+        u32 mask;
+        int r, i;
+
+        mask = 0;
+        for (i = 0; i < num_mgrs; ++i)
+                mask |= dispc_mgr_get_vsync_irq(i);
+
+        for (i = 0; i < num_mgrs; ++i)
+                mask |= dispc_mgr_get_framedone_irq(i);
+
+        r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask);
+        WARN_ON(r);
+
+        dss_data.irq_enabled = true;
+}
+
+static void dss_unregister_vsync_isr(void)
+{
+        const int num_mgrs = dss_feat_get_num_mgrs();
+        u32 mask;
+        int r, i;
+
+        mask = 0;
+        for (i = 0; i < num_mgrs; ++i)
+                mask |= dispc_mgr_get_vsync_irq(i);
+
+        for (i = 0; i < num_mgrs; ++i)
+                mask |= dispc_mgr_get_framedone_irq(i);
+
+        r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask);
+        WARN_ON(r);
+
+        dss_data.irq_enabled = false;
+}
+
+static void mgr_clear_shadow_dirty(struct omap_overlay_manager *mgr)
+{
+        struct omap_overlay *ovl;
+        struct mgr_priv_data *mp;
+        struct ovl_priv_data *op;
+
+        mp = get_mgr_priv(mgr);
+        mp->shadow_info_dirty = false;
+
+        list_for_each_entry(ovl, &mgr->overlays, list) {
+                op = get_ovl_priv(ovl);
+                op->shadow_info_dirty = false;
+                op->shadow_extra_info_dirty = false;
+        }
+}
+
+static void dss_apply_irq_handler(void *data, u32 mask)
+{
+        const int num_mgrs = dss_feat_get_num_mgrs();
+        int i;
+        bool extra_updating;
+
+        spin_lock(&data_lock);
+
+        /* clear busy, updating flags, shadow_dirty flags */
+        for (i = 0; i < num_mgrs; i++) {
+                struct omap_overlay_manager *mgr;
+                struct mgr_priv_data *mp;
+                bool was_updating;
+
+                mgr = omap_dss_get_overlay_manager(i);
+                mp = get_mgr_priv(mgr);
+
+                if (!mp->enabled)
+                        continue;
+
+                was_updating = mp->updating;
+                mp->updating = dispc_mgr_is_enabled(i);
+
+                if (!mgr_manual_update(mgr)) {
+                        bool was_busy = mp->busy;
+                        mp->busy = dispc_mgr_go_busy(i);
+
+                        if (was_busy && !mp->busy)
+                                mgr_clear_shadow_dirty(mgr);
+                } else {
+                        if (was_updating && !mp->updating)
+                                mgr_clear_shadow_dirty(mgr);
+                }
+        }
+
+        dss_write_regs();
+        dss_set_go_bits();
+
+        extra_updating = extra_info_update_ongoing();
+        if (!extra_updating)
+                complete_all(&extra_updated_completion);
+
+        if (!need_isr())
+                dss_unregister_vsync_isr();
+
+        spin_unlock(&data_lock);
+}
+
+static void omap_dss_mgr_apply_ovl(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op;
+
+        op = get_ovl_priv(ovl);
+
+        if (!op->user_info_dirty)
+                return;
+
+        op->user_info_dirty = false;
+        op->info_dirty = true;
+        op->info = op->user_info;
+}
+
+static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr)
+{
+        struct mgr_priv_data *mp;
+
+        mp = get_mgr_priv(mgr);
+
+        if (!mp->user_info_dirty)
+                return;
+
+        mp->user_info_dirty = false;
+        mp->info_dirty = true;
+        mp->info = mp->user_info;
+}
+
+int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
+{
+        unsigned long flags;
+        struct omap_overlay *ovl;
+        int r;
+
+        DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name);
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        r = dss_check_settings_apply(mgr, mgr->device);
+        if (r) {
+                spin_unlock_irqrestore(&data_lock, flags);
+                DSSERR("failed to apply settings: illegal configuration.\n");
+                return r;
+        }
+
+        /* Configure overlays */
+        list_for_each_entry(ovl, &mgr->overlays, list)
+                omap_dss_mgr_apply_ovl(ovl);
+
+        /* Configure manager */
+        omap_dss_mgr_apply_mgr(mgr);
+
+        dss_write_regs();
+        dss_set_go_bits();
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        return 0;
+}
+
+static void dss_apply_ovl_enable(struct omap_overlay *ovl, bool enable)
+{
+        struct ovl_priv_data *op;
+
+        op = get_ovl_priv(ovl);
+
+        if (op->enabled == enable)
+                return;
+
+        op->enabled = enable;
+        op->extra_info_dirty = true;
+}
+
+static void dss_apply_ovl_fifo_thresholds(struct omap_overlay *ovl,
+                u32 fifo_low, u32 fifo_high)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+
+        if (op->fifo_low == fifo_low && op->fifo_high == fifo_high)
+                return;
+
+        op->fifo_low = fifo_low;
+        op->fifo_high = fifo_high;
+        op->extra_info_dirty = true;
+}
+
+static void dss_ovl_setup_fifo(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        struct omap_dss_device *dssdev;
+        u32 size, burst_size;
+        u32 fifo_low, fifo_high;
+
+        if (!op->enabled && !op->enabling)
+                return;
+
+        dssdev = ovl->manager->device;
+
+        size = dispc_ovl_get_fifo_size(ovl->id);
+
+        burst_size = dispc_ovl_get_burst_size(ovl->id);
+
+        switch (dssdev->type) {
+        case OMAP_DISPLAY_TYPE_DPI:
+        case OMAP_DISPLAY_TYPE_DBI:
+        case OMAP_DISPLAY_TYPE_SDI:
+        case OMAP_DISPLAY_TYPE_VENC:
+        case OMAP_DISPLAY_TYPE_HDMI:
+                default_get_overlay_fifo_thresholds(ovl->id, size,
+                                burst_size, &fifo_low, &fifo_high);
+                break;
+#ifdef CONFIG_OMAP2_DSS_DSI
+        case OMAP_DISPLAY_TYPE_DSI:
+                dsi_get_overlay_fifo_thresholds(ovl->id, size,
+                                burst_size, &fifo_low, &fifo_high);
+                break;
+#endif
+        default:
+                BUG();
+        }
+
+        dss_apply_ovl_fifo_thresholds(ovl, fifo_low, fifo_high);
+}
+
+static void dss_mgr_setup_fifos(struct omap_overlay_manager *mgr)
+{
+        struct omap_overlay *ovl;
+        struct mgr_priv_data *mp;
+
+        mp = get_mgr_priv(mgr);
+
+        if (!mp->enabled)
+                return;
+
+        list_for_each_entry(ovl, &mgr->overlays, list)
+                dss_ovl_setup_fifo(ovl);
+}
+
+static void dss_setup_fifos(void)
+{
+        const int num_mgrs = omap_dss_get_num_overlay_managers();
+        struct omap_overlay_manager *mgr;
+        int i;
+
+        for (i = 0; i < num_mgrs; ++i) {
+                mgr = omap_dss_get_overlay_manager(i);
+                dss_mgr_setup_fifos(mgr);
+        }
+}
+
+int dss_mgr_enable(struct omap_overlay_manager *mgr)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+        unsigned long flags;
+        int r;
+
+        mutex_lock(&apply_lock);
+
+        if (mp->enabled)
+                goto out;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        mp->enabled = true;
+
+        r = dss_check_settings(mgr, mgr->device);
+        if (r) {
+                DSSERR("failed to enable manager %d: check_settings failed\n",
+                                mgr->id);
+                goto err;
+        }
+
+        dss_setup_fifos();
+
+        dss_write_regs();
+        dss_set_go_bits();
+
+        if (!mgr_manual_update(mgr))
+                mp->updating = true;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        if (!mgr_manual_update(mgr))
+                dispc_mgr_enable(mgr->id, true);
+
+out:
+        mutex_unlock(&apply_lock);
+
+        return 0;
+
+err:
+        mp->enabled = false;
+        spin_unlock_irqrestore(&data_lock, flags);
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
+void dss_mgr_disable(struct omap_overlay_manager *mgr)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+        unsigned long flags;
+
+        mutex_lock(&apply_lock);
+
+        if (!mp->enabled)
+                goto out;
+
+        if (!mgr_manual_update(mgr))
+                dispc_mgr_enable(mgr->id, false);
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        mp->updating = false;
+        mp->enabled = false;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+out:
+        mutex_unlock(&apply_lock);
+}
+
+int dss_mgr_set_info(struct omap_overlay_manager *mgr,
+                struct omap_overlay_manager_info *info)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+        unsigned long flags;
+        int r;
+
+        r = dss_mgr_simple_check(mgr, info);
+        if (r)
+                return r;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        mp->user_info = *info;
+        mp->user_info_dirty = true;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        return 0;
+}
+
+void dss_mgr_get_info(struct omap_overlay_manager *mgr,
+                struct omap_overlay_manager_info *info)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+        unsigned long flags;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        *info = mp->user_info;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+}
+
+int dss_mgr_set_device(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev)
+{
+        int r;
+
+        mutex_lock(&apply_lock);
+
+        if (dssdev->manager) {
+                DSSERR("display '%s' already has a manager '%s'\n",
+                               dssdev->name, dssdev->manager->name);
+                r = -EINVAL;
+                goto err;
+        }
+
+        if ((mgr->supported_displays & dssdev->type) == 0) {
+                DSSERR("display '%s' does not support manager '%s'\n",
+                               dssdev->name, mgr->name);
+                r = -EINVAL;
+                goto err;
+        }
+
+        dssdev->manager = mgr;
+        mgr->device = dssdev;
+
+        mutex_unlock(&apply_lock);
+
+        return 0;
+err:
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
+int dss_mgr_unset_device(struct omap_overlay_manager *mgr)
+{
+        int r;
+
+        mutex_lock(&apply_lock);
+
+        if (!mgr->device) {
+                DSSERR("failed to unset display, display not set.\n");
+                r = -EINVAL;
+                goto err;
+        }
+
+        /*
+         * Don't allow currently enabled displays to have the overlay manager
+         * pulled out from underneath them
+         */
+        if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED) {
+                r = -EINVAL;
+                goto err;
+        }
+
+        mgr->device->manager = NULL;
+        mgr->device = NULL;
+
+        mutex_unlock(&apply_lock);
+
+        return 0;
+err:
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
+
+int dss_ovl_set_info(struct omap_overlay *ovl,
+                struct omap_overlay_info *info)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+        int r;
+
+        r = dss_ovl_simple_check(ovl, info);
+        if (r)
+                return r;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        op->user_info = *info;
+        op->user_info_dirty = true;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        return 0;
+}
+
+void dss_ovl_get_info(struct omap_overlay *ovl,
+                struct omap_overlay_info *info)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        *info = op->user_info;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+}
+
+int dss_ovl_set_manager(struct omap_overlay *ovl,
+                struct omap_overlay_manager *mgr)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+        int r;
+
+        if (!mgr)
+                return -EINVAL;
+
+        mutex_lock(&apply_lock);
+
+        if (ovl->manager) {
+                DSSERR("overlay '%s' already has a manager '%s'\n",
+                                ovl->name, ovl->manager->name);
+                r = -EINVAL;
+                goto err;
+        }
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        if (op->enabled) {
+                spin_unlock_irqrestore(&data_lock, flags);
+                DSSERR("overlay has to be disabled to change the manager\n");
+                r = -EINVAL;
+                goto err;
+        }
+
+        op->channel = mgr->id;
+        op->extra_info_dirty = true;
+
+        ovl->manager = mgr;
+        list_add_tail(&ovl->list, &mgr->overlays);
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        /* XXX: When there is an overlay on a DSI manual update display, and
+         * the overlay is first disabled, then moved to tv, and enabled, we
+         * seem to get SYNC_LOST_DIGIT error.
+         *
+         * Waiting doesn't seem to help, but updating the manual update display
+         * after disabling the overlay seems to fix this. This hints that the
+         * overlay is perhaps somehow tied to the LCD output until the output
+         * is updated.
+         *
+         * Userspace workaround for this is to update the LCD after disabling
+         * the overlay, but before moving the overlay to TV.
+         */
+
+        mutex_unlock(&apply_lock);
+
+        return 0;
+err:
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
+int dss_ovl_unset_manager(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+        int r;
+
+        mutex_lock(&apply_lock);
+
+        if (!ovl->manager) {
+                DSSERR("failed to detach overlay: manager not set\n");
+                r = -EINVAL;
+                goto err;
+        }
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        if (op->enabled) {
+                spin_unlock_irqrestore(&data_lock, flags);
+                DSSERR("overlay has to be disabled to unset the manager\n");
+                r = -EINVAL;
+                goto err;
+        }
+
+        op->channel = -1;
+
+        ovl->manager = NULL;
+        list_del(&ovl->list);
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        mutex_unlock(&apply_lock);
+
+        return 0;
+err:
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
+bool dss_ovl_is_enabled(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+        bool e;
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        e = op->enabled;
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        return e;
+}
+
+int dss_ovl_enable(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+        int r;
+
+        mutex_lock(&apply_lock);
+
+        if (op->enabled) {
+                r = 0;
+                goto err1;
+        }
+
+        if (ovl->manager == NULL || ovl->manager->device == NULL) {
+                r = -EINVAL;
+                goto err1;
+        }
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        op->enabling = true;
+
+        r = dss_check_settings(ovl->manager, ovl->manager->device);
+        if (r) {
+                DSSERR("failed to enable overlay %d: check_settings failed\n",
+                                ovl->id);
+                goto err2;
+        }
+
+        dss_setup_fifos();
+
+        op->enabling = false;
+        dss_apply_ovl_enable(ovl, true);
+
+        dss_write_regs();
+        dss_set_go_bits();
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        mutex_unlock(&apply_lock);
+
+        return 0;
+err2:
+        op->enabling = false;
+        spin_unlock_irqrestore(&data_lock, flags);
+err1:
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
+int dss_ovl_disable(struct omap_overlay *ovl)
+{
+        struct ovl_priv_data *op = get_ovl_priv(ovl);
+        unsigned long flags;
+        int r;
+
+        mutex_lock(&apply_lock);
+
+        if (!op->enabled) {
+                r = 0;
+                goto err;
+        }
+
+        if (ovl->manager == NULL || ovl->manager->device == NULL) {
+                r = -EINVAL;
+                goto err;
+        }
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        dss_apply_ovl_enable(ovl, false);
+        dss_write_regs();
+        dss_set_go_bits();
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        mutex_unlock(&apply_lock);
+
+        return 0;
+
+err:
+        mutex_unlock(&apply_lock);
+        return r;
+}
+
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index da7b18576549..8613f86fb56d 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -178,6 +178,8 @@ static int omap_dss_probe(struct platform_device *pdev)
 
         dss_features_init();
 
+        dss_apply_init();
+
         dss_init_overlay_managers(pdev);
         dss_init_overlays(pdev);
 
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 5c81533eacaa..a5ec7f37c185 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -64,22 +64,6 @@ struct omap_dispc_isr_data {
         u32                     mask;
 };
 
-struct dispc_h_coef {
-        s8 hc4;
-        s8 hc3;
-        u8 hc2;
-        s8 hc1;
-        s8 hc0;
-};
-
-struct dispc_v_coef {
-        s8 vc22;
-        s8 vc2;
-        u8 vc1;
-        s8 vc0;
-        s8 vc00;
-};
-
 enum omap_burst_size {
         BURST_SIZE_X2 = 0,
         BURST_SIZE_X4 = 1,
@@ -438,6 +422,34 @@ static struct omap_dss_device *dispc_mgr_get_device(enum omap_channel channel)
         return mgr ? mgr->device : NULL;
 }
 
+u32 dispc_mgr_get_vsync_irq(enum omap_channel channel)
+{
+        switch (channel) {
+        case OMAP_DSS_CHANNEL_LCD:
+                return DISPC_IRQ_VSYNC;
+        case OMAP_DSS_CHANNEL_LCD2:
+                return DISPC_IRQ_VSYNC2;
+        case OMAP_DSS_CHANNEL_DIGIT:
+                return DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
+        default:
+                BUG();
+        }
+}
+
+u32 dispc_mgr_get_framedone_irq(enum omap_channel channel)
+{
+        switch (channel) {
+        case OMAP_DSS_CHANNEL_LCD:
+                return DISPC_IRQ_FRAMEDONE;
+        case OMAP_DSS_CHANNEL_LCD2:
+                return DISPC_IRQ_FRAMEDONE2;
+        case OMAP_DSS_CHANNEL_DIGIT:
+                return 0;
+        default:
+                BUG();
+        }
+}
+
 bool dispc_mgr_go_busy(enum omap_channel channel)
 {
         int bit;
@@ -533,105 +545,27 @@ static void dispc_ovl_write_firv2_reg(enum omap_plane plane, int reg, u32 value)
         dispc_write_reg(DISPC_OVL_FIR_COEF_V2(plane, reg), value);
 }
 
-static void dispc_ovl_set_scale_coef(enum omap_plane plane, int hscaleup,
-                                  int vscaleup, int five_taps,
-                                  enum omap_color_component color_comp)
-{
-        /* Coefficients for horizontal up-sampling */
-        static const struct dispc_h_coef coef_hup[8] = {
-                {  0,   0, 128,   0,  0 },
-                { -1,  13, 124,  -8,  0 },
-                { -2,  30, 112, -11, -1 },
-                { -5,  51,  95, -11, -2 },
-                {  0,  -9,  73,  73, -9 },
-                { -2, -11,  95,  51, -5 },
-                { -1, -11, 112,  30, -2 },
-                {  0,  -8, 124,  13, -1 },
-        };
-
-        /* Coefficients for vertical up-sampling */
-        static const struct dispc_v_coef coef_vup_3tap[8] = {
-                { 0,  0, 128,  0, 0 },
-                { 0,  3, 123,  2, 0 },
-                { 0, 12, 111,  5, 0 },
-                { 0, 32,  89,  7, 0 },
-                { 0,  0,  64, 64, 0 },
-                { 0,  7,  89, 32, 0 },
-                { 0,  5, 111, 12, 0 },
-                { 0,  2, 123,  3, 0 },
-        };
-
-        static const struct dispc_v_coef coef_vup_5tap[8] = {
-                {  0,   0, 128,   0,  0 },
-                { -1,  13, 124,  -8,  0 },
-                { -2,  30, 112, -11, -1 },
-                { -5,  51,  95, -11, -2 },
-                {  0,  -9,  73,  73, -9 },
-                { -2, -11,  95,  51, -5 },
-                { -1, -11, 112,  30, -2 },
-                {  0,  -8, 124,  13, -1 },
-        };
-
-        /* Coefficients for horizontal down-sampling */
-        static const struct dispc_h_coef coef_hdown[8] = {
-                {   0, 36, 56, 36,  0 },
-                {   4, 40, 55, 31, -2 },
-                {   8, 44, 54, 27, -5 },
-                {  12, 48, 53, 22, -7 },
-                {  -9, 17, 52, 51, 17 },
-                {  -7, 22, 53, 48, 12 },
-                {  -5, 27, 54, 44,  8 },
-                {  -2, 31, 55, 40,  4 },
-        };
-
-        /* Coefficients for vertical down-sampling */
-        static const struct dispc_v_coef coef_vdown_3tap[8] = {
-                { 0, 36, 56, 36, 0 },
-                { 0, 40, 57, 31, 0 },
-                { 0, 45, 56, 27, 0 },
-                { 0, 50, 55, 23, 0 },
-                { 0, 18, 55, 55, 0 },
-                { 0, 23, 55, 50, 0 },
-                { 0, 27, 56, 45, 0 },
-                { 0, 31, 57, 40, 0 },
-        };
-
-        static const struct dispc_v_coef coef_vdown_5tap[8] = {
-                {   0, 36, 56, 36,  0 },
-                {   4, 40, 55, 31, -2 },
-                {   8, 44, 54, 27, -5 },
-                {  12, 48, 53, 22, -7 },
-                {  -9, 17, 52, 51, 17 },
-                {  -7, 22, 53, 48, 12 },
-                {  -5, 27, 54, 44,  8 },
-                {  -2, 31, 55, 40,  4 },
-        };
-
-        const struct dispc_h_coef *h_coef;
-        const struct dispc_v_coef *v_coef;
+static void dispc_ovl_set_scale_coef(enum omap_plane plane, int fir_hinc,
+                                int fir_vinc, int five_taps,
+                                enum omap_color_component color_comp)
+{
+        const struct dispc_coef *h_coef, *v_coef;
         int i;
 
-        if (hscaleup)
-                h_coef = coef_hup;
-        else
-                h_coef = coef_hdown;
-
-        if (vscaleup)
-                v_coef = five_taps ? coef_vup_5tap : coef_vup_3tap;
-        else
-                v_coef = five_taps ? coef_vdown_5tap : coef_vdown_3tap;
+        h_coef = dispc_ovl_get_scale_coef(fir_hinc, true);
+        v_coef = dispc_ovl_get_scale_coef(fir_vinc, five_taps);
 
         for (i = 0; i < 8; i++) {
                 u32 h, hv;
 
-                h = FLD_VAL(h_coef[i].hc0, 7, 0)
-                        | FLD_VAL(h_coef[i].hc1, 15, 8)
-                        | FLD_VAL(h_coef[i].hc2, 23, 16)
-                        | FLD_VAL(h_coef[i].hc3, 31, 24);
-                hv = FLD_VAL(h_coef[i].hc4, 7, 0)
-                        | FLD_VAL(v_coef[i].vc0, 15, 8)
-                        | FLD_VAL(v_coef[i].vc1, 23, 16)
-                        | FLD_VAL(v_coef[i].vc2, 31, 24);
+                h = FLD_VAL(h_coef[i].hc0_vc00, 7, 0)
+                        | FLD_VAL(h_coef[i].hc1_vc0, 15, 8)
+                        | FLD_VAL(h_coef[i].hc2_vc1, 23, 16)
+                        | FLD_VAL(h_coef[i].hc3_vc2, 31, 24);
+                hv = FLD_VAL(h_coef[i].hc4_vc22, 7, 0)
+                        | FLD_VAL(v_coef[i].hc1_vc0, 15, 8)
+                        | FLD_VAL(v_coef[i].hc2_vc1, 23, 16)
+                        | FLD_VAL(v_coef[i].hc3_vc2, 31, 24);
 
                 if (color_comp == DISPC_COLOR_COMPONENT_RGB_Y) {
                         dispc_ovl_write_firh_reg(plane, i, h);
@@ -646,8 +580,8 @@ static void dispc_ovl_set_scale_coef(enum omap_plane plane, int hscaleup,
         if (five_taps) {
                 for (i = 0; i < 8; i++) {
                         u32 v;
-                        v = FLD_VAL(v_coef[i].vc00, 7, 0)
-                                | FLD_VAL(v_coef[i].vc22, 15, 8);
+                        v = FLD_VAL(v_coef[i].hc0_vc00, 7, 0)
+                                | FLD_VAL(v_coef[i].hc4_vc22, 15, 8);
                         if (color_comp == DISPC_COLOR_COMPONENT_RGB_Y)
                                 dispc_ovl_write_firv_reg(plane, i, v);
                         else
@@ -875,8 +809,7 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane,
         REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1);
 }
 
-static void dispc_ovl_set_channel_out(enum omap_plane plane,
-                enum omap_channel channel)
+void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel)
 {
         int shift;
         u32 val;
@@ -923,6 +856,39 @@ static void dispc_ovl_set_channel_out(enum omap_plane plane,
         dispc_write_reg(DISPC_OVL_ATTRIBUTES(plane), val);
 }
 
+static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane)
+{
+        int shift;
+        u32 val;
+        enum omap_channel channel;
+
+        switch (plane) {
+        case OMAP_DSS_GFX:
+                shift = 8;
+                break;
+        case OMAP_DSS_VIDEO1:
+        case OMAP_DSS_VIDEO2:
+        case OMAP_DSS_VIDEO3:
+                shift = 16;
+                break;
+        default:
+                BUG();
+        }
+
+        val = dispc_read_reg(DISPC_OVL_ATTRIBUTES(plane));
+
+        if (dss_has_feature(FEAT_MGR_LCD2)) {
+                if (FLD_GET(val, 31, 30) == 0)
+                        channel = FLD_GET(val, shift, shift);
+                else
+                        channel = OMAP_DSS_CHANNEL_LCD2;
+        } else {
+                channel = FLD_GET(val, shift, shift);
+        }
+
+        return channel;
+}
+
 static void dispc_ovl_set_burst_size(enum omap_plane plane,
                 enum omap_burst_size burst_size)
 {
@@ -964,7 +930,7 @@ void dispc_enable_gamma_table(bool enable)
         REG_FLD_MOD(DISPC_CONFIG, enable, 9, 9);
 }
 
-void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable)
+static void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable)
 {
         u16 reg;
 
@@ -978,7 +944,7 @@ void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable)
         REG_FLD_MOD(reg, enable, 15, 15);
 }
 
-void dispc_mgr_set_cpr_coef(enum omap_channel channel,
+static void dispc_mgr_set_cpr_coef(enum omap_channel channel,
                 struct omap_dss_cpr_coefs *coefs)
 {
         u32 coef_r, coef_g, coef_b;
@@ -1057,8 +1023,7 @@ u32 dispc_ovl_get_fifo_size(enum omap_plane plane)
         return dispc.fifo_size[plane];
 }
 
-static void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low,
-                u32 high)
+void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high)
 {
         u8 hi_start, hi_end, lo_start, lo_end;
         u32 unit;
@@ -1169,17 +1134,12 @@ static void dispc_ovl_set_scale_param(enum omap_plane plane,
                 enum omap_color_component color_comp)
 {
         int fir_hinc, fir_vinc;
-        int hscaleup, vscaleup;
-
-        hscaleup = orig_width <= out_width;
-        vscaleup = orig_height <= out_height;
-
-        dispc_ovl_set_scale_coef(plane, hscaleup, vscaleup, five_taps,
-                        color_comp);
 
         fir_hinc = 1024 * orig_width / out_width;
         fir_vinc = 1024 * orig_height / out_height;
 
+        dispc_ovl_set_scale_coef(plane, fir_hinc, fir_vinc, five_taps,
+                                color_comp);
         dispc_ovl_set_fir(plane, fir_hinc, fir_vinc, color_comp);
 }
 
@@ -1654,6 +1614,9 @@ static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,
         u32 fclk = 0;
         u64 tmp, pclk = dispc_mgr_pclk_rate(channel);
 
+        if (height <= out_height && width <= out_width)
+                return (unsigned long) pclk;
+
         if (height > out_height) {
                 struct omap_dss_device *dssdev = dispc_mgr_get_device(channel);
                 unsigned int ppl = dssdev->panel.timings.x_res;
@@ -1708,7 +1671,16 @@ static unsigned long calc_fclk(enum omap_channel channel, u16 width,
         else
                 vf = 1;
 
-        return dispc_mgr_pclk_rate(channel) * vf * hf;
+        if (cpu_is_omap24xx()) {
+                if (vf > 1 && hf > 1)
+                        return dispc_mgr_pclk_rate(channel) * 4;
+                else
+                        return dispc_mgr_pclk_rate(channel) * 2;
+        } else if (cpu_is_omap34xx()) {
+                return dispc_mgr_pclk_rate(channel) * vf * hf;
+        } else {
+                return dispc_mgr_pclk_rate(channel) * hf;
+        }
 }
 
 static int dispc_ovl_calc_scaling(enum omap_plane plane,
@@ -1718,6 +1690,8 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
 {
         struct omap_overlay *ovl = omap_dss_get_overlay(plane);
         const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
+        const int maxsinglelinewidth =
+                                dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
         unsigned long fclk = 0;
 
         if (width == out_width && height == out_height)
@@ -1734,28 +1708,40 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
                         out_height > height * 8)
                 return -EINVAL;
 
-        /* Must use 5-tap filter? */
-        *five_taps = height > out_height * 2;
-
-        if (!*five_taps) {
+        if (cpu_is_omap24xx()) {
+                if (width > maxsinglelinewidth)
+                        DSSERR("Cannot scale max input width exceeded");
+                *five_taps = false;
+                fclk = calc_fclk(channel, width, height, out_width,
+                                                                out_height);
+        } else if (cpu_is_omap34xx()) {
+                if (width > (maxsinglelinewidth * 2)) {
+                        DSSERR("Cannot setup scaling");
+                        DSSERR("width exceeds maximum width possible");
+                        return -EINVAL;
+                }
+                fclk = calc_fclk_five_taps(channel, width, height, out_width,
+                                                out_height, color_mode);
+                if (width > maxsinglelinewidth) {
+                        if (height > out_height && height < out_height * 2)
+                                *five_taps = false;
+                        else {
+                                DSSERR("cannot setup scaling with five taps");
+                                return -EINVAL;
+                        }
+                }
+                if (!*five_taps)
+                        fclk = calc_fclk(channel, width, height, out_width,
+                                        out_height);
+        } else {
+                if (width > maxsinglelinewidth) {
+                        DSSERR("Cannot scale width exceeds max line width");
+                        return -EINVAL;
+                }
                 fclk = calc_fclk(channel, width, height, out_width,
                                 out_height);
-
-                /* Try 5-tap filter if 3-tap fclk is too high */
-                if (cpu_is_omap34xx() && height > out_height &&
-                                fclk > dispc_fclk_rate())
-                        *five_taps = true;
-        }
-
-        if (width > (2048 >> *five_taps)) {
-                DSSERR("failed to set up scaling, fclk too low\n");
-                return -EINVAL;
         }
 
-        if (*five_taps)
-                fclk = calc_fclk_five_taps(channel, width, height,
-                                out_width, out_height, color_mode);
-
         DSSDBG("required fclk rate = %lu Hz\n", fclk);
         DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
 
@@ -1771,11 +1757,10 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
 }
 
 int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
-                bool ilace, enum omap_channel channel, bool replication,
-                u32 fifo_low, u32 fifo_high)
+                bool ilace, bool replication)
 {
         struct omap_overlay *ovl = omap_dss_get_overlay(plane);
-        bool five_taps = false;
+        bool five_taps = true;
         bool fieldmode = 0;
         int r, cconv = 0;
         unsigned offset0, offset1;
@@ -1783,36 +1768,43 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
         s32 pix_inc;
         u16 frame_height = oi->height;
         unsigned int field_offset = 0;
+        u16 outw, outh;
+        enum omap_channel channel;
+
+        channel = dispc_ovl_get_channel_out(plane);
 
         DSSDBG("dispc_ovl_setup %d, pa %x, pa_uv %x, sw %d, %d,%d, %dx%d -> "
-                "%dx%d, cmode %x, rot %d, mir %d, ilace %d chan %d repl %d "
-                "fifo_low %d fifo high %d\n", plane, oi->paddr, oi->p_uv_addr,
+                "%dx%d, cmode %x, rot %d, mir %d, ilace %d chan %d repl %d\n",
+                plane, oi->paddr, oi->p_uv_addr,
                 oi->screen_width, oi->pos_x, oi->pos_y, oi->width, oi->height,
                 oi->out_width, oi->out_height, oi->color_mode, oi->rotation,
-                oi->mirror, ilace, channel, replication, fifo_low, fifo_high);
+                oi->mirror, ilace, channel, replication);
 
         if (oi->paddr == 0)
                 return -EINVAL;
 
-        if (ilace && oi->height == oi->out_height)
+        outw = oi->out_width == 0 ? oi->width : oi->out_width;
+        outh = oi->out_height == 0 ? oi->height : oi->out_height;
+
+        if (ilace && oi->height == outh)
                 fieldmode = 1;
 
         if (ilace) {
                 if (fieldmode)
                         oi->height /= 2;
                 oi->pos_y /= 2;
-                oi->out_height /= 2;
+                outh /= 2;
 
                 DSSDBG("adjusting for ilace: height %d, pos_y %d, "
                                 "out_height %d\n",
-                                oi->height, oi->pos_y, oi->out_height);
+                                oi->height, oi->pos_y, outh);
         }
 
         if (!dss_feat_color_mode_supported(plane, oi->color_mode))
                 return -EINVAL;
 
         r = dispc_ovl_calc_scaling(plane, channel, oi->width, oi->height,
-                        oi->out_width, oi->out_height, oi->color_mode,
+                        outw, outh, oi->color_mode,
                         &five_taps);
         if (r)
                 return r;
@@ -1830,10 +1822,10 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
                  * so the integer part must be added to the base address of the
                  * bottom field.
                  */
-                if (!oi->height || oi->height == oi->out_height)
+                if (!oi->height || oi->height == outh)
                         field_offset = 0;
                 else
-                        field_offset = oi->height / oi->out_height / 2;
+                        field_offset = oi->height / outh / 2;
         }
 
         /* Fields are independent but interleaved in memory. */
@@ -1869,7 +1861,7 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
         dispc_ovl_set_pix_inc(plane, pix_inc);
 
         DSSDBG("%d,%d %dx%d -> %dx%d\n", oi->pos_x, oi->pos_y, oi->width,
-                        oi->height, oi->out_width, oi->out_height);
+                        oi->height, outw, outh);
 
         dispc_ovl_set_pos(plane, oi->pos_x, oi->pos_y);
 
@@ -1877,10 +1869,10 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
 
         if (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) {
                 dispc_ovl_set_scaling(plane, oi->width, oi->height,
-                                   oi->out_width, oi->out_height,
+                                   outw, outh,
                                    ilace, five_taps, fieldmode,
                                    oi->color_mode, oi->rotation);
-                dispc_ovl_set_vid_size(plane, oi->out_width, oi->out_height);
+                dispc_ovl_set_vid_size(plane, outw, outh);
                 dispc_ovl_set_vid_color_conv(plane, cconv);
         }
 
@@ -1891,10 +1883,7 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
         dispc_ovl_set_pre_mult_alpha(plane, oi->pre_mult_alpha);
         dispc_ovl_setup_global_alpha(plane, oi->global_alpha);
 
-        dispc_ovl_set_channel_out(plane, channel);
-
         dispc_ovl_enable_replication(plane, replication);
-        dispc_ovl_set_fifo_threshold(plane, fifo_low, fifo_high);
 
         return 0;
 }
@@ -1916,10 +1905,14 @@ static void dispc_disable_isr(void *data, u32 mask)
 
 static void _enable_lcd_out(enum omap_channel channel, bool enable)
 {
-        if (channel == OMAP_DSS_CHANNEL_LCD2)
+        if (channel == OMAP_DSS_CHANNEL_LCD2) {
                 REG_FLD_MOD(DISPC_CONTROL2, enable ? 1 : 0, 0, 0);
-        else
+                /* flush posted write */
+                dispc_read_reg(DISPC_CONTROL2);
+        } else {
                 REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 0, 0);
+                dispc_read_reg(DISPC_CONTROL);
+        }
 }
 
 static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable)
@@ -1967,6 +1960,8 @@ static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable)
 static void _enable_digit_out(bool enable)
 {
         REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 1, 1);
+        /* flush posted write */
+        dispc_read_reg(DISPC_CONTROL);
 }
 
 static void dispc_mgr_enable_digit_out(bool enable)
@@ -2124,25 +2119,12 @@ void dispc_set_loadmode(enum omap_dss_load_mode mode)
 }
 
 
-void dispc_mgr_set_default_color(enum omap_channel channel, u32 color)
+static void dispc_mgr_set_default_color(enum omap_channel channel, u32 color)
 {
         dispc_write_reg(DISPC_DEFAULT_COLOR(channel), color);
 }
 
-u32 dispc_mgr_get_default_color(enum omap_channel channel)
-{
-        u32 l;
-
-        BUG_ON(channel != OMAP_DSS_CHANNEL_DIGIT &&
-                channel != OMAP_DSS_CHANNEL_LCD &&
-                channel != OMAP_DSS_CHANNEL_LCD2);
-
-        l = dispc_read_reg(DISPC_DEFAULT_COLOR(channel));
-
-        return l;
-}
-
-void dispc_mgr_set_trans_key(enum omap_channel ch,
+static void dispc_mgr_set_trans_key(enum omap_channel ch,
                 enum omap_dss_trans_key_type type,
                 u32 trans_key)
 {
@@ -2156,26 +2138,7 @@ void dispc_mgr_set_trans_key(enum omap_channel ch,
         dispc_write_reg(DISPC_TRANS_COLOR(ch), trans_key);
 }
 
-void dispc_mgr_get_trans_key(enum omap_channel ch,
-                enum omap_dss_trans_key_type *type,
-                u32 *trans_key)
-{
-        if (type) {
-                if (ch == OMAP_DSS_CHANNEL_LCD)
-                        *type = REG_GET(DISPC_CONFIG, 11, 11);
-                else if (ch == OMAP_DSS_CHANNEL_DIGIT)
-                        *type = REG_GET(DISPC_CONFIG, 13, 13);
-                else if (ch == OMAP_DSS_CHANNEL_LCD2)
-                        *type = REG_GET(DISPC_CONFIG2, 11, 11);
-                else
-                        BUG();
-        }
-
-        if (trans_key)
-                *trans_key = dispc_read_reg(DISPC_TRANS_COLOR(ch));
-}
-
-void dispc_mgr_enable_trans_key(enum omap_channel ch, bool enable)
+static void dispc_mgr_enable_trans_key(enum omap_channel ch, bool enable)
 {
         if (ch == OMAP_DSS_CHANNEL_LCD)
                 REG_FLD_MOD(DISPC_CONFIG, enable, 10, 10);
@@ -2185,7 +2148,8 @@ void dispc_mgr_enable_trans_key(enum omap_channel ch, bool enable)
                 REG_FLD_MOD(DISPC_CONFIG2, enable, 10, 10);
 }
 
-void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch, bool enable)
+static void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch,
+                bool enable)
 {
         if (!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER))
                 return;
@@ -2196,40 +2160,20 @@ void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch, bool enable)
                 REG_FLD_MOD(DISPC_CONFIG, enable, 19, 19);
 }
 
-bool dispc_mgr_alpha_fixed_zorder_enabled(enum omap_channel ch)
-{
-        bool enabled;
-
-        if (!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER))
-                return false;
-
-        if (ch == OMAP_DSS_CHANNEL_LCD)
-                enabled = REG_GET(DISPC_CONFIG, 18, 18);
-        else if (ch == OMAP_DSS_CHANNEL_DIGIT)
-                enabled = REG_GET(DISPC_CONFIG, 19, 19);
-        else
-                BUG();
-
-        return enabled;
-}
-
-bool dispc_mgr_trans_key_enabled(enum omap_channel ch)
+void dispc_mgr_setup(enum omap_channel channel,
+                struct omap_overlay_manager_info *info)
 {
-        bool enabled;
-
-        if (ch == OMAP_DSS_CHANNEL_LCD)
-                enabled = REG_GET(DISPC_CONFIG, 10, 10);
-        else if (ch == OMAP_DSS_CHANNEL_DIGIT)
-                enabled = REG_GET(DISPC_CONFIG, 12, 12);
-        else if (ch == OMAP_DSS_CHANNEL_LCD2)
-                enabled = REG_GET(DISPC_CONFIG2, 10, 10);
-        else
-                BUG();
-
-        return enabled;
+        dispc_mgr_set_default_color(channel, info->default_color);
+        dispc_mgr_set_trans_key(channel, info->trans_key_type, info->trans_key);
+        dispc_mgr_enable_trans_key(channel, info->trans_enabled);
+        dispc_mgr_enable_alpha_fixed_zorder(channel,
+                        info->partial_alpha_enabled);
+        if (dss_has_feature(FEAT_CPR)) {
+                dispc_mgr_enable_cpr(channel, info->cpr_enable);
+                dispc_mgr_set_cpr_coef(channel, &info->cpr_coefs);
+        }
 }
 
-
 void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines)
 {
         int code;
@@ -3184,7 +3128,8 @@ static void dispc_error_worker(struct work_struct *work)
                 for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
                         struct omap_overlay_manager *mgr;
                         mgr = omap_dss_get_overlay_manager(i);
-                        mgr->device->driver->disable(mgr->device);
+                        if (mgr->device && mgr->device->driver)
+                                mgr->device->driver->disable(mgr->device);
                 }
         }
 
diff --git a/drivers/video/omap2/dss/dispc.h b/drivers/video/omap2/dss/dispc.h
index c06efc38983e..5836bd1650f9 100644
--- a/drivers/video/omap2/dss/dispc.h
+++ b/drivers/video/omap2/dss/dispc.h
@@ -97,6 +97,17 @@
 #define DISPC_OVL_PRELOAD(n)            (DISPC_OVL_BASE(n) + \
                                         DISPC_PRELOAD_OFFSET(n))
 
+/* DISPC up/downsampling FIR filter coefficient structure */
+struct dispc_coef {
+        s8 hc4_vc22;
+        s8 hc3_vc2;
+        u8 hc2_vc1;
+        s8 hc1_vc0;
+        s8 hc0_vc00;
+};
+
+const struct dispc_coef *dispc_ovl_get_scale_coef(int inc, int five_taps);
+
 /* DISPC manager/channel specific registers */
 static inline u16 DISPC_DEFAULT_COLOR(enum omap_channel channel)
 {
diff --git a/drivers/video/omap2/dss/dispc_coefs.c b/drivers/video/omap2/dss/dispc_coefs.c
new file mode 100644
index 000000000000..069bccbb3f12
--- /dev/null
+++ b/drivers/video/omap2/dss/dispc_coefs.c
@@ -0,0 +1,326 @@
+/*
+ * linux/drivers/video/omap2/dss/dispc_coefs.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Chandrabhanu Mahapatra <cmahapatra@ti.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.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kernel.h>
+#include <video/omapdss.h>
+#include "dispc.h"
+
+#define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0]))
+
+static const struct dispc_coef coef3_M8[8] = {
+        { 0,  0, 128,  0, 0 },
+        { 0, -4, 123,  9, 0 },
+        { 0, -4, 108, 87, 0 },
+        { 0, -2,  87, 43, 0 },
+        { 0, 64,  64,  0, 0 },
+        { 0, 43,  87, -2, 0 },
+        { 0, 24, 108, -4, 0 },
+        { 0,  9, 123, -4, 0 },
+};
+
+static const struct dispc_coef coef3_M9[8] = {
+        { 0,  6, 116,  6, 0 },
+        { 0,  0, 112, 16, 0 },
+        { 0, -2, 100, 30, 0 },
+        { 0, -2,  83, 47, 0 },
+        { 0, 64,  64,  0, 0 },
+        { 0, 47,  83, -2, 0 },
+        { 0, 30, 100, -2, 0 },
+        { 0, 16, 112,  0, 0 },
+};
+
+static const struct dispc_coef coef3_M10[8] = {
+        { 0, 10, 108, 10, 0 },
+        { 0,  3, 104, 21, 0 },
+        { 0,  0,  94, 34, 0 },
+        { 0, -1,  80, 49, 0 },
+        { 0, 64,  64,  0, 0 },
+        { 0, 49,  80, -1, 0 },
+        { 0, 34,  94,  0, 0 },
+        { 0, 21, 104,  3, 0 },
+};
+
+static const struct dispc_coef coef3_M11[8] = {
+        { 0, 14, 100, 14, 0 },
+        { 0,  6,  98, 24, 0 },
+        { 0,  2,  90, 36, 0 },
+        { 0,  0,  78, 50, 0 },
+        { 0, 64,  64,  0, 0 },
+        { 0, 50,  78,  0, 0 },
+        { 0, 36,  90,  2, 0 },
+        { 0, 24,  98,  6, 0 },
+};
+
+static const struct dispc_coef coef3_M12[8] = {
+        { 0, 16,  96, 16, 0 },
+        { 0,  9,  93, 26, 0 },
+        { 0,  4,  86, 38, 0 },
+        { 0,  1,  76, 51, 0 },
+        { 0, 64,  64,  0, 0 },
+        { 0, 51,  76,  1, 0 },
+        { 0, 38,  86,  4, 0 },
+        { 0, 26,  93,  9, 0 },
+};
+
+static const struct dispc_coef coef3_M13[8] = {
+        { 0, 18,  92, 18, 0 },
+        { 0, 10,  90, 28, 0 },
+        { 0,  5,  83, 40, 0 },
+        { 0,  1,  75, 52, 0 },
+        { 0, 64,  64,  0, 0 },
+        { 0, 52,  75,  1, 0 },
+        { 0, 40,  83,  5, 0 },
+        { 0, 28,  90, 10, 0 },
+};
+
+static const struct dispc_coef coef3_M14[8] = {
+        { 0, 20, 88, 20, 0 },
+        { 0, 12, 86, 30, 0 },
+        { 0,  6, 81, 41, 0 },
+        { 0,  2, 74, 52, 0 },
+        { 0, 64, 64,  0, 0 },
+        { 0, 52, 74,  2, 0 },
+        { 0, 41, 81,  6, 0 },
+        { 0, 30, 86, 12, 0 },
+};
+
+static const struct dispc_coef coef3_M16[8] = {
+        { 0, 22, 84, 22, 0 },
+        { 0, 14, 82, 32, 0 },
+        { 0,  8, 78, 42, 0 },
+        { 0,  3, 72, 53, 0 },
+        { 0, 64, 64,  0, 0 },
+        { 0, 53, 72,  3, 0 },
+        { 0, 42, 78,  8, 0 },
+        { 0, 32, 82, 14, 0 },
+};
+
+static const struct dispc_coef coef3_M19[8] = {
+        { 0, 24, 80, 24, 0 },
+        { 0, 16, 79, 33, 0 },
+        { 0,  9, 76, 43, 0 },
+        { 0,  4, 70, 54, 0 },
+        { 0, 64, 64,  0, 0 },
+        { 0, 54, 70,  4, 0 },
+        { 0, 43, 76,  9, 0 },
+        { 0, 33, 79, 16, 0 },
+};
+
+static const struct dispc_coef coef3_M22[8] = {
+        { 0, 25, 78, 25, 0 },
+        { 0, 17, 77, 34, 0 },
+        { 0, 10, 74, 44, 0 },
+        { 0,  5, 69, 54, 0 },
+        { 0, 64, 64,  0, 0 },
+        { 0, 54, 69,  5, 0 },
+        { 0, 44, 74, 10, 0 },
+        { 0, 34, 77, 17, 0 },
+};
+
+static const struct dispc_coef coef3_M26[8] = {
+        { 0, 26, 76, 26, 0 },
+        { 0, 19, 74, 35, 0 },
+        { 0, 11, 72, 45, 0 },
+        { 0,  5, 69, 54, 0 },
+        { 0, 64, 64,  0, 0 },
+        { 0, 54, 69,  5, 0 },
+        { 0, 45, 72, 11, 0 },
+        { 0, 35, 74, 19, 0 },
+};
+
+static const struct dispc_coef coef3_M32[8] = {
+        { 0, 27, 74, 27, 0 },
+        { 0, 19, 73, 36, 0 },
+        { 0, 12, 71, 45, 0 },
+        { 0,  6, 68, 54, 0 },
+        { 0, 64, 64,  0, 0 },
+        { 0, 54, 68,  6, 0 },
+        { 0, 45, 71, 12, 0 },
+        { 0, 36, 73, 19, 0 },
+};
+
+static const struct dispc_coef coef5_M8[8] = {
+        {   0,   0, 128,   0,   0 },
+        {  -2,  14, 125, -10,   1 },
+        {  -6,  33, 114, -15,   2 },
+        { -10,  55,  98, -16,   1 },
+        {   0, -14,  78,  78, -14 },
+        {   1, -16,  98,  55, -10 },
+        {   2, -15, 114,  33,  -6 },
+        {   1, -10, 125,  14,  -2 },
+};
+
+static const struct dispc_coef coef5_M9[8] = {
+        {  -3,  10, 114,  10,  -3 },
+        {  -6,  24, 110,   0,  -1 },
+        {  -8,  40, 103,  -7,   0 },
+        { -11,  58,  91, -11,   1 },
+        {   0, -12,  76,  76, -12 },
+        {   1, -11,  91,  58, -11 },
+        {   0,  -7, 103,  40,  -8 },
+        {  -1,   0, 111,  24,  -6 },
+};
+
+static const struct dispc_coef coef5_M10[8] = {
+        {  -4,  18, 100,  18,  -4 },
+        {  -6,  30,  99,   8,  -3 },
+        {  -8,  44,  93,   0,  -1 },
+        {  -9,  58,  84,  -5,   0 },
+        {   0,  -8,  72,  72,  -8 },
+        {   0,  -5,  84,  58,  -9 },
+        {  -1,   0,  93,  44,  -8 },
+        {  -3,   8,  99,  30,  -6 },
+};
+
+static const struct dispc_coef coef5_M11[8] = {
+        {  -5,  23,  92,  23,  -5 },
+        {  -6,  34,  90,  13,  -3 },
+        {  -6,  45,  85,   6,  -2 },
+        {  -6,  57,  78,   0,  -1 },
+        {   0,  -4,  68,  68,  -4 },
+        {  -1,   0,  78,  57,  -6 },
+        {  -2,   6,  85,  45,  -6 },
+        {  -3,  13,  90,  34,  -6 },
+};
+
+static const struct dispc_coef coef5_M12[8] = {
+        {  -4,  26,  84,  26,  -4 },
+        {  -5,  36,  82,  18,  -3 },
+        {  -4,  46,  78,  10,  -2 },
+        {  -3,  55,  72,   5,  -1 },
+        {   0,   0,  64,  64,   0 },
+        {  -1,   5,  72,  55,  -3 },
+        {  -2,  10,  78,  46,  -4 },
+        {  -3,  18,  82,  36,  -5 },
+};
+
+static const struct dispc_coef coef5_M13[8] = {
+        {  -3,  28,  78,  28,  -3 },
+        {  -3,  37,  76,  21,  -3 },
+        {  -2,  45,  73,  14,  -2 },
+        {   0,  53,  68,   8,  -1 },
+        {   0,   3,  61,  61,   3 },
+        {  -1,   8,  68,  53,   0 },
+        {  -2,  14,  73,  45,  -2 },
+        {  -3,  21,  76,  37,  -3 },
+};
+
+static const struct dispc_coef coef5_M14[8] = {
+        {  -2,  30,  72,  30,  -2 },
+        {  -1,  37,  71,  23,  -2 },
+        {   0,  45,  69,  16,  -2 },
+        {   3,  52,  64,  10,  -1 },
+        {   0,   6,  58,  58,   6 },
+        {  -1,  10,  64,  52,   3 },
+        {  -2,  16,  69,  45,   0 },
+        {  -2,  23,  71,  37,  -1 },
+};
+
+static const struct dispc_coef coef5_M16[8] = {
+        {   0,  31,  66,  31,   0 },
+        {   1,  38,  65,  25,  -1 },
+        {   3,  44,  62,  20,  -1 },
+        {   6,  49,  59,  14,   0 },
+        {   0,  10,  54,  54,  10 },
+        {   0,  14,  59,  49,   6 },
+        {  -1,  20,  62,  44,   3 },
+        {  -1,  25,  65,  38,   1 },
+};
+
+static const struct dispc_coef coef5_M19[8] = {
+        {   3,  32,  58,  32,   3 },
+        {   4,  38,  58,  27,   1 },
+        {   7,  42,  55,  23,   1 },
+        {  10,  46,  54,  18,   0 },
+        {   0,  14,  50,  50,  14 },
+        {   0,  18,  54,  46,  10 },
+        {   1,  23,  55,  42,   7 },
+        {   1,  27,  58,  38,   4 },
+};
+
+static const struct dispc_coef coef5_M22[8] = {
+        {   4,  33,  54,  33,   4 },
+        {   6,  37,  54,  28,   3 },
+        {   9,  41,  53,  24,   1 },
+        {  12,  45,  51,  20,   0 },
+        {   0,  16,  48,  48,  16 },
+        {   0,  20,  51,  45,  12 },
+        {   1,  24,  53,  41,   9 },
+        {   3,  28,  54,  37,   6 },
+};
+
+static const struct dispc_coef coef5_M26[8] = {
+        {   6,  33,  50,  33,   6 },
+        {   8,  36,  51,  29,   4 },
+        {  11,  40,  50,  25,   2 },
+        {  14,  43,  48,  22,   1 },
+        {   0,  18,  46,  46,  18 },
+        {   1,  22,  48,  43,  14 },
+        {   2,  25,  50,  40,  11 },
+        {   4,  29,  51,  36,   8 },
+};
+
+static const struct dispc_coef coef5_M32[8] = {
+        {   7,  33,  48,  33,   7 },
+        {  10,  36,  48,  29,   5 },
+        {  13,  39,  47,  26,   3 },
+        {  16,  42,  46,  23,   1 },
+        {   0,  19,  45,  45,  19 },
+        {   1,  23,  46,  42,  16 },
+        {   3,  26,  47,  39,  13 },
+        {   5,  29,  48,  36,  10 },
+};
+
+const struct dispc_coef *dispc_ovl_get_scale_coef(int inc, int five_taps)
+{
+        int i;
+        static const struct {
+                int Mmin;
+                int Mmax;
+                const struct dispc_coef *coef_3;
+                const struct dispc_coef *coef_5;
+        } coefs[] = {
+                { 27, 32, coef3_M32, coef5_M32 },
+                { 23, 26, coef3_M26, coef5_M26 },
+                { 20, 22, coef3_M22, coef5_M22 },
+                { 17, 19, coef3_M19, coef5_M19 },
+                { 15, 16, coef3_M16, coef5_M16 },
+                { 14, 14, coef3_M14, coef5_M14 },
+                { 13, 13, coef3_M13, coef5_M13 },
+                { 12, 12, coef3_M12, coef5_M12 },
+                { 11, 11, coef3_M11, coef5_M11 },
+                { 10, 10, coef3_M10, coef5_M10 },
+                {  9,  9,  coef3_M9,  coef5_M9 },
+                {  4,  8,  coef3_M8,  coef5_M8 },
+                /*
+                 * When upscaling more than two times, blockiness and outlines
+                 * around the image are observed when M8 tables are used. M11,
+                 * M16 and M19 tables are used to prevent this.
+                 */
+                {  3,  3, coef3_M11, coef5_M11 },
+                {  2,  2, coef3_M16, coef5_M16 },
+                {  0,  1, coef3_M19, coef5_M19 },
+        };
+
+        inc /= 128;
+        for (i = 0; i < ARRAY_LEN(coefs); ++i)
+                if (inc >= coefs[i].Mmin && inc <= coefs[i].Mmax)
+                        return five_taps ? coefs[i].coef_5 : coefs[i].coef_3;
+        return NULL;
+}
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 976ac23dcd0c..395d658a94fc 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -223,10 +223,13 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 
         mdelay(2);
 
-        dssdev->manager->enable(dssdev->manager);
+        r = dss_mgr_enable(dssdev->manager);
+        if (r)
+                goto err_mgr_enable;
 
         return 0;
 
+err_mgr_enable:
 err_set_mode:
         if (dpi_use_dsi_pll(dssdev))
                 dsi_pll_uninit(dpi.dsidev, true);
@@ -249,7 +252,7 @@ EXPORT_SYMBOL(omapdss_dpi_display_enable);
 
 void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
 {
-        dssdev->manager->disable(dssdev->manager);
+        dss_mgr_disable(dssdev->manager);
 
         if (dpi_use_dsi_pll(dssdev)) {
                 dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 46f37883e499..d4d676c82c12 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -203,6 +203,21 @@ struct dsi_reg { u16 idx; };
 typedef void (*omap_dsi_isr_t) (void *arg, u32 mask);
 
 #define DSI_MAX_NR_ISRS                2
+#define DSI_MAX_NR_LANES        5
+
+enum dsi_lane_function {
+        DSI_LANE_UNUSED = 0,
+        DSI_LANE_CLK,
+        DSI_LANE_DATA1,
+        DSI_LANE_DATA2,
+        DSI_LANE_DATA3,
+        DSI_LANE_DATA4,
+};
+
+struct dsi_lane_config {
+        enum dsi_lane_function function;
+        u8 polarity;
+};
 
 struct dsi_isr_data {
         omap_dsi_isr_t  isr;
@@ -223,24 +238,6 @@ enum dsi_vc_source {
         DSI_VC_SOURCE_VP,
 };
 
-enum dsi_lane {
-        DSI_CLK_P       = 1 << 0,
-        DSI_CLK_N       = 1 << 1,
-        DSI_DATA1_P     = 1 << 2,
-        DSI_DATA1_N     = 1 << 3,
-        DSI_DATA2_P     = 1 << 4,
-        DSI_DATA2_N     = 1 << 5,
-        DSI_DATA3_P     = 1 << 6,
-        DSI_DATA3_N     = 1 << 7,
-        DSI_DATA4_P     = 1 << 8,
-        DSI_DATA4_N     = 1 << 9,
-};
-
-struct dsi_update_region {
-        u16 x, y, w, h;
-        struct omap_dss_device *device;
-};
-
 struct dsi_irq_stats {
         unsigned long last_reset;
         unsigned irq_count;
@@ -290,7 +287,9 @@ struct dsi_data {
         struct dsi_isr_tables isr_tables_copy;
 
         int update_channel;
-        struct dsi_update_region update_region;
+#ifdef DEBUG
+        unsigned update_bytes;
+#endif
 
         bool te_enabled;
         bool ulps_enabled;
@@ -327,7 +326,10 @@ struct dsi_data {
         unsigned long  fint_min, fint_max;
         unsigned long lpdiv_max;
 
-        int num_data_lanes;
+        unsigned num_lanes_supported;
+
+        struct dsi_lane_config lanes[DSI_MAX_NR_LANES];
+        unsigned num_lanes_used;
 
         unsigned scp_clk_refcount;
 };
@@ -413,14 +415,29 @@ static void dsi_completion_handler(void *data, u32 mask)
 static inline int wait_for_bit_change(struct platform_device *dsidev,
                 const struct dsi_reg idx, int bitnum, int value)
 {
-        int t = 100000;
+        unsigned long timeout;
+        ktime_t wait;
+        int t;
 
-        while (REG_GET(dsidev, idx, bitnum, bitnum) != value) {
-                if (--t == 0)
-                        return !value;
+        /* first busyloop to see if the bit changes right away */
+        t = 100;
+        while (t-- > 0) {
+                if (REG_GET(dsidev, idx, bitnum, bitnum) == value)
+                        return value;
         }
 
-        return value;
+        /* then loop for 500ms, sleeping for 1ms in between */
+        timeout = jiffies + msecs_to_jiffies(500);
+        while (time_before(jiffies, timeout)) {
+                if (REG_GET(dsidev, idx, bitnum, bitnum) == value)
+                        return value;
+
+                wait = ns_to_ktime(1000 * 1000);
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_hrtimeout(&wait, HRTIMER_MODE_REL);
+        }
+
+        return !value;
 }
 
 u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
@@ -454,7 +471,6 @@ static void dsi_perf_mark_start(struct platform_device *dsidev)
 static void dsi_perf_show(struct platform_device *dsidev, const char *name)
 {
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
-        struct omap_dss_device *dssdev = dsi->update_region.device;
         ktime_t t, setup_time, trans_time;
         u32 total_bytes;
         u32 setup_us, trans_us, total_us;
@@ -476,9 +492,7 @@ static void dsi_perf_show(struct platform_device *dsidev, const char *name)
 
         total_us = setup_us + trans_us;
 
-        total_bytes = dsi->update_region.w *
-                dsi->update_region.h *
-                dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt) / 8;
+        total_bytes = dsi->update_bytes;
 
         printk(KERN_INFO "DSI(%s): %u us + %u us = %u us (%uHz), "
                         "%u bytes, %u kbytes/sec\n",
@@ -1720,17 +1734,19 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
         seq_printf(s,   "CLKIN4DDR\t%-16luregm %u\n",
                         cinfo->clkin4ddr, cinfo->regm);
 
-        seq_printf(s,   "%s (%s)\t%-16luregm_dispc %u\t(%s)\n",
-                        dss_get_generic_clk_source_name(dispc_clk_src),
-                        dss_feat_get_clk_source_name(dispc_clk_src),
+        seq_printf(s,   "DSI_PLL_HSDIV_DISPC (%s)\t%-16luregm_dispc %u\t(%s)\n",
+                        dss_feat_get_clk_source_name(dsi_module == 0 ?
+                                OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
+                                OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC),
                         cinfo->dsi_pll_hsdiv_dispc_clk,
                         cinfo->regm_dispc,
                         dispc_clk_src == OMAP_DSS_CLK_SRC_FCK ?
                         "off" : "on");
 
-        seq_printf(s,   "%s (%s)\t%-16luregm_dsi %u\t(%s)\n",
-                        dss_get_generic_clk_source_name(dsi_clk_src),
-                        dss_feat_get_clk_source_name(dsi_clk_src),
+        seq_printf(s,   "DSI_PLL_HSDIV_DSI (%s)\t%-16luregm_dsi %u\t(%s)\n",
+                        dss_feat_get_clk_source_name(dsi_module == 0 ?
+                                OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
+                                OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI),
                         cinfo->dsi_pll_hsdiv_dsi_clk,
                         cinfo->regm_dsi,
                         dsi_clk_src == OMAP_DSS_CLK_SRC_FCK ?
@@ -2029,34 +2045,6 @@ static int dsi_cio_power(struct platform_device *dsidev,
         return 0;
 }
 
-/* Number of data lanes present on DSI interface */
-static inline int dsi_get_num_data_lanes(struct platform_device *dsidev)
-{
-        /* DSI on OMAP3 doesn't have register DSI_GNQ, set number
-         * of data lanes as 2 by default */
-        if (dss_has_feature(FEAT_DSI_GNQ))
-                return REG_GET(dsidev, DSI_GNQ, 11, 9); /* NB_DATA_LANES */
-        else
-                return 2;
-}
-
-/* Number of data lanes used by the dss device */
-static inline int dsi_get_num_data_lanes_dssdev(struct omap_dss_device *dssdev)
-{
-        int num_data_lanes = 0;
-
-        if (dssdev->phy.dsi.data1_lane != 0)
-                num_data_lanes++;
-        if (dssdev->phy.dsi.data2_lane != 0)
-                num_data_lanes++;
-        if (dssdev->phy.dsi.data3_lane != 0)
-                num_data_lanes++;
-        if (dssdev->phy.dsi.data4_lane != 0)
-                num_data_lanes++;
-
-        return num_data_lanes;
-}
-
 static unsigned dsi_get_line_buf_size(struct platform_device *dsidev)
 {
         int val;
@@ -2088,59 +2076,112 @@ static unsigned dsi_get_line_buf_size(struct platform_device *dsidev)
         }
 }
 
-static void dsi_set_lane_config(struct omap_dss_device *dssdev)
+static int dsi_parse_lane_config(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
-        u32 r;
-        int num_data_lanes_dssdev = dsi_get_num_data_lanes_dssdev(dssdev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        u8 lanes[DSI_MAX_NR_LANES];
+        u8 polarities[DSI_MAX_NR_LANES];
+        int num_lanes, i;
+
+        static const enum dsi_lane_function functions[] = {
+                DSI_LANE_CLK,
+                DSI_LANE_DATA1,
+                DSI_LANE_DATA2,
+                DSI_LANE_DATA3,
+                DSI_LANE_DATA4,
+        };
+
+        lanes[0] = dssdev->phy.dsi.clk_lane;
+        lanes[1] = dssdev->phy.dsi.data1_lane;
+        lanes[2] = dssdev->phy.dsi.data2_lane;
+        lanes[3] = dssdev->phy.dsi.data3_lane;
+        lanes[4] = dssdev->phy.dsi.data4_lane;
+        polarities[0] = dssdev->phy.dsi.clk_pol;
+        polarities[1] = dssdev->phy.dsi.data1_pol;
+        polarities[2] = dssdev->phy.dsi.data2_pol;
+        polarities[3] = dssdev->phy.dsi.data3_pol;
+        polarities[4] = dssdev->phy.dsi.data4_pol;
 
-        int clk_lane   = dssdev->phy.dsi.clk_lane;
-        int data1_lane = dssdev->phy.dsi.data1_lane;
-        int data2_lane = dssdev->phy.dsi.data2_lane;
-        int clk_pol    = dssdev->phy.dsi.clk_pol;
-        int data1_pol  = dssdev->phy.dsi.data1_pol;
-        int data2_pol  = dssdev->phy.dsi.data2_pol;
+        num_lanes = 0;
+
+        for (i = 0; i < dsi->num_lanes_supported; ++i)
+                dsi->lanes[i].function = DSI_LANE_UNUSED;
+
+        for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                int num;
+
+                if (lanes[i] == DSI_LANE_UNUSED)
+                        break;
+
+                num = lanes[i] - 1;
+
+                if (num >= dsi->num_lanes_supported)
+                        return -EINVAL;
+
+                if (dsi->lanes[num].function != DSI_LANE_UNUSED)
+                        return -EINVAL;
+
+                dsi->lanes[num].function = functions[i];
+                dsi->lanes[num].polarity = polarities[i];
+                num_lanes++;
+        }
+
+        if (num_lanes < 2 || num_lanes > dsi->num_lanes_supported)
+                return -EINVAL;
+
+        dsi->num_lanes_used = num_lanes;
+
+        return 0;
+}
+
+static int dsi_set_lane_config(struct omap_dss_device *dssdev)
+{
+        struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        static const u8 offsets[] = { 0, 4, 8, 12, 16 };
+        static const enum dsi_lane_function functions[] = {
+                DSI_LANE_CLK,
+                DSI_LANE_DATA1,
+                DSI_LANE_DATA2,
+                DSI_LANE_DATA3,
+                DSI_LANE_DATA4,
+        };
+        u32 r;
+        int i;
 
         r = dsi_read_reg(dsidev, DSI_COMPLEXIO_CFG1);
-        r = FLD_MOD(r, clk_lane, 2, 0);
-        r = FLD_MOD(r, clk_pol, 3, 3);
-        r = FLD_MOD(r, data1_lane, 6, 4);
-        r = FLD_MOD(r, data1_pol, 7, 7);
-        r = FLD_MOD(r, data2_lane, 10, 8);
-        r = FLD_MOD(r, data2_pol, 11, 11);
-        if (num_data_lanes_dssdev > 2) {
-                int data3_lane  = dssdev->phy.dsi.data3_lane;
-                int data3_pol  = dssdev->phy.dsi.data3_pol;
-
-                r = FLD_MOD(r, data3_lane, 14, 12);
-                r = FLD_MOD(r, data3_pol, 15, 15);
+
+        for (i = 0; i < dsi->num_lanes_used; ++i) {
+                unsigned offset = offsets[i];
+                unsigned polarity, lane_number;
+                unsigned t;
+
+                for (t = 0; t < dsi->num_lanes_supported; ++t)
+                        if (dsi->lanes[t].function == functions[i])
+                                break;
+
+                if (t == dsi->num_lanes_supported)
+                        return -EINVAL;
+
+                lane_number = t;
+                polarity = dsi->lanes[t].polarity;
+
+                r = FLD_MOD(r, lane_number + 1, offset + 2, offset);
+                r = FLD_MOD(r, polarity, offset + 3, offset + 3);
         }
-        if (num_data_lanes_dssdev > 3) {
-                int data4_lane  = dssdev->phy.dsi.data4_lane;
-                int data4_pol  = dssdev->phy.dsi.data4_pol;
 
-                r = FLD_MOD(r, data4_lane, 18, 16);
-                r = FLD_MOD(r, data4_pol, 19, 19);
+        /* clear the unused lanes */
+        for (; i < dsi->num_lanes_supported; ++i) {
+                unsigned offset = offsets[i];
+
+                r = FLD_MOD(r, 0, offset + 2, offset);
+                r = FLD_MOD(r, 0, offset + 3, offset + 3);
         }
-        dsi_write_reg(dsidev, DSI_COMPLEXIO_CFG1, r);
 
-        /* The configuration of the DSI complex I/O (number of data lanes,
-           position, differential order) should not be changed while
-           DSS.DSI_CLK_CRTRL[20] LP_CLK_ENABLE bit is set to 1. In order for
-           the hardware to take into account a new configuration of the complex
-           I/O (done in DSS.DSI_COMPLEXIO_CFG1 register), it is recommended to
-           follow this sequence: First set the DSS.DSI_CTRL[0] IF_EN bit to 1,
-           then reset the DSS.DSI_CTRL[0] IF_EN to 0, then set
-           DSS.DSI_CLK_CTRL[20] LP_CLK_ENABLE to 1 and finally set again the
-           DSS.DSI_CTRL[0] IF_EN bit to 1. If the sequence is not followed, the
-           DSI complex I/O configuration is unknown. */
+        dsi_write_reg(dsidev, DSI_COMPLEXIO_CFG1, r);
 
-        /*
-        REG_FLD_MOD(dsidev, DSI_CTRL, 1, 0, 0);
-        REG_FLD_MOD(dsidev, DSI_CTRL, 0, 0, 0);
-        REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 1, 20, 20);
-        REG_FLD_MOD(dsidev, DSI_CTRL, 1, 0, 0);
-        */
+        return 0;
 }
 
 static inline unsigned ns2ddr(struct platform_device *dsidev, unsigned ns)
@@ -2230,49 +2271,28 @@ static void dsi_cio_timings(struct platform_device *dsidev)
         dsi_write_reg(dsidev, DSI_DSIPHY_CFG2, r);
 }
 
+/* lane masks have lane 0 at lsb. mask_p for positive lines, n for negative */
 static void dsi_cio_enable_lane_override(struct omap_dss_device *dssdev,
-                enum dsi_lane lanes)
+                unsigned mask_p, unsigned mask_n)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
-        int clk_lane   = dssdev->phy.dsi.clk_lane;
-        int data1_lane = dssdev->phy.dsi.data1_lane;
-        int data2_lane = dssdev->phy.dsi.data2_lane;
-        int data3_lane = dssdev->phy.dsi.data3_lane;
-        int data4_lane = dssdev->phy.dsi.data4_lane;
-        int clk_pol    = dssdev->phy.dsi.clk_pol;
-        int data1_pol  = dssdev->phy.dsi.data1_pol;
-        int data2_pol  = dssdev->phy.dsi.data2_pol;
-        int data3_pol  = dssdev->phy.dsi.data3_pol;
-        int data4_pol  = dssdev->phy.dsi.data4_pol;
-
-        u32 l = 0;
-        u8 lptxscp_start = dsi->num_data_lanes == 2 ? 22 : 26;
-
-        if (lanes & DSI_CLK_P)
-                l |= 1 << ((clk_lane - 1) * 2 + (clk_pol ? 0 : 1));
-        if (lanes & DSI_CLK_N)
-                l |= 1 << ((clk_lane - 1) * 2 + (clk_pol ? 1 : 0));
-
-        if (lanes & DSI_DATA1_P)
-                l |= 1 << ((data1_lane - 1) * 2 + (data1_pol ? 0 : 1));
-        if (lanes & DSI_DATA1_N)
-                l |= 1 << ((data1_lane - 1) * 2 + (data1_pol ? 1 : 0));
-
-        if (lanes & DSI_DATA2_P)
-                l |= 1 << ((data2_lane - 1) * 2 + (data2_pol ? 0 : 1));
-        if (lanes & DSI_DATA2_N)
-                l |= 1 << ((data2_lane - 1) * 2 + (data2_pol ? 1 : 0));
-
-        if (lanes & DSI_DATA3_P)
-                l |= 1 << ((data3_lane - 1) * 2 + (data3_pol ? 0 : 1));
-        if (lanes & DSI_DATA3_N)
-                l |= 1 << ((data3_lane - 1) * 2 + (data3_pol ? 1 : 0));
-
-        if (lanes & DSI_DATA4_P)
-                l |= 1 << ((data4_lane - 1) * 2 + (data4_pol ? 0 : 1));
-        if (lanes & DSI_DATA4_N)
-                l |= 1 << ((data4_lane - 1) * 2 + (data4_pol ? 1 : 0));
+        int i;
+        u32 l;
+        u8 lptxscp_start = dsi->num_lanes_supported == 3 ? 22 : 26;
+
+        l = 0;
+
+        for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                unsigned p = dsi->lanes[i].polarity;
+
+                if (mask_p & (1 << i))
+                        l |= 1 << (i * 2 + (p ? 0 : 1));
+
+                if (mask_n & (1 << i))
+                        l |= 1 << (i * 2 + (p ? 1 : 0));
+        }
+
         /*
          * Bits in REGLPTXSCPDAT4TO0DXDY:
          * 17: DY0 18: DX0
@@ -2305,51 +2325,40 @@ static void dsi_cio_disable_lane_override(struct platform_device *dsidev)
 static int dsi_cio_wait_tx_clk_esc_reset(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
-        int t;
-        int bits[3];
-        bool in_use[3];
-
-        if (dss_has_feature(FEAT_DSI_REVERSE_TXCLKESC)) {
-                bits[0] = 28;
-                bits[1] = 27;
-                bits[2] = 26;
-        } else {
-                bits[0] = 24;
-                bits[1] = 25;
-                bits[2] = 26;
-        }
-
-        in_use[0] = false;
-        in_use[1] = false;
-        in_use[2] = false;
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        int t, i;
+        bool in_use[DSI_MAX_NR_LANES];
+        static const u8 offsets_old[] = { 28, 27, 26 };
+        static const u8 offsets_new[] = { 24, 25, 26, 27, 28 };
+        const u8 *offsets;
+
+        if (dss_has_feature(FEAT_DSI_REVERSE_TXCLKESC))
+                offsets = offsets_old;
+        else
+                offsets = offsets_new;
 
-        if (dssdev->phy.dsi.clk_lane != 0)
-                in_use[dssdev->phy.dsi.clk_lane - 1] = true;
-        if (dssdev->phy.dsi.data1_lane != 0)
-                in_use[dssdev->phy.dsi.data1_lane - 1] = true;
-        if (dssdev->phy.dsi.data2_lane != 0)
-                in_use[dssdev->phy.dsi.data2_lane - 1] = true;
+        for (i = 0; i < dsi->num_lanes_supported; ++i)
+                in_use[i] = dsi->lanes[i].function != DSI_LANE_UNUSED;
 
         t = 100000;
         while (true) {
                 u32 l;
-                int i;
                 int ok;
 
                 l = dsi_read_reg(dsidev, DSI_DSIPHY_CFG5);
 
                 ok = 0;
-                for (i = 0; i < 3; ++i) {
-                        if (!in_use[i] || (l & (1 << bits[i])))
+                for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                        if (!in_use[i] || (l & (1 << offsets[i])))
                                 ok++;
                 }
 
-                if (ok == 3)
+                if (ok == dsi->num_lanes_supported)
                         break;
 
                 if (--t == 0) {
-                        for (i = 0; i < 3; ++i) {
-                                if (!in_use[i] || (l & (1 << bits[i])))
+                        for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                                if (!in_use[i] || (l & (1 << offsets[i])))
                                         continue;
 
                                 DSSERR("CIO TXCLKESC%d domain not coming " \
@@ -2362,22 +2371,20 @@ static int dsi_cio_wait_tx_clk_esc_reset(struct omap_dss_device *dssdev)
         return 0;
 }
 
+/* return bitmask of enabled lanes, lane0 being the lsb */
 static unsigned dsi_get_lane_mask(struct omap_dss_device *dssdev)
 {
-        unsigned lanes = 0;
+        struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        unsigned mask = 0;
+        int i;
 
-        if (dssdev->phy.dsi.clk_lane != 0)
-                lanes |= 1 << (dssdev->phy.dsi.clk_lane - 1);
-        if (dssdev->phy.dsi.data1_lane != 0)
-                lanes |= 1 << (dssdev->phy.dsi.data1_lane - 1);
-        if (dssdev->phy.dsi.data2_lane != 0)
-                lanes |= 1 << (dssdev->phy.dsi.data2_lane - 1);
-        if (dssdev->phy.dsi.data3_lane != 0)
-                lanes |= 1 << (dssdev->phy.dsi.data3_lane - 1);
-        if (dssdev->phy.dsi.data4_lane != 0)
-                lanes |= 1 << (dssdev->phy.dsi.data4_lane - 1);
+        for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                if (dsi->lanes[i].function != DSI_LANE_UNUSED)
+                        mask |= 1 << i;
+        }
 
-        return lanes;
+        return mask;
 }
 
 static int dsi_cio_init(struct omap_dss_device *dssdev)
@@ -2385,7 +2392,6 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         int r;
-        int num_data_lanes_dssdev = dsi_get_num_data_lanes_dssdev(dssdev);
         u32 l;
 
         DSSDBGF();
@@ -2407,7 +2413,9 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
                 goto err_scp_clk_dom;
         }
 
-        dsi_set_lane_config(dssdev);
+        r = dsi_set_lane_config(dssdev);
+        if (r)
+                goto err_scp_clk_dom;
 
         /* set TX STOP MODE timer to maximum for this operation */
         l = dsi_read_reg(dsidev, DSI_TIMING1);
@@ -2418,7 +2426,8 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
         dsi_write_reg(dsidev, DSI_TIMING1, l);
 
         if (dsi->ulps_enabled) {
-                u32 lane_mask = DSI_CLK_P | DSI_DATA1_P | DSI_DATA2_P;
+                unsigned mask_p;
+                int i;
 
                 DSSDBG("manual ulps exit\n");
 
@@ -2427,16 +2436,19 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
                  * ULPS exit sequence, as after reset the DSS HW thinks
                  * that we are not in ULPS mode, and refuses to send the
                  * sequence. So we need to send the ULPS exit sequence
-                 * manually.
+                 * manually by setting positive lines high and negative lines
+                 * low for 1ms.
                  */
 
-                if (num_data_lanes_dssdev > 2)
-                        lane_mask |= DSI_DATA3_P;
+                mask_p = 0;
 
-                if (num_data_lanes_dssdev > 3)
-                        lane_mask |= DSI_DATA4_P;
+                for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                        if (dsi->lanes[i].function == DSI_LANE_UNUSED)
+                                continue;
+                        mask_p |= 1 << i;
+                }
 
-                dsi_cio_enable_lane_override(dssdev, lane_mask);
+                dsi_cio_enable_lane_override(dssdev, mask_p, 0);
         }
 
         r = dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_ON);
@@ -2913,6 +2925,9 @@ static int dsi_vc_send_bta(struct platform_device *dsidev, int channel)
 
         REG_FLD_MOD(dsidev, DSI_VC_CTRL(channel), 1, 6, 6); /* BTA_EN */
 
+        /* flush posted write */
+        dsi_read_reg(dsidev, DSI_VC_CTRL(channel));
+
         return 0;
 }
 
@@ -3513,7 +3528,8 @@ static int dsi_enter_ulps(struct platform_device *dsidev)
 {
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         DECLARE_COMPLETION_ONSTACK(completion);
-        int r;
+        int r, i;
+        unsigned mask;
 
         DSSDBGF();
 
@@ -3524,9 +3540,11 @@ static int dsi_enter_ulps(struct platform_device *dsidev)
         if (dsi->ulps_enabled)
                 return 0;
 
+        /* DDR_CLK_ALWAYS_ON */
         if (REG_GET(dsidev, DSI_CLK_CTRL, 13, 13)) {
-                DSSERR("DDR_CLK_ALWAYS_ON enabled when entering ULPS\n");
-                return -EIO;
+                dsi_if_enable(dsidev, 0);
+                REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 0, 13, 13);
+                dsi_if_enable(dsidev, 1);
         }
 
         dsi_sync_vc(dsidev, 0);
@@ -3556,10 +3574,19 @@ static int dsi_enter_ulps(struct platform_device *dsidev)
         if (r)
                 return r;
 
+        mask = 0;
+
+        for (i = 0; i < dsi->num_lanes_supported; ++i) {
+                if (dsi->lanes[i].function == DSI_LANE_UNUSED)
+                        continue;
+                mask |= 1 << i;
+        }
         /* Assert TxRequestEsc for data lanes and TxUlpsClk for clk lane */
         /* LANEx_ULPS_SIG2 */
-        REG_FLD_MOD(dsidev, DSI_COMPLEXIO_CFG2, (1 << 0) | (1 << 1) | (1 << 2),
-                7, 5);
+        REG_FLD_MOD(dsidev, DSI_COMPLEXIO_CFG2, mask, 9, 5);
+
+        /* flush posted write and wait for SCP interface to finish the write */
+        dsi_read_reg(dsidev, DSI_COMPLEXIO_CFG2);
 
         if (wait_for_completion_timeout(&completion,
                                 msecs_to_jiffies(1000)) == 0) {
@@ -3572,8 +3599,10 @@ static int dsi_enter_ulps(struct platform_device *dsidev)
                         DSI_CIO_IRQ_ULPSACTIVENOT_ALL0);
 
         /* Reset LANEx_ULPS_SIG2 */
-        REG_FLD_MOD(dsidev, DSI_COMPLEXIO_CFG2, (0 << 0) | (0 << 1) | (0 << 2),
-                7, 5);
+        REG_FLD_MOD(dsidev, DSI_COMPLEXIO_CFG2, 0, 9, 5);
+
+        /* flush posted write and wait for SCP interface to finish the write */
+        dsi_read_reg(dsidev, DSI_COMPLEXIO_CFG2);
 
         dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_ULPS);
 
@@ -3836,6 +3865,7 @@ static int dsi_proto_config(struct omap_dss_device *dssdev)
 static void dsi_proto_timings(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail;
         unsigned tclk_pre, tclk_post;
         unsigned ths_prepare, ths_prepare_ths_zero, ths_zero;
@@ -3843,7 +3873,7 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)
         unsigned ddr_clk_pre, ddr_clk_post;
         unsigned enter_hs_mode_lat, exit_hs_mode_lat;
         unsigned ths_eot;
-        int ndl = dsi_get_num_data_lanes_dssdev(dssdev);
+        int ndl = dsi->num_lanes_used - 1;
         u32 r;
 
         r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG0);
@@ -3945,68 +3975,82 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)
         }
 }
 
-int dsi_video_mode_enable(struct omap_dss_device *dssdev, int channel)
+int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         int bpp = dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt);
         u8 data_type;
         u16 word_count;
+        int r;
 
-        switch (dssdev->panel.dsi_pix_fmt) {
-        case OMAP_DSS_DSI_FMT_RGB888:
-                data_type = MIPI_DSI_PACKED_PIXEL_STREAM_24;
-                break;
-        case OMAP_DSS_DSI_FMT_RGB666:
-                data_type = MIPI_DSI_PIXEL_STREAM_3BYTE_18;
-                break;
-        case OMAP_DSS_DSI_FMT_RGB666_PACKED:
-                data_type = MIPI_DSI_PACKED_PIXEL_STREAM_18;
-                break;
-        case OMAP_DSS_DSI_FMT_RGB565:
-                data_type = MIPI_DSI_PACKED_PIXEL_STREAM_16;
-                break;
-        default:
-                BUG();
-        };
+        if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {
+                switch (dssdev->panel.dsi_pix_fmt) {
+                case OMAP_DSS_DSI_FMT_RGB888:
+                        data_type = MIPI_DSI_PACKED_PIXEL_STREAM_24;
+                        break;
+                case OMAP_DSS_DSI_FMT_RGB666:
+                        data_type = MIPI_DSI_PIXEL_STREAM_3BYTE_18;
+                        break;
+                case OMAP_DSS_DSI_FMT_RGB666_PACKED:
+                        data_type = MIPI_DSI_PACKED_PIXEL_STREAM_18;
+                        break;
+                case OMAP_DSS_DSI_FMT_RGB565:
+                        data_type = MIPI_DSI_PACKED_PIXEL_STREAM_16;
+                        break;
+                default:
+                        BUG();
+                };
 
-        dsi_if_enable(dsidev, false);
-        dsi_vc_enable(dsidev, channel, false);
+                dsi_if_enable(dsidev, false);
+                dsi_vc_enable(dsidev, channel, false);
 
-        /* MODE, 1 = video mode */
-        REG_FLD_MOD(dsidev, DSI_VC_CTRL(channel), 1, 4, 4);
+                /* MODE, 1 = video mode */
+                REG_FLD_MOD(dsidev, DSI_VC_CTRL(channel), 1, 4, 4);
 
-        word_count = DIV_ROUND_UP(dssdev->panel.timings.x_res * bpp, 8);
+                word_count = DIV_ROUND_UP(dssdev->panel.timings.x_res * bpp, 8);
 
-        dsi_vc_write_long_header(dsidev, channel, data_type, word_count, 0);
+                dsi_vc_write_long_header(dsidev, channel, data_type,
+                                word_count, 0);
 
-        dsi_vc_enable(dsidev, channel, true);
-        dsi_if_enable(dsidev, true);
+                dsi_vc_enable(dsidev, channel, true);
+                dsi_if_enable(dsidev, true);
+        }
 
-        dssdev->manager->enable(dssdev->manager);
+        r = dss_mgr_enable(dssdev->manager);
+        if (r) {
+                if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {
+                        dsi_if_enable(dsidev, false);
+                        dsi_vc_enable(dsidev, channel, false);
+                }
+
+                return r;
+        }
 
         return 0;
 }
-EXPORT_SYMBOL(dsi_video_mode_enable);
+EXPORT_SYMBOL(dsi_enable_video_output);
 
-void dsi_video_mode_disable(struct omap_dss_device *dssdev, int channel)
+void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
 
-        dsi_if_enable(dsidev, false);
-        dsi_vc_enable(dsidev, channel, false);
+        if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {
+                dsi_if_enable(dsidev, false);
+                dsi_vc_enable(dsidev, channel, false);
 
-        /* MODE, 0 = command mode */
-        REG_FLD_MOD(dsidev, DSI_VC_CTRL(channel), 0, 4, 4);
+                /* MODE, 0 = command mode */
+                REG_FLD_MOD(dsidev, DSI_VC_CTRL(channel), 0, 4, 4);
 
-        dsi_vc_enable(dsidev, channel, true);
-        dsi_if_enable(dsidev, true);
+                dsi_vc_enable(dsidev, channel, true);
+                dsi_if_enable(dsidev, true);
+        }
 
-        dssdev->manager->disable(dssdev->manager);
+        dss_mgr_disable(dssdev->manager);
 }
-EXPORT_SYMBOL(dsi_video_mode_disable);
+EXPORT_SYMBOL(dsi_disable_video_output);
 
 static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
-                u16 x, u16 y, u16 w, u16 h)
+                u16 w, u16 h)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4021,8 +4065,7 @@ static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
         const unsigned channel = dsi->update_channel;
         const unsigned line_buf_size = dsi_get_line_buf_size(dsidev);
 
-        DSSDBG("dsi_update_screen_dispc(%d,%d %dx%d)\n",
-                        x, y, w, h);
+        DSSDBG("dsi_update_screen_dispc(%dx%d)\n", w, h);
 
         dsi_vc_config_source(dsidev, channel, DSI_VC_SOURCE_VP);
 
@@ -4070,7 +4113,7 @@ static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
                 msecs_to_jiffies(250));
         BUG_ON(r == 0);
 
-        dss_start_update(dssdev);
+        dss_mgr_start_update(dssdev->manager);
 
         if (dsi->te_enabled) {
                 /* disable LP_RX_TO, so that we can receive TE.  Time to wait
@@ -4146,66 +4189,27 @@ static void dsi_framedone_irq_callback(void *data, u32 mask)
 #endif
 }
 
-int omap_dsi_prepare_update(struct omap_dss_device *dssdev,
-                                    u16 *x, u16 *y, u16 *w, u16 *h,
-                                    bool enlarge_update_area)
+int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
+                void (*callback)(int, void *), void *data)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         u16 dw, dh;
 
-        dssdev->driver->get_resolution(dssdev, &dw, &dh);
-
-        if  (*x > dw || *y > dh)
-                return -EINVAL;
-
-        if (*x + *w > dw)
-                return -EINVAL;
-
-        if (*y + *h > dh)
-                return -EINVAL;
-
-        if (*w == 1)
-                return -EINVAL;
-
-        if (*w == 0 || *h == 0)
-                return -EINVAL;
-
         dsi_perf_mark_setup(dsidev);
 
-        dss_setup_partial_planes(dssdev, x, y, w, h,
-                        enlarge_update_area);
-        dispc_mgr_set_lcd_size(dssdev->manager->id, *w, *h);
-
-        return 0;
-}
-EXPORT_SYMBOL(omap_dsi_prepare_update);
-
-int omap_dsi_update(struct omap_dss_device *dssdev,
-                int channel,
-                u16 x, u16 y, u16 w, u16 h,
-                void (*callback)(int, void *), void *data)
-{
-        struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
-        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
-
         dsi->update_channel = channel;
 
-        /* OMAP DSS cannot send updates of odd widths.
-         * omap_dsi_prepare_update() makes the widths even, but add a BUG_ON
-         * here to make sure we catch erroneous updates. Otherwise we'll only
-         * see rather obscure HW error happening, as DSS halts. */
-        BUG_ON(x % 2 == 1);
-
         dsi->framedone_callback = callback;
         dsi->framedone_data = data;
 
-        dsi->update_region.x = x;
-        dsi->update_region.y = y;
-        dsi->update_region.w = w;
-        dsi->update_region.h = h;
-        dsi->update_region.device = dssdev;
+        dssdev->driver->get_resolution(dssdev, &dw, &dh);
 
-        dsi_update_screen_dispc(dssdev, x, y, w, h);
+#ifdef DEBUG
+        dsi->update_bytes = dw * dh *
+                dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt) / 8;
+#endif
+        dsi_update_screen_dispc(dssdev, dw, dh);
 
         return 0;
 }
@@ -4218,6 +4222,7 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev)
         int r;
 
         if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_CMD_MODE) {
+                u16 dw, dh;
                 u32 irq;
                 struct omap_video_timings timings = {
                         .hsw            = 1,
@@ -4228,6 +4233,10 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev)
                         .vbp            = 0,
                 };
 
+                dssdev->driver->get_resolution(dssdev, &dw, &dh);
+                timings.x_res = dw;
+                timings.y_res = dh;
+
                 irq = dssdev->manager->id == OMAP_DSS_CHANNEL_LCD ?
                         DISPC_IRQ_FRAMEDONE : DISPC_IRQ_FRAMEDONE2;
 
@@ -4330,6 +4339,12 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
         int dsi_module = dsi_get_dsidev_id(dsidev);
         int r;
 
+        r = dsi_parse_lane_config(dssdev);
+        if (r) {
+                DSSERR("illegal lane config");
+                goto err0;
+        }
+
         r = dsi_pll_init(dsidev, true, true);
         if (r)
                 goto err0;
@@ -4521,7 +4536,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
-        int dsi_module = dsi_get_dsidev_id(dsidev);
 
         DSSDBG("DSI init\n");
 
@@ -4543,12 +4557,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
                 dsi->vdds_dsi_reg = vdds_dsi;
         }
 
-        if (dsi_get_num_data_lanes_dssdev(dssdev) > dsi->num_data_lanes) {
-                DSSERR("DSI%d can't support more than %d data lanes\n",
-                        dsi_module + 1, dsi->num_data_lanes);
-                return -EINVAL;
-        }
-
         return 0;
 }
 
@@ -4771,7 +4779,13 @@ static int omap_dsihw_probe(struct platform_device *dsidev)
         dev_dbg(&dsidev->dev, "OMAP DSI rev %d.%d\n",
                FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
 
-        dsi->num_data_lanes = dsi_get_num_data_lanes(dsidev);
+        /* DSI on OMAP3 doesn't have register DSI_GNQ, set number
+         * of data to 3 by default */
+        if (dss_has_feature(FEAT_DSI_GNQ))
+                /* NB_DATA_LANES */
+                dsi->num_lanes_supported = 1 + REG_GET(dsidev, DSI_GNQ, 11, 9);
+        else
+                dsi->num_lanes_supported = 3;
 
         dsi_runtime_put(dsidev);
 
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 57a52eecee91..32ff69fb3333 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -163,6 +163,34 @@ struct bus_type *dss_get_bus(void);
 struct regulator *dss_get_vdds_dsi(void);
 struct regulator *dss_get_vdds_sdi(void);
 
+/* apply */
+void dss_apply_init(void);
+int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr);
+int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
+void dss_mgr_start_update(struct omap_overlay_manager *mgr);
+int omap_dss_mgr_apply(struct omap_overlay_manager *mgr);
+
+int dss_mgr_enable(struct omap_overlay_manager *mgr);
+void dss_mgr_disable(struct omap_overlay_manager *mgr);
+int dss_mgr_set_info(struct omap_overlay_manager *mgr,
+                struct omap_overlay_manager_info *info);
+void dss_mgr_get_info(struct omap_overlay_manager *mgr,
+                struct omap_overlay_manager_info *info);
+int dss_mgr_set_device(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev);
+int dss_mgr_unset_device(struct omap_overlay_manager *mgr);
+
+bool dss_ovl_is_enabled(struct omap_overlay *ovl);
+int dss_ovl_enable(struct omap_overlay *ovl);
+int dss_ovl_disable(struct omap_overlay *ovl);
+int dss_ovl_set_info(struct omap_overlay *ovl,
+                struct omap_overlay_info *info);
+void dss_ovl_get_info(struct omap_overlay *ovl,
+                struct omap_overlay_info *info);
+int dss_ovl_set_manager(struct omap_overlay *ovl,
+                struct omap_overlay_manager *mgr);
+int dss_ovl_unset_manager(struct omap_overlay *ovl);
+
 /* display */
 int dss_suspend_all_devices(void);
 int dss_resume_all_devices(void);
@@ -181,21 +209,22 @@ void default_get_overlay_fifo_thresholds(enum omap_plane plane,
 /* manager */
 int dss_init_overlay_managers(struct platform_device *pdev);
 void dss_uninit_overlay_managers(struct platform_device *pdev);
-int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
-void dss_setup_partial_planes(struct omap_dss_device *dssdev,
-                                u16 *x, u16 *y, u16 *w, u16 *h,
-                                bool enlarge_update_area);
-void dss_start_update(struct omap_dss_device *dssdev);
+int dss_mgr_simple_check(struct omap_overlay_manager *mgr,
+                const struct omap_overlay_manager_info *info);
+int dss_mgr_check(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev,
+                struct omap_overlay_manager_info *info,
+                struct omap_overlay_info **overlay_infos);
 
 /* overlay */
 void dss_init_overlays(struct platform_device *pdev);
 void dss_uninit_overlays(struct platform_device *pdev);
-int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev);
 void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr);
-#ifdef L4_EXAMPLE
-void dss_overlay_setup_l4_manager(struct omap_overlay_manager *mgr);
-#endif
 void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
+int dss_ovl_simple_check(struct omap_overlay *ovl,
+                const struct omap_overlay_info *info);
+int dss_ovl_check(struct omap_overlay *ovl,
+                struct omap_overlay_info *info, struct omap_dss_device *dssdev);
 
 /* DSS */
 int dss_init_platform_driver(void);
@@ -399,21 +428,22 @@ int dispc_calc_clock_rates(unsigned long dispc_fclk_rate,
                 struct dispc_clock_info *cinfo);
 
 
+void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high);
 u32 dispc_ovl_get_fifo_size(enum omap_plane plane);
 u32 dispc_ovl_get_burst_size(enum omap_plane plane);
 int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
-                bool ilace, enum omap_channel channel, bool replication,
-                u32 fifo_low, u32 fifo_high);
+                bool ilace, bool replication);
 int dispc_ovl_enable(enum omap_plane plane, bool enable);
-
+void dispc_ovl_set_channel_out(enum omap_plane plane,
+                enum omap_channel channel);
 
 void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable);
 void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height);
-void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable);
-void dispc_mgr_set_cpr_coef(enum omap_channel channel,
-                struct omap_dss_cpr_coefs *coefs);
+u32 dispc_mgr_get_vsync_irq(enum omap_channel channel);
+u32 dispc_mgr_get_framedone_irq(enum omap_channel channel);
 bool dispc_mgr_go_busy(enum omap_channel channel);
 void dispc_mgr_go(enum omap_channel channel);
+bool dispc_mgr_is_enabled(enum omap_channel channel);
 void dispc_mgr_enable(enum omap_channel channel, bool enable);
 bool dispc_mgr_is_channel_enabled(enum omap_channel channel);
 void dispc_mgr_set_io_pad_mode(enum dss_io_pad_mode mode);
@@ -421,18 +451,6 @@ void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable);
 void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines);
 void dispc_mgr_set_lcd_display_type(enum omap_channel channel,
                 enum omap_lcd_display_type type);
-void dispc_mgr_set_default_color(enum omap_channel channel, u32 color);
-u32 dispc_mgr_get_default_color(enum omap_channel channel);
-void dispc_mgr_set_trans_key(enum omap_channel ch,
-                enum omap_dss_trans_key_type type,
-                u32 trans_key);
-void dispc_mgr_get_trans_key(enum omap_channel ch,
-                enum omap_dss_trans_key_type *type,
-                u32 *trans_key);
-void dispc_mgr_enable_trans_key(enum omap_channel ch, bool enable);
-void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch, bool enable);
-bool dispc_mgr_trans_key_enabled(enum omap_channel ch);
-bool dispc_mgr_alpha_fixed_zorder_enabled(enum omap_channel ch);
 void dispc_mgr_set_lcd_timings(enum omap_channel channel,
                 struct omap_video_timings *timings);
 void dispc_mgr_set_pol_freq(enum omap_channel channel,
@@ -443,6 +461,8 @@ int dispc_mgr_set_clock_div(enum omap_channel channel,
                 struct dispc_clock_info *cinfo);
 int dispc_mgr_get_clock_div(enum omap_channel channel,
                 struct dispc_clock_info *cinfo);
+void dispc_mgr_setup(enum omap_channel channel,
+                struct omap_overlay_manager_info *info);
 
 /* VENC */
 #ifdef CONFIG_OMAP2_DSS_VENC
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index b402699168a5..afcb59301c37 100644
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -304,6 +304,11 @@ static const struct dss_param_range omap2_dss_param_range[] = {
         [FEAT_PARAM_DSIPLL_FINT]                = { 0, 0 },
         [FEAT_PARAM_DSIPLL_LPDIV]               = { 0, 0 },
         [FEAT_PARAM_DOWNSCALE]                  = { 1, 2 },
+        /*
+         * Assuming the line width buffer to be 768 pixels as OMAP2 DISPC
+         * scaler cannot scale a image with width more than 768.
+         */
+        [FEAT_PARAM_LINEWIDTH]                  = { 1, 768 },
 };
 
 static const struct dss_param_range omap3_dss_param_range[] = {
@@ -316,6 +321,7 @@ static const struct dss_param_range omap3_dss_param_range[] = {
         [FEAT_PARAM_DSIPLL_FINT]                = { 750000, 2100000 },
         [FEAT_PARAM_DSIPLL_LPDIV]               = { 1, (1 << 13) - 1},
         [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
+        [FEAT_PARAM_LINEWIDTH]                  = { 1, 1024 },
 };
 
 static const struct dss_param_range omap4_dss_param_range[] = {
@@ -328,6 +334,7 @@ static const struct dss_param_range omap4_dss_param_range[] = {
         [FEAT_PARAM_DSIPLL_FINT]                = { 500000, 2500000 },
         [FEAT_PARAM_DSIPLL_LPDIV]               = { 0, (1 << 13) - 1 },
         [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
+        [FEAT_PARAM_LINEWIDTH]                  = { 1, 2048 },
 };
 
 /* OMAP2 DSS Features */
@@ -465,6 +472,10 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = {
         .dump_core              =       ti_hdmi_4xxx_core_dump,
         .dump_pll               =       ti_hdmi_4xxx_pll_dump,
         .dump_phy               =       ti_hdmi_4xxx_phy_dump,
+#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+        .audio_enable           =       ti_hdmi_4xxx_wp_audio_enable,
+#endif
 
 };
 
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index 6a6c05dd45ce..cd833bbaac3d 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -86,6 +86,7 @@ enum dss_range_param {
         FEAT_PARAM_DSIPLL_FINT,
         FEAT_PARAM_DSIPLL_LPDIV,
         FEAT_PARAM_DOWNSCALE,
+        FEAT_PARAM_LINEWIDTH,
 };
 
 /* DSS Feature Functions */
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index c56378c555b0..b4c270edb915 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -333,7 +333,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         if (r)
                 return r;
 
-        dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0);
+        dss_mgr_disable(dssdev->manager);
 
         p = &dssdev->panel.timings;
 
@@ -387,9 +387,16 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 
         hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
 
-        dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1);
+        r = dss_mgr_enable(dssdev->manager);
+        if (r)
+                goto err_mgr_enable;
 
         return 0;
+
+err_mgr_enable:
+        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
+        hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
+        hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);
 err:
         hdmi_runtime_put();
         return -EIO;
@@ -397,7 +404,7 @@ err:
 
 static void hdmi_power_off(struct omap_dss_device *dssdev)
 {
-        dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0);
+        dss_mgr_disable(dssdev->manager);
 
         hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
         hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
@@ -554,11 +561,44 @@ void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev)
 #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
         defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
 
-static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data,
-                                        struct snd_pcm_substream *substream,
+static int hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_codec *codec = rtd->codec;
+        struct platform_device *pdev = to_platform_device(codec->dev);
+        struct hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec);
+        int err = 0;
+
+        if (!(ip_data->ops) && !(ip_data->ops->audio_enable)) {
+                dev_err(&pdev->dev, "Cannot enable/disable audio\n");
+                return -ENODEV;
+        }
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                ip_data->ops->audio_enable(ip_data, true);
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                ip_data->ops->audio_enable(ip_data, false);
+                break;
+        default:
+                err = -EINVAL;
+        }
+        return err;
+}
+
+static int hdmi_audio_hw_params(struct snd_pcm_substream *substream,
                                     struct snd_pcm_hw_params *params,
                                     struct snd_soc_dai *dai)
 {
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_codec *codec = rtd->codec;
+        struct hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec);
         struct hdmi_audio_format audio_format;
         struct hdmi_audio_dma audio_dma;
         struct hdmi_core_audio_config core_cfg;
@@ -698,7 +738,16 @@ static int hdmi_audio_startup(struct snd_pcm_substream *substream,
         return 0;
 }
 
+static int hdmi_audio_codec_probe(struct snd_soc_codec *codec)
+{
+        struct hdmi_ip_data *priv = &hdmi.ip_data;
+
+        snd_soc_codec_set_drvdata(codec, priv);
+        return 0;
+}
+
 static struct snd_soc_codec_driver hdmi_audio_codec_drv = {
+        .probe = hdmi_audio_codec_probe,
 };
 
 static struct snd_soc_dai_ops hdmi_audio_codec_ops = {
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 6e63845cc7d7..d1858e71c64e 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -26,17 +26,15 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/spinlock.h>
 #include <linux/jiffies.h>
 
 #include <video/omapdss.h>
-#include <plat/cpu.h>
 
 #include "dss.h"
 #include "dss_features.h"
 
 static int num_managers;
-static struct list_head manager_list;
+static struct omap_overlay_manager *managers;
 
 static ssize_t manager_name_show(struct omap_overlay_manager *mgr, char *buf)
 {
@@ -106,7 +104,11 @@ put_device:
 static ssize_t manager_default_color_show(struct omap_overlay_manager *mgr,
                                           char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%#x\n", mgr->info.default_color);
+        struct omap_overlay_manager_info info;
+
+        mgr->get_manager_info(mgr, &info);
+
+        return snprintf(buf, PAGE_SIZE, "%#x\n", info.default_color);
 }
 
 static ssize_t manager_default_color_store(struct omap_overlay_manager *mgr,
@@ -144,8 +146,11 @@ static ssize_t manager_trans_key_type_show(struct omap_overlay_manager *mgr,
                                            char *buf)
 {
         enum omap_dss_trans_key_type key_type;
+        struct omap_overlay_manager_info info;
+
+        mgr->get_manager_info(mgr, &info);
 
-        key_type = mgr->info.trans_key_type;
+        key_type = info.trans_key_type;
         BUG_ON(key_type >= ARRAY_SIZE(trans_key_type_str));
 
         return snprintf(buf, PAGE_SIZE, "%s\n", trans_key_type_str[key_type]);
@@ -185,7 +190,11 @@ static ssize_t manager_trans_key_type_store(struct omap_overlay_manager *mgr,
 static ssize_t manager_trans_key_value_show(struct omap_overlay_manager *mgr,
                                             char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%#x\n", mgr->info.trans_key);
+        struct omap_overlay_manager_info info;
+
+        mgr->get_manager_info(mgr, &info);
+
+        return snprintf(buf, PAGE_SIZE, "%#x\n", info.trans_key);
 }
 
 static ssize_t manager_trans_key_value_store(struct omap_overlay_manager *mgr,
@@ -217,7 +226,11 @@ static ssize_t manager_trans_key_value_store(struct omap_overlay_manager *mgr,
 static ssize_t manager_trans_key_enabled_show(struct omap_overlay_manager *mgr,
                                               char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.trans_enabled);
+        struct omap_overlay_manager_info info;
+
+        mgr->get_manager_info(mgr, &info);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", info.trans_enabled);
 }
 
 static ssize_t manager_trans_key_enabled_store(struct omap_overlay_manager *mgr,
@@ -249,10 +262,14 @@ static ssize_t manager_trans_key_enabled_store(struct omap_overlay_manager *mgr,
 static ssize_t manager_alpha_blending_enabled_show(
                 struct omap_overlay_manager *mgr, char *buf)
 {
+        struct omap_overlay_manager_info info;
+
+        mgr->get_manager_info(mgr, &info);
+
         WARN_ON(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER));
 
         return snprintf(buf, PAGE_SIZE, "%d\n",
-                mgr->info.partial_alpha_enabled);
+                info.partial_alpha_enabled);
 }
 
 static ssize_t manager_alpha_blending_enabled_store(
@@ -287,7 +304,11 @@ static ssize_t manager_alpha_blending_enabled_store(
 static ssize_t manager_cpr_enable_show(struct omap_overlay_manager *mgr,
                 char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.cpr_enable);
+        struct omap_overlay_manager_info info;
+
+        mgr->get_manager_info(mgr, &info);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", info.cpr_enable);
 }
 
 static ssize_t manager_cpr_enable_store(struct omap_overlay_manager *mgr,
@@ -469,143 +490,6 @@ static struct kobj_type manager_ktype = {
         .default_attrs = manager_sysfs_attrs,
 };
 
-/*
- * We have 4 levels of cache for the dispc settings. First two are in SW and
- * the latter two in HW.
- *
- * +--------------------+
- * |overlay/manager_info|
- * +--------------------+
- *          v
- *        apply()
- *          v
- * +--------------------+
- * |     dss_cache      |
- * +--------------------+
- *          v
- *      configure()
- *          v
- * +--------------------+
- * |  shadow registers  |
- * +--------------------+
- *          v
- * VFP or lcd/digit_enable
- *          v
- * +--------------------+
- * |      registers     |
- * +--------------------+
- */
-
-struct overlay_cache_data {
-        /* If true, cache changed, but not written to shadow registers. Set
-         * in apply(), cleared when registers written. */
-        bool dirty;
-        /* If true, shadow registers contain changed values not yet in real
-         * registers. Set when writing to shadow registers, cleared at
-         * VSYNC/EVSYNC */
-        bool shadow_dirty;
-
-        bool enabled;
-
-        struct omap_overlay_info info;
-
-        enum omap_channel channel;
-        bool replication;
-        bool ilace;
-
-        u32 fifo_low;
-        u32 fifo_high;
-};
-
-struct manager_cache_data {
-        /* If true, cache changed, but not written to shadow registers. Set
-         * in apply(), cleared when registers written. */
-        bool dirty;
-        /* If true, shadow registers contain changed values not yet in real
-         * registers. Set when writing to shadow registers, cleared at
-         * VSYNC/EVSYNC */
-        bool shadow_dirty;
-
-        struct omap_overlay_manager_info info;
-
-        bool manual_update;
-        bool do_manual_update;
-
-        /* manual update region */
-        u16 x, y, w, h;
-
-        /* enlarge the update area if the update area contains scaled
-         * overlays */
-        bool enlarge_update_area;
-};
-
-static struct {
-        spinlock_t lock;
-        struct overlay_cache_data overlay_cache[MAX_DSS_OVERLAYS];
-        struct manager_cache_data manager_cache[MAX_DSS_MANAGERS];
-
-        bool irq_enabled;
-} dss_cache;
-
-
-
-static int omap_dss_set_device(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev)
-{
-        int i;
-        int r;
-
-        if (dssdev->manager) {
-                DSSERR("display '%s' already has a manager '%s'\n",
-                               dssdev->name, dssdev->manager->name);
-                return -EINVAL;
-        }
-
-        if ((mgr->supported_displays & dssdev->type) == 0) {
-                DSSERR("display '%s' does not support manager '%s'\n",
-                               dssdev->name, mgr->name);
-                return -EINVAL;
-        }
-
-        for (i = 0; i < mgr->num_overlays; i++) {
-                struct omap_overlay *ovl = mgr->overlays[i];
-
-                if (ovl->manager != mgr || !ovl->info.enabled)
-                        continue;
-
-                r = dss_check_overlay(ovl, dssdev);
-                if (r)
-                        return r;
-        }
-
-        dssdev->manager = mgr;
-        mgr->device = dssdev;
-        mgr->device_changed = true;
-
-        return 0;
-}
-
-static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
-{
-        if (!mgr->device) {
-                DSSERR("failed to unset display, display not set.\n");
-                return -EINVAL;
-        }
-
-        /*
-         * Don't allow currently enabled displays to have the overlay manager
-         * pulled out from underneath them
-         */
-        if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED)
-                return -EINVAL;
-
-        mgr->device->manager = NULL;
-        mgr->device = NULL;
-        mgr->device_changed = true;
-
-        return 0;
-}
-
 static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
 {
         unsigned long timeout = msecs_to_jiffies(500);
@@ -624,1022 +508,169 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
         return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
 }
 
-static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
-{
-        unsigned long timeout = msecs_to_jiffies(500);
-        struct manager_cache_data *mc;
-        u32 irq;
-        int r;
-        int i;
-        struct omap_dss_device *dssdev = mgr->device;
-
-        if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-                return 0;
-
-        if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE)
-                return 0;
-
-        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
-                        || dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
-                irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
-        } else {
-                irq = (dssdev->manager->id == OMAP_DSS_CHANNEL_LCD) ?
-                        DISPC_IRQ_VSYNC : DISPC_IRQ_VSYNC2;
-        }
-
-        mc = &dss_cache.manager_cache[mgr->id];
-        i = 0;
-        while (1) {
-                unsigned long flags;
-                bool shadow_dirty, dirty;
-
-                spin_lock_irqsave(&dss_cache.lock, flags);
-                dirty = mc->dirty;
-                shadow_dirty = mc->shadow_dirty;
-                spin_unlock_irqrestore(&dss_cache.lock, flags);
-
-                if (!dirty && !shadow_dirty) {
-                        r = 0;
-                        break;
-                }
-
-                /* 4 iterations is the worst case:
-                 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
-                 * 2 - first VSYNC, dirty = true
-                 * 3 - dirty = false, shadow_dirty = true
-                 * 4 - shadow_dirty = false */
-                if (i++ == 3) {
-                        DSSERR("mgr(%d)->wait_for_go() not finishing\n",
-                                        mgr->id);
-                        r = 0;
-                        break;
-                }
-
-                r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
-                if (r == -ERESTARTSYS)
-                        break;
-
-                if (r) {
-                        DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id);
-                        break;
-                }
-        }
-
-        return r;
-}
-
-int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
-{
-        unsigned long timeout = msecs_to_jiffies(500);
-        struct overlay_cache_data *oc;
-        struct omap_dss_device *dssdev;
-        u32 irq;
-        int r;
-        int i;
-
-        if (!ovl->manager)
-                return 0;
-
-        dssdev = ovl->manager->device;
-
-        if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-                return 0;
-
-        if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE)
-                return 0;
-
-        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
-                        || dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
-                irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
-        } else {
-                irq = (dssdev->manager->id == OMAP_DSS_CHANNEL_LCD) ?
-                        DISPC_IRQ_VSYNC : DISPC_IRQ_VSYNC2;
-        }
-
-        oc = &dss_cache.overlay_cache[ovl->id];
-        i = 0;
-        while (1) {
-                unsigned long flags;
-                bool shadow_dirty, dirty;
-
-                spin_lock_irqsave(&dss_cache.lock, flags);
-                dirty = oc->dirty;
-                shadow_dirty = oc->shadow_dirty;
-                spin_unlock_irqrestore(&dss_cache.lock, flags);
-
-                if (!dirty && !shadow_dirty) {
-                        r = 0;
-                        break;
-                }
-
-                /* 4 iterations is the worst case:
-                 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
-                 * 2 - first VSYNC, dirty = true
-                 * 3 - dirty = false, shadow_dirty = true
-                 * 4 - shadow_dirty = false */
-                if (i++ == 3) {
-                        DSSERR("ovl(%d)->wait_for_go() not finishing\n",
-                                        ovl->id);
-                        r = 0;
-                        break;
-                }
-
-                r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
-                if (r == -ERESTARTSYS)
-                        break;
-
-                if (r) {
-                        DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id);
-                        break;
-                }
-        }
-
-        return r;
-}
-
-static int overlay_enabled(struct omap_overlay *ovl)
-{
-        return ovl->info.enabled && ovl->manager && ovl->manager->device;
-}
-
-/* Is rect1 a subset of rect2? */
-static bool rectangle_subset(int x1, int y1, int w1, int h1,
-                int x2, int y2, int w2, int h2)
-{
-        if (x1 < x2 || y1 < y2)
-                return false;
-
-        if (x1 + w1 > x2 + w2)
-                return false;
-
-        if (y1 + h1 > y2 + h2)
-                return false;
-
-        return true;
-}
-
-/* Do rect1 and rect2 overlap? */
-static bool rectangle_intersects(int x1, int y1, int w1, int h1,
-                int x2, int y2, int w2, int h2)
-{
-        if (x1 >= x2 + w2)
-                return false;
-
-        if (x2 >= x1 + w1)
-                return false;
-
-        if (y1 >= y2 + h2)
-                return false;
-
-        if (y2 >= y1 + h1)
-                return false;
-
-        return true;
-}
-
-static bool dispc_is_overlay_scaled(struct overlay_cache_data *oc)
-{
-        struct omap_overlay_info *oi = &oc->info;
-
-        if (oi->out_width != 0 && oi->width != oi->out_width)
-                return true;
-
-        if (oi->out_height != 0 && oi->height != oi->out_height)
-                return true;
-
-        return false;
-}
-
-static int configure_overlay(enum omap_plane plane)
+int dss_init_overlay_managers(struct platform_device *pdev)
 {
-        struct overlay_cache_data *c;
-        struct manager_cache_data *mc;
-        struct omap_overlay_info *oi, new_oi;
-        struct omap_overlay_manager_info *mi;
-        u16 outw, outh;
-        u16 x, y, w, h;
-        u32 paddr;
-        int r;
-        u16 orig_w, orig_h, orig_outw, orig_outh;
+        int i, r;
 
-        DSSDBGF("%d", plane);
+        num_managers = dss_feat_get_num_mgrs();
 
-        c = &dss_cache.overlay_cache[plane];
-        oi = &c->info;
+        managers = kzalloc(sizeof(struct omap_overlay_manager) * num_managers,
+                        GFP_KERNEL);
 
-        if (!c->enabled) {
-                dispc_ovl_enable(plane, 0);
-                return 0;
-        }
+        BUG_ON(managers == NULL);
 
-        mc = &dss_cache.manager_cache[c->channel];
-        mi = &mc->info;
-
-        x = oi->pos_x;
-        y = oi->pos_y;
-        w = oi->width;
-        h = oi->height;
-        outw = oi->out_width == 0 ? oi->width : oi->out_width;
-        outh = oi->out_height == 0 ? oi->height : oi->out_height;
-        paddr = oi->paddr;
-
-        orig_w = w;
-        orig_h = h;
-        orig_outw = outw;
-        orig_outh = outh;
-
-        if (mc->manual_update && mc->do_manual_update) {
-                unsigned bpp;
-                unsigned scale_x_m = w, scale_x_d = outw;
-                unsigned scale_y_m = h, scale_y_d = outh;
-
-                /* If the overlay is outside the update region, disable it */
-                if (!rectangle_intersects(mc->x, mc->y, mc->w, mc->h,
-                                        x, y, outw, outh)) {
-                        dispc_ovl_enable(plane, 0);
-                        return 0;
-                }
+        for (i = 0; i < num_managers; ++i) {
+                struct omap_overlay_manager *mgr = &managers[i];
 
-                switch (oi->color_mode) {
-                case OMAP_DSS_COLOR_NV12:
-                        bpp = 8;
-                        break;
-                case OMAP_DSS_COLOR_RGB16:
-                case OMAP_DSS_COLOR_ARGB16:
-                case OMAP_DSS_COLOR_YUV2:
-                case OMAP_DSS_COLOR_UYVY:
-                case OMAP_DSS_COLOR_RGBA16:
-                case OMAP_DSS_COLOR_RGBX16:
-                case OMAP_DSS_COLOR_ARGB16_1555:
-                case OMAP_DSS_COLOR_XRGB16_1555:
-                        bpp = 16;
+                switch (i) {
+                case 0:
+                        mgr->name = "lcd";
+                        mgr->id = OMAP_DSS_CHANNEL_LCD;
                         break;
-
-                case OMAP_DSS_COLOR_RGB24P:
-                        bpp = 24;
+                case 1:
+                        mgr->name = "tv";
+                        mgr->id = OMAP_DSS_CHANNEL_DIGIT;
                         break;
-
-                case OMAP_DSS_COLOR_RGB24U:
-                case OMAP_DSS_COLOR_ARGB32:
-                case OMAP_DSS_COLOR_RGBA32:
-                case OMAP_DSS_COLOR_RGBX32:
-                        bpp = 32;
+                case 2:
+                        mgr->name = "lcd2";
+                        mgr->id = OMAP_DSS_CHANNEL_LCD2;
                         break;
-
-                default:
-                        BUG();
                 }
 
-                if (mc->x > oi->pos_x) {
-                        x = 0;
-                        outw -= (mc->x - oi->pos_x);
-                        paddr += (mc->x - oi->pos_x) *
-                                scale_x_m / scale_x_d * bpp / 8;
-                } else {
-                        x = oi->pos_x - mc->x;
-                }
-
-                if (mc->y > oi->pos_y) {
-                        y = 0;
-                        outh -= (mc->y - oi->pos_y);
-                        paddr += (mc->y - oi->pos_y) *
-                                scale_y_m / scale_y_d *
-                                oi->screen_width * bpp / 8;
-                } else {
-                        y = oi->pos_y - mc->y;
-                }
-
-                if (mc->w < (x + outw))
-                        outw -= (x + outw) - (mc->w);
-
-                if (mc->h < (y + outh))
-                        outh -= (y + outh) - (mc->h);
-
-                w = w * outw / orig_outw;
-                h = h * outh / orig_outh;
-
-                /* YUV mode overlay's input width has to be even and the
-                 * algorithm above may adjust the width to be odd.
-                 *
-                 * Here we adjust the width if needed, preferring to increase
-                 * the width if the original width was bigger.
-                 */
-                if ((w & 1) &&
-                                (oi->color_mode == OMAP_DSS_COLOR_YUV2 ||
-                                 oi->color_mode == OMAP_DSS_COLOR_UYVY)) {
-                        if (orig_w > w)
-                                w += 1;
-                        else
-                                w -= 1;
-                }
-        }
-
-        new_oi = *oi;
-
-        /* update new_oi members which could have been possibly updated */
-        new_oi.pos_x = x;
-        new_oi.pos_y = y;
-        new_oi.width = w;
-        new_oi.height = h;
-        new_oi.out_width = outw;
-        new_oi.out_height = outh;
-        new_oi.paddr = paddr;
-
-        r = dispc_ovl_setup(plane, &new_oi, c->ilace, c->channel,
-                c->replication, c->fifo_low, c->fifo_high);
-        if (r) {
-                /* this shouldn't happen */
-                DSSERR("dispc_ovl_setup failed for ovl %d\n", plane);
-                dispc_ovl_enable(plane, 0);
-                return r;
-        }
-
-        dispc_ovl_enable(plane, 1);
-
-        return 0;
-}
-
-static void configure_manager(enum omap_channel channel)
-{
-        struct omap_overlay_manager_info *mi;
-
-        DSSDBGF("%d", channel);
-
-        /* picking info from the cache */
-        mi = &dss_cache.manager_cache[channel].info;
-
-        dispc_mgr_set_default_color(channel, mi->default_color);
-        dispc_mgr_set_trans_key(channel, mi->trans_key_type, mi->trans_key);
-        dispc_mgr_enable_trans_key(channel, mi->trans_enabled);
-        dispc_mgr_enable_alpha_fixed_zorder(channel, mi->partial_alpha_enabled);
-        if (dss_has_feature(FEAT_CPR)) {
-                dispc_mgr_enable_cpr(channel, mi->cpr_enable);
-                dispc_mgr_set_cpr_coef(channel, &mi->cpr_coefs);
-        }
-}
-
-/* configure_dispc() tries to write values from cache to shadow registers.
- * It writes only to those managers/overlays that are not busy.
- * returns 0 if everything could be written to shadow registers.
- * returns 1 if not everything could be written to shadow registers. */
-static int configure_dispc(void)
-{
-        struct overlay_cache_data *oc;
-        struct manager_cache_data *mc;
-        const int num_ovls = dss_feat_get_num_ovls();
-        const int num_mgrs = dss_feat_get_num_mgrs();
-        int i;
-        int r;
-        bool mgr_busy[MAX_DSS_MANAGERS];
-        bool mgr_go[MAX_DSS_MANAGERS];
-        bool busy;
-
-        r = 0;
-        busy = false;
-
-        for (i = 0; i < num_mgrs; i++) {
-                mgr_busy[i] = dispc_mgr_go_busy(i);
-                mgr_go[i] = false;
-        }
-
-        /* Commit overlay settings */
-        for (i = 0; i < num_ovls; ++i) {
-                oc = &dss_cache.overlay_cache[i];
-                mc = &dss_cache.manager_cache[oc->channel];
+                mgr->set_device = &dss_mgr_set_device;
+                mgr->unset_device = &dss_mgr_unset_device;
+                mgr->apply = &omap_dss_mgr_apply;
+                mgr->set_manager_info = &dss_mgr_set_info;
+                mgr->get_manager_info = &dss_mgr_get_info;
+                mgr->wait_for_go = &dss_mgr_wait_for_go;
+                mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;
 
-                if (!oc->dirty)
-                        continue;
+                mgr->caps = 0;
+                mgr->supported_displays =
+                        dss_feat_get_supported_displays(mgr->id);
 
-                if (mc->manual_update && !mc->do_manual_update)
-                        continue;
+                INIT_LIST_HEAD(&mgr->overlays);
 
-                if (mgr_busy[oc->channel]) {
-                        busy = true;
-                        continue;
-                }
+                r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
+                                &pdev->dev.kobj, "manager%d", i);
 
-                r = configure_overlay(i);
                 if (r)
-                        DSSERR("configure_overlay %d failed\n", i);
-
-                oc->dirty = false;
-                oc->shadow_dirty = true;
-                mgr_go[oc->channel] = true;
-        }
-
-        /* Commit manager settings */
-        for (i = 0; i < num_mgrs; ++i) {
-                mc = &dss_cache.manager_cache[i];
-
-                if (!mc->dirty)
-                        continue;
-
-                if (mc->manual_update && !mc->do_manual_update)
-                        continue;
-
-                if (mgr_busy[i]) {
-                        busy = true;
-                        continue;
-                }
-
-                configure_manager(i);
-                mc->dirty = false;
-                mc->shadow_dirty = true;
-                mgr_go[i] = true;
-        }
-
-        /* set GO */
-        for (i = 0; i < num_mgrs; ++i) {
-                mc = &dss_cache.manager_cache[i];
-
-                if (!mgr_go[i])
-                        continue;
-
-                /* We don't need GO with manual update display. LCD iface will
-                 * always be turned off after frame, and new settings will be
-                 * taken in to use at next update */
-                if (!mc->manual_update)
-                        dispc_mgr_go(i);
-        }
-
-        if (busy)
-                r = 1;
-        else
-                r = 0;
-
-        return r;
-}
-
-/* Make the coordinates even. There are some strange problems with OMAP and
- * partial DSI update when the update widths are odd. */
-static void make_even(u16 *x, u16 *w)
-{
-        u16 x1, x2;
-
-        x1 = *x;
-        x2 = *x + *w;
-
-        x1 &= ~1;
-        x2 = ALIGN(x2, 2);
-
-        *x = x1;
-        *w = x2 - x1;
-}
-
-/* Configure dispc for partial update. Return possibly modified update
- * area */
-void dss_setup_partial_planes(struct omap_dss_device *dssdev,
-                u16 *xi, u16 *yi, u16 *wi, u16 *hi, bool enlarge_update_area)
-{
-        struct overlay_cache_data *oc;
-        struct manager_cache_data *mc;
-        struct omap_overlay_info *oi;
-        const int num_ovls = dss_feat_get_num_ovls();
-        struct omap_overlay_manager *mgr;
-        int i;
-        u16 x, y, w, h;
-        unsigned long flags;
-        bool area_changed;
-
-        x = *xi;
-        y = *yi;
-        w = *wi;
-        h = *hi;
-
-        DSSDBG("dispc_setup_partial_planes %d,%d %dx%d\n",
-                *xi, *yi, *wi, *hi);
-
-        mgr = dssdev->manager;
-
-        if (!mgr) {
-                DSSDBG("no manager\n");
-                return;
+                        DSSERR("failed to create sysfs file\n");
         }
 
-        make_even(&x, &w);
-
-        spin_lock_irqsave(&dss_cache.lock, flags);
-
-        /*
-         * Execute the outer loop until the inner loop has completed
-         * once without increasing the update area. This will ensure that
-         * all scaled overlays end up completely within the update area.
-         */
-        do {
-                area_changed = false;
-
-                /* We need to show the whole overlay if it is scaled. So look
-                 * for those, and make the update area larger if found.
-                 * Also mark the overlay cache dirty */
-                for (i = 0; i < num_ovls; ++i) {
-                        unsigned x1, y1, x2, y2;
-                        unsigned outw, outh;
-
-                        oc = &dss_cache.overlay_cache[i];
-                        oi = &oc->info;
-
-                        if (oc->channel != mgr->id)
-                                continue;
-
-                        oc->dirty = true;
-
-                        if (!enlarge_update_area)
-                                continue;
-
-                        if (!oc->enabled)
-                                continue;
-
-                        if (!dispc_is_overlay_scaled(oc))
-                                continue;
-
-                        outw = oi->out_width == 0 ?
-                                oi->width : oi->out_width;
-                        outh = oi->out_height == 0 ?
-                                oi->height : oi->out_height;
-
-                        /* is the overlay outside the update region? */
-                        if (!rectangle_intersects(x, y, w, h,
-                                                oi->pos_x, oi->pos_y,
-                                                outw, outh))
-                                continue;
-
-                        /* if the overlay totally inside the update region? */
-                        if (rectangle_subset(oi->pos_x, oi->pos_y, outw, outh,
-                                                x, y, w, h))
-                                continue;
-
-                        if (x > oi->pos_x)
-                                x1 = oi->pos_x;
-                        else
-                                x1 = x;
-
-                        if (y > oi->pos_y)
-                                y1 = oi->pos_y;
-                        else
-                                y1 = y;
-
-                        if ((x + w) < (oi->pos_x + outw))
-                                x2 = oi->pos_x + outw;
-                        else
-                                x2 = x + w;
-
-                        if ((y + h) < (oi->pos_y + outh))
-                                y2 = oi->pos_y + outh;
-                        else
-                                y2 = y + h;
-
-                        x = x1;
-                        y = y1;
-                        w = x2 - x1;
-                        h = y2 - y1;
-
-                        make_even(&x, &w);
-
-                        DSSDBG("changing upd area due to ovl(%d) "
-                               "scaling %d,%d %dx%d\n",
-                                i, x, y, w, h);
-
-                        area_changed = true;
-                }
-        } while (area_changed);
-
-        mc = &dss_cache.manager_cache[mgr->id];
-        mc->do_manual_update = true;
-        mc->enlarge_update_area = enlarge_update_area;
-        mc->x = x;
-        mc->y = y;
-        mc->w = w;
-        mc->h = h;
-
-        configure_dispc();
-
-        mc->do_manual_update = false;
-
-        spin_unlock_irqrestore(&dss_cache.lock, flags);
-
-        *xi = x;
-        *yi = y;
-        *wi = w;
-        *hi = h;
+        return 0;
 }
 
-void dss_start_update(struct omap_dss_device *dssdev)
+void dss_uninit_overlay_managers(struct platform_device *pdev)
 {
-        struct manager_cache_data *mc;
-        struct overlay_cache_data *oc;
-        const int num_ovls = dss_feat_get_num_ovls();
-        const int num_mgrs = dss_feat_get_num_mgrs();
-        struct omap_overlay_manager *mgr;
         int i;
 
-        mgr = dssdev->manager;
+        for (i = 0; i < num_managers; ++i) {
+                struct omap_overlay_manager *mgr = &managers[i];
 
-        for (i = 0; i < num_ovls; ++i) {
-                oc = &dss_cache.overlay_cache[i];
-                if (oc->channel != mgr->id)
-                        continue;
-
-                oc->shadow_dirty = false;
-        }
-
-        for (i = 0; i < num_mgrs; ++i) {
-                mc = &dss_cache.manager_cache[i];
-                if (mgr->id != i)
-                        continue;
-
-                mc->shadow_dirty = false;
+                kobject_del(&mgr->kobj);
+                kobject_put(&mgr->kobj);
         }
 
-        dssdev->manager->enable(dssdev->manager);
+        kfree(managers);
+        managers = NULL;
+        num_managers = 0;
 }
 
-static void dss_apply_irq_handler(void *data, u32 mask)
+int omap_dss_get_num_overlay_managers(void)
 {
-        struct manager_cache_data *mc;
-        struct overlay_cache_data *oc;
-        const int num_ovls = dss_feat_get_num_ovls();
-        const int num_mgrs = dss_feat_get_num_mgrs();
-        int i, r;
-        bool mgr_busy[MAX_DSS_MANAGERS];
-        u32 irq_mask;
-
-        for (i = 0; i < num_mgrs; i++)
-                mgr_busy[i] = dispc_mgr_go_busy(i);
-
-        spin_lock(&dss_cache.lock);
-
-        for (i = 0; i < num_ovls; ++i) {
-                oc = &dss_cache.overlay_cache[i];
-                if (!mgr_busy[oc->channel])
-                        oc->shadow_dirty = false;
-        }
-
-        for (i = 0; i < num_mgrs; ++i) {
-                mc = &dss_cache.manager_cache[i];
-                if (!mgr_busy[i])
-                        mc->shadow_dirty = false;
-        }
-
-        r = configure_dispc();
-        if (r == 1)
-                goto end;
-
-        /* re-read busy flags */
-        for (i = 0; i < num_mgrs; i++)
-                mgr_busy[i] = dispc_mgr_go_busy(i);
-
-        /* keep running as long as there are busy managers, so that
-         * we can collect overlay-applied information */
-        for (i = 0; i < num_mgrs; ++i) {
-                if (mgr_busy[i])
-                        goto end;
-        }
-
-        irq_mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_ODD |
-                        DISPC_IRQ_EVSYNC_EVEN;
-        if (dss_has_feature(FEAT_MGR_LCD2))
-                irq_mask |= DISPC_IRQ_VSYNC2;
-
-        omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, irq_mask);
-        dss_cache.irq_enabled = false;
-
-end:
-        spin_unlock(&dss_cache.lock);
+        return num_managers;
 }
+EXPORT_SYMBOL(omap_dss_get_num_overlay_managers);
 
-static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
+struct omap_overlay_manager *omap_dss_get_overlay_manager(int num)
 {
-        struct overlay_cache_data *oc;
-        struct manager_cache_data *mc;
-        int i;
-        struct omap_overlay *ovl;
-        int num_planes_enabled = 0;
-        bool use_fifomerge;
-        unsigned long flags;
-        int r;
-
-        DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name);
-
-        r = dispc_runtime_get();
-        if (r)
-                return r;
-
-        spin_lock_irqsave(&dss_cache.lock, flags);
-
-        /* Configure overlays */
-        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-                struct omap_dss_device *dssdev;
-
-                ovl = omap_dss_get_overlay(i);
-
-                oc = &dss_cache.overlay_cache[ovl->id];
-
-                if (ovl->manager_changed) {
-                        ovl->manager_changed = false;
-                        ovl->info_dirty  = true;
-                }
-
-                if (!overlay_enabled(ovl)) {
-                        if (oc->enabled) {
-                                oc->enabled = false;
-                                oc->dirty = true;
-                        }
-                        continue;
-                }
-
-                if (!ovl->info_dirty) {
-                        if (oc->enabled)
-                                ++num_planes_enabled;
-                        continue;
-                }
-
-                dssdev = ovl->manager->device;
-
-                if (dss_check_overlay(ovl, dssdev)) {
-                        if (oc->enabled) {
-                                oc->enabled = false;
-                                oc->dirty = true;
-                        }
-                        continue;
-                }
-
-                ovl->info_dirty = false;
-                oc->dirty = true;
-                oc->info = ovl->info;
-
-                oc->replication =
-                        dss_use_replication(dssdev, ovl->info.color_mode);
-
-                oc->ilace = dssdev->type == OMAP_DISPLAY_TYPE_VENC;
-
-                oc->channel = ovl->manager->id;
-
-                oc->enabled = true;
-
-                ++num_planes_enabled;
-        }
-
-        /* Configure managers */
-        list_for_each_entry(mgr, &manager_list, list) {
-                struct omap_dss_device *dssdev;
+        if (num >= num_managers)
+                return NULL;
 
-                mc = &dss_cache.manager_cache[mgr->id];
-
-                if (mgr->device_changed) {
-                        mgr->device_changed = false;
-                        mgr->info_dirty  = true;
-                }
-
-                if (!mgr->info_dirty)
-                        continue;
-
-                if (!mgr->device)
-                        continue;
-
-                dssdev = mgr->device;
-
-                mgr->info_dirty = false;
-                mc->dirty = true;
-                mc->info = mgr->info;
-
-                mc->manual_update =
-                        dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
-        }
-
-        /* XXX TODO: Try to get fifomerge working. The problem is that it
-         * affects both managers, not individually but at the same time. This
-         * means the change has to be well synchronized. I guess the proper way
-         * is to have a two step process for fifo merge:
-         *        fifomerge enable:
-         *             1. disable other planes, leaving one plane enabled
-         *             2. wait until the planes are disabled on HW
-         *             3. config merged fifo thresholds, enable fifomerge
-         *        fifomerge disable:
-         *             1. config unmerged fifo thresholds, disable fifomerge
-         *             2. wait until fifo changes are in HW
-         *             3. enable planes
-         */
-        use_fifomerge = false;
-
-        /* Configure overlay fifos */
-        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-                struct omap_dss_device *dssdev;
-                u32 size, burst_size;
-
-                ovl = omap_dss_get_overlay(i);
-
-                oc = &dss_cache.overlay_cache[ovl->id];
-
-                if (!oc->enabled)
-                        continue;
-
-                dssdev = ovl->manager->device;
-
-                size = dispc_ovl_get_fifo_size(ovl->id);
-                if (use_fifomerge)
-                        size *= 3;
-
-                burst_size = dispc_ovl_get_burst_size(ovl->id);
-
-                switch (dssdev->type) {
-                case OMAP_DISPLAY_TYPE_DPI:
-                case OMAP_DISPLAY_TYPE_DBI:
-                case OMAP_DISPLAY_TYPE_SDI:
-                case OMAP_DISPLAY_TYPE_VENC:
-                case OMAP_DISPLAY_TYPE_HDMI:
-                        default_get_overlay_fifo_thresholds(ovl->id, size,
-                                        burst_size, &oc->fifo_low,
-                                        &oc->fifo_high);
-                        break;
-#ifdef CONFIG_OMAP2_DSS_DSI
-                case OMAP_DISPLAY_TYPE_DSI:
-                        dsi_get_overlay_fifo_thresholds(ovl->id, size,
-                                        burst_size, &oc->fifo_low,
-                                        &oc->fifo_high);
-                        break;
-#endif
-                default:
-                        BUG();
-                }
-        }
-
-        r = 0;
-        if (!dss_cache.irq_enabled) {
-                u32 mask;
-
-                mask = DISPC_IRQ_VSYNC  | DISPC_IRQ_EVSYNC_ODD |
-                        DISPC_IRQ_EVSYNC_EVEN;
-                if (dss_has_feature(FEAT_MGR_LCD2))
-                        mask |= DISPC_IRQ_VSYNC2;
-
-                r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask);
-                dss_cache.irq_enabled = true;
-        }
-        configure_dispc();
-
-        spin_unlock_irqrestore(&dss_cache.lock, flags);
-
-        dispc_runtime_put();
-
-        return r;
+        return &managers[num];
 }
+EXPORT_SYMBOL(omap_dss_get_overlay_manager);
 
-static int dss_check_manager(struct omap_overlay_manager *mgr)
+int dss_mgr_simple_check(struct omap_overlay_manager *mgr,
+                const struct omap_overlay_manager_info *info)
 {
         if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)) {
                 /*
                  * OMAP3 supports only graphics source transparency color key
                  * and alpha blending simultaneously. See TRM 15.4.2.4.2.2
-                 * Alpha Mode
+                 * Alpha Mode.
                  */
-                if (mgr->info.partial_alpha_enabled && mgr->info.trans_enabled
-                        && mgr->info.trans_key_type !=
-                                OMAP_DSS_COLOR_KEY_GFX_DST)
+                if (info->partial_alpha_enabled && info->trans_enabled
+                        && info->trans_key_type != OMAP_DSS_COLOR_KEY_GFX_DST) {
+                        DSSERR("check_manager: illegal transparency key\n");
                         return -EINVAL;
+                }
         }
 
         return 0;
 }
 
-static int omap_dss_mgr_set_info(struct omap_overlay_manager *mgr,
-                struct omap_overlay_manager_info *info)
-{
-        int r;
-        struct omap_overlay_manager_info old_info;
-
-        old_info = mgr->info;
-        mgr->info = *info;
-
-        r = dss_check_manager(mgr);
-        if (r) {
-                mgr->info = old_info;
-                return r;
-        }
-
-        mgr->info_dirty = true;
-
-        return 0;
-}
-
-static void omap_dss_mgr_get_info(struct omap_overlay_manager *mgr,
-                struct omap_overlay_manager_info *info)
+static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr,
+                struct omap_overlay_info **overlay_infos)
 {
-        *info = mgr->info;
-}
+        struct omap_overlay *ovl1, *ovl2;
+        struct omap_overlay_info *info1, *info2;
 
-static int dss_mgr_enable(struct omap_overlay_manager *mgr)
-{
-        dispc_mgr_enable(mgr->id, 1);
-        return 0;
-}
+        list_for_each_entry(ovl1, &mgr->overlays, list) {
+                info1 = overlay_infos[ovl1->id];
 
-static int dss_mgr_disable(struct omap_overlay_manager *mgr)
-{
-        dispc_mgr_enable(mgr->id, 0);
-        return 0;
-}
-
-static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager)
-{
-        ++num_managers;
-        list_add_tail(&manager->list, &manager_list);
-}
-
-int dss_init_overlay_managers(struct platform_device *pdev)
-{
-        int i, r;
-
-        spin_lock_init(&dss_cache.lock);
-
-        INIT_LIST_HEAD(&manager_list);
-
-        num_managers = 0;
-
-        for (i = 0; i < dss_feat_get_num_mgrs(); ++i) {
-                struct omap_overlay_manager *mgr;
-                mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-
-                BUG_ON(mgr == NULL);
-
-                switch (i) {
-                case 0:
-                        mgr->name = "lcd";
-                        mgr->id = OMAP_DSS_CHANNEL_LCD;
-                        break;
-                case 1:
-                        mgr->name = "tv";
-                        mgr->id = OMAP_DSS_CHANNEL_DIGIT;
-                        break;
-                case 2:
-                        mgr->name = "lcd2";
-                        mgr->id = OMAP_DSS_CHANNEL_LCD2;
-                        break;
-                }
-
-                mgr->set_device = &omap_dss_set_device;
-                mgr->unset_device = &omap_dss_unset_device;
-                mgr->apply = &omap_dss_mgr_apply;
-                mgr->set_manager_info = &omap_dss_mgr_set_info;
-                mgr->get_manager_info = &omap_dss_mgr_get_info;
-                mgr->wait_for_go = &dss_mgr_wait_for_go;
-                mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;
-
-                mgr->enable = &dss_mgr_enable;
-                mgr->disable = &dss_mgr_disable;
-
-                mgr->caps = 0;
-                mgr->supported_displays =
-                        dss_feat_get_supported_displays(mgr->id);
+                if (info1 == NULL)
+                        continue;
 
-                dss_overlay_setup_dispc_manager(mgr);
+                list_for_each_entry(ovl2, &mgr->overlays, list) {
+                        if (ovl1 == ovl2)
+                                continue;
 
-                omap_dss_add_overlay_manager(mgr);
+                        info2 = overlay_infos[ovl2->id];
 
-                r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
-                                &pdev->dev.kobj, "manager%d", i);
+                        if (info2 == NULL)
+                                continue;
 
-                if (r) {
-                        DSSERR("failed to create sysfs file\n");
-                        continue;
+                        if (info1->zorder == info2->zorder) {
+                                DSSERR("overlays %d and %d have the same "
+                                                "zorder %d\n",
+                                        ovl1->id, ovl2->id, info1->zorder);
+                                return -EINVAL;
+                        }
                 }
         }
 
         return 0;
 }
 
-void dss_uninit_overlay_managers(struct platform_device *pdev)
+int dss_mgr_check(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev,
+                struct omap_overlay_manager_info *info,
+                struct omap_overlay_info **overlay_infos)
 {
-        struct omap_overlay_manager *mgr;
+        struct omap_overlay *ovl;
+        int r;
 
-        while (!list_empty(&manager_list)) {
-                mgr = list_first_entry(&manager_list,
-                                struct omap_overlay_manager, list);
-                list_del(&mgr->list);
-                kobject_del(&mgr->kobj);
-                kobject_put(&mgr->kobj);
-                kfree(mgr);
+        if (dss_has_feature(FEAT_ALPHA_FREE_ZORDER)) {
+                r = dss_mgr_check_zorder(mgr, overlay_infos);
+                if (r)
+                        return r;
         }
 
-        num_managers = 0;
-}
+        list_for_each_entry(ovl, &mgr->overlays, list) {
+                struct omap_overlay_info *oi;
+                int r;
 
-int omap_dss_get_num_overlay_managers(void)
-{
-        return num_managers;
-}
-EXPORT_SYMBOL(omap_dss_get_num_overlay_managers);
+                oi = overlay_infos[ovl->id];
 
-struct omap_overlay_manager *omap_dss_get_overlay_manager(int num)
-{
-        int i = 0;
-        struct omap_overlay_manager *mgr;
+                if (oi == NULL)
+                        continue;
 
-        list_for_each_entry(mgr, &manager_list, list) {
-                if (i++ == num)
-                        return mgr;
+                r = dss_ovl_check(ovl, oi, dssdev);
+                if (r)
+                        return r;
         }
 
-        return NULL;
+        return 0;
 }
-EXPORT_SYMBOL(omap_dss_get_overlay_manager);
-
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
index ab8e40e48759..6e821810deec 100644
--- a/drivers/video/omap2/dss/overlay.c
+++ b/drivers/video/omap2/dss/overlay.c
@@ -38,7 +38,7 @@
 #include "dss_features.h"
 
 static int num_overlays;
-static struct list_head overlay_list;
+static struct omap_overlay *overlays;
 
 static ssize_t overlay_name_show(struct omap_overlay *ovl, char *buf)
 {
@@ -124,19 +124,31 @@ err:
 
 static ssize_t overlay_input_size_show(struct omap_overlay *ovl, char *buf)
 {
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
         return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-                        ovl->info.width, ovl->info.height);
+                        info.width, info.height);
 }
 
 static ssize_t overlay_screen_width_show(struct omap_overlay *ovl, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.screen_width);
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", info.screen_width);
 }
 
 static ssize_t overlay_position_show(struct omap_overlay *ovl, char *buf)
 {
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
         return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-                        ovl->info.pos_x, ovl->info.pos_y);
+                        info.pos_x, info.pos_y);
 }
 
 static ssize_t overlay_position_store(struct omap_overlay *ovl,
@@ -170,8 +182,12 @@ static ssize_t overlay_position_store(struct omap_overlay *ovl,
 
 static ssize_t overlay_output_size_show(struct omap_overlay *ovl, char *buf)
 {
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
         return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-                        ovl->info.out_width, ovl->info.out_height);
+                        info.out_width, info.out_height);
 }
 
 static ssize_t overlay_output_size_store(struct omap_overlay *ovl,
@@ -205,7 +221,7 @@ static ssize_t overlay_output_size_store(struct omap_overlay *ovl,
 
 static ssize_t overlay_enabled_show(struct omap_overlay *ovl, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.enabled);
+        return snprintf(buf, PAGE_SIZE, "%d\n", ovl->is_enabled(ovl));
 }
 
 static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf,
@@ -213,33 +229,30 @@ static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf,
 {
         int r;
         bool enable;
-        struct omap_overlay_info info;
-
-        ovl->get_overlay_info(ovl, &info);
 
         r = strtobool(buf, &enable);
         if (r)
                 return r;
 
-        info.enabled = enable;
+        if (enable)
+                r = ovl->enable(ovl);
+        else
+                r = ovl->disable(ovl);
 
-        r = ovl->set_overlay_info(ovl, &info);
         if (r)
                 return r;
 
-        if (ovl->manager) {
-                r = ovl->manager->apply(ovl->manager);
-                if (r)
-                        return r;
-        }
-
         return size;
 }
 
 static ssize_t overlay_global_alpha_show(struct omap_overlay *ovl, char *buf)
 {
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
         return snprintf(buf, PAGE_SIZE, "%d\n",
-                        ovl->info.global_alpha);
+                        info.global_alpha);
 }
 
 static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl,
@@ -276,8 +289,12 @@ static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl,
 static ssize_t overlay_pre_mult_alpha_show(struct omap_overlay *ovl,
                 char *buf)
 {
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
         return snprintf(buf, PAGE_SIZE, "%d\n",
-                        ovl->info.pre_mult_alpha);
+                        info.pre_mult_alpha);
 }
 
 static ssize_t overlay_pre_mult_alpha_store(struct omap_overlay *ovl,
@@ -313,7 +330,11 @@ static ssize_t overlay_pre_mult_alpha_store(struct omap_overlay *ovl,
 
 static ssize_t overlay_zorder_show(struct omap_overlay *ovl, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.zorder);
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", info.zorder);
 }
 
 static ssize_t overlay_zorder_store(struct omap_overlay *ovl,
@@ -430,183 +451,6 @@ static struct kobj_type overlay_ktype = {
         .default_attrs = overlay_sysfs_attrs,
 };
 
-/* Check if overlay parameters are compatible with display */
-int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev)
-{
-        struct omap_overlay_info *info;
-        u16 outw, outh;
-        u16 dw, dh;
-        int i;
-
-        if (!dssdev)
-                return 0;
-
-        if (!ovl->info.enabled)
-                return 0;
-
-        info = &ovl->info;
-
-        if (info->paddr == 0) {
-                DSSDBG("check_overlay failed: paddr 0\n");
-                return -EINVAL;
-        }
-
-        dssdev->driver->get_resolution(dssdev, &dw, &dh);
-
-        DSSDBG("check_overlay %d: (%d,%d %dx%d -> %dx%d) disp (%dx%d)\n",
-                        ovl->id,
-                        info->pos_x, info->pos_y,
-                        info->width, info->height,
-                        info->out_width, info->out_height,
-                        dw, dh);
-
-        if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
-                outw = info->width;
-                outh = info->height;
-        } else {
-                if (info->out_width == 0)
-                        outw = info->width;
-                else
-                        outw = info->out_width;
-
-                if (info->out_height == 0)
-                        outh = info->height;
-                else
-                        outh = info->out_height;
-        }
-
-        if (dw < info->pos_x + outw) {
-                DSSDBG("check_overlay failed 1: %d < %d + %d\n",
-                                dw, info->pos_x, outw);
-                return -EINVAL;
-        }
-
-        if (dh < info->pos_y + outh) {
-                DSSDBG("check_overlay failed 2: %d < %d + %d\n",
-                                dh, info->pos_y, outh);
-                return -EINVAL;
-        }
-
-        if ((ovl->supported_modes & info->color_mode) == 0) {
-                DSSERR("overlay doesn't support mode %d\n", info->color_mode);
-                return -EINVAL;
-        }
-
-        if (ovl->caps & OMAP_DSS_OVL_CAP_ZORDER) {
-                if (info->zorder < 0 || info->zorder > 3) {
-                        DSSERR("zorder out of range: %d\n",
-                                info->zorder);
-                        return -EINVAL;
-                }
-                /*
-                 * Check that zorder doesn't match with zorder of any other
-                 * overlay which is enabled and is also connected to the same
-                 * manager
-                 */
-                for (i = 0; i < omap_dss_get_num_overlays(); i++) {
-                        struct omap_overlay *tmp_ovl = omap_dss_get_overlay(i);
-
-                        if (tmp_ovl->id != ovl->id &&
-                                        tmp_ovl->manager == ovl->manager &&
-                                        tmp_ovl->info.enabled == true &&
-                                        tmp_ovl->info.zorder == info->zorder) {
-                                DSSERR("%s and %s have same zorder: %d\n",
-                                        ovl->name, tmp_ovl->name, info->zorder);
-                                return -EINVAL;
-                        }
-                }
-        }
-
-        return 0;
-}
-
-static int dss_ovl_set_overlay_info(struct omap_overlay *ovl,
-                struct omap_overlay_info *info)
-{
-        int r;
-        struct omap_overlay_info old_info;
-
-        old_info = ovl->info;
-        ovl->info = *info;
-
-        if (ovl->manager) {
-                r = dss_check_overlay(ovl, ovl->manager->device);
-                if (r) {
-                        ovl->info = old_info;
-                        return r;
-                }
-        }
-
-        ovl->info_dirty = true;
-
-        return 0;
-}
-
-static void dss_ovl_get_overlay_info(struct omap_overlay *ovl,
-                struct omap_overlay_info *info)
-{
-        *info = ovl->info;
-}
-
-static int dss_ovl_wait_for_go(struct omap_overlay *ovl)
-{
-        return dss_mgr_wait_for_go_ovl(ovl);
-}
-
-static int omap_dss_set_manager(struct omap_overlay *ovl,
-                struct omap_overlay_manager *mgr)
-{
-        if (!mgr)
-                return -EINVAL;
-
-        if (ovl->manager) {
-                DSSERR("overlay '%s' already has a manager '%s'\n",
-                                ovl->name, ovl->manager->name);
-                return -EINVAL;
-        }
-
-        if (ovl->info.enabled) {
-                DSSERR("overlay has to be disabled to change the manager\n");
-                return -EINVAL;
-        }
-
-        ovl->manager = mgr;
-        ovl->manager_changed = true;
-
-        /* XXX: When there is an overlay on a DSI manual update display, and
-         * the overlay is first disabled, then moved to tv, and enabled, we
-         * seem to get SYNC_LOST_DIGIT error.
-         *
-         * Waiting doesn't seem to help, but updating the manual update display
-         * after disabling the overlay seems to fix this. This hints that the
-         * overlay is perhaps somehow tied to the LCD output until the output
-         * is updated.
-         *
-         * Userspace workaround for this is to update the LCD after disabling
-         * the overlay, but before moving the overlay to TV.
-         */
-
-        return 0;
-}
-
-static int omap_dss_unset_manager(struct omap_overlay *ovl)
-{
-        if (!ovl->manager) {
-                DSSERR("failed to detach overlay: manager not set\n");
-                return -EINVAL;
-        }
-
-        if (ovl->info.enabled) {
-                DSSERR("overlay has to be disabled to unset the manager\n");
-                return -EINVAL;
-        }
-
-        ovl->manager = NULL;
-        ovl->manager_changed = true;
-
-        return 0;
-}
-
 int omap_dss_get_num_overlays(void)
 {
         return num_overlays;
@@ -615,134 +459,65 @@ EXPORT_SYMBOL(omap_dss_get_num_overlays);
 
 struct omap_overlay *omap_dss_get_overlay(int num)
 {
-        int i = 0;
-        struct omap_overlay *ovl;
+        if (num >= num_overlays)
+                return NULL;
 
-        list_for_each_entry(ovl, &overlay_list, list) {
-                if (i++ == num)
-                        return ovl;
-        }
-
-        return NULL;
+        return &overlays[num];
 }
 EXPORT_SYMBOL(omap_dss_get_overlay);
 
-static void omap_dss_add_overlay(struct omap_overlay *overlay)
-{
-        ++num_overlays;
-        list_add_tail(&overlay->list, &overlay_list);
-}
-
-static struct omap_overlay *dispc_overlays[MAX_DSS_OVERLAYS];
-
-void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr)
-{
-        mgr->num_overlays = dss_feat_get_num_ovls();
-        mgr->overlays = dispc_overlays;
-}
-
-#ifdef L4_EXAMPLE
-static struct omap_overlay *l4_overlays[1];
-void dss_overlay_setup_l4_manager(struct omap_overlay_manager *mgr)
-{
-        mgr->num_overlays = 1;
-        mgr->overlays = l4_overlays;
-}
-#endif
-
 void dss_init_overlays(struct platform_device *pdev)
 {
         int i, r;
 
-        INIT_LIST_HEAD(&overlay_list);
+        num_overlays = dss_feat_get_num_ovls();
 
-        num_overlays = 0;
+        overlays = kzalloc(sizeof(struct omap_overlay) * num_overlays,
+                        GFP_KERNEL);
 
-        for (i = 0; i < dss_feat_get_num_ovls(); ++i) {
-                struct omap_overlay *ovl;
-                ovl = kzalloc(sizeof(*ovl), GFP_KERNEL);
+        BUG_ON(overlays == NULL);
 
-                BUG_ON(ovl == NULL);
+        for (i = 0; i < num_overlays; ++i) {
+                struct omap_overlay *ovl = &overlays[i];
 
                 switch (i) {
                 case 0:
                         ovl->name = "gfx";
                         ovl->id = OMAP_DSS_GFX;
-                        ovl->info.global_alpha = 255;
-                        ovl->info.zorder = 0;
                         break;
                 case 1:
                         ovl->name = "vid1";
                         ovl->id = OMAP_DSS_VIDEO1;
-                        ovl->info.global_alpha = 255;
-                        ovl->info.zorder =
-                                dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 3 : 0;
                         break;
                 case 2:
                         ovl->name = "vid2";
                         ovl->id = OMAP_DSS_VIDEO2;
-                        ovl->info.global_alpha = 255;
-                        ovl->info.zorder =
-                                dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 2 : 0;
                         break;
                 case 3:
                         ovl->name = "vid3";
                         ovl->id = OMAP_DSS_VIDEO3;
-                        ovl->info.global_alpha = 255;
-                        ovl->info.zorder =
-                                dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 1 : 0;
                         break;
                 }
 
-                ovl->set_manager = &omap_dss_set_manager;
-                ovl->unset_manager = &omap_dss_unset_manager;
-                ovl->set_overlay_info = &dss_ovl_set_overlay_info;
-                ovl->get_overlay_info = &dss_ovl_get_overlay_info;
-                ovl->wait_for_go = &dss_ovl_wait_for_go;
+                ovl->is_enabled = &dss_ovl_is_enabled;
+                ovl->enable = &dss_ovl_enable;
+                ovl->disable = &dss_ovl_disable;
+                ovl->set_manager = &dss_ovl_set_manager;
+                ovl->unset_manager = &dss_ovl_unset_manager;
+                ovl->set_overlay_info = &dss_ovl_set_info;
+                ovl->get_overlay_info = &dss_ovl_get_info;
+                ovl->wait_for_go = &dss_mgr_wait_for_go_ovl;
 
                 ovl->caps = dss_feat_get_overlay_caps(ovl->id);
                 ovl->supported_modes =
                         dss_feat_get_supported_color_modes(ovl->id);
 
-                omap_dss_add_overlay(ovl);
-
                 r = kobject_init_and_add(&ovl->kobj, &overlay_ktype,
                                 &pdev->dev.kobj, "overlay%d", i);
 
-                if (r) {
-                        DSSERR("failed to create sysfs file\n");
-                        continue;
-                }
-
-                dispc_overlays[i] = ovl;
-        }
-
-#ifdef L4_EXAMPLE
-        {
-                struct omap_overlay *ovl;
-                ovl = kzalloc(sizeof(*ovl), GFP_KERNEL);
-
-                BUG_ON(ovl == NULL);
-
-                ovl->name = "l4";
-                ovl->supported_modes = OMAP_DSS_COLOR_RGB24U;
-
-                ovl->set_manager = &omap_dss_set_manager;
-                ovl->unset_manager = &omap_dss_unset_manager;
-                ovl->set_overlay_info = &dss_ovl_set_overlay_info;
-                ovl->get_overlay_info = &dss_ovl_get_overlay_info;
-
-                omap_dss_add_overlay(ovl);
-
-                r = kobject_init_and_add(&ovl->kobj, &overlay_ktype,
-                                &pdev->dev.kobj, "overlayl4");
-
                 if (r)
                         DSSERR("failed to create sysfs file\n");
-
-                l4_overlays[0] = ovl;
         }
-#endif
 }
 
 /* connect overlays to the new device, if not already connected. if force
@@ -795,8 +570,8 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
                         ovl = omap_dss_get_overlay(i);
                         if (!ovl->manager || force) {
                                 if (ovl->manager)
-                                        omap_dss_unset_manager(ovl);
-                                omap_dss_set_manager(ovl, mgr);
+                                        ovl->unset_manager(ovl);
+                                ovl->set_manager(ovl, mgr);
                         }
                 }
 
@@ -806,17 +581,95 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
 
 void dss_uninit_overlays(struct platform_device *pdev)
 {
-        struct omap_overlay *ovl;
+        int i;
+
+        for (i = 0; i < num_overlays; ++i) {
+                struct omap_overlay *ovl = &overlays[i];
 
-        while (!list_empty(&overlay_list)) {
-                ovl = list_first_entry(&overlay_list,
-                                struct omap_overlay, list);
-                list_del(&ovl->list);
                 kobject_del(&ovl->kobj);
                 kobject_put(&ovl->kobj);
-                kfree(ovl);
         }
 
+        kfree(overlays);
+        overlays = NULL;
         num_overlays = 0;
 }
 
+int dss_ovl_simple_check(struct omap_overlay *ovl,
+                const struct omap_overlay_info *info)
+{
+        if (info->paddr == 0) {
+                DSSERR("check_overlay: paddr cannot be 0\n");
+                return -EINVAL;
+        }
+
+        if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
+                if (info->out_width != 0 && info->width != info->out_width) {
+                        DSSERR("check_overlay: overlay %d doesn't support "
+                                        "scaling\n", ovl->id);
+                        return -EINVAL;
+                }
+
+                if (info->out_height != 0 && info->height != info->out_height) {
+                        DSSERR("check_overlay: overlay %d doesn't support "
+                                        "scaling\n", ovl->id);
+                        return -EINVAL;
+                }
+        }
+
+        if ((ovl->supported_modes & info->color_mode) == 0) {
+                DSSERR("check_overlay: overlay %d doesn't support mode %d\n",
+                                ovl->id, info->color_mode);
+                return -EINVAL;
+        }
+
+        if (info->zorder >= omap_dss_get_num_overlays()) {
+                DSSERR("check_overlay: zorder %d too high\n", info->zorder);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+int dss_ovl_check(struct omap_overlay *ovl,
+                struct omap_overlay_info *info, struct omap_dss_device *dssdev)
+{
+        u16 outw, outh;
+        u16 dw, dh;
+
+        if (dssdev == NULL)
+                return 0;
+
+        dssdev->driver->get_resolution(dssdev, &dw, &dh);
+
+        if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
+                outw = info->width;
+                outh = info->height;
+        } else {
+                if (info->out_width == 0)
+                        outw = info->width;
+                else
+                        outw = info->out_width;
+
+                if (info->out_height == 0)
+                        outh = info->height;
+                else
+                        outh = info->out_height;
+        }
+
+        if (dw < info->pos_x + outw) {
+                DSSERR("overlay %d horizontally not inside the display area "
+                                "(%d + %d >= %d)\n",
+                                ovl->id, info->pos_x, outw, dw);
+                return -EINVAL;
+        }
+
+        if (dh < info->pos_y + outh) {
+                DSSERR("overlay %d vertically not inside the display area "
+                                "(%d + %d >= %d)\n",
+                                ovl->id, info->pos_y, outh, dh);
+                return -EINVAL;
+        }
+
+        return 0;
+}
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 1130c608a561..814bb9500dca 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -784,7 +784,6 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
         if (*w == 0 || *h == 0)
                 return -EINVAL;
 
-        dss_setup_partial_planes(dssdev, x, y, w, h, true);
         dispc_mgr_set_lcd_size(dssdev->manager->id, *w, *h);
 
         return 0;
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 40305ad7841e..8266ca0d666b 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -123,10 +123,14 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
                 goto err_sdi_enable;
         mdelay(2);
 
-        dssdev->manager->enable(dssdev->manager);
+        r = dss_mgr_enable(dssdev->manager);
+        if (r)
+                goto err_mgr_enable;
 
         return 0;
 
+err_mgr_enable:
+        dss_sdi_disable();
 err_sdi_enable:
 err_set_dispc_clock_div:
 err_set_dss_clock_div:
@@ -145,7 +149,7 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
 
 void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 {
-        dssdev->manager->disable(dssdev->manager);
+        dss_mgr_disable(dssdev->manager);
 
         dss_sdi_disable();
 
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index 2c3443dabb14..7503f7f619a7 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -110,6 +110,11 @@ struct ti_hdmi_ip_ops {
 
         void (*dump_phy)(struct hdmi_ip_data *ip_data, struct seq_file *s);
 
+#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+        void (*audio_enable)(struct hdmi_ip_data *ip_data, bool start);
+#endif
+
 };
 
 struct hdmi_ip_data {
@@ -134,5 +139,8 @@ void ti_hdmi_4xxx_wp_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_pll_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
-
+#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable);
+#endif
 #endif
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index e1a6ce518af6..9af81f18f163 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -1204,36 +1204,13 @@ int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
         return 0;
 }
 
-int hdmi_audio_trigger(struct hdmi_ip_data *ip_data,
-                                struct snd_pcm_substream *substream, int cmd,
-                                struct snd_soc_dai *dai)
+void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable)
 {
-        int err = 0;
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                REG_FLD_MOD(hdmi_av_base(ip_data),
-                                        HDMI_CORE_AV_AUD_MODE, 1, 0, 0);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 1, 31, 31);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 1, 30, 30);
-                break;
-
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                REG_FLD_MOD(hdmi_av_base(ip_data),
-                                        HDMI_CORE_AV_AUD_MODE, 0, 0, 0);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 0, 30, 30);
-                REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                        HDMI_WP_AUDIO_CTRL, 0, 31, 31);
-                break;
-        default:
-                err = -EINVAL;
-        }
-        return err;
+        REG_FLD_MOD(hdmi_av_base(ip_data),
+                                HDMI_CORE_AV_AUD_MODE, enable, 0, 0);
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                                HDMI_WP_AUDIO_CTRL, enable, 31, 31);
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                                HDMI_WP_AUDIO_CTRL, enable, 30, 30);
 }
 #endif
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
index 204095632d27..a442998980f1 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
@@ -576,9 +576,6 @@ struct hdmi_core_audio_config {
 
 #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
         defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-int hdmi_audio_trigger(struct hdmi_ip_data *ip_data,
-                                struct snd_pcm_substream *substream, int cmd,
-                                struct snd_soc_dai *dai);
 int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
                                 u32 sample_freq, u32 *n, u32 *cts);
 void hdmi_core_audio_infoframe_config(struct hdmi_ip_data *ip_data,
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 7533458ba4d2..b3e9f9091581 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -417,9 +417,10 @@ static const struct venc_config *venc_timings_to_config(
         BUG();
 }
 
-static void venc_power_on(struct omap_dss_device *dssdev)
+static int venc_power_on(struct omap_dss_device *dssdev)
 {
         u32 l;
+        int r;
 
         venc_reset();
         venc_write_config(venc_timings_to_config(&dssdev->panel.timings));
@@ -447,7 +448,22 @@ static void venc_power_on(struct omap_dss_device *dssdev)
         if (dssdev->platform_enable)
                 dssdev->platform_enable(dssdev);
 
-        dssdev->manager->enable(dssdev->manager);
+        r = dss_mgr_enable(dssdev->manager);
+        if (r)
+                goto err;
+
+        return 0;
+
+err:
+        venc_write_reg(VENC_OUTPUT_CONTROL, 0);
+        dss_set_dac_pwrdn_bgz(0);
+
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        regulator_disable(venc.vdda_dac_reg);
+
+        return r;
 }
 
 static void venc_power_off(struct omap_dss_device *dssdev)
@@ -455,7 +471,7 @@ static void venc_power_off(struct omap_dss_device *dssdev)
         venc_write_reg(VENC_OUTPUT_CONTROL, 0);
         dss_set_dac_pwrdn_bgz(0);
 
-        dssdev->manager->disable(dssdev->manager);
+        dss_mgr_disable(dssdev->manager);
 
         if (dssdev->platform_disable)
                 dssdev->platform_disable(dssdev);
@@ -504,7 +520,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
         if (r)
                 goto err1;
 
-        venc_power_on(dssdev);
+        r = venc_power_on(dssdev);
+        if (r)
+                goto err2;
 
         venc.wss_data = 0;
 
@@ -512,6 +530,8 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
 
         mutex_unlock(&venc.venc_lock);
         return 0;
+err2:
+        venc_runtime_put();
 err1:
         omap_dss_stop_device(dssdev);
 err0:
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index df7bcce5b107..16ba6196f330 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -111,28 +111,22 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
                 set_fb_fix(fbi);
         }
 
-        if (pi->enabled) {
-                struct omap_overlay_info info;
+        if (!pi->enabled) {
+                r = ovl->disable(ovl);
+                if (r)
+                        goto undo;
+        }
 
+        if (pi->enabled) {
                 r = omapfb_setup_overlay(fbi, ovl, pi->pos_x, pi->pos_y,
                         pi->out_width, pi->out_height);
                 if (r)
                         goto undo;
-
-                ovl->get_overlay_info(ovl, &info);
-
-                if (!info.enabled) {
-                        info.enabled = pi->enabled;
-                        r = ovl->set_overlay_info(ovl, &info);
-                        if (r)
-                                goto undo;
-                }
         } else {
                 struct omap_overlay_info info;
 
                 ovl->get_overlay_info(ovl, &info);
 
-                info.enabled = pi->enabled;
                 info.pos_x = pi->pos_x;
                 info.pos_y = pi->pos_y;
                 info.out_width = pi->out_width;
@@ -146,6 +140,12 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
         if (ovl->manager)
                 ovl->manager->apply(ovl->manager);
 
+        if (pi->enabled) {
+                r = ovl->enable(ovl);
+                if (r)
+                        goto undo;
+        }
+
         /* Release the locks in a specific order to keep lockdep happy */
         if (old_rg->id > new_rg->id) {
                 omapfb_put_mem_region(old_rg);
@@ -189,19 +189,19 @@ static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
                 memset(pi, 0, sizeof(*pi));
         } else {
                 struct omap_overlay *ovl;
-                struct omap_overlay_info *ovli;
+                struct omap_overlay_info ovli;
 
                 ovl = ofbi->overlays[0];
-                ovli = &ovl->info;
+                ovl->get_overlay_info(ovl, &ovli);
 
-                pi->pos_x = ovli->pos_x;
-                pi->pos_y = ovli->pos_y;
-                pi->enabled = ovli->enabled;
+                pi->pos_x = ovli.pos_x;
+                pi->pos_y = ovli.pos_y;
+                pi->enabled = ovl->is_enabled(ovl);
                 pi->channel_out = 0; /* xxx */
                 pi->mirror = 0;
                 pi->mem_idx = get_mem_idx(ofbi);
-                pi->out_width = ovli->out_width;
-                pi->out_height = ovli->out_height;
+                pi->out_width = ovli.out_width;
+                pi->out_height = ovli.out_height;
         }
 
         return 0;
@@ -238,7 +238,9 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
                         continue;
 
                 for (j = 0; j < ofbi2->num_overlays; j++) {
-                        if (ofbi2->overlays[j]->info.enabled) {
+                        struct omap_overlay *ovl;
+                        ovl = ofbi2->overlays[j];
+                        if (ovl->is_enabled(ovl)) {
                                 r = -EBUSY;
                                 goto out;
                         }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 68ba1f800082..ce158311ff59 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -970,16 +970,20 @@ int omapfb_apply_changes(struct fb_info *fbi, int init)
                                 outh = var->yres;
                         }
                 } else {
-                        outw = ovl->info.out_width;
-                        outh = ovl->info.out_height;
+                        struct omap_overlay_info info;
+                        ovl->get_overlay_info(ovl, &info);
+                        outw = info.out_width;
+                        outh = info.out_height;
                 }
 
                 if (init) {
                         posx = 0;
                         posy = 0;
                 } else {
-                        posx = ovl->info.pos_x;
-                        posy = ovl->info.pos_y;
+                        struct omap_overlay_info info;
+                        ovl->get_overlay_info(ovl, &info);
+                        posx = info.pos_x;
+                        posy = info.pos_y;
                 }
 
                 r = omapfb_setup_overlay(fbi, ovl, posx, posy, outw, outh);
@@ -2067,6 +2071,8 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
                 if (ofbi->num_overlays > 0) {
                         struct omap_overlay *ovl = ofbi->overlays[0];
 
+                        ovl->manager->apply(ovl->manager);
+
                         r = omapfb_overlay_enable(ovl, 1);
 
                         if (r) {
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
index 1694d5148f32..e8d8cc76a435 100644
--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
@@ -473,7 +473,9 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
                         continue;
 
                 for (j = 0; j < ofbi2->num_overlays; j++) {
-                        if (ofbi2->overlays[j]->info.enabled) {
+                        struct omap_overlay *ovl;
+                        ovl = ofbi2->overlays[j];
+                        if (ovl->is_enabled(ovl)) {
                                 r = -EBUSY;
                                 goto out;
                         }
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index e12d384ea520..c0bdc9b54ecf 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -181,13 +181,10 @@ static inline void omapfb_unlock(struct omapfb2_device *fbdev)
 static inline int omapfb_overlay_enable(struct omap_overlay *ovl,
                 int enable)
 {
-        struct omap_overlay_info info;
-
-        ovl->get_overlay_info(ovl, &info);
-        if (info.enabled == enable)
-                return 0;
-        info.enabled = enable;
-        return ovl->set_overlay_info(ovl, &info);
+        if (enable)
+                return ovl->enable(ovl);
+        else
+                return ovl->disable(ovl);
 }
 
 static inline struct omapfb2_mem_region *
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
index b2252fea2858..6d30428e9cf9 100644
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -193,17 +193,6 @@ static struct platform_driver rgbfb_driver = {
         .remove = rgbfb_remove,
 };
 
-static int __init rgbfb_init(void)
-{
-        return platform_driver_register(&rgbfb_driver);
-}
-
-static void __exit rgbfb_exit(void)
-{
-        platform_driver_unregister(&rgbfb_driver);
-}
-
-module_init(rgbfb_init);
-module_exit(rgbfb_exit);
+module_platform_driver(rgbfb_driver);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c
index 50e00395240f..c5c741452cac 100644
--- a/drivers/video/pnx4008/sdum.c
+++ b/drivers/video/pnx4008/sdum.c
@@ -856,17 +856,6 @@ static struct platform_driver sdum_driver = {
         .resume = sdum_resume,
 };
 
-int __init sdum_init(void)
-{
-        return platform_driver_register(&sdum_driver);
-}
-
-static void __exit sdum_exit(void)
-{
-        platform_driver_unregister(&sdum_driver);
-};
-
-module_init(sdum_init);
-module_exit(sdum_exit);
+module_platform_driver(sdum_driver);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index 18ead6f0184d..8384b941f6ba 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -832,17 +832,7 @@ static struct platform_driver pxa168fb_driver = {
         .remove         = __devexit_p(pxa168fb_remove),
 };
 
-static int __init pxa168fb_init(void)
-{
-        return platform_driver_register(&pxa168fb_driver);
-}
-module_init(pxa168fb_init);
-
-static void __exit pxa168fb_exit(void)
-{
-        platform_driver_unregister(&pxa168fb_driver);
-}
-module_exit(pxa168fb_exit);
+module_platform_driver(pxa168fb_driver);
 
 MODULE_AUTHOR("Lennert Buytenhek <buytenh@marvell.com> "
               "Green Wan <gwan@marvell.com>");
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
index 1ed8b366618d..1d71c08a818f 100644
--- a/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@ -747,20 +747,7 @@ static struct platform_driver pxa3xx_gcu_driver = {
         },
 };
 
-static int __init
-pxa3xx_gcu_init(void)
-{
-        return platform_driver_register(&pxa3xx_gcu_driver);
-}
-
-static void __exit
-pxa3xx_gcu_exit(void)
-{
-        platform_driver_unregister(&pxa3xx_gcu_driver);
-}
-
-module_init(pxa3xx_gcu_init);
-module_exit(pxa3xx_gcu_exit);
+module_platform_driver(pxa3xx_gcu_driver);
 
 MODULE_DESCRIPTION("PXA3xx graphics controller unit driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 0753b1cfcb8b..0c63b69b6340 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -192,6 +192,7 @@ struct s3c_fb_vsync {
  * @regs: The mapped hardware registers.
  * @variant: Variant information for this hardware.
  * @enabled: A bitmask of enabled hardware windows.
+ * @output_on: Flag if the physical output is enabled.
  * @pdata: The platform configuration data passed with the device.
  * @windows: The hardware windows that have been claimed.
  * @irq_no: IRQ line number
@@ -208,6 +209,7 @@ struct s3c_fb {
         struct s3c_fb_variant    variant;
 
         unsigned char            enabled;
+        bool                     output_on;
 
         struct s3c_fb_platdata  *pdata;
         struct s3c_fb_win       *windows[S3C_FB_MAX_WIN];
@@ -441,6 +443,39 @@ static void shadow_protect_win(struct s3c_fb_win *win, bool protect)
 }
 
 /**
+ * s3c_fb_enable() - Set the state of the main LCD output
+ * @sfb: The main framebuffer state.
+ * @enable: The state to set.
+ */
+static void s3c_fb_enable(struct s3c_fb *sfb, int enable)
+{
+        u32 vidcon0 = readl(sfb->regs + VIDCON0);
+
+        if (enable && !sfb->output_on)
+                pm_runtime_get_sync(sfb->dev);
+
+        if (enable) {
+                vidcon0 |= VIDCON0_ENVID | VIDCON0_ENVID_F;
+        } else {
+                /* see the note in the framebuffer datasheet about
+                 * why you cannot take both of these bits down at the
+                 * same time. */
+
+                if (vidcon0 & VIDCON0_ENVID) {
+                        vidcon0 |= VIDCON0_ENVID;
+                        vidcon0 &= ~VIDCON0_ENVID_F;
+                }
+        }
+
+        writel(vidcon0, sfb->regs + VIDCON0);
+
+        if (!enable && sfb->output_on)
+                pm_runtime_put_sync(sfb->dev);
+
+        sfb->output_on = enable;
+}
+
+/**
  * s3c_fb_set_par() - framebuffer request to set new framebuffer state.
  * @info: The framebuffer to change.
  *
@@ -461,6 +496,8 @@ static int s3c_fb_set_par(struct fb_info *info)
 
         dev_dbg(sfb->dev, "setting framebuffer parameters\n");
 
+        pm_runtime_get_sync(sfb->dev);
+
         shadow_protect_win(win, 1);
 
         switch (var->bits_per_pixel) {
@@ -510,9 +547,10 @@ static int s3c_fb_set_par(struct fb_info *info)
                 if (sfb->variant.is_2443)
                         data |= (1 << 5);
 
-                data |= VIDCON0_ENVID | VIDCON0_ENVID_F;
                 writel(data, regs + VIDCON0);
 
+                s3c_fb_enable(sfb, 1);
+
                 data = VIDTCON0_VBPD(var->upper_margin - 1) |
                        VIDTCON0_VFPD(var->lower_margin - 1) |
                        VIDTCON0_VSPW(var->vsync_len - 1);
@@ -574,6 +612,7 @@ static int s3c_fb_set_par(struct fb_info *info)
         }
 
         data = WINCONx_ENWIN;
+        sfb->enabled |= (1 << win->index);
 
         /* note, since we have to round up the bits-per-pixel, we end up
          * relying on the bitfield information for r/g/b/a to work out
@@ -621,7 +660,8 @@ static int s3c_fb_set_par(struct fb_info *info)
                 } else if (var->transp.length == 1)
                         data |= WINCON1_BPPMODE_25BPP_A1888
                                 | WINCON1_BLD_PIX;
-                else if (var->transp.length == 4)
+                else if ((var->transp.length == 4) ||
+                        (var->transp.length == 8))
                         data |= WINCON1_BPPMODE_28BPP_A4888
                                 | WINCON1_BLD_PIX | WINCON1_ALPHA_SEL;
                 else
@@ -654,6 +694,8 @@ static int s3c_fb_set_par(struct fb_info *info)
 
         shadow_protect_win(win, 0);
 
+        pm_runtime_put_sync(sfb->dev);
+
         return 0;
 }
 
@@ -725,6 +767,8 @@ static int s3c_fb_setcolreg(unsigned regno,
         dev_dbg(sfb->dev, "%s: win %d: %d => rgb=%d/%d/%d\n",
                 __func__, win->index, regno, red, green, blue);
 
+        pm_runtime_get_sync(sfb->dev);
+
         switch (info->fix.visual) {
         case FB_VISUAL_TRUECOLOR:
                 /* true-colour, use pseudo-palette */
@@ -752,39 +796,15 @@ static int s3c_fb_setcolreg(unsigned regno,
                 break;
 
         default:
+                pm_runtime_put_sync(sfb->dev);
                 return 1;       /* unknown type */
         }
 
+        pm_runtime_put_sync(sfb->dev);
         return 0;
 }
 
 /**
- * s3c_fb_enable() - Set the state of the main LCD output
- * @sfb: The main framebuffer state.
- * @enable: The state to set.
- */
-static void s3c_fb_enable(struct s3c_fb *sfb, int enable)
-{
-        u32 vidcon0 = readl(sfb->regs + VIDCON0);
-
-        if (enable)
-                vidcon0 |= VIDCON0_ENVID | VIDCON0_ENVID_F;
-        else {
-                /* see the note in the framebuffer datasheet about
-                 * why you cannot take both of these bits down at the
-                 * same time. */
-
-                if (!(vidcon0 & VIDCON0_ENVID))
-                        return;
-
-                vidcon0 |= VIDCON0_ENVID;
-                vidcon0 &= ~VIDCON0_ENVID_F;
-        }
-
-        writel(vidcon0, sfb->regs + VIDCON0);
-}
-
-/**
  * s3c_fb_blank() - blank or unblank the given window
  * @blank_mode: The blank state from FB_BLANK_*
  * @info: The framebuffer to blank.
@@ -800,6 +820,8 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
 
         dev_dbg(sfb->dev, "blank mode %d\n", blank_mode);
 
+        pm_runtime_get_sync(sfb->dev);
+
         wincon = readl(sfb->regs + sfb->variant.wincon + (index * 4));
 
         switch (blank_mode) {
@@ -810,12 +832,16 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
 
         case FB_BLANK_NORMAL:
                 /* disable the DMA and display 0x0 (black) */
+                shadow_protect_win(win, 1);
                 writel(WINxMAP_MAP | WINxMAP_MAP_COLOUR(0x0),
                        sfb->regs + sfb->variant.winmap + (index * 4));
+                shadow_protect_win(win, 0);
                 break;
 
         case FB_BLANK_UNBLANK:
+                shadow_protect_win(win, 1);
                 writel(0x0, sfb->regs + sfb->variant.winmap + (index * 4));
+                shadow_protect_win(win, 0);
                 wincon |= WINCONx_ENWIN;
                 sfb->enabled |= (1 << index);
                 break;
@@ -823,10 +849,13 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
         case FB_BLANK_VSYNC_SUSPEND:
         case FB_BLANK_HSYNC_SUSPEND:
         default:
+                pm_runtime_put_sync(sfb->dev);
                 return 1;
         }
 
+        shadow_protect_win(win, 1);
         writel(wincon, sfb->regs + sfb->variant.wincon + (index * 4));
+        shadow_protect_win(win, 0);
 
         /* Check the enabled state to see if we need to be running the
          * main LCD interface, as if there are no active windows then
@@ -845,8 +874,13 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
         /* we're stuck with this until we can do something about overriding
          * the power control using the blanking event for a single fb.
          */
-        if (index == sfb->pdata->default_win)
+        if (index == sfb->pdata->default_win) {
+                shadow_protect_win(win, 1);
                 s3c_fb_enable(sfb, blank_mode != FB_BLANK_POWERDOWN ? 1 : 0);
+                shadow_protect_win(win, 0);
+        }
+
+        pm_runtime_put_sync(sfb->dev);
 
         return 0;
 }
@@ -870,6 +904,8 @@ static int s3c_fb_pan_display(struct fb_var_screeninfo *var,
         void __iomem *buf       = sfb->regs + win->index * 8;
         unsigned int start_boff, end_boff;
 
+        pm_runtime_get_sync(sfb->dev);
+
         /* Offset in bytes to the start of the displayed area */
         start_boff = var->yoffset * info->fix.line_length;
         /* X offset depends on the current bpp */
@@ -888,6 +924,7 @@ static int s3c_fb_pan_display(struct fb_var_screeninfo *var,
                         break;
                 default:
                         dev_err(sfb->dev, "invalid bpp\n");
+                        pm_runtime_put_sync(sfb->dev);
                         return -EINVAL;
                 }
         }
@@ -903,6 +940,7 @@ static int s3c_fb_pan_display(struct fb_var_screeninfo *var,
 
         shadow_protect_win(win, 0);
 
+        pm_runtime_put_sync(sfb->dev);
         return 0;
 }
 
@@ -992,11 +1030,16 @@ static int s3c_fb_wait_for_vsync(struct s3c_fb *sfb, u32 crtc)
         if (crtc != 0)
                 return -ENODEV;
 
+        pm_runtime_get_sync(sfb->dev);
+
         count = sfb->vsync_info.count;
         s3c_fb_enable_irq(sfb);
         ret = wait_event_interruptible_timeout(sfb->vsync_info.wait,
                                        count != sfb->vsync_info.count,
                                        msecs_to_jiffies(VSYNC_TIMEOUT_MSEC));
+
+        pm_runtime_put_sync(sfb->dev);
+
         if (ret == 0)
                 return -ETIMEDOUT;
 
@@ -1027,30 +1070,8 @@ static int s3c_fb_ioctl(struct fb_info *info, unsigned int cmd,
         return ret;
 }
 
-static int s3c_fb_open(struct fb_info *info, int user)
-{
-        struct s3c_fb_win *win = info->par;
-        struct s3c_fb *sfb = win->parent;
-
-        pm_runtime_get_sync(sfb->dev);
-
-        return 0;
-}
-
-static int s3c_fb_release(struct fb_info *info, int user)
-{
-        struct s3c_fb_win *win = info->par;
-        struct s3c_fb *sfb = win->parent;
-
-        pm_runtime_put_sync(sfb->dev);
-
-        return 0;
-}
-
 static struct fb_ops s3c_fb_ops = {
         .owner          = THIS_MODULE,
-        .fb_open        = s3c_fb_open,
-        .fb_release     = s3c_fb_release,
         .fb_check_var   = s3c_fb_check_var,
         .fb_set_par     = s3c_fb_set_par,
         .fb_blank       = s3c_fb_blank,
@@ -1452,7 +1473,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
                         dev_err(dev, "failed to create window %d\n", win);
                         for (; win >= 0; win--)
                                 s3c_fb_release_win(sfb, sfb->windows[win]);
-                        goto err_irq;
+                        goto err_pm_runtime;
                 }
         }
 
@@ -1461,7 +1482,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
 
         return 0;
 
-err_irq:
+err_pm_runtime:
+        pm_runtime_put_sync(sfb->dev);
         free_irq(sfb->irq_no, sfb);
 
 err_ioremap:
@@ -1471,6 +1493,8 @@ err_req_region:
         release_mem_region(sfb->regs_res->start, resource_size(sfb->regs_res));
 
 err_lcd_clk:
+        pm_runtime_disable(sfb->dev);
+
         if (!sfb->variant.has_clksel) {
                 clk_disable(sfb->lcd_clk);
                 clk_put(sfb->lcd_clk);
@@ -1524,7 +1548,7 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int s3c_fb_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -1571,10 +1595,15 @@ static int s3c_fb_resume(struct device *dev)
 
         for (win_no = 0; win_no < sfb->variant.nr_windows - 1; win_no++) {
                 void __iomem *regs = sfb->regs + sfb->variant.keycon;
+                win = sfb->windows[win_no];
+                if (!win)
+                        continue;
 
+                shadow_protect_win(win, 1);
                 regs += (win_no * 8);
                 writel(0xffffff, regs + WKEYCON0);
                 writel(0xffffff, regs + WKEYCON1);
+                shadow_protect_win(win, 0);
         }
 
         /* restore framebuffers */
@@ -1589,27 +1618,19 @@ static int s3c_fb_resume(struct device *dev)
 
         return 0;
 }
+#endif
 
+#ifdef CONFIG_PM_RUNTIME
 static int s3c_fb_runtime_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct s3c_fb *sfb = platform_get_drvdata(pdev);
-        struct s3c_fb_win *win;
-        int win_no;
-
-        for (win_no = S3C_FB_MAX_WIN - 1; win_no >= 0; win_no--) {
-                win = sfb->windows[win_no];
-                if (!win)
-                        continue;
-
-                /* use the blank function to push into power-down */
-                s3c_fb_blank(FB_BLANK_POWERDOWN, win->fbinfo);
-        }
 
         if (!sfb->variant.has_clksel)
                 clk_disable(sfb->lcd_clk);
 
         clk_disable(sfb->bus_clk);
+
         return 0;
 }
 
@@ -1618,8 +1639,6 @@ static int s3c_fb_runtime_resume(struct device *dev)
         struct platform_device *pdev = to_platform_device(dev);
         struct s3c_fb *sfb = platform_get_drvdata(pdev);
         struct s3c_fb_platdata *pd = sfb->pdata;
-        struct s3c_fb_win *win;
-        int win_no;
 
         clk_enable(sfb->bus_clk);
 
@@ -1630,39 +1649,10 @@ static int s3c_fb_runtime_resume(struct device *dev)
         pd->setup_gpio();
         writel(pd->vidcon1, sfb->regs + VIDCON1);
 
-        /* zero all windows before we do anything */
-        for (win_no = 0; win_no < sfb->variant.nr_windows; win_no++)
-                s3c_fb_clear_win(sfb, win_no);
-
-        for (win_no = 0; win_no < sfb->variant.nr_windows - 1; win_no++) {
-                void __iomem *regs = sfb->regs + sfb->variant.keycon;
-
-                regs += (win_no * 8);
-                writel(0xffffff, regs + WKEYCON0);
-                writel(0xffffff, regs + WKEYCON1);
-        }
-
-        /* restore framebuffers */
-        for (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++) {
-                win = sfb->windows[win_no];
-                if (!win)
-                        continue;
-
-                dev_dbg(&pdev->dev, "resuming window %d\n", win_no);
-                s3c_fb_set_par(win->fbinfo);
-        }
-
         return 0;
 }
-
-#else
-#define s3c_fb_suspend NULL
-#define s3c_fb_resume  NULL
-#define s3c_fb_runtime_suspend NULL
-#define s3c_fb_runtime_resume NULL
 #endif
 
-
 #define VALID_BPP124 (VALID_BPP(1) | VALID_BPP(2) | VALID_BPP(4))
 #define VALID_BPP1248 (VALID_BPP124 | VALID_BPP(8))
 
@@ -1985,10 +1975,9 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
 MODULE_DEVICE_TABLE(platform, s3c_fb_driver_ids);
 
 static const struct dev_pm_ops s3cfb_pm_ops = {
-        .suspend        = s3c_fb_suspend,
-        .resume         = s3c_fb_resume,
-        .runtime_suspend        = s3c_fb_runtime_suspend,
-        .runtime_resume         = s3c_fb_runtime_resume,
+        SET_SYSTEM_SLEEP_PM_OPS(s3c_fb_suspend, s3c_fb_resume)
+        SET_RUNTIME_PM_OPS(s3c_fb_runtime_suspend, s3c_fb_runtime_resume,
+                           NULL)
 };
 
 static struct platform_driver s3c_fb_driver = {
@@ -2002,18 +1991,7 @@ static struct platform_driver s3c_fb_driver = {
         },
 };
 
-static int __init s3c_fb_init(void)
-{
-        return platform_driver_register(&s3c_fb_driver);
-}
-
-static void __exit s3c_fb_cleanup(void)
-{
-        platform_driver_unregister(&s3c_fb_driver);
-}
-
-module_init(s3c_fb_init);
-module_exit(s3c_fb_cleanup);
+module_platform_driver(s3c_fb_driver);
 
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("Samsung S3C SoC Framebuffer driver");
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ee4c0df217f7..77f34c614c86 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -26,8 +26,8 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/cpufreq.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/div64.h>
 
 #include <asm/mach/map.h>
@@ -45,10 +45,10 @@
 #ifdef CONFIG_FB_S3C2410_DEBUG
 static int debug        = 1;
 #else
-static int debug        = 0;
+static int debug;
 #endif
 
-#define dprintk(msg...) if (debug) { printk(KERN_DEBUG "s3c2410fb: " msg); }
+#define dprintk(msg...) if (debug) printk(KERN_DEBUG "s3c2410fb: " msg);
 
 /* useful functions */
 
@@ -567,11 +567,10 @@ static int s3c2410fb_blank(int blank_mode, struct fb_info *info)
 
         tpal_reg += is_s3c2412(fbi) ? S3C2412_TPAL : S3C2410_TPAL;
 
-        if (blank_mode == FB_BLANK_POWERDOWN) {
+        if (blank_mode == FB_BLANK_POWERDOWN)
                 s3c2410fb_lcd_enable(fbi, 0);
-        } else {
+        else
                 s3c2410fb_lcd_enable(fbi, 1);
-        }
 
         if (blank_mode == FB_BLANK_UNBLANK)
                 writel(0x0, tpal_reg);
@@ -812,7 +811,7 @@ static inline void s3c2410fb_cpufreq_deregister(struct s3c2410fb_info *info)
 #endif
 
 
-static char driver_name[] = "s3c2410fb";
+static const char driver_name[] = "s3c2410fb";
 
 static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
                                   enum s3c_drv_type drv_type)
@@ -881,7 +880,10 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
                 goto release_mem;
         }
 
-        info->irq_base = info->io + ((drv_type == DRV_S3C2412) ? S3C2412_LCDINTBASE : S3C2410_LCDINTBASE);
+        if (drv_type == DRV_S3C2412)
+                info->irq_base = info->io + S3C2412_LCDINTBASE;
+        else
+                info->irq_base = info->io + S3C2410_LCDINTBASE;
 
         dprintk("devinit\n");
 
@@ -927,7 +929,7 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
         clk_enable(info->clk);
         dprintk("got and enabled clock\n");
 
-        msleep(1);
+        usleep_range(1000, 1000);
 
         info->clk_rate = clk_get_rate(info->clk);
 
@@ -975,9 +977,8 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
 
         /* create device files */
         ret = device_create_file(&pdev->dev, &dev_attr_debug);
-        if (ret) {
+        if (ret)
                 printk(KERN_ERR "failed to add debug attribute\n");
-        }
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                 fbinfo->node, fbinfo->fix.id);
@@ -1027,7 +1028,7 @@ static int __devexit s3c2410fb_remove(struct platform_device *pdev)
         s3c2410fb_cpufreq_deregister(info);
 
         s3c2410fb_lcd_enable(info, 0);
-        msleep(1);
+        usleep_range(1000, 1000);
 
         s3c2410fb_unmap_video_memory(fbinfo);
 
@@ -1064,7 +1065,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
          * the LCD DMA engine is not going to get back on the bus
          * before the clock goes off again (bjd) */
 
-        msleep(1);
+        usleep_range(1000, 1000);
         clk_disable(info->clk);
 
         return 0;
@@ -1076,7 +1077,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
         struct s3c2410fb_info *info = fbinfo->par;
 
         clk_enable(info->clk);
-        msleep(1);
+        usleep_range(1000, 1000);
 
         s3c2410fb_init_registers(fbinfo);
 
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 946a949f4c7d..2c80246b18b8 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -727,7 +727,7 @@ static int s3fb_set_par(struct fb_info *info)
         if (par->chip == CHIP_988_VIRGE_VX) {
                 vga_wcrt(par->state.vgabase, 0x50, 0x00);
                 vga_wcrt(par->state.vgabase, 0x67, 0x50);
-
+                msleep(10); /* screen remains blank sometimes without this */
                 vga_wcrt(par->state.vgabase, 0x63, (mode <= 2) ? 0x90 : 0x09);
                 vga_wcrt(par->state.vgabase, 0x66, 0x90);
         }
@@ -901,7 +901,8 @@ static int s3fb_set_par(struct fb_info *info)
 
         /* Set Data Transfer Position */
         hsstart = ((info->var.xres + info->var.right_margin) * hmul) / 8;
-        value = clamp((htotal + hsstart + 1) / 2, hsstart + 4, htotal + 1);
+        /* + 2 is needed for Virge/VX, does no harm on other cards */
+        value = clamp((htotal + hsstart + 1) / 2 + 2, hsstart + 4, htotal + 1);
         svga_wcrt_multi(par->state.vgabase, s3_dtpc_regs, value);
 
         memset_io(info->screen_base, 0x00, screen_size);
@@ -1216,6 +1217,31 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
                         info->screen_size = 2 << 20;
                         break;
                 }
+        } else if (par->chip == CHIP_988_VIRGE_VX) {
+                switch ((regval & 0x60) >> 5) {
+                case 0: /* 2MB */
+                        info->screen_size = 2 << 20;
+                        break;
+                case 1: /* 4MB */
+                        info->screen_size = 4 << 20;
+                        break;
+                case 2: /* 6MB */
+                        info->screen_size = 6 << 20;
+                        break;
+                case 3: /* 8MB */
+                        info->screen_size = 8 << 20;
+                        break;
+                }
+                /* off-screen memory */
+                regval = vga_rcrt(par->state.vgabase, 0x37);
+                switch ((regval & 0x60) >> 5) {
+                case 1: /* 4MB */
+                        info->screen_size -= 4 << 20;
+                        break;
+                case 2: /* 2MB */
+                        info->screen_size -= 2 << 20;
+                        break;
+                }
         } else
                 info->screen_size = s3_memsizes[regval >> 5] << 10;
         info->fix.smem_len = info->screen_size;
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 37d764ad56b0..3c1de981a18c 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -76,7 +76,7 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
                                 map_offset = (physbase + map[i].poff) & POFF_MASK;
                                 break;
                         }
-                if (!map_size){
+                if (!map_size) {
                         page += PAGE_SIZE;
                         continue;
                 }
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index 45e47d847163..83b16e237a0e 100644
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -585,18 +585,7 @@ static struct platform_driver sh7760_lcdc_driver = {
         .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_platform_driver(sh7760_lcdc_driver);
 
 MODULE_AUTHOR("Nobuhiro Iwamatsu, Manuel Lauss");
 MODULE_DESCRIPTION("FBdev for SH7760/63 integrated LCD Controller");
diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index 72ee96bc6b3e..05151b82f40f 100644
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/bitmap.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -41,6 +42,7 @@
 #define VMCTR1          0x0020
 #define VMCTR2          0x0024
 #define VMLEN1          0x0028
+#define VMLEN2          0x002c
 #define CMTSRTREQ       0x0070
 #define CMTSRTCTR       0x00d0
 
@@ -51,8 +53,7 @@ struct sh_mipi {
         void __iomem    *base;
         void __iomem    *linkbase;
         struct clk      *dsit_clk;
-        struct clk      *dsip_clk;
-        struct device   *dev;
+        struct platform_device *pdev;
 
         void    *next_board_data;
         void    (*next_display_on)(void *board_data, struct fb_info *info);
@@ -124,35 +125,15 @@ static void sh_mipi_shutdown(struct platform_device *pdev)
         sh_mipi_dsi_enable(mipi, false);
 }
 
-static void mipi_display_on(void *arg, struct fb_info *info)
-{
-        struct sh_mipi *mipi = arg;
-
-        pm_runtime_get_sync(mipi->dev);
-        sh_mipi_dsi_enable(mipi, true);
-
-        if (mipi->next_display_on)
-                mipi->next_display_on(mipi->next_board_data, info);
-}
-
-static void mipi_display_off(void *arg)
-{
-        struct sh_mipi *mipi = arg;
-
-        if (mipi->next_display_off)
-                mipi->next_display_off(mipi->next_board_data);
-
-        sh_mipi_dsi_enable(mipi, false);
-        pm_runtime_put(mipi->dev);
-}
-
 static int __init sh_mipi_setup(struct sh_mipi *mipi,
                                 struct sh_mipi_dsi_info *pdata)
 {
         void __iomem *base = mipi->base;
         struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;
-        u32 pctype, datatype, pixfmt, linelength, vmctr2 = 0x00e00000;
+        u32 pctype, datatype, pixfmt, linelength, vmctr2;
+        u32 tmp, top, bottom, delay, div;
         bool yuv;
+        int bpp;
 
         /*
          * Select data format. MIPI DSI is not hot-pluggable, so, we just use
@@ -253,6 +234,9 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
             (!yuv && ch->interface_type != RGB24))
                 return -EINVAL;
 
+        if (!pdata->lane)
+                return -EINVAL;
+
         /* reset DSI link */
         iowrite32(0x00000001, base + SYSCTRL);
         /* Hold reset for 100 cycles of the slowest of bus, HS byte and LP clock */
@@ -262,15 +246,6 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         /* setup DSI link */
 
         /*
-         * Default = ULPS enable |
-         *      Contention detection enabled |
-         *      EoT packet transmission enable |
-         *      CRC check enable |
-         *      ECC check enable
-         * additionally enable first two lanes
-         */
-        iowrite32(0x00003703, base + SYSCONF);
-        /*
          * T_wakeup = 0x7000
          * T_hs-trail = 3
          * T_hs-prepare = 3
@@ -290,15 +265,24 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         iowrite32(0x0fffffff, base + TATOVSET);
         /* Peripheral reset timeout, default 0xffffffff */
         iowrite32(0x0fffffff, base + PRTOVSET);
-        /* Enable timeout counters */
-        iowrite32(0x00000f00, base + DSICTRL);
         /* Interrupts not used, disable all */
         iowrite32(0, base + DSIINTE);
         /* DSI-Tx bias on */
         iowrite32(0x00000001, base + PHYCTRL);
         udelay(200);
-        /* Deassert resets, power on, set multiplier */
-        iowrite32(0x03070b01, base + PHYCTRL);
+        /* Deassert resets, power on */
+        iowrite32(0x03070001, base + PHYCTRL);
+
+        /*
+         * Default = ULPS enable |
+         *      Contention detection enabled |
+         *      EoT packet transmission enable |
+         *      CRC check enable |
+         *      ECC check enable
+         */
+        bitmap_fill((unsigned long *)&tmp, pdata->lane);
+        tmp |= 0x00003700;
+        iowrite32(tmp, base + SYSCONF);
 
         /* setup l-bridge */
 
@@ -316,18 +300,68 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
          * Non-burst mode with sync pulses: VSE and HSE are output,
          * HSA period allowed, no commands in LP
          */
+        vmctr2 = 0;
+        if (pdata->flags & SH_MIPI_DSI_VSEE)
+                vmctr2 |= 1 << 23;
+        if (pdata->flags & SH_MIPI_DSI_HSEE)
+                vmctr2 |= 1 << 22;
+        if (pdata->flags & SH_MIPI_DSI_HSAE)
+                vmctr2 |= 1 << 21;
+        if (pdata->flags & SH_MIPI_DSI_BL2E)
+                vmctr2 |= 1 << 17;
         if (pdata->flags & SH_MIPI_DSI_HSABM)
-                vmctr2 |= 0x20;
-        if (pdata->flags & SH_MIPI_DSI_HSPBM)
-                vmctr2 |= 0x10;
+                vmctr2 |= 1 << 5;
+        if (pdata->flags & SH_MIPI_DSI_HBPBM)
+                vmctr2 |= 1 << 4;
+        if (pdata->flags & SH_MIPI_DSI_HFPBM)
+                vmctr2 |= 1 << 3;
         iowrite32(vmctr2, mipi->linkbase + VMCTR2);
 
         /*
-         * 0x660 = 1632 bytes per line (RGB24, 544 pixels: see
-         * sh_mobile_lcdc_info.ch[0].lcd_cfg[0].xres), HSALEN = 1 - default
-         * (unused if VMCTR2[HSABM] = 0)
+         * VMLEN1 = RGBLEN | HSALEN
+         *
+         * see
+         *  Video mode - Blanking Packet setting
+         */
+        top = linelength << 16; /* RGBLEN */
+        bottom = 0x00000001;
+        if (pdata->flags & SH_MIPI_DSI_HSABM) /* HSALEN */
+                bottom = (pdata->lane * ch->lcd_cfg[0].hsync_len) - 10;
+        iowrite32(top | bottom , mipi->linkbase + VMLEN1);
+
+        /*
+         * VMLEN2 = HBPLEN | HFPLEN
+         *
+         * see
+         *  Video mode - Blanking Packet setting
          */
-        iowrite32(1 | (linelength << 16), mipi->linkbase + VMLEN1);
+        top     = 0x00010000;
+        bottom  = 0x00000001;
+        delay   = 0;
+
+        div = 1;        /* HSbyteCLK is calculation base
+                         * HS4divCLK = HSbyteCLK/2
+                         * HS6divCLK is not supported for now */
+        if (pdata->flags & SH_MIPI_DSI_HS4divCLK)
+                div = 2;
+
+        if (pdata->flags & SH_MIPI_DSI_HFPBM) { /* HBPLEN */
+                top = ch->lcd_cfg[0].hsync_len + ch->lcd_cfg[0].left_margin;
+                top = ((pdata->lane * top / div) - 10) << 16;
+        }
+        if (pdata->flags & SH_MIPI_DSI_HBPBM) { /* HFPLEN */
+                bottom = ch->lcd_cfg[0].right_margin;
+                bottom = (pdata->lane * bottom / div) - 12;
+        }
+
+        bpp = linelength / ch->lcd_cfg[0].xres; /* byte / pixel */
+        if ((pdata->lane / div) > bpp) {
+                tmp = ch->lcd_cfg[0].xres / bpp; /* output cycle */
+                tmp = ch->lcd_cfg[0].xres - tmp; /* (input - output) cycle */
+                delay = (pdata->lane * tmp);
+        }
+
+        iowrite32(top | (bottom + delay) , mipi->linkbase + VMLEN2);
 
         msleep(5);
 
@@ -352,9 +386,56 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
                           pixfmt << 4);
         sh_mipi_dcs(ch->chan, MIPI_DCS_SET_DISPLAY_ON);
 
+        /* Enable timeout counters */
+        iowrite32(0x00000f00, base + DSICTRL);
+
         return 0;
 }
 
+static void mipi_display_on(void *arg, struct fb_info *info)
+{
+        struct sh_mipi *mipi = arg;
+        struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;
+        int ret;
+
+        pm_runtime_get_sync(&mipi->pdev->dev);
+
+        ret = pdata->set_dot_clock(mipi->pdev, mipi->base, 1);
+        if (ret < 0)
+                goto mipi_display_on_fail1;
+
+        ret = sh_mipi_setup(mipi, pdata);
+        if (ret < 0)
+                goto mipi_display_on_fail2;
+
+        sh_mipi_dsi_enable(mipi, true);
+
+        if (mipi->next_display_on)
+                mipi->next_display_on(mipi->next_board_data, info);
+
+        return;
+
+mipi_display_on_fail1:
+        pm_runtime_put_sync(&mipi->pdev->dev);
+mipi_display_on_fail2:
+        pdata->set_dot_clock(mipi->pdev, mipi->base, 0);
+}
+
+static void mipi_display_off(void *arg)
+{
+        struct sh_mipi *mipi = arg;
+        struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;
+
+        if (mipi->next_display_off)
+                mipi->next_display_off(mipi->next_board_data);
+
+        sh_mipi_dsi_enable(mipi, false);
+
+        pdata->set_dot_clock(mipi->pdev, mipi->base, 0);
+
+        pm_runtime_put_sync(&mipi->pdev->dev);
+}
+
 static int __init sh_mipi_probe(struct platform_device *pdev)
 {
         struct sh_mipi *mipi;
@@ -363,11 +444,13 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
         struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         unsigned long rate, f_current;
         int idx = pdev->id, ret;
-        char dsip_clk[] = "dsi.p_clk";
 
         if (!res || !res2 || idx >= ARRAY_SIZE(mipi_dsi) || !pdata)
                 return -ENODEV;
 
+        if (!pdata->set_dot_clock)
+                return -EINVAL;
+
         mutex_lock(&array_lock);
         if (idx < 0)
                 for (idx = 0; idx < ARRAY_SIZE(mipi_dsi) && mipi_dsi[idx]; idx++)
@@ -408,7 +491,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
                 goto emap2;
         }
 
-        mipi->dev = &pdev->dev;
+        mipi->pdev = pdev;
 
         mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk");
         if (IS_ERR(mipi->dsit_clk)) {
@@ -428,44 +511,15 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
 
         dev_dbg(&pdev->dev, "DSI-T clk %lu -> %lu\n", f_current, rate);
 
-        sprintf(dsip_clk, "dsi%1.1dp_clk", idx);
-        mipi->dsip_clk = clk_get(&pdev->dev, dsip_clk);
-        if (IS_ERR(mipi->dsip_clk)) {
-                ret = PTR_ERR(mipi->dsip_clk);
-                goto eclkpget;
-        }
-
-        f_current = clk_get_rate(mipi->dsip_clk);
-        /* Between 10 and 50MHz */
-        rate = clk_round_rate(mipi->dsip_clk, 24000000);
-        if (rate > 0 && rate != f_current)
-                ret = clk_set_rate(mipi->dsip_clk, rate);
-        else
-                ret = rate;
-        if (ret < 0)
-                goto esetprate;
-
-        dev_dbg(&pdev->dev, "DSI-P clk %lu -> %lu\n", f_current, rate);
-
-        msleep(10);
-
         ret = clk_enable(mipi->dsit_clk);
         if (ret < 0)
                 goto eclkton;
 
-        ret = clk_enable(mipi->dsip_clk);
-        if (ret < 0)
-                goto eclkpon;
-
         mipi_dsi[idx] = mipi;
 
         pm_runtime_enable(&pdev->dev);
         pm_runtime_resume(&pdev->dev);
 
-        ret = sh_mipi_setup(mipi, pdata);
-        if (ret < 0)
-                goto emipisetup;
-
         mutex_unlock(&array_lock);
         platform_set_drvdata(pdev, mipi);
 
@@ -482,16 +536,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
 
         return 0;
 
-emipisetup:
-        mipi_dsi[idx] = NULL;
-        pm_runtime_disable(&pdev->dev);
-        clk_disable(mipi->dsip_clk);
-eclkpon:
-        clk_disable(mipi->dsit_clk);
 eclkton:
-esetprate:
-        clk_put(mipi->dsip_clk);
-eclkpget:
 esettrate:
         clk_put(mipi->dsit_clk);
 eclktget:
@@ -542,10 +587,9 @@ static int __exit sh_mipi_remove(struct platform_device *pdev)
         pdata->lcd_chan->board_cfg.board_data = NULL;
 
         pm_runtime_disable(&pdev->dev);
-        clk_disable(mipi->dsip_clk);
         clk_disable(mipi->dsit_clk);
         clk_put(mipi->dsit_clk);
-        clk_put(mipi->dsip_clk);
+
         iounmap(mipi->linkbase);
         if (res2)
                 release_mem_region(res2->start, resource_size(res2));
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index facffc254976..aac5b369d73c 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/videodev2.h>
 #include <linux/vmalloc.h>
 #include <linux/ioctl.h>
 #include <linux/slab.h>
@@ -102,7 +103,7 @@ struct sh_mobile_lcdc_priv {
         struct sh_mobile_lcdc_chan ch[2];
         struct notifier_block notifier;
         int started;
-        int forced_bpp; /* 2 channel LCDC must share bpp setting */
+        int forced_fourcc; /* 2 channel LCDC must share fourcc setting */
         struct sh_mobile_meram_info *meram_dev;
 };
 
@@ -215,6 +216,47 @@ struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
         lcdc_sys_read_data,
 };
 
+static int sh_mobile_format_fourcc(const struct fb_var_screeninfo *var)
+{
+        if (var->grayscale > 1)
+                return var->grayscale;
+
+        switch (var->bits_per_pixel) {
+        case 16:
+                return V4L2_PIX_FMT_RGB565;
+        case 24:
+                return V4L2_PIX_FMT_BGR24;
+        case 32:
+                return V4L2_PIX_FMT_BGR32;
+        default:
+                return 0;
+        }
+}
+
+static int sh_mobile_format_is_fourcc(const struct fb_var_screeninfo *var)
+{
+        return var->grayscale > 1;
+}
+
+static bool sh_mobile_format_is_yuv(const struct fb_var_screeninfo *var)
+{
+        if (var->grayscale <= 1)
+                return false;
+
+        switch (var->grayscale) {
+        case V4L2_PIX_FMT_NV12:
+        case V4L2_PIX_FMT_NV21:
+        case V4L2_PIX_FMT_NV16:
+        case V4L2_PIX_FMT_NV61:
+        case V4L2_PIX_FMT_NV24:
+        case V4L2_PIX_FMT_NV42:
+                return true;
+
+        default:
+                return false;
+        }
+}
+
 static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv)
 {
         if (atomic_inc_and_test(&priv->hw_usecnt)) {
@@ -420,7 +462,7 @@ static void sh_mobile_lcdc_geometry(struct sh_mobile_lcdc_chan *ch)
         tmp = ((display_var->xres & 7) << 24) |
                 ((display_h_total & 7) << 16) |
                 ((display_var->hsync_len & 7) << 8) |
-                hsync_pos;
+                (hsync_pos & 7);
         lcdc_write_chan(ch, LDHAJR, tmp);
 }
 
@@ -435,7 +477,6 @@ static void __sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
 {
         struct sh_mobile_lcdc_chan *ch;
         unsigned long tmp;
-        int bpp = 0;
         int k, m;
 
         /* Enable LCDC channels. Read data from external memory, avoid using the
@@ -454,9 +495,6 @@ static void __sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
                 if (!ch->enabled)
                         continue;
 
-                if (!bpp)
-                        bpp = ch->info->var.bits_per_pixel;
-
                 /* Power supply */
                 lcdc_write_chan(ch, LDPMR, 0);
 
@@ -487,31 +525,37 @@ static void __sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
 
                 sh_mobile_lcdc_geometry(ch);
 
-                if (ch->info->var.nonstd) {
-                        tmp = (ch->info->var.nonstd << 16);
-                        switch (ch->info->var.bits_per_pixel) {
-                        case 12:
-                                tmp |= LDDFR_YF_420;
-                                break;
-                        case 16:
-                                tmp |= LDDFR_YF_422;
-                                break;
-                        case 24:
-                        default:
-                                tmp |= LDDFR_YF_444;
-                                break;
-                        }
-                } else {
-                        switch (ch->info->var.bits_per_pixel) {
-                        case 16:
-                                tmp = LDDFR_PKF_RGB16;
-                                break;
-                        case 24:
-                                tmp = LDDFR_PKF_RGB24;
+                switch (sh_mobile_format_fourcc(&ch->info->var)) {
+                case V4L2_PIX_FMT_RGB565:
+                        tmp = LDDFR_PKF_RGB16;
+                        break;
+                case V4L2_PIX_FMT_BGR24:
+                        tmp = LDDFR_PKF_RGB24;
+                        break;
+                case V4L2_PIX_FMT_BGR32:
+                        tmp = LDDFR_PKF_ARGB32;
+                        break;
+                case V4L2_PIX_FMT_NV12:
+                case V4L2_PIX_FMT_NV21:
+                        tmp = LDDFR_CC | LDDFR_YF_420;
+                        break;
+                case V4L2_PIX_FMT_NV16:
+                case V4L2_PIX_FMT_NV61:
+                        tmp = LDDFR_CC | LDDFR_YF_422;
+                        break;
+                case V4L2_PIX_FMT_NV24:
+                case V4L2_PIX_FMT_NV42:
+                        tmp = LDDFR_CC | LDDFR_YF_444;
+                        break;
+                }
+
+                if (sh_mobile_format_is_yuv(&ch->info->var)) {
+                        switch (ch->info->var.colorspace) {
+                        case V4L2_COLORSPACE_REC709:
+                                tmp |= LDDFR_CF1;
                                 break;
-                        case 32:
-                        default:
-                                tmp = LDDFR_PKF_ARGB32;
+                        case V4L2_COLORSPACE_JPEG:
+                                tmp |= LDDFR_CF0;
                                 break;
                         }
                 }
@@ -519,7 +563,7 @@ static void __sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
                 lcdc_write_chan(ch, LDDFR, tmp);
                 lcdc_write_chan(ch, LDMLSR, ch->pitch);
                 lcdc_write_chan(ch, LDSA1R, ch->base_addr_y);
-                if (ch->info->var.nonstd)
+                if (sh_mobile_format_is_yuv(&ch->info->var))
                         lcdc_write_chan(ch, LDSA2R, ch->base_addr_c);
 
                 /* When using deferred I/O mode, configure the LCDC for one-shot
@@ -536,21 +580,23 @@ static void __sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
         }
 
         /* Word and long word swap. */
-        if  (priv->ch[0].info->var.nonstd)
+        switch (sh_mobile_format_fourcc(&priv->ch[0].info->var)) {
+        case V4L2_PIX_FMT_RGB565:
+        case V4L2_PIX_FMT_NV21:
+        case V4L2_PIX_FMT_NV61:
+        case V4L2_PIX_FMT_NV42:
+                tmp = LDDDSR_LS | LDDDSR_WS;
+                break;
+        case V4L2_PIX_FMT_BGR24:
+        case V4L2_PIX_FMT_NV12:
+        case V4L2_PIX_FMT_NV16:
+        case V4L2_PIX_FMT_NV24:
                 tmp = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS;
-        else {
-                switch (bpp) {
-                case 16:
-                        tmp = LDDDSR_LS | LDDDSR_WS;
-                        break;
-                case 24:
-                        tmp = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS;
-                        break;
-                case 32:
-                default:
-                        tmp = LDDDSR_LS;
-                        break;
-                }
+                break;
+        case V4L2_PIX_FMT_BGR32:
+        default:
+                tmp = LDDDSR_LS;
+                break;
         }
         lcdc_write(priv, _LDDDSR, tmp);
 
@@ -622,12 +668,24 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
                         ch->meram_enabled = 0;
                 }
 
-                if (!ch->info->var.nonstd)
-                        pixelformat = SH_MOBILE_MERAM_PF_RGB;
-                else if (ch->info->var.bits_per_pixel == 24)
-                        pixelformat = SH_MOBILE_MERAM_PF_NV24;
-                else
+                switch (sh_mobile_format_fourcc(&ch->info->var)) {
+                case V4L2_PIX_FMT_NV12:
+                case V4L2_PIX_FMT_NV21:
+                case V4L2_PIX_FMT_NV16:
+                case V4L2_PIX_FMT_NV61:
                         pixelformat = SH_MOBILE_MERAM_PF_NV;
+                        break;
+                case V4L2_PIX_FMT_NV24:
+                case V4L2_PIX_FMT_NV42:
+                        pixelformat = SH_MOBILE_MERAM_PF_NV24;
+                        break;
+                case V4L2_PIX_FMT_RGB565:
+                case V4L2_PIX_FMT_BGR24:
+                case V4L2_PIX_FMT_BGR32:
+                default:
+                        pixelformat = SH_MOBILE_MERAM_PF_RGB;
+                        break;
+                }
 
                 ret = mdev->ops->meram_register(mdev, cfg, ch->pitch,
                                         ch->info->var.yres, pixelformat,
@@ -845,6 +903,7 @@ static struct fb_fix_screeninfo sh_mobile_lcdc_fix  = {
         .xpanstep =     0,
         .ypanstep =     1,
         .ywrapstep =    0,
+        .capabilities = FB_CAP_FOURCC,
 };
 
 static void sh_mobile_lcdc_fillrect(struct fb_info *info,
@@ -877,8 +936,9 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
         unsigned long new_pan_offset;
         unsigned long base_addr_y, base_addr_c;
         unsigned long c_offset;
+        bool yuv = sh_mobile_format_is_yuv(&info->var);
 
-        if (!info->var.nonstd)
+        if (!yuv)
                 new_pan_offset = var->yoffset * info->fix.line_length
                                + var->xoffset * (info->var.bits_per_pixel / 8);
         else
@@ -892,7 +952,7 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
 
         /* Set the source address for the next refresh */
         base_addr_y = ch->dma_handle + new_pan_offset;
-        if (info->var.nonstd) {
+        if (yuv) {
                 /* Set y offset */
                 c_offset = var->yoffset * info->fix.line_length
                          * (info->var.bits_per_pixel - 8) / 8;
@@ -900,7 +960,7 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
                             + info->var.xres * info->var.yres_virtual
                             + c_offset;
                 /* Set x offset */
-                if (info->var.bits_per_pixel == 24)
+                if (sh_mobile_format_fourcc(&info->var) == V4L2_PIX_FMT_NV24)
                         base_addr_c += 2 * var->xoffset;
                 else
                         base_addr_c += var->xoffset;
@@ -924,7 +984,7 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
         ch->base_addr_c = base_addr_c;
 
         lcdc_write_chan_mirror(ch, LDSA1R, base_addr_y);
-        if (info->var.nonstd)
+        if (yuv)
                 lcdc_write_chan_mirror(ch, LDSA2R, base_addr_c);
 
         if (lcdc_chan_is_sublcd(ch))
@@ -1100,51 +1160,84 @@ static int sh_mobile_check_var(struct fb_var_screeninfo *var, struct fb_info *in
         if (var->yres_virtual < var->yres)
                 var->yres_virtual = var->yres;
 
-        if (var->bits_per_pixel <= 16) {                /* RGB 565 */
-                var->bits_per_pixel = 16;
-                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;
-        } else if (var->bits_per_pixel <= 24) {         /* RGB 888 */
-                var->bits_per_pixel = 24;
-                var->red.offset = 16;
-                var->red.length = 8;
-                var->green.offset = 8;
-                var->green.length = 8;
-                var->blue.offset = 0;
-                var->blue.length = 8;
-                var->transp.offset = 0;
-                var->transp.length = 0;
-        } else if (var->bits_per_pixel <= 32) {         /* RGBA 888 */
-                var->bits_per_pixel = 32;
-                var->red.offset = 16;
-                var->red.length = 8;
-                var->green.offset = 8;
-                var->green.length = 8;
-                var->blue.offset = 0;
-                var->blue.length = 8;
-                var->transp.offset = 24;
-                var->transp.length = 8;
-        } else
-                return -EINVAL;
+        if (sh_mobile_format_is_fourcc(var)) {
+                switch (var->grayscale) {
+                case V4L2_PIX_FMT_NV12:
+                case V4L2_PIX_FMT_NV21:
+                        var->bits_per_pixel = 12;
+                        break;
+                case V4L2_PIX_FMT_RGB565:
+                case V4L2_PIX_FMT_NV16:
+                case V4L2_PIX_FMT_NV61:
+                        var->bits_per_pixel = 16;
+                        break;
+                case V4L2_PIX_FMT_BGR24:
+                case V4L2_PIX_FMT_NV24:
+                case V4L2_PIX_FMT_NV42:
+                        var->bits_per_pixel = 24;
+                        break;
+                case V4L2_PIX_FMT_BGR32:
+                        var->bits_per_pixel = 32;
+                        break;
+                default:
+                        return -EINVAL;
+                }
 
-        var->red.msb_right = 0;
-        var->green.msb_right = 0;
-        var->blue.msb_right = 0;
-        var->transp.msb_right = 0;
+                /* Default to RGB and JPEG color-spaces for RGB and YUV formats
+                 * respectively.
+                 */
+                if (!sh_mobile_format_is_yuv(var))
+                        var->colorspace = V4L2_COLORSPACE_SRGB;
+                else if (var->colorspace != V4L2_COLORSPACE_REC709)
+                        var->colorspace = V4L2_COLORSPACE_JPEG;
+        } else {
+                if (var->bits_per_pixel <= 16) {                /* RGB 565 */
+                        var->bits_per_pixel = 16;
+                        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;
+                } else if (var->bits_per_pixel <= 24) {         /* RGB 888 */
+                        var->bits_per_pixel = 24;
+                        var->red.offset = 16;
+                        var->red.length = 8;
+                        var->green.offset = 8;
+                        var->green.length = 8;
+                        var->blue.offset = 0;
+                        var->blue.length = 8;
+                        var->transp.offset = 0;
+                        var->transp.length = 0;
+                } else if (var->bits_per_pixel <= 32) {         /* RGBA 888 */
+                        var->bits_per_pixel = 32;
+                        var->red.offset = 16;
+                        var->red.length = 8;
+                        var->green.offset = 8;
+                        var->green.length = 8;
+                        var->blue.offset = 0;
+                        var->blue.length = 8;
+                        var->transp.offset = 24;
+                        var->transp.length = 8;
+                } else
+                        return -EINVAL;
+
+                var->red.msb_right = 0;
+                var->green.msb_right = 0;
+                var->blue.msb_right = 0;
+                var->transp.msb_right = 0;
+        }
 
         /* Make sure we don't exceed our allocated memory. */
         if (var->xres_virtual * var->yres_virtual * var->bits_per_pixel / 8 >
             info->fix.smem_len)
                 return -EINVAL;
 
-        /* only accept the forced_bpp for dual channel configurations */
-        if (p->forced_bpp && p->forced_bpp != var->bits_per_pixel)
+        /* only accept the forced_fourcc for dual channel configurations */
+        if (p->forced_fourcc &&
+            p->forced_fourcc != sh_mobile_format_fourcc(var))
                 return -EINVAL;
 
         return 0;
@@ -1158,7 +1251,7 @@ static int sh_mobile_set_par(struct fb_info *info)
 
         sh_mobile_lcdc_stop(ch->lcdc);
 
-        if (info->var.nonstd)
+        if (sh_mobile_format_is_yuv(&info->var))
                 info->fix.line_length = info->var.xres;
         else
                 info->fix.line_length = info->var.xres
@@ -1170,6 +1263,14 @@ static int sh_mobile_set_par(struct fb_info *info)
                 info->fix.line_length = line_length;
         }
 
+        if (sh_mobile_format_is_fourcc(&info->var)) {
+                info->fix.type = FB_TYPE_FOURCC;
+                info->fix.visual = FB_VISUAL_FOURCC;
+        } else {
+                info->fix.type = FB_TYPE_PACKED_PIXELS;
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+        }
+
         return ret;
 }
 
@@ -1464,9 +1565,9 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch,
         for (i = 0, mode = cfg->lcd_cfg; i < cfg->num_cfg; i++, mode++) {
                 unsigned int size = mode->yres * mode->xres;
 
-                /* NV12 buffers must have even number of lines */
-                if ((cfg->nonstd) && cfg->bpp == 12 &&
-                                (mode->yres & 0x1)) {
+                /* NV12/NV21 buffers must have even number of lines */
+                if ((cfg->fourcc == V4L2_PIX_FMT_NV12 ||
+                     cfg->fourcc == V4L2_PIX_FMT_NV21) && (mode->yres & 0x1)) {
                         dev_err(dev, "yres must be multiple of 2 for YCbCr420 "
                                 "mode.\n");
                         return -EINVAL;
@@ -1484,14 +1585,6 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch,
                 dev_dbg(dev, "Found largest videomode %ux%u\n",
                         max_mode->xres, max_mode->yres);
 
-        /* Initialize fixed screen information. Restrict pan to 2 lines steps
-         * for NV12.
-         */
-        info->fix = sh_mobile_lcdc_fix;
-        info->fix.smem_len = max_size * 2 * cfg->bpp / 8;
-        if (cfg->nonstd && cfg->bpp == 12)
-                info->fix.ypanstep = 2;
-
         /* Create the mode list. */
         if (cfg->lcd_cfg == NULL) {
                 mode = &default_720p;
@@ -1509,19 +1602,38 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch,
          */
         var = &info->var;
         fb_videomode_to_var(var, mode);
-        var->bits_per_pixel = cfg->bpp;
         var->width = cfg->lcd_size_cfg.width;
         var->height = cfg->lcd_size_cfg.height;
         var->yres_virtual = var->yres * 2;
         var->activate = FB_ACTIVATE_NOW;
 
+        switch (cfg->fourcc) {
+        case V4L2_PIX_FMT_RGB565:
+                var->bits_per_pixel = 16;
+                break;
+        case V4L2_PIX_FMT_BGR24:
+                var->bits_per_pixel = 24;
+                break;
+        case V4L2_PIX_FMT_BGR32:
+                var->bits_per_pixel = 32;
+                break;
+        default:
+                var->grayscale = cfg->fourcc;
+                break;
+        }
+
+        /* Make sure the memory size check won't fail. smem_len is initialized
+         * later based on var.
+         */
+        info->fix.smem_len = UINT_MAX;
         ret = sh_mobile_check_var(var, info);
         if (ret)
                 return ret;
 
+        max_size = max_size * var->bits_per_pixel / 8 * 2;
+
         /* Allocate frame buffer memory and color map. */
-        buf = dma_alloc_coherent(dev, info->fix.smem_len, &ch->dma_handle,
-                                 GFP_KERNEL);
+        buf = dma_alloc_coherent(dev, max_size, &ch->dma_handle, GFP_KERNEL);
         if (!buf) {
                 dev_err(dev, "unable to allocate buffer\n");
                 return -ENOMEM;
@@ -1530,16 +1642,27 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch,
         ret = fb_alloc_cmap(&info->cmap, PALETTE_NR, 0);
         if (ret < 0) {
                 dev_err(dev, "unable to allocate cmap\n");
-                dma_free_coherent(dev, info->fix.smem_len,
-                                  buf, ch->dma_handle);
+                dma_free_coherent(dev, max_size, buf, ch->dma_handle);
                 return ret;
         }
 
+        /* Initialize fixed screen information. Restrict pan to 2 lines steps
+         * for NV12 and NV21.
+         */
+        info->fix = sh_mobile_lcdc_fix;
         info->fix.smem_start = ch->dma_handle;
-        if (var->nonstd)
+        info->fix.smem_len = max_size;
+        if (cfg->fourcc == V4L2_PIX_FMT_NV12 ||
+            cfg->fourcc == V4L2_PIX_FMT_NV21)
+                info->fix.ypanstep = 2;
+
+        if (sh_mobile_format_is_yuv(var)) {
                 info->fix.line_length = var->xres;
-        else
-                info->fix.line_length = var->xres * (cfg->bpp / 8);
+                info->fix.visual = FB_VISUAL_FOURCC;
+        } else {
+                info->fix.line_length = var->xres * var->bits_per_pixel / 8;
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+        }
 
         info->screen_base = buf;
         info->device = dev;
@@ -1626,9 +1749,9 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        /* for dual channel LCDC (MAIN + SUB) force shared bpp setting */
+        /* for dual channel LCDC (MAIN + SUB) force shared format setting */
         if (num_channels == 2)
-                priv->forced_bpp = pdata->ch[0].bpp;
+                priv->forced_fourcc = pdata->ch[0].fourcc;
 
         priv->base = ioremap_nocache(res->start, resource_size(res));
         if (!priv->base)
@@ -1675,13 +1798,10 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
                 if (error < 0)
                         goto err1;
 
-                dev_info(info->dev,
-                         "registered %s/%s as %dx%d %dbpp.\n",
-                         pdev->name,
-                         (ch->cfg.chan == LCDC_CHAN_MAINLCD) ?
-                         "mainlcd" : "sublcd",
-                         info->var.xres, info->var.yres,
-                         ch->cfg.bpp);
+                dev_info(info->dev, "registered %s/%s as %dx%d %dbpp.\n",
+                         pdev->name, (ch->cfg.chan == LCDC_CHAN_MAINLCD) ?
+                         "mainlcd" : "sublcd", info->var.xres, info->var.yres,
+                         info->var.bits_per_pixel);
 
                 /* deferred io mode: disable clock to save power */
                 if (info->fbdefio || info->state == FBINFO_STATE_SUSPENDED)
@@ -1709,18 +1829,7 @@ static struct platform_driver sh_mobile_lcdc_driver = {
         .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_platform_driver(sh_mobile_lcdc_driver);
 
 MODULE_DESCRIPTION("SuperH Mobile LCDC Framebuffer driver");
 MODULE_AUTHOR("Magnus Damm <damm@opensource.se>");
diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index 4d63490209cd..f45d83ecfd21 100644
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -679,18 +679,7 @@ static struct platform_driver sh_mobile_meram_driver = {
         .remove         = sh_mobile_meram_remove,
 };
 
-static int __init sh_mobile_meram_init(void)
-{
-        return platform_driver_register(&sh_mobile_meram_driver);
-}
-
-static void __exit sh_mobile_meram_exit(void)
-{
-        platform_driver_unregister(&sh_mobile_meram_driver);
-}
-
-module_init(sh_mobile_meram_init);
-module_exit(sh_mobile_meram_exit);
+module_platform_driver(sh_mobile_meram_driver);
 
 MODULE_DESCRIPTION("SuperH Mobile MERAM driver");
 MODULE_AUTHOR("Damian Hobson-Garcia / Takanari Hayama");
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index a78254cf8e83..3690effbedcc 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -2230,18 +2230,7 @@ static struct platform_driver sm501fb_driver = {
         },
 };
 
-static int __devinit sm501fb_init(void)
-{
-        return platform_driver_register(&sm501fb_driver);
-}
-
-static void __exit sm501fb_cleanup(void)
-{
-        platform_driver_unregister(&sm501fb_driver);
-}
-
-module_init(sm501fb_init);
-module_exit(sm501fb_cleanup);
+module_platform_driver(sm501fb_driver);
 
 module_param_named(mode, fb_mode, charp, 0);
 MODULE_PARM_DESC(mode,
diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c
index 777c21dd7a6b..2a5fe6ede845 100644
--- a/drivers/video/vt8500lcdfb.c
+++ b/drivers/video/vt8500lcdfb.c
@@ -457,18 +457,7 @@ static struct platform_driver vt8500lcd_driver = {
         },
 };
 
-static int __init vt8500lcd_init(void)
-{
-        return platform_driver_register(&vt8500lcd_driver);
-}
-
-static void __exit vt8500lcd_exit(void)
-{
-        platform_driver_unregister(&vt8500lcd_driver);
-}
-
-module_init(vt8500lcd_init);
-module_exit(vt8500lcd_exit);
+module_platform_driver(vt8500lcd_driver);
 
 MODULE_AUTHOR("Alexey Charkov <alchark@gmail.com>");
 MODULE_DESCRIPTION("LCD controller driver for VIA VT8500");
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 2375e5bbf572..90a2e30272ad 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -1620,18 +1620,7 @@ static struct platform_driver w100fb_driver = {
         },
 };
 
-int __init w100fb_init(void)
-{
-        return platform_driver_register(&w100fb_driver);
-}
-
-void __exit w100fb_cleanup(void)
-{
-        platform_driver_unregister(&w100fb_driver);
-}
-
-module_init(w100fb_init);
-module_exit(w100fb_cleanup);
+module_platform_driver(w100fb_driver);
 
 MODULE_DESCRIPTION("ATI Imageon w100 framebuffer driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
index 96e34a569169..c8703bd61b74 100644
--- a/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@ -404,18 +404,7 @@ static struct platform_driver wm8505fb_driver = {
         },
 };
 
-static int __init wm8505fb_init(void)
-{
-        return platform_driver_register(&wm8505fb_driver);
-}
-
-static void __exit wm8505fb_exit(void)
-{
-        platform_driver_unregister(&wm8505fb_driver);
-}
-
-module_init(wm8505fb_init);
-module_exit(wm8505fb_exit);
+module_platform_driver(wm8505fb_driver);
 
 MODULE_AUTHOR("Ed Spiridonov <edo.rus@gmail.com>");
 MODULE_DESCRIPTION("Framebuffer driver for WMT WM8505");
diff --git a/drivers/video/wmt_ge_rops.c b/drivers/video/wmt_ge_rops.c
index 45832b7ef7d2..55be3865015b 100644
--- a/drivers/video/wmt_ge_rops.c
+++ b/drivers/video/wmt_ge_rops.c
@@ -167,18 +167,7 @@ static struct platform_driver wmt_ge_rops_driver = {
         },
 };
 
-static int __init wmt_ge_rops_init(void)
-{
-        return platform_driver_register(&wmt_ge_rops_driver);
-}
-
-static void __exit wmt_ge_rops_exit(void)
-{
-        platform_driver_unregister(&wmt_ge_rops_driver);
-}
-
-module_init(wmt_ge_rops_init);
-module_exit(wmt_ge_rops_exit);
+module_platform_driver(wmt_ge_rops_driver);
 
 MODULE_AUTHOR("Alexey Charkov <alchark@gmail.com");
 MODULE_DESCRIPTION("Accelerators for raster operations using "
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index fcb6cd90f64d..18084525402a 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -511,25 +511,7 @@ static struct platform_driver xilinxfb_of_driver = {
         },
 };
 
-
-/* ---------------------------------------------------------------------
- * Module setup and teardown
- */
-
-static int __init
-xilinxfb_init(void)
-{
-        return platform_driver_register(&xilinxfb_of_driver);
-}
-
-static void __exit
-xilinxfb_cleanup(void)
-{
-        platform_driver_unregister(&xilinxfb_of_driver);
-}
-
-module_init(xilinxfb_init);
-module_exit(xilinxfb_cleanup);
+module_platform_driver(xilinxfb_of_driver);
 
 MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
 MODULE_DESCRIPTION("Xilinx TFT frame buffer driver");
diff --git a/include/linux/display.h b/include/linux/display.h
deleted file mode 100644
index 3bf70d639728..000000000000
--- a/include/linux/display.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2006 James Simmons <jsimmons@infradead.org>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#ifndef _LINUX_DISPLAY_H
-#define _LINUX_DISPLAY_H
-
-#include <linux/device.h>
-
-struct display_device;
-
-/* This structure defines all the properties of a Display. */
-struct display_driver {
-        int  (*set_contrast)(struct display_device *, unsigned int);
-        int  (*get_contrast)(struct display_device *);
-        void (*suspend)(struct display_device *, pm_message_t state);
-        void (*resume)(struct display_device *);
-        int  (*probe)(struct display_device *, void *);
-        int  (*remove)(struct display_device *);
-        int  max_contrast;
-};
-
-struct display_device {
-        struct module *owner;                   /* Owner module */
-        struct display_driver *driver;
-        struct device *parent;                  /* This is the parent */
-        struct device *dev;                     /* This is this display device */
-        struct mutex lock;
-        void *priv_data;
-        char type[16];
-        char *name;
-        int idx;
-};
-
-extern struct display_device *display_device_register(struct display_driver *driver,
-                                        struct device *dev, void *devdata);
-extern void display_device_unregister(struct display_device *dev);
-
-extern int probe_edid(struct display_device *dev, void *devdata);
-
-#define to_display_device(obj) container_of(obj, struct display_device, class_dev)
-
-#endif
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 1d6836c498dd..c18122f40543 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -45,6 +45,7 @@
 #define FB_TYPE_INTERLEAVED_PLANES      2       /* Interleaved planes   */
 #define FB_TYPE_TEXT                    3       /* Text/attributes      */
 #define FB_TYPE_VGA_PLANES              4       /* EGA/VGA planes       */
+#define FB_TYPE_FOURCC                  5       /* Type identified by a V4L2 FOURCC */
 
 #define FB_AUX_TEXT_MDA         0       /* Monochrome text */
 #define FB_AUX_TEXT_CGA         1       /* CGA/EGA/VGA Color text */
@@ -69,6 +70,7 @@
 #define FB_VISUAL_PSEUDOCOLOR           3       /* Pseudo color (like atari) */
 #define FB_VISUAL_DIRECTCOLOR           4       /* Direct color */
 #define FB_VISUAL_STATIC_PSEUDOCOLOR    5       /* Pseudo color readonly */
+#define FB_VISUAL_FOURCC                6       /* Visual identified by a V4L2 FOURCC */
 
 #define FB_ACCEL_NONE           0       /* no hardware accelerator      */
 #define FB_ACCEL_ATARIBLITT     1       /* Atari Blitter                */
@@ -154,6 +156,8 @@
 
 #define FB_ACCEL_PUV3_UNIGFX    0xa0    /* PKUnity-v3 Unigfx            */
 
+#define FB_CAP_FOURCC           1       /* Device supports FOURCC-based formats */
+
 struct fb_fix_screeninfo {
         char id[16];                    /* identification string eg "TT Builtin" */
         unsigned long smem_start;       /* Start of frame buffer mem */
@@ -171,7 +175,8 @@ struct fb_fix_screeninfo {
         __u32 mmio_len;                 /* Length of Memory Mapped I/O  */
         __u32 accel;                    /* Indicate to driver which     */
                                         /*  specific chip/card we have  */
-        __u16 reserved[3];              /* Reserved for future compatibility */
+        __u16 capabilities;             /* see FB_CAP_*                 */
+        __u16 reserved[2];              /* Reserved for future compatibility */
 };
 
 /* Interpretation of offset for color fields: All offsets are from the right,
@@ -246,8 +251,8 @@ struct fb_var_screeninfo {
         __u32 yoffset;                  /* resolution                   */
 
         __u32 bits_per_pixel;           /* guess what                   */
-        __u32 grayscale;                /* != 0 Graylevels instead of colors */
-
+        __u32 grayscale;                /* 0 = color, 1 = grayscale,    */
+                                        /* >1 = FOURCC                  */
         struct fb_bitfield red;         /* bitfield in fb mem if true color, */
         struct fb_bitfield green;       /* else only length is significant */
         struct fb_bitfield blue;
@@ -273,7 +278,8 @@ struct fb_var_screeninfo {
         __u32 sync;                     /* see FB_SYNC_*                */
         __u32 vmode;                    /* see FB_VMODE_*               */
         __u32 rotate;                   /* angle we rotate counter clockwise */
-        __u32 reserved[5];              /* Reserved for future compatibility */
+        __u32 colorspace;               /* colorspace for FOURCC-based modes */
+        __u32 reserved[4];              /* Reserved for future compatibility */
 };
 
 struct fb_cmap {
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 4b752d5ee80e..d2f74f8e3fe3 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -343,6 +343,8 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
 #define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
 #define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
+#define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
+#define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */
 
 /* two non contiguous planes - one Y, one Cr + Cb interleaved  */
 #define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
diff --git a/include/linux/zorro_ids.h b/include/linux/zorro_ids.h
index 7e749088910d..74bc53bcfdcf 100644
--- a/include/linux/zorro_ids.h
+++ b/include/linux/zorro_ids.h
@@ -360,8 +360,8 @@
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM       ZORRO_ID(VILLAGE_TRONIC, 0x0B, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG       ZORRO_ID(VILLAGE_TRONIC, 0x0C, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_SEGMENTED_MODE    ZORRO_ID(VILLAGE_TRONIC, 0x0D, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_MEM1           ZORRO_ID(VILLAGE_TRONIC, 0x15, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_MEM2           ZORRO_ID(VILLAGE_TRONIC, 0x16, 0)
+#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1           ZORRO_ID(VILLAGE_TRONIC, 0x15, 0)
+#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM2           ZORRO_ID(VILLAGE_TRONIC, 0x16, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_REG            ZORRO_ID(VILLAGE_TRONIC, 0x17, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3                ZORRO_ID(VILLAGE_TRONIC, 0x18, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_ARIADNE                      ZORRO_ID(VILLAGE_TRONIC, 0xC9, 0)
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 378c7ed6760b..062b3b24ff10 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -200,6 +200,10 @@ enum omap_dss_clk_source {
         OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,    /* OMAP4: PLL2_CLK2 */
 };
 
+enum omap_hdmi_flags {
+        OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0,
+};
+
 /* RFBI */
 
 struct rfbi_timings {
@@ -294,8 +298,8 @@ int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel,
                 u16 len);
 int dsi_vc_send_null(struct omap_dss_device *dssdev, int channel);
 int dsi_vc_send_bta_sync(struct omap_dss_device *dssdev, int channel);
-int dsi_video_mode_enable(struct omap_dss_device *dssdev, int channel);
-void dsi_video_mode_disable(struct omap_dss_device *dssdev, int channel);
+int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel);
+void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel);
 
 /* Board specific data */
 struct omap_dss_board_info {
@@ -309,6 +313,8 @@ struct omap_dss_board_info {
 
 /* Init with the board info */
 extern int omap_display_init(struct omap_dss_board_info *board_data);
+/* HDMI mux init*/
+extern int omap_hdmi_init(enum omap_hdmi_flags flags);
 
 struct omap_display_platform_data {
         struct omap_dss_board_info *board_data;
@@ -352,8 +358,6 @@ struct omap_dss_cpr_coefs {
 };
 
 struct omap_overlay_info {
-        bool enabled;
-
         u32 paddr;
         u32 p_uv_addr;  /* for NV12 format */
         u16 screen_width;
@@ -385,11 +389,21 @@ struct omap_overlay {
 
         /* dynamic fields */
         struct omap_overlay_manager *manager;
-        struct omap_overlay_info info;
 
-        bool manager_changed;
-        /* if true, info has been changed, but not applied() yet */
-        bool info_dirty;
+        /*
+         * The following functions do not block:
+         *
+         * is_enabled
+         * set_overlay_info
+         * get_overlay_info
+         *
+         * The rest of the functions may block and cannot be called from
+         * interrupt context
+         */
+
+        int (*enable)(struct omap_overlay *ovl);
+        int (*disable)(struct omap_overlay *ovl);
+        bool (*is_enabled)(struct omap_overlay *ovl);
 
         int (*set_manager)(struct omap_overlay *ovl,
                 struct omap_overlay_manager *mgr);
@@ -418,23 +432,27 @@ struct omap_overlay_manager_info {
 
 struct omap_overlay_manager {
         struct kobject kobj;
-        struct list_head list;
 
         /* static fields */
         const char *name;
         enum omap_channel id;
         enum omap_overlay_manager_caps caps;
-        int num_overlays;
-        struct omap_overlay **overlays;
+        struct list_head overlays;
         enum omap_display_type supported_displays;
 
         /* dynamic fields */
         struct omap_dss_device *device;
-        struct omap_overlay_manager_info info;
 
-        bool device_changed;
-        /* if true, info has been changed but not applied() yet */
-        bool info_dirty;
+        /*
+         * The following functions do not block:
+         *
+         * set_manager_info
+         * get_manager_info
+         * apply
+         *
+         * The rest of the functions may block and cannot be called from
+         * interrupt context
+         */
 
         int (*set_device)(struct omap_overlay_manager *mgr,
                 struct omap_dss_device *dssdev);
@@ -448,9 +466,6 @@ struct omap_overlay_manager {
         int (*apply)(struct omap_overlay_manager *mgr);
         int (*wait_for_go)(struct omap_overlay_manager *mgr);
         int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
-
-        int (*enable)(struct omap_overlay_manager *mgr);
-        int (*disable)(struct omap_overlay_manager *mgr);
 };
 
 struct omap_dss_device {
@@ -662,12 +677,7 @@ void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,
                 bool enable);
 int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable);
 
-int omap_dsi_prepare_update(struct omap_dss_device *dssdev,
-                                    u16 *x, u16 *y, u16 *w, u16 *h,
-                                    bool enlarge_update_area);
-int omap_dsi_update(struct omap_dss_device *dssdev,
-                int channel,
-                u16 x, u16 y, u16 w, u16 h,
+int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
                 void (*callback)(int, void *), void *data);
 int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
 int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
diff --git a/include/video/sh_mipi_dsi.h b/include/video/sh_mipi_dsi.h
index 6cb95c977de9..434d56b4a1a5 100644
--- a/include/video/sh_mipi_dsi.h
+++ b/include/video/sh_mipi_dsi.h
@@ -28,14 +28,33 @@ enum sh_mipi_dsi_data_fmt {
 struct sh_mobile_lcdc_chan_cfg;
 
 #define SH_MIPI_DSI_HSABM       (1 << 0)
-#define SH_MIPI_DSI_HSPBM       (1 << 1)
+#define SH_MIPI_DSI_HBPBM       (1 << 1)
+#define SH_MIPI_DSI_HFPBM       (1 << 2)
+#define SH_MIPI_DSI_BL2E        (1 << 3)
+#define SH_MIPI_DSI_VSEE        (1 << 4)
+#define SH_MIPI_DSI_HSEE        (1 << 5)
+#define SH_MIPI_DSI_HSAE        (1 << 6)
+
+#define SH_MIPI_DSI_HSbyteCLK   (1 << 24)
+#define SH_MIPI_DSI_HS6divCLK   (1 << 25)
+#define SH_MIPI_DSI_HS4divCLK   (1 << 26)
+
+#define SH_MIPI_DSI_SYNC_PULSES_MODE    (SH_MIPI_DSI_VSEE | \
+                                         SH_MIPI_DSI_HSEE | \
+                                         SH_MIPI_DSI_HSAE)
+#define SH_MIPI_DSI_SYNC_EVENTS_MODE    (0)
+#define SH_MIPI_DSI_SYNC_BURST_MODE     (SH_MIPI_DSI_BL2E)
 
 struct sh_mipi_dsi_info {
         enum sh_mipi_dsi_data_fmt       data_format;
         struct sh_mobile_lcdc_chan_cfg  *lcd_chan;
+        int                             lane;
         unsigned long                   flags;
         u32                             clksrc;
         unsigned int                    vsynw_offset;
+        int     (*set_dot_clock)(struct platform_device *pdev,
+                                 void __iomem *base,
+                                 int enable);
 };
 
 #endif
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 8101b726b48a..fe30b759c51e 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -174,7 +174,8 @@ struct sh_mobile_lcdc_bl_info {
 
 struct sh_mobile_lcdc_chan_cfg {
         int chan;
-        int bpp;
+        int fourcc;
+        int colorspace;
         int interface_type; /* selects RGBn or SYSn I/F, see above */
         int clock_divider;
         unsigned long flags; /* LCDC_FLAGS_... */
@@ -184,7 +185,6 @@ struct sh_mobile_lcdc_chan_cfg {
         struct sh_mobile_lcdc_board_cfg board_cfg;
         struct sh_mobile_lcdc_bl_info bl_info;
         struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */
-        int nonstd;
         struct sh_mobile_meram_cfg *meram_cfg;
 };