]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:20:28 +0000 (15:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:20:28 +0000 (15:20 +1100)
44 files changed:
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-sam9261ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-sam9rlek.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/clock-sh7372.c
arch/arm/mach-shmobile/clock-sh73a0.c
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/amifb.c
drivers/video/atmel_lcdfb.c
drivers/video/cirrusfb.c
drivers/video/controlfb.c
drivers/video/display/Kconfig [deleted file]
drivers/video/display/Makefile [deleted file]
drivers/video/display/display-sysfs.c [deleted file]
drivers/video/mxsfb.c
drivers/video/nuc900fb.c
drivers/video/omap/lcd_mipid.c
drivers/video/omap2/displays/panel-acx565akm.c
drivers/video/omap2/displays/panel-n8x0.c
drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
drivers/video/omap2/displays/panel-tpo-td043mtea1.c
drivers/video/pxa168fb.c
drivers/video/pxa3xx-gcu.c
drivers/video/s3c-fb.c
drivers/video/s3c2410fb.c
drivers/video/sbuslib.c
drivers/video/sh7760fb.c
drivers/video/sh_mipi_dsi.c
drivers/video/sh_mobile_lcdcfb.c
drivers/video/sh_mobile_meram.c
drivers/video/sm501fb.c
drivers/video/vt8500lcdfb.c
drivers/video/w100fb.c
drivers/video/wm8505fb.c
drivers/video/wmt_ge_rops.c
drivers/video/xilinxfb.c
include/linux/display.h [deleted file]
include/linux/zorro_ids.h
include/video/sh_mipi_dsi.h

index ac3de4f7c31d871fa96ebb9a190501c6249fab91..d4f896acae4d3f603cb8100e71c999ff78ae2ef9 100644 (file)
@@ -302,7 +302,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,
 
index 3f8617c0e04e27849634c168e34ff2a6b7305e36..4fc7aaa0f782125226f9ba73f194be89178900f3 100644 (file)
@@ -233,7 +233,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(5000),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,
 
index 40895072a1a754c520608427faa5fdfe708a0fdf..ab5031e0a45522ddbca79e6d594a1ac6502d8317 100644 (file)
@@ -370,7 +370,7 @@ static struct fb_videomode at91_stn_modes[] = {
                .xres           = 320,          .yres           = 240,
                .pixclock       = KHZ2PICOS(1440),
 
-               .left_margin    = 1,            .right_margin   = 1,
+               .left_margin    = 1,            .right_margin   = 2,
                .upper_margin   = 0,            .lower_margin   = 0,
                .hsync_len      = 1,            .vsync_len      = 1,
 
@@ -431,7 +431,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,
 
index 29f66052fe63b57d275cc40ae694b1f0199b83bf..5ab71ff5479af096d9e7301f8ce53d8636c495ac 100644 (file)
@@ -254,7 +254,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,
 
index ea0d1b9c2b7bd0327326a227509f7d4f1c896263..b37f5bada5aa4f94a92a986d9b87e19c1ae2db8b 100644 (file)
@@ -195,7 +195,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 480,          .yres           = 272,
                .pixclock       = KHZ2PICOS(9000),
 
-               .left_margin    = 1,            .right_margin   = 1,
+               .left_margin    = 1,            .right_margin   = 2,
                .upper_margin   = 40,           .lower_margin   = 1,
                .hsync_len      = 45,           .vsync_len      = 1,
 
index c1366d0032bf46a7bcafedaac099b1b6f6210b6e..24b9726b8ec043fc9331c57091fbdf0502ab27e3 100644 (file)
@@ -149,7 +149,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,
 
index 202c3c6ec9d8667759a22bd6079835be18220a3f..ad6706e77cbd5c10f6722dc5dcdec1cb23ce909d 100644 (file)
@@ -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 = {
@@ -474,8 +508,6 @@ static void __init ag5evm_map_io(void)
        shmobile_setup_console();
 }
 
-#define DSI0PHYCR      0xe615006c
-
 static void __init ag5evm_init(void)
 {
        sh73a0_pinmux_init();
@@ -556,9 +588,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);
index bb08d2d25dcf307662b72116b07c0beefc07660e..7d467187f16a46d8800c9fe9f322c94c9e7c407b 100644 (file)
@@ -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 = {
index 995a9c3aec8fbe60da9c78f3dba9835d20db9003..1ebab171e4f7cdf0702993065b9485e0eaef4bcd 100644 (file)
@@ -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 */
index 61a846bb30f2034ec3ae69253aea2d2d6d695aa8..3da30bac518eb4ae264517632e7abd2341a5d809 100644 (file)
@@ -319,8 +319,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 */
index acd4ba555e3a5df1570d57eed24e18d2303a098f..6ca0c407c1447151f1d9b64bfb6c9445acd61b72 100644 (file)
@@ -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"
index 9b9d8fff7732917d0b16e28f705d552850c738b2..142606814d982bf1ed44df0090e4dbc04b8ab021 100644 (file)
@@ -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
index 5ea6596dd824084971b49bdf2e9364df7832746c..f23cae094f1b75e2781987705ef1ad115b540bb9 100644 (file)
 
       - 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
    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
 
    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.
    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
 
       - 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
       - 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
    --------------
    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,
    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
 
 
    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 -
 
       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
 
    -----------
 
       - 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.
 
    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,2693 +1114,2671 @@ static u_short sprfetchmode[3] = {
 };
 
 
-       /*
-        * Interface used by the world
-        */
-
-int amifb_setup(char*);
-
-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);
-
+/* --------------------------- Hardware routines --------------------------- */
 
        /*
-        * Interface to the low level console driver
+        * Get the video params out of `var'. If a value doesn't fit, round
+        * it up, if it's too big, return -EINVAL.
         */
 
-static void amifb_deinit(struct platform_device *pdev);
+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;
 
        /*
-        * Internal routines
+        * Find a matching Pixel Clock
         */
 
-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);
+       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;
 
        /*
-        * Hardware routines
+        * Check the Geometry Values
         */
 
-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);
-
-
-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,
-};
+       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;
 
-static void __init amifb_setup_mcap(char *spec)
-{
-       char *p;
-       int vmin, vmax, hmin, hmax;
+       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;
+       }
 
-       /* Format for monitor capabilities is: <Vmin>;<Vmax>;<Hmin>;<Hmax>
-        * <V*> vertical freq. in Hz
-        * <H*> horizontal freq. in kHz
+       /*
+        * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing
+        * checks failed and smooth scrolling is not possible
         */
 
-       if (!(p = strsep(&spec, ";")) || !*p)
-               return;
-       vmin = simple_strtoul(p, NULL, 10);
-       if (vmin <= 0)
-               return;
-       if (!(p = strsep(&spec, ";")) || !*p)
-               return;
-       vmax = simple_strtoul(p, NULL, 10);
-       if (vmax <= 0 || vmax <= vmin)
-               return;
-       if (!(p = strsep(&spec, ";")) || !*p)
-               return;
-       hmin = 1000 * simple_strtoul(p, NULL, 10);
-       if (hmin <= 0)
-               return;
-       if (!(p = strsep(&spec, "")) || !*p)
-               return;
-       hmax = 1000 * simple_strtoul(p, NULL, 10);
-       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;
-}
-
-int __init amifb_setup(char *options)
-{
-       char *this_opt;
-
-       if (!options || !*options)
-               return 0;
-
-       while ((this_opt = strsep(&options, ",")) != NULL) {
-               if (!*this_opt)
-                       continue;
-               if (!strcmp(this_opt, "inverse")) {
-                       amifb_inverse = 1;
-                       fb_invert_cmaps();
-               } else if (!strcmp(this_opt, "ilbm"))
-                       amifb_ilbm = 1;
-               else if (!strncmp(this_opt, "monitorcap:", 11))
-                       amifb_setup_mcap(this_opt+11);
-               else if (!strncmp(this_opt, "fstart:", 7))
-                       min_fstrt = simple_strtoul(this_opt+7, NULL, 0);
-               else
-                       mode_option = this_opt;
+       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;
 
-       if (min_fstrt < 48)
-               min_fstrt = 48;
-
-       return 0;
-}
-
-
-static int amifb_check_var(struct fb_var_screeninfo *var,
-                          struct fb_info *info)
-{
-       int err;
-       struct amifb_par par;
-
-       /* Validate wanted screen parameters */
-       if ((err = ami_decode_var(var, &par)))
-               return err;
-
-       /* Encode (possibly rounded) screen parameters */
-       ami_encode_var(var, &par);
-       return 0;
-}
-
-
-static int amifb_set_par(struct fb_info *info)
-{
-       struct amifb_par *par = (struct amifb_par *)info->par;
-
-       do_vmode_pan = 0;
-       do_vmode_full = 0;
-
-       /* Decode wanted screen parameters */
-       ami_decode_var(&info->var, par);
-
-       /* Set new videomode */
-       ami_build_copper();
-
-       /* Set VBlank trigger */
-       do_vmode_full = 1;
+       /*
+        * Vertical and Horizontal Timings
+        */
 
-       /* Update fix for new screen parameters */
-       if (par->bpp == 1) {
-               info->fix.type = FB_TYPE_PACKED_PIXELS;
-               info->fix.type_aux = 0;
-       } else if (amifb_ilbm) {
-               info->fix.type = FB_TYPE_INTERLEAVED_PLANES;
-               info->fix.type_aux = par->next_line;
-       } else {
-               info->fix.type = FB_TYPE_PLANES;
-               info->fix.type_aux = 0;
-       }
-       info->fix.line_length = div8(upx(16<<maxfmode, par->vxres));
+       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 (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 */
-       } else {
-               info->fix.ywrapstep = 0;
-               if (par->vmode & FB_VMODE_SMOOTH_XPAN)
-                       info->fix.xpanstep = 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
-                       info->fix.xpanstep = 16<<maxfmode;
-               info->fix.ypanstep = 1;
-               info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
-       }
-       return 0;
-}
-
-
-       /*
-        * Pan or Wrap the Display
-        *
-        * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-        */
+                       par->diwstop_h = down4(par->diwstop_h);
 
-static int amifb_pan_display(struct fb_var_screeninfo *var,
-                            struct fb_info *info)
-{
-       if (var->vmode & FB_VMODE_YWRAP) {
-               if (var->yoffset < 0 ||
-                   var->yoffset >= info->var.yres_virtual || var->xoffset)
+               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;
-       } 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 (par->diwstop_v > par->vtotal) {
+                       DPRINTK("invalid diwstop_v\n");
                        return -EINVAL;
-       }
-       ami_pan_var(var);
-       info->var.xoffset = var->xoffset;
-       info->var.yoffset = var->yoffset;
-       if (var->vmode & FB_VMODE_YWRAP)
-               info->var.vmode |= FB_VMODE_YWRAP;
-       else
-               info->var.vmode &= ~FB_VMODE_YWRAP;
-       return 0;
-}
-
+               }
 
-#if BITS_PER_LONG == 32
-#define BYTES_PER_LONG 4
-#define SHIFT_PER_LONG 5
-#elif BITS_PER_LONG == 64
-#define BYTES_PER_LONG 8
-#define SHIFT_PER_LONG 6
-#else
-#define Please update me
-#endif
+               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
+        */
 
-    /*
-     *  Compose two values, using a bitmask as decision value
-     *  This is equivalent to (a & mask) | (b & ~mask)
-     */
+       fconst = 16 << maxfmode << clk_shift;
 
-static inline unsigned long comp(unsigned long a, unsigned long b,
-                                unsigned long mask)
-{
-       return ((a ^ b) & mask) ^ b;
-}
+       /*
+        * smallest window start value without turn off other dma cycles
+        * than sprite1-7, unless you change min_fstrt
+        */
 
 
-static inline unsigned long xor(unsigned long a, unsigned long b,
-                               unsigned long mask)
-{
-       return (a & mask) ^ b;
-}
+       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
+        */
 
-    /*
-     *  Unaligned forward bit copy using 32-bit or 64-bit memory accesses
-     */
+       fstrt = downx(fconst, par->diwstrt_h - fconst + (1 << clk_shift) - 4) -
+               fsize;
+       if (fstrt < min_fstrt)
+               par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
 
-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;
-       unsigned long d0, d1;
-       int m;
+       maxfetchstop = down16(par->htotal - 80);
 
-       if (!n)
-               return;
+       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;
 
-       shift = dst_idx-src_idx;
-       first = ~0UL >> dst_idx;
-       last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+       fsize = upx(fconst, xres_n);
+       if (fstrt + fsize > maxfetchstop) {
+               DPRINTK("fetch stop too high\n");
+               return -EINVAL;
+       }
 
-       if (!shift) {
-               // Same alignment for source and dest
+       if (maxfmode + clk_shift <= 1) {
+               fsize = up64(xres_n + fconst - 1);
+               if (min_fstrt + fsize - 64 > maxfetchstop)
+                       par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
 
-               if (dst_idx+n <= BITS_PER_LONG) {
-                       // Single word
-                       if (last)
-                               first &= last;
-                       *dst = comp(*src, *dst, first);
-               } else {
-                       // Multiple destination words
-                       // Leading bits
-                       if (first) {
-                               *dst = comp(*src, *dst, first);
-                               dst++;
-                               src++;
-                               n -= BITS_PER_LONG-dst_idx;
-                       }
+               fsize = up64(xres_n);
+               if (min_fstrt + fsize - 64 > maxfetchstop) {
+                       DPRINTK("fetch size too high\n");
+                       return -EINVAL;
+               }
 
-                       // Main chunk
-                       n /= BITS_PER_LONG;
-                       while (n >= 8) {
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               *dst++ = *src++;
-                               n -= 8;
-                       }
-                       while (n--)
-                               *dst++ = *src++;
+               fsize -= 64;
+       } else
+               fsize -= fconst;
 
-                       // Trailing bits
-                       if (last)
-                               *dst = comp(*src, *dst, last);
+       /*
+        * 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 {
-               // Different alignment for source and dest
+               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;
+               }
+       }
 
-               right = shift & (BITS_PER_LONG-1);
-               left = -shift & (BITS_PER_LONG-1);
+       /*
+        * Hardware Register Values
+        */
 
-               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) {
-                               // Single source word
-                               *dst = comp(*src << left, *dst, first);
-                       } else {
-                               // 2 source words
-                               d0 = *src++;
-                               d1 = *src;
-                               *dst = comp(d0 << left | d1 >> right, *dst,
-                                           first);
-                       }
-               } else {
-                       // Multiple destination words
-                       d0 = *src++;
-                       // Leading bits
-                       if (shift > 0) {
-                               // Single source word
-                               *dst = comp(d0 >> right, *dst, first);
-                               dst++;
-                               n -= BITS_PER_LONG-dst_idx;
-                       } else {
-                               // 2 source words
-                               d1 = *src++;
-                               *dst = comp(d0 << left | d1 >> right, *dst,
-                                           first);
-                               d0 = d1;
-                               dst++;
-                               n -= BITS_PER_LONG-dst_idx;
-                       }
+       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;
 
-                       // Main chunk
-                       m = n % BITS_PER_LONG;
-                       n /= BITS_PER_LONG;
-                       while (n >= 4) {
-                               d1 = *src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               d1 = *src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               d1 = *src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               d1 = *src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               n -= 4;
-                       }
-                       while (n--) {
-                               d1 = *src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                       }
+       if (IS_AGA)
+               par->fmode = bplfetchmode[maxfmode];
 
-                       // Trailing bits
-                       if (last) {
-                               if (m <= right) {
-                                       // Single source word
-                                       *dst = comp(d0 << left, *dst, last);
-                               } else {
-                                       // 2 source words
-                                       d1 = *src;
-                                       *dst = comp(d0 << left | d1 >> right,
-                                                   *dst, last);
-                               }
-                       }
-               }
+       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;
 
-    /*
-     *  Unaligned reverse bit copy using 32-bit or 64-bit memory accesses
-     */
+       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;
 
-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;
-       unsigned long d0, d1;
-       int m;
+       return 0;
+}
 
-       if (!n)
-               return;
+       /*
+        * Fill the `var' structure based on the values in `par' and maybe
+        * other values read out of the hardware.
+        */
 
-       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;
-               src += src_idx >> SHIFT_PER_LONG;
-               src_idx &= BITS_PER_LONG-1;
-       }
+static void ami_encode_var(struct fb_var_screeninfo *var,
+                          struct amifb_par *par)
+{
+       u_short clk_shift, line_shift;
 
-       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)));
+       memset(var, 0, sizeof(struct fb_var_screeninfo));
 
-       if (!shift) {
-               // Same alignment for source and dest
+       clk_shift = par->clk_shift;
+       line_shift = par->line_shift;
 
-               if ((unsigned long)dst_idx+1 >= n) {
-                       // Single word
-                       if (last)
-                               first &= last;
-                       *dst = comp(*src, *dst, first);
-               } else {
-                       // Multiple destination words
-                       // Leading bits
-                       if (first) {
-                               *dst = comp(*src, *dst, first);
-                               dst--;
-                               src--;
-                               n -= dst_idx+1;
-                       }
+       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;
 
-                       // Main chunk
-                       n /= BITS_PER_LONG;
-                       while (n >= 8) {
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               *dst-- = *src--;
-                               n -= 8;
-                       }
-                       while (n--)
-                               *dst-- = *src--;
+       var->bits_per_pixel = par->bpp;
+       var->grayscale = 0;
 
-                       // Trailing bits
-                       if (last)
-                               *dst = comp(*src, *dst, last);
-               }
-       } else {
-               // Different alignment for source and dest
+       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;
 
-               right = shift & (BITS_PER_LONG-1);
-               left = -shift & (BITS_PER_LONG-1);
+       if (par->bplcon0 & BPC0_HAM)
+               var->nonstd = FB_NONSTD_HAM;
+       else
+               var->nonstd = 0;
+       var->activate = 0;
 
-               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) {
-                               // Single source word
-                               *dst = comp(*src >> right, *dst, first);
-                       } else {
-                               // 2 source words
-                               d0 = *src--;
-                               d1 = *src;
-                               *dst = comp(d0 >> right | d1 << left, *dst,
-                                           first);
-                       }
-               } else {
-                       // Multiple destination words
-                       d0 = *src--;
-                       // Leading bits
-                       if (shift < 0) {
-                               // Single source word
-                               *dst = comp(d0 << left, *dst, first);
-                               dst--;
-                               n -= dst_idx+1;
-                       } else {
-                               // 2 source words
-                               d1 = *src--;
-                               *dst = comp(d0 >> right | d1 << left, *dst,
-                                           first);
-                               d0 = d1;
-                               dst--;
-                               n -= dst_idx+1;
-                       }
+       var->height = -1;
+       var->width = -1;
 
-                       // Main chunk
-                       m = n % BITS_PER_LONG;
-                       n /= BITS_PER_LONG;
-                       while (n >= 4) {
-                               d1 = *src--;
-                               *dst-- = d0 >> right | d1 << left;
-                               d0 = d1;
-                               d1 = *src--;
-                               *dst-- = d0 >> right | d1 << left;
-                               d0 = d1;
-                               d1 = *src--;
-                               *dst-- = d0 >> right | d1 << left;
-                               d0 = d1;
-                               d1 = *src--;
-                               *dst-- = d0 >> right | d1 << left;
-                               d0 = d1;
-                               n -= 4;
-                       }
-                       while (n--) {
-                               d1 = *src--;
-                               *dst-- = d0 >> right | d1 << left;
-                               d0 = d1;
-                       }
+       var->pixclock = pixclock[clk_shift];
 
-                       // Trailing bits
-                       if (last) {
-                               if (m <= left) {
-                                       // Single source word
-                                       *dst = comp(d0 >> right, *dst, last);
-                               } else {
-                                       // 2 source words
-                                       d1 = *src;
-                                       *dst = comp(d0 >> right | d1 << left,
-                                                   *dst, last);
-                               }
-                       }
-               }
+       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;
 }
 
 
-    /*
-     *  Unaligned forward inverting bit copy using 32-bit or 64-bit memory
-     *  accesses
-     */
+       /*
+        * Update hardware
+        */
 
-static void bitcpy_not(unsigned long *dst, int dst_idx,
-                      const unsigned long *src, int src_idx, u32 n)
+static void ami_update_par(struct fb_info *info)
 {
-       unsigned long first, last;
-       int shift = dst_idx-src_idx, left, right;
-       unsigned long d0, d1;
-       int m;
+       struct amifb_par *par = info->par;
+       short clk_shift, vshift, fstrt, fsize, fstop, fconst,  shift, move, mod;
 
-       if (!n)
-               return;
+       clk_shift = par->clk_shift;
 
-       shift = dst_idx-src_idx;
-       first = ~0UL >> dst_idx;
-       last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+       if (!(par->vmode & FB_VMODE_SMOOTH_XPAN))
+               par->xoffset = upx(16 << maxfmode, par->xoffset);
 
-       if (!shift) {
-               // Same alignment for source and dest
+       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 (dst_idx+n <= BITS_PER_LONG) {
-                       // Single word
-                       if (last)
-                               first &= last;
-                       *dst = comp(~*src, *dst, first);
-               } else {
-                       // Multiple destination words
-                       // Leading bits
-                       if (first) {
-                               *dst = comp(~*src, *dst, first);
-                               dst++;
-                               src++;
-                               n -= BITS_PER_LONG-dst_idx;
+       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;
 
-                       // Main chunk
-                       n /= BITS_PER_LONG;
-                       while (n >= 8) {
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               *dst++ = ~*src++;
-                               n -= 8;
-                       }
-                       while (n--)
-                               *dst++ = ~*src++;
+       if (par->bplcon0 & BPC0_LACE && mod2(par->diwstrt_v))
+               par->bplpt0 += par->next_line;
+}
 
-                       // Trailing bits
-                       if (last)
-                               *dst = comp(~*src, *dst, last);
-               }
-       } else {
-               // Different alignment for source and dest
 
-               right = shift & (BITS_PER_LONG-1);
-               left = -shift & (BITS_PER_LONG-1);
+       /*
+        * Pan or Wrap the Display
+        *
+        * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
+        * in `var'.
+        */
 
-               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) {
-                               // Single source word
-                               *dst = comp(~*src << left, *dst, first);
-                       } else {
-                               // 2 source words
-                               d0 = ~*src++;
-                               d1 = ~*src;
-                               *dst = comp(d0 << left | d1 >> right, *dst,
-                                           first);
-                       }
-               } else {
-                       // Multiple destination words
-                       d0 = ~*src++;
-                       // Leading bits
-                       if (shift > 0) {
-                               // Single source word
-                               *dst = comp(d0 >> right, *dst, first);
-                               dst++;
-                               n -= BITS_PER_LONG-dst_idx;
-                       } else {
-                               // 2 source words
-                               d1 = ~*src++;
-                               *dst = comp(d0 << left | d1 >> right, *dst,
-                                           first);
-                               d0 = d1;
-                               dst++;
-                               n -= BITS_PER_LONG-dst_idx;
-                       }
+static void ami_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+       struct amifb_par *par = info->par;
 
-                       // Main chunk
-                       m = n % BITS_PER_LONG;
-                       n /= BITS_PER_LONG;
-                       while (n >= 4) {
-                               d1 = ~*src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               d1 = ~*src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               d1 = ~*src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               d1 = ~*src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                               n -= 4;
-                       }
-                       while (n--) {
-                               d1 = ~*src++;
-                               *dst++ = d0 << left | d1 >> right;
-                               d0 = d1;
-                       }
+       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;
 
-                       // Trailing bits
-                       if (last) {
-                               if (m <= right) {
-                                       // Single source word
-                                       *dst = comp(d0 << left, *dst, last);
-                               } else {
-                                       // 2 source words
-                                       d1 = ~*src;
-                                       *dst = comp(d0 << left | d1 >> right,
-                                                   *dst, last);
-                               }
-                       }
-               }
-       }
+       do_vmode_pan = 0;
+       ami_update_par(info);
+       do_vmode_pan = 1;
 }
 
 
-    /*
-     *  Unaligned 32-bit pattern fill using 32/64-bit memory accesses
-     */
-
-static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
+static void ami_update_display(const struct amifb_par *par)
 {
-       unsigned long val = pat;
-       unsigned long first, last;
-
-       if (!n)
-               return;
+       custom.bplcon1 = par->bplcon1;
+       custom.bpl1mod = par->bpl1mod;
+       custom.bpl2mod = par->bpl2mod;
+       custom.ddfstrt = ddfstrt2hw(par->ddfstrt);
+       custom.ddfstop = ddfstop2hw(par->ddfstop);
+}
 
-#if BITS_PER_LONG == 64
-       val |= val << 32;
-#endif
+       /*
+        * Change the video mode (called by VBlank interrupt)
+        */
 
-       first = ~0UL >> dst_idx;
-       last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
+static void ami_init_display(const struct amifb_par *par)
+{
+       int i;
 
-       if (dst_idx+n <= BITS_PER_LONG) {
-               // Single word
-               if (last)
-                       first &= last;
-               *dst = comp(val, *dst, first);
-       } else {
-               // Multiple destination words
-               // Leading bits
-               if (first) {
-                       *dst = comp(val, *dst, first);
-                       dst++;
-                       n -= BITS_PER_LONG-dst_idx;
+       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;
 
-               // Main chunk
-               n /= BITS_PER_LONG;
-               while (n >= 8) {
-                       *dst++ = val;
-                       *dst++ = val;
-                       *dst++ = val;
-                       *dst++ = val;
-                       *dst++ = val;
-                       *dst++ = val;
-                       *dst++ = val;
-                       *dst++ = val;
-                       n -= 8;
-               }
-               while (n--)
-                       *dst++ = val;
+       /*
+        * The minimum period for audio depends on htotal
+        */
 
-               // Trailing bits
-               if (last)
-                       *dst = comp(val, *dst, last);
+       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)
+        */
 
-    /*
-     *  Unaligned 32-bit pattern xor using 32/64-bit memory accesses
-     */
-
-static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
+static void ami_do_blank(const struct amifb_par *par)
 {
-       unsigned long val = pat;
-       unsigned long first, last;
-
-       if (!n)
-               return;
-
-#if BITS_PER_LONG == 64
-       val |= val << 32;
+#if defined(CONFIG_FB_AMIGA_AGA)
+       u_short bplcon3 = par->bplcon3;
 #endif
+       u_char red, green, blue;
 
-       first = ~0UL >> dst_idx;
-       last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
-
-       if (dst_idx+n <= BITS_PER_LONG) {
-               // Single word
-               if (last)
-                       first &= last;
-               *dst = xor(val, *dst, first);
-       } else {
-               // Multiple destination words
-               // Leading bits
-               if (first) {
-                       *dst = xor(val, *dst, first);
-                       dst++;
-                       n -= BITS_PER_LONG-dst_idx;
+       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;
+                       }
                }
-
-               // Main chunk
-               n /= BITS_PER_LONG;
-               while (n >= 4) {
-                       *dst++ ^= val;
-                       *dst++ ^= val;
-                       *dst++ ^= val;
-                       *dst++ ^= val;
-                       n -= 4;
+       } 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;
                }
-               while (n--)
-                       *dst++ ^= val;
-
-               // Trailing bits
-               if (last)
-                       *dst = xor(val, *dst, last);
        }
-}
+#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;
 
-static inline void fill_one_line(int bpp, unsigned long next_plane,
-                                unsigned long *dst, int dst_idx, u32 n,
-                                u32 color)
-{
-       while (1) {
-               dst += dst_idx >> SHIFT_PER_LONG;
-               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;
-       }
+               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 inline void xor_one_line(int bpp, unsigned long next_plane,
-                               unsigned long *dst, int dst_idx, u32 n,
-                               u32 color)
+static int ami_get_fix_cursorinfo(struct fb_fix_cursorinfo *fix,
+                                 const struct amifb_par *par)
 {
-       while (color) {
-               dst += dst_idx >> SHIFT_PER_LONG;
-               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;
-       }
+       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 void amifb_fillrect(struct fb_info *info,
-                          const struct fb_fillrect *rect)
+static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var,
+                                 u_char __user *data,
+                                 const struct amifb_par *par)
 {
-       struct amifb_par *par = (struct amifb_par *)info->par;
-       int dst_idx, x2, y2;
-       unsigned long *dst;
-       u32 width, height;
-
-       if (!rect->width || !rect->height)
-               return;
-
-       /*
-        * We could use hardware clipping but on many cards you get around
-        * hardware clipping by writing to framebuffer directly.
-        * */
-       x2 = rect->dx + rect->width;
-       y2 = rect->dy + rect->height;
-       x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
-       y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
-       width = x2 - rect->dx;
-       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;
-       while (height--) {
-               switch (rect->rop) {
-                   case ROP_COPY:
-                       fill_one_line(info->var.bits_per_pixel,
-                                     par->next_plane, dst, dst_idx, width,
-                                     rect->color);
-                       break;
+       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;
 
-                   case ROP_XOR:
-                       xor_one_line(info->var.bits_per_pixel, par->next_plane,
-                                    dst, dst_idx, width, rect->color);
-                       break;
+       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;
                }
-               dst_idx += par->next_line*8;
+#endif
        }
+       return 0;
 }
 
-static inline void copy_one_line(int bpp, unsigned long next_plane,
-                                unsigned long *dst, int dst_idx,
-                                unsigned long *src, int src_idx, u32 n)
+static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var,
+                                 u_char __user *data, struct amifb_par *par)
 {
-       while (1) {
-               dst += dst_idx >> SHIFT_PER_LONG;
-               dst_idx &= (BITS_PER_LONG-1);
-               src += src_idx >> SHIFT_PER_LONG;
-               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;
-       }
-}
+       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;
 
-static inline void copy_one_line_rev(int bpp, unsigned long next_plane,
-                                    unsigned long *dst, int dst_idx,
-                                    unsigned long *src, int src_idx, u32 n)
-{
-       while (1) {
-               dst += dst_idx >> SHIFT_PER_LONG;
-               dst_idx &= (BITS_PER_LONG-1);
-               src += src_idx >> SHIFT_PER_LONG;
-               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;
+       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;
        }
-}
-
-
-static void amifb_copyarea(struct fb_info *info,
-                          const struct fb_copyarea *area)
-{
-       struct amifb_par *par = (struct amifb_par *)info->par;
-       int x2, y2;
-       u32 dx, dy, sx, sy, width, height;
-       unsigned long *dst, *src;
-       int dst_idx, src_idx;
-       int rev_copy = 0;
-
-       /* clip the destination */
-       x2 = area->dx + area->width;
-       y2 = area->dy + area->height;
-       dx = area->dx > 0 ? area->dx : 0;
-       dy = area->dy > 0 ? area->dy : 0;
-       x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
-       y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
-       width = x2 - dx;
-       height = y2 - dy;
-
-       if (area->sx + dx < area->dx || area->sy + dy < area->dy)
-               return;
-
-       /* update sx,sy */
-       sx = area->sx + (dx - area->dx);
-       sy = area->sy + (dy - area->dy);
-
-       /* the source must be completely inside the virtual screen */
-       if (sx + width > info->var.xres_virtual ||
-                       sy + height > info->var.yres_virtual)
-               return;
-
-       if (dy > sy || (dy == sy && dx > sx)) {
-               dy += height;
-               sy += height;
-               rev_copy = 1;
-       }
-       dst = (unsigned long *)
-               ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
-       src = dst;
-       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;
-       if (rev_copy) {
-               while (height--) {
-                       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);
+       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
+                       }
                }
-       } else {
-               while (height--) {
-                       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;
+               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 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)
+static int ami_get_cursorstate(struct fb_cursorstate *state,
+                              const struct amifb_par *par)
 {
-    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;
-    }
+       state->xoffset = par->crsr.crsr_x;
+       state->yoffset = par->crsr.crsr_y;
+       state->mode = cursormode;
+       return 0;
 }
 
-
-static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
+static int ami_set_cursorstate(struct fb_cursorstate *state,
+                              struct amifb_par *par)
 {
-       struct amifb_par *par = (struct amifb_par *)info->par;
-       int x2, y2;
-       unsigned long *dst;
-       int dst_idx;
-       const char *src;
-       u32 dx, dy, width, height, pitch;
+       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;
+}
 
-       /*
-        * We could use hardware clipping but on many cards you get around
-        * hardware clipping by writing to framebuffer directly like we are
-        * doing here.
-        */
-       x2 = image->dx + image->width;
-       y2 = image->dy + image->height;
-       dx = image->dx;
-       dy = image->dy;
-       x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
-       y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
-       width  = x2 - dx;
-       height = y2 - dy;
+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;
 
-       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;
-               src = image->data;
-               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;
-                       src += pitch;
+       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);
                }
-       } else {
-               c2p_planar(info->screen_base, image->data, dx, dy, width,
-                          height, par->next_line, par->next_plane,
-                          image->width, info->var.bits_per_pixel);
+       }
+       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);
        }
 }
 
 
        /*
-        * Amiga Frame Buffer Specific ioctls
+        * Initialise the Copper Initialisation List
         */
 
-static int amifb_ioctl(struct fb_info *info,
-                      unsigned int cmd, unsigned long arg)
+static void __init ami_init_copper(void)
 {
-       union {
-               struct fb_fix_cursorinfo fix;
-               struct fb_var_cursorinfo var;
-               struct fb_cursorstate state;
-       } crsr;
-       void __user *argp = (void __user *)arg;
+       copins *cop = copdisplay.init;
+       u_long p;
        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);
+       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]);
        }
-       return -EINVAL;
-}
-
 
-       /*
-        * Allocate, Clear and Align a Block of Chip Memory
-        */
-
-static void *aligned_chipptr;
+       (cop++)->l = CMOVE(IF_SETCLR | IF_COPER, intreq);
+       copdisplay.wait = cop;
+       (cop++)->l = CEND;
+       (cop++)->l = CMOVE(0, copjmp2);
+       cop->l = CEND;
 
-static inline u_long __init chipalloc(u_long size)
-{
-       aligned_chipptr = amiga_chip_alloc(size, "amifb [RAM]");
-       if (!aligned_chipptr) {
-               pr_err("amifb: No Chip RAM for frame buffer");
-               return 0;
-       }
-       memset(aligned_chipptr, 0, size);
-       return (u_long)aligned_chipptr;
+       custom.cop1lc = (u_short *)ZTWO_PADDR(copdisplay.init);
+       custom.copjmp1 = 0;
 }
 
-static inline void chipfree(void)
+static void ami_reinit_copper(const struct amifb_par *par)
 {
-       if (aligned_chipptr)
-               amiga_chip_free(aligned_chipptr);
+       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);
 }
 
 
        /*
-        * Initialisation
+        * Rebuild the Copper List
+        *
+        * We only change the things that are not static
         */
 
-static int __init amifb_probe(struct platform_device *pdev)
+static void ami_rebuild_copper(const struct amifb_par *par)
 {
-       int tag, i, err = 0;
-       u_long chipptr;
-       u_int defmode;
-
-#ifndef MODULE
-       char *option = NULL;
+       copins *copl, *cops;
+       u_short line, h_end1, h_end2;
+       short i;
+       u_long p;
 
-       if (fb_get_options("amifb", &option)) {
-               amifb_video_off();
-               return -ENODEV;
-       }
-       amifb_setup(option);
-#endif
-       custom.dmacon = DMAF_ALL | DMAF_MASTER;
-
-       switch (amiga_chipset) {
-#ifdef CONFIG_FB_AMIGA_OCS
-               case CS_OCS:
-                       strcat(fb_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;
-#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;
-#endif /* CONFIG_FB_AMIGA_ECS */
+       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;
 
-#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;
-#endif /* CONFIG_FB_AMIGA_AGA */
+       ami_set_sprite(par);
 
-               default:
-#ifdef CONFIG_FB_AMIGA_OCS
-                       printk("Unknown graphics chipset, defaulting to OCS\n");
-                       strcat(fb_info.fix.id, "Unknown");
-                       goto default_chipset;
-#else /* CONFIG_FB_AMIGA_OCS */
-                       err = -ENODEV;
-                       goto amifb_error;
-#endif /* CONFIG_FB_AMIGA_OCS */
-                       break;
+       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;
        }
-
-       /*
-        * Calculate the Pixel Clock Values for this Machine
-        */
-
-       {
-       u_long tmp = DIVUL(200000000000ULL, amiga_eclock);
-
-       pixclock[TAG_SHRES] = (tmp + 4) / 8;    /* SHRES:  35 ns / 28 MHz */
-       pixclock[TAG_HIRES] = (tmp + 2) / 4;    /* HIRES:  70 ns / 14 MHz */
-       pixclock[TAG_LORES] = (tmp + 1) / 2;    /* LORES: 140 ns /  7 MHz */
+       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;
 
-       /*
-        * Replace the Tag Values with the Real Pixel Clock Values
-        */
-
-       for (i = 0; i < NUM_TOTAL_MODES; i++) {
-               struct fb_videomode *mode = &ami_modedb[i];
-               tag = mode->pixclock;
-               if (tag == TAG_SHRES || tag == TAG_HIRES || tag == TAG_LORES) {
-                       mode->pixclock = pixclock[tag];
+       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;
        }
+}
+
 
        /*
-        *  These monitor specs are for a typical Amiga monitor (e.g. A1960)
+        * Build the Copper List
         */
-       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;
-       }
 
-       fb_info.fbops = &amifb_ops;
-       fb_info.par = &currentpar;
-       fb_info.flags = FBINFO_DEFAULT;
-       fb_info.device = &pdev->dev;
+static void ami_build_copper(struct fb_info *info)
+{
+       struct amifb_par *par = info->par;
+       copins *copl, *cops;
+       u_long p;
 
-       if (!fb_find_mode(&fb_info.var, &fb_info, mode_option, ami_modedb,
-                         NUM_TOTAL_MODES, &ami_modedb[defmode], 4)) {
-               err = -EINVAL;
-               goto amifb_error;
-       }
+       currentcop = 1 - currentcop;
 
-       fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
-                                &fb_info.modelist);
+       copl = copdisplay.list[currentcop][1];
 
-       round_down_bpp = 0;
-       chipptr = chipalloc(fb_info.fix.smem_len+
-                           SPRITEMEMSIZE+
-                           DUMMYSPRITEMEMSIZE+
-                           COPINITSIZE+
-                           4*COPLISTSIZE);
-       if (!chipptr) {
-               err = -ENOMEM;
-               goto amifb_error;
-       }
+       (copl++)->l = CWAIT(0, 10);
+       (copl++)->l = CMOVE(par->bplcon0, bplcon0);
+       (copl++)->l = CMOVE(0, sprpt[0]);
+       (copl++)->l = CMOVE2(0, sprpt[0]);
 
-       assignchunk(videomemory, u_long, chipptr, fb_info.fix.smem_len);
-       assignchunk(spritememory, u_long, chipptr, SPRITEMEMSIZE);
-       assignchunk(dummysprite, u_short *, chipptr, DUMMYSPRITEMEMSIZE);
-       assignchunk(copdisplay.init, copins *, chipptr, COPINITSIZE);
-       assignchunk(copdisplay.list[0][0], copins *, chipptr, COPLISTSIZE);
-       assignchunk(copdisplay.list[0][1], copins *, chipptr, COPLISTSIZE);
-       assignchunk(copdisplay.list[1][0], copins *, chipptr, COPLISTSIZE);
-       assignchunk(copdisplay.list[1][1], copins *, chipptr, COPLISTSIZE);
+       if (par->bplcon0 & BPC0_LACE) {
+               cops = copdisplay.list[currentcop][0];
 
-       /*
-        * 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);
-       if (!videomemory) {
-               printk("amifb: WARNING! unable to map videomem cached writethrough\n");
-               fb_info.screen_base = (char *)ZTWO_VADDR(fb_info.fix.smem_start);
-       } else
-               fb_info.screen_base = (char *)videomemory;
+               (cops++)->l = CWAIT(0, 10);
+               (cops++)->l = CMOVE(par->bplcon0, bplcon0);
+               (cops++)->l = CMOVE(0, sprpt[0]);
+               (cops++)->l = CMOVE2(0, sprpt[0]);
 
-       memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
+               (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;
 
-       /*
-        * Enable Display DMA
-        */
+       ami_update_par(info);
+       ami_rebuild_copper(info->par);
+}
 
-       custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
-                       DMAF_BLITTER | DMAF_SPRITE;
 
-       /*
-        * Make sure the Copper has something to do
+static void __init amifb_setup_mcap(char *spec)
+{
+       char *p;
+       int vmin, vmax, hmin, hmax;
+
+       /* Format for monitor capabilities is: <Vmin>;<Vmax>;<Hmin>;<Hmax>
+        * <V*> vertical freq. in Hz
+        * <H*> horizontal freq. in kHz
         */
 
-       ami_init_copper();
+       if (!(p = strsep(&spec, ";")) || !*p)
+               return;
+       vmin = simple_strtoul(p, NULL, 10);
+       if (vmin <= 0)
+               return;
+       if (!(p = strsep(&spec, ";")) || !*p)
+               return;
+       vmax = simple_strtoul(p, NULL, 10);
+       if (vmax <= 0 || vmax <= vmin)
+               return;
+       if (!(p = strsep(&spec, ";")) || !*p)
+               return;
+       hmin = 1000 * simple_strtoul(p, NULL, 10);
+       if (hmin <= 0)
+               return;
+       if (!(p = strsep(&spec, "")) || !*p)
+               return;
+       hmax = 1000 * simple_strtoul(p, NULL, 10);
+       if (hmax <= 0 || hmax <= hmin)
+               return;
 
-       if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
-                       "fb vertb handler", &currentpar)) {
-               err = -EBUSY;
-               goto amifb_error;
-       }
+       amifb_hfmin = hmin;
+       amifb_hfmax = hmax;
+       amifb_vfmin = vmin;
+       amifb_vfmax = vmax;
+}
 
-       err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
-       if (err)
-               goto amifb_error;
+static int __init amifb_setup(char *options)
+{
+       char *this_opt;
 
-       if (register_framebuffer(&fb_info) < 0) {
-               err = -EINVAL;
-               goto amifb_error;
+       if (!options || !*options)
+               return 0;
+
+       while ((this_opt = strsep(&options, ",")) != NULL) {
+               if (!*this_opt)
+                       continue;
+               if (!strcmp(this_opt, "inverse")) {
+                       amifb_inverse = 1;
+                       fb_invert_cmaps();
+               } else if (!strcmp(this_opt, "ilbm"))
+                       amifb_ilbm = 1;
+               else if (!strncmp(this_opt, "monitorcap:", 11))
+                       amifb_setup_mcap(this_opt + 11);
+               else if (!strncmp(this_opt, "fstart:", 7))
+                       min_fstrt = simple_strtoul(this_opt + 7, NULL, 0);
+               else
+                       mode_option = this_opt;
        }
 
-       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);
+       if (min_fstrt < 48)
+               min_fstrt = 48;
 
        return 0;
-
-amifb_error:
-       amifb_deinit(pdev);
-       return err;
 }
 
-static void amifb_deinit(struct platform_device *pdev)
+
+static int amifb_check_var(struct fb_var_screeninfo *var,
+                          struct fb_info *info)
 {
-       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;
+       int err;
+       struct amifb_par par;
+
+       /* Validate wanted screen parameters */
+       err = ami_decode_var(var, &par, info);
+       if (err)
+               return err;
+
+       /* Encode (possibly rounded) screen parameters */
+       ami_encode_var(var, &par);
+       return 0;
 }
 
 
-       /*
-        * 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 amifb_set_par(struct fb_info *info)
 {
-       static int cursorcount = 1;
+       struct amifb_par *par = info->par;
+       int error;
 
-       if (cursormode == FB_CURSOR_FLASH) {
-               if (!--cursorcount) {
-                       cursorstate = -cursorstate;
-                       cursorcount = cursorrate;
-                       if (!is_blanked)
-                               return 1;
-               }
-       }
-       return 0;
-}
+       do_vmode_pan = 0;
+       do_vmode_full = 0;
 
-       /*
-        * VBlank Display Interrupt
-        */
+       /* Decode wanted screen parameters */
+       error = ami_decode_var(&info->var, par, info);
+       if (error)
+               return error;
 
-static irqreturn_t amifb_interrupt(int irq, void *dev_id)
-{
-       if (do_vmode_pan || do_vmode_full)
-               ami_update_display();
+       /* Set new videomode */
+       ami_build_copper(info);
 
-       if (do_vmode_full)
-               ami_init_display();
+       /* Set VBlank trigger */
+       do_vmode_full = 1;
 
-       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;
+       /* Update fix for new screen parameters */
+       if (par->bpp == 1) {
+               info->fix.type = FB_TYPE_PACKED_PIXELS;
+               info->fix.type_aux = 0;
+       } else if (amifb_ilbm) {
+               info->fix.type = FB_TYPE_INTERLEAVED_PLANES;
+               info->fix.type_aux = par->next_line;
        } else {
-               if (flash_cursor())
-                       ami_set_sprite();
-       }
-
-       if (do_blank) {
-               ami_do_blank();
-               do_blank = 0;
+               info->fix.type = FB_TYPE_PLANES;
+               info->fix.type_aux = 0;
        }
+       info->fix.line_length = div8(upx(16 << maxfmode, par->vxres));
 
-       if (do_vmode_full) {
-               ami_reinit_copper();
-               do_vmode_full = 0;
+       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 */
+       } else {
+               info->fix.ywrapstep = 0;
+               if (par->vmode & FB_VMODE_SMOOTH_XPAN)
+                       info->fix.xpanstep = 1;
+               else
+                       info->fix.xpanstep = 16 << maxfmode;
+               info->fix.ypanstep = 1;
+               info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
        }
-       return IRQ_HANDLED;
+       return 0;
 }
 
-/* --------------------------- 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.
+        * 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 ami_decode_var(struct fb_var_screeninfo *var,
-                          struct amifb_par *par)
+static int amifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                          u_int transp, struct fb_info *info)
 {
-       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;
+       const struct amifb_par *par = info->par;
 
-       /*
-        * 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;
-                       }
-               }
+       if (IS_AGA) {
+               if (regno > 255)
+                       return 1;
+       } else if (par->bplcon0 & BPC0_SHRES) {
+               if (regno > 3)
+                       return 1;
        } else {
-               DPRINTK("unknown nonstd mode\n");
-               return -EINVAL;
+               if (regno > 31)
+                       return 1;
        }
-
-       /*
-        * 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;
+       red >>= 8;
+       green >>= 8;
+       blue >>= 8;
+       if (!regno) {
+               red0 = red;
+               green0 = green;
+               blue0 = blue;
        }
-       par->line_shift = line_shift;
 
        /*
-        * Vertical and Horizontal Timings
+        * 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.
         */
 
-       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 (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;
 
-               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;
+                       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;
+}
+
 
        /*
-        * Checking the DMA timing
+        * Blank the display.
         */
 
-       fconst = 16<<maxfmode<<clk_shift;
+static int amifb_blank(int blank, struct fb_info *info)
+{
+       do_blank = blank ? blank : -1;
+
+       return 0;
+}
+
 
        /*
-        * smallest window start value without turn off other dma cycles
-        * than sprite1-7, unless you change min_fstrt
+        * Pan or Wrap the Display
+        *
+        * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
         */
 
-
-       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;
+static int amifb_pan_display(struct fb_var_screeninfo *var,
+                            struct fb_info *info)
+{
+       if (var->vmode & FB_VMODE_YWRAP) {
+               if (var->yoffset < 0 ||
+                       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)
+                       return -EINVAL;
        }
+       ami_pan_var(var, info);
+       info->var.xoffset = var->xoffset;
+       info->var.yoffset = var->yoffset;
+       if (var->vmode & FB_VMODE_YWRAP)
+               info->var.vmode |= FB_VMODE_YWRAP;
+       else
+               info->var.vmode &= ~FB_VMODE_YWRAP;
+       return 0;
+}
+
+
+#if BITS_PER_LONG == 32
+#define BYTES_PER_LONG 4
+#define SHIFT_PER_LONG 5
+#elif BITS_PER_LONG == 64
+#define BYTES_PER_LONG 8
+#define SHIFT_PER_LONG 6
+#else
+#define Please update me
+#endif
+
 
        /*
-        * smallest window start value where smooth scrolling is possible
+        *  Compose two values, using a bitmask as decision value
+        *  This is equivalent to (a & mask) | (b & ~mask)
         */
 
-       fstrt = downx(fconst, par->diwstrt_h-fconst+(1<<clk_shift)-4) - fsize;
-       if (fstrt < min_fstrt)
-               par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
+static inline unsigned long comp(unsigned long a, unsigned long b,
+                                unsigned long mask)
+{
+       return ((a ^ b) & mask) ^ b;
+}
 
-       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;
+static inline unsigned long xor(unsigned long a, unsigned long b,
+                               unsigned long mask)
+{
+       return (a & mask) ^ b;
+}
 
-       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;
+       /*
+        *  Unaligned forward bit copy using 32-bit or 64-bit memory accesses
+        */
 
-               fsize = up64(xres_n);
-               if (min_fstrt + fsize - 64 > maxfetchstop) {
-                       DPRINTK("fetch size too high\n");
-                       return -EINVAL;
+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;
+       unsigned long d0, d1;
+       int m;
+
+       if (!n)
+               return;
+
+       shift = dst_idx - src_idx;
+       first = ~0UL >> dst_idx;
+       last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
+
+       if (!shift) {
+               // Same alignment for source and dest
+
+               if (dst_idx + n <= BITS_PER_LONG) {
+                       // Single word
+                       if (last)
+                               first &= last;
+                       *dst = comp(*src, *dst, first);
+               } else {
+                       // Multiple destination words
+                       // Leading bits
+                       if (first) {
+                               *dst = comp(*src, *dst, first);
+                               dst++;
+                               src++;
+                               n -= BITS_PER_LONG - dst_idx;
+                       }
+
+                       // Main chunk
+                       n /= BITS_PER_LONG;
+                       while (n >= 8) {
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               *dst++ = *src++;
+                               n -= 8;
+                       }
+                       while (n--)
+                               *dst++ = *src++;
+
+                       // Trailing bits
+                       if (last)
+                               *dst = comp(*src, *dst, last);
                }
+       } else {
+               // Different alignment for source and dest
 
-               fsize -= 64;
-       } else
-               fsize -= fconst;
+               right = shift & (BITS_PER_LONG - 1);
+               left = -shift & (BITS_PER_LONG - 1);
 
-       /*
-        * Check if there is enough time to update the bitplane pointers for ywrap
-        */
+               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) {
+                               // Single source word
+                               *dst = comp(*src << left, *dst, first);
+                       } else {
+                               // 2 source words
+                               d0 = *src++;
+                               d1 = *src;
+                               *dst = comp(d0 << left | d1 >> right, *dst,
+                                           first);
+                       }
+               } else {
+                       // Multiple destination words
+                       d0 = *src++;
+                       // Leading bits
+                       if (shift > 0) {
+                               // Single source word
+                               *dst = comp(d0 >> right, *dst, first);
+                               dst++;
+                               n -= BITS_PER_LONG - dst_idx;
+                       } else {
+                               // 2 source words
+                               d1 = *src++;
+                               *dst = comp(d0 << left | d1 >> right, *dst,
+                                           first);
+                               d0 = d1;
+                               dst++;
+                               n -= BITS_PER_LONG - dst_idx;
+                       }
+
+                       // Main chunk
+                       m = n % BITS_PER_LONG;
+                       n /= BITS_PER_LONG;
+                       while (n >= 4) {
+                               d1 = *src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               d1 = *src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               d1 = *src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               d1 = *src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               n -= 4;
+                       }
+                       while (n--) {
+                               d1 = *src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                       }
+
+                       // Trailing bits
+                       if (last) {
+                               if (m <= right) {
+                                       // Single source word
+                                       *dst = comp(d0 << left, *dst, last);
+                               } else {
+                                       // 2 source words
+                                       d1 = *src;
+                                       *dst = comp(d0 << left | d1 >> right,
+                                                   *dst, last);
+                               }
+                       }
+               }
+       }
+}
 
-       if (par->htotal-fsize-64 < par->bpp*64)
-               par->vmode &= ~FB_VMODE_YWRAP;
 
        /*
-        * Bitplane calculations and check the Memory Requirements
+        *  Unaligned reverse bit copy using 32-bit or 64-bit memory accesses
         */
 
-       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;
+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;
+       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 += dst_idx >> SHIFT_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;
+       }
+
+       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) {
+                       // Single word
+                       if (last)
+                               first &= last;
+                       *dst = comp(*src, *dst, first);
+               } else {
+                       // Multiple destination words
+                       // Leading bits
+                       if (first) {
+                               *dst = comp(*src, *dst, first);
+                               dst--;
+                               src--;
+                               n -= dst_idx + 1;
+                       }
+
+                       // Main chunk
+                       n /= BITS_PER_LONG;
+                       while (n >= 8) {
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               *dst-- = *src--;
+                               n -= 8;
+                       }
+                       while (n--)
+                               *dst-- = *src--;
+
+                       // Trailing bits
+                       if (last)
+                               *dst = comp(*src, *dst, last);
                }
        } 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];
+               // Different alignment for source and dest
 
-       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;
-       }
+               right = shift & (BITS_PER_LONG - 1);
+               left = -shift & (BITS_PER_LONG - 1);
 
-       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;
+               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) {
+                               // Single source word
+                               *dst = comp(*src >> right, *dst, first);
+                       } else {
+                               // 2 source words
+                               d0 = *src--;
+                               d1 = *src;
+                               *dst = comp(d0 >> right | d1 << left, *dst,
+                                           first);
+                       }
                } 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;
+                       // Multiple destination words
+                       d0 = *src--;
+                       // Leading bits
+                       if (shift < 0) {
+                               // Single source word
+                               *dst = comp(d0 << left, *dst, first);
+                               dst--;
+                               n -= dst_idx + 1;
+                       } else {
+                               // 2 source words
+                               d1 = *src--;
+                               *dst = comp(d0 >> right | d1 << left, *dst,
+                                           first);
+                               d0 = d1;
+                               dst--;
+                               n -= dst_idx + 1;
+                       }
 
-       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;
+                       // Main chunk
+                       m = n % BITS_PER_LONG;
+                       n /= BITS_PER_LONG;
+                       while (n >= 4) {
+                               d1 = *src--;
+                               *dst-- = d0 >> right | d1 << left;
+                               d0 = d1;
+                               d1 = *src--;
+                               *dst-- = d0 >> right | d1 << left;
+                               d0 = d1;
+                               d1 = *src--;
+                               *dst-- = d0 >> right | d1 << left;
+                               d0 = d1;
+                               d1 = *src--;
+                               *dst-- = d0 >> right | d1 << left;
+                               d0 = d1;
+                               n -= 4;
+                       }
+                       while (n--) {
+                               d1 = *src--;
+                               *dst-- = d0 >> right | d1 << left;
+                               d0 = d1;
+                       }
 
-       return 0;
+                       // Trailing bits
+                       if (last) {
+                               if (m <= left) {
+                                       // Single source word
+                                       *dst = comp(d0 >> right, *dst, last);
+                               } else {
+                                       // 2 source words
+                                       d1 = *src;
+                                       *dst = comp(d0 >> right | d1 << left,
+                                                   *dst, last);
+                               }
+                       }
+               }
+       }
 }
 
+
        /*
-        * Fill the `var' structure based on the values in `par' and maybe
-        * other values read out of the hardware.
+        *  Unaligned forward inverting bit copy using 32-bit or 64-bit memory
+        *  accesses
         */
 
-static int ami_encode_var(struct fb_var_screeninfo *var,
-                          struct amifb_par *par)
+static void bitcpy_not(unsigned long *dst, int dst_idx,
+                      const unsigned long *src, int src_idx, u32 n)
 {
-       u_short clk_shift, line_shift;
-
-       memset(var, 0, sizeof(struct fb_var_screeninfo));
-
-       clk_shift = par->clk_shift;
-       line_shift = par->line_shift;
+       unsigned long first, last;
+       int shift = dst_idx - src_idx, left, right;
+       unsigned long d0, d1;
+       int m;
 
-       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;
+       if (!n)
+               return;
 
-       var->bits_per_pixel = par->bpp;
-       var->grayscale = 0;
+       shift = dst_idx - src_idx;
+       first = ~0UL >> dst_idx;
+       last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
 
-       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 (!shift) {
+               // Same alignment for source and dest
 
-       if (par->bplcon0 & BPC0_HAM)
-               var->nonstd = FB_NONSTD_HAM;
-       else
-               var->nonstd = 0;
-       var->activate = 0;
+               if (dst_idx + n <= BITS_PER_LONG) {
+                       // Single word
+                       if (last)
+                               first &= last;
+                       *dst = comp(~*src, *dst, first);
+               } else {
+                       // Multiple destination words
+                       // Leading bits
+                       if (first) {
+                               *dst = comp(~*src, *dst, first);
+                               dst++;
+                               src++;
+                               n -= BITS_PER_LONG - dst_idx;
+                       }
 
-       var->height = -1;
-       var->width = -1;
+                       // Main chunk
+                       n /= BITS_PER_LONG;
+                       while (n >= 8) {
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               *dst++ = ~*src++;
+                               n -= 8;
+                       }
+                       while (n--)
+                               *dst++ = ~*src++;
 
-       var->pixclock = pixclock[clk_shift];
+                       // Trailing bits
+                       if (last)
+                               *dst = comp(~*src, *dst, last);
+               }
+       } else {
+               // Different alignment for source and dest
 
-       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;
+               right = shift & (BITS_PER_LONG - 1);
+               left = -shift & (BITS_PER_LONG - 1);
 
-       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 (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) {
+                               // Single source word
+                               *dst = comp(~*src << left, *dst, first);
+                       } else {
+                               // 2 source words
+                               d0 = ~*src++;
+                               d1 = ~*src;
+                               *dst = comp(d0 << left | d1 >> right, *dst,
+                                           first);
+                       }
+               } else {
+                       // Multiple destination words
+                       d0 = ~*src++;
+                       // Leading bits
+                       if (shift > 0) {
+                               // Single source word
+                               *dst = comp(d0 >> right, *dst, first);
+                               dst++;
+                               n -= BITS_PER_LONG - dst_idx;
+                       } else {
+                               // 2 source words
+                               d1 = ~*src++;
+                               *dst = comp(d0 << left | d1 >> right, *dst,
+                                           first);
+                               d0 = d1;
+                               dst++;
+                               n -= BITS_PER_LONG - dst_idx;
+                       }
 
-       if (par->bplcon0 & BPC0_ERSY)
-               var->sync |= FB_SYNC_EXT;
-       if (par->vmode & FB_VMODE_YWRAP)
-               var->vmode |= FB_VMODE_YWRAP;
+                       // Main chunk
+                       m = n % BITS_PER_LONG;
+                       n /= BITS_PER_LONG;
+                       while (n >= 4) {
+                               d1 = ~*src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               d1 = ~*src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               d1 = ~*src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               d1 = ~*src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                               n -= 4;
+                       }
+                       while (n--) {
+                               d1 = ~*src++;
+                               *dst++ = d0 << left | d1 >> right;
+                               d0 = d1;
+                       }
 
-       return 0;
+                       // Trailing bits
+                       if (last) {
+                               if (m <= right) {
+                                       // Single source word
+                                       *dst = comp(d0 << left, *dst, last);
+                               } else {
+                                       // 2 source words
+                                       d1 = ~*src;
+                                       *dst = comp(d0 << left | d1 >> right,
+                                                   *dst, last);
+                               }
+                       }
+               }
+       }
 }
 
 
        /*
-        * Pan or Wrap the Display
-        *
-        * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-        * in `var'.
+        *  Unaligned 32-bit pattern fill using 32/64-bit memory accesses
         */
 
-static void ami_pan_var(struct fb_var_screeninfo *var)
+static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 {
-       struct amifb_par *par = &currentpar;
+       unsigned long val = pat;
+       unsigned long first, last;
 
-       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;
+       if (!n)
+               return;
 
-       do_vmode_pan = 0;
-       ami_update_par();
-       do_vmode_pan = 1;
+#if BITS_PER_LONG == 64
+       val |= val << 32;
+#endif
+
+       first = ~0UL >> dst_idx;
+       last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
+
+       if (dst_idx + n <= BITS_PER_LONG) {
+               // Single word
+               if (last)
+                       first &= last;
+               *dst = comp(val, *dst, first);
+       } else {
+               // Multiple destination words
+               // Leading bits
+               if (first) {
+                       *dst = comp(val, *dst, first);
+                       dst++;
+                       n -= BITS_PER_LONG - dst_idx;
+               }
+
+               // Main chunk
+               n /= BITS_PER_LONG;
+               while (n >= 8) {
+                       *dst++ = val;
+                       *dst++ = val;
+                       *dst++ = val;
+                       *dst++ = val;
+                       *dst++ = val;
+                       *dst++ = val;
+                       *dst++ = val;
+                       *dst++ = val;
+                       n -= 8;
+               }
+               while (n--)
+                       *dst++ = val;
+
+               // Trailing bits
+               if (last)
+                       *dst = comp(val, *dst, last);
+       }
 }
 
+
        /*
-        * Update hardware
+        *  Unaligned 32-bit pattern xor using 32/64-bit memory accesses
         */
 
-static int ami_update_par(void)
+static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
 {
-       struct amifb_par *par = &currentpar;
-       short clk_shift, vshift, fstrt, fsize, fstop, fconst,  shift, move, mod;
+       unsigned long val = pat;
+       unsigned long first, last;
 
-       clk_shift = par->clk_shift;
+       if (!n)
+               return;
 
-       if (!(par->vmode & FB_VMODE_SMOOTH_XPAN))
-               par->xoffset = upx(16<<maxfmode, par->xoffset);
+#if BITS_PER_LONG == 64
+       val |= val << 32;
+#endif
 
-       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;
+       first = ~0UL >> dst_idx;
+       last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
+
+       if (dst_idx + n <= BITS_PER_LONG) {
+               // Single word
+               if (last)
+                       first &= last;
+               *dst = xor(val, *dst, first);
        } 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;
+               // Multiple destination words
+               // Leading bits
+               if (first) {
+                       *dst = xor(val, *dst, first);
+                       dst++;
+                       n -= BITS_PER_LONG - dst_idx;
                }
-               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;
-                       }
+               // Main chunk
+               n /= BITS_PER_LONG;
+               while (n >= 4) {
+                       *dst++ ^= val;
+                       *dst++ ^= val;
+                       *dst++ ^= val;
+                       *dst++ ^= val;
+                       n -= 4;
                }
-       } else
-               par->bplpt0 = fb_info.fix.smem_start + move;
+               while (n--)
+                       *dst++ ^= val;
 
-       if (par->bplcon0 & BPC0_LACE && mod2(par->diwstrt_v))
-               par->bplpt0 += par->next_line;
+               // Trailing bits
+               if (last)
+                       *dst = xor(val, *dst, last);
+       }
+}
 
-       return 0;
+static inline void fill_one_line(int bpp, unsigned long next_plane,
+                                unsigned long *dst, int dst_idx, u32 n,
+                                u32 color)
+{
+       while (1) {
+               dst += dst_idx >> SHIFT_PER_LONG;
+               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;
+       }
 }
 
+static inline void xor_one_line(int bpp, unsigned long next_plane,
+                               unsigned long *dst, int dst_idx, u32 n,
+                               u32 color)
+{
+       while (color) {
+               dst += dst_idx >> SHIFT_PER_LONG;
+               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;
+       }
+}
 
-       /*
-        * 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)
+static void amifb_fillrect(struct fb_info *info,
+                          const struct fb_fillrect *rect)
 {
-       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;
-       }
+       struct amifb_par *par = info->par;
+       int dst_idx, x2, y2;
+       unsigned long *dst;
+       u32 width, height;
+
+       if (!rect->width || !rect->height)
+               return;
 
        /*
-        * 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.
-        */
+        * We could use hardware clipping but on many cards you get around
+        * hardware clipping by writing to framebuffer directly.
+        * */
+       x2 = rect->dx + rect->width;
+       y2 = rect->dy + rect->height;
+       x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
+       y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
+       width = x2 - rect->dx;
+       height = y2 - rect->dy;
 
-       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;
+       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;
+       while (height--) {
+               switch (rect->rop) {
+               case ROP_COPY:
+                       fill_one_line(info->var.bits_per_pixel,
+                                     par->next_plane, dst, dst_idx, width,
+                                     rect->color);
+                       break;
 
-                       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);
+               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;
        }
-       return 0;
 }
 
-static void ami_update_display(void)
+static inline void copy_one_line(int bpp, unsigned long next_plane,
+                                unsigned long *dst, int dst_idx,
+                                unsigned long *src, int src_idx, u32 n)
 {
-       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);
+       while (1) {
+               dst += dst_idx >> SHIFT_PER_LONG;
+               dst_idx &= (BITS_PER_LONG - 1);
+               src += src_idx >> SHIFT_PER_LONG;
+               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;
+       }
 }
 
-       /*
-        * Change the video mode (called by VBlank interrupt)
-        */
-
-static void ami_init_display(void)
+static inline void copy_one_line_rev(int bpp, unsigned long next_plane,
+                                    unsigned long *dst, int dst_idx,
+                                    unsigned long *src, int src_idx, u32 n)
 {
-       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);
-               }
+       while (1) {
+               dst += dst_idx >> SHIFT_PER_LONG;
+               dst_idx &= (BITS_PER_LONG - 1);
+               src += src_idx >> SHIFT_PER_LONG;
+               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;
        }
-       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);
+static void amifb_copyarea(struct fb_info *info,
+                          const struct fb_copyarea *area)
+{
+       struct amifb_par *par = info->par;
+       int x2, y2;
+       u32 dx, dy, sx, sy, width, height;
+       unsigned long *dst, *src;
+       int dst_idx, src_idx;
+       int rev_copy = 0;
 
-       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]);
-}
+       /* clip the destination */
+       x2 = area->dx + area->width;
+       y2 = area->dy + area->height;
+       dx = area->dx > 0 ? area->dx : 0;
+       dy = area->dy > 0 ? area->dy : 0;
+       x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
+       y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
+       width = x2 - dx;
+       height = y2 - dy;
 
-       /*
-        * (Un)Blank the screen (called by VBlank interrupt)
-        */
+       if (area->sx + dx < area->dx || area->sy + dy < area->dy)
+               return;
 
-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;
+       /* update sx,sy */
+       sx = area->sx + (dx - area->dx);
+       sy = area->sy + (dy - area->dy);
 
-       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;
-                       }
+       /* the source must be completely inside the virtual screen */
+       if (sx + width > info->var.xres_virtual ||
+                       sy + height > info->var.yres_virtual)
+               return;
+
+       if (dy > sy || (dy == sy && dx > sx)) {
+               dy += height;
+               sy += height;
+               rev_copy = 1;
+       }
+       dst = (unsigned long *)
+               ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
+       src = dst;
+       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;
+       if (rev_copy) {
+               while (height--) {
+                       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);
                }
        } 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;
+               while (height--) {
+                       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;
                }
        }
-#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)
+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)
 {
-       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;
+       const unsigned long *src;
+       int src_idx;
 
-       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
+       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;
        }
-       return 0;
 }
 
-static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data)
+
+static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-       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;
+       struct amifb_par *par = info->par;
+       int x2, y2;
+       unsigned long *dst;
+       int dst_idx;
+       const char *src;
+       u32 dx, dy, width, height, pitch;
 
-       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;
+       /*
+        * We could use hardware clipping but on many cards you get around
+        * hardware clipping by writing to framebuffer directly like we are
+        * doing here.
+        */
+       x2 = image->dx + image->width;
+       y2 = image->dy + image->height;
+       dx = image->dx;
+       dy = image->dy;
+       x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
+       y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
+       width  = x2 - dx;
+       height = y2 - dy;
+
+       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;
+               src = image->data;
+               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;
+                       src += pitch;
                }
-#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;
+       } else {
+               c2p_planar(info->screen_base, image->data, dx, dy, width,
+                          height, par->next_line, par->next_plane,
+                          image->width, info->var.bits_per_pixel);
        }
-       return 0;
 }
 
-static int ami_get_cursorstate(struct fb_cursorstate *state)
+
+       /*
+        * Amiga Frame Buffer Specific ioctls
+        */
+
+static int amifb_ioctl(struct fb_info *info,
+                      unsigned int cmd, unsigned long arg)
 {
-       struct amifb_par *par = &currentpar;
+       union {
+               struct fb_fix_cursorinfo fix;
+               struct fb_var_cursorinfo var;
+               struct fb_cursorstate state;
+       } crsr;
+       void __user *argp = (void __user *)arg;
+       int i;
 
-       state->xoffset = par->crsr.crsr_x;
-       state->yoffset = par->crsr.crsr_y;
-       state->mode = cursormode;
-       return 0;
+       switch (cmd) {
+       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;
 }
 
-static int ami_set_cursorstate(struct fb_cursorstate *state)
+
+       /*
+        * Flash the cursor (called by VBlank interrupt)
+        */
+
+static int flash_cursor(void)
 {
-       struct amifb_par *par = &currentpar;
+       static int cursorcount = 1;
 
-       par->crsr.crsr_x = state->xoffset;
-       par->crsr.crsr_y = state->yoffset;
-       if ((cursormode = state->mode) == FB_CURSOR_OFF)
-               cursorstate = -1;
-       do_cursor = 1;
+       if (cursormode == FB_CURSOR_FLASH) {
+               if (!--cursorcount) {
+                       cursorstate = -cursorstate;
+                       cursorcount = cursorrate;
+                       if (!is_blanked)
+                               return 1;
+               }
+       }
        return 0;
 }
 
-static void ami_set_sprite(void)
+       /*
+        * VBlank Display Interrupt
+        */
+
+static irqreturn_t amifb_interrupt(int irq, void *dev_id)
 {
-       struct amifb_par *par = &currentpar;
-       copins *copl, *cops;
-       u_short hs, vs, ve;
-       u_long pl, ps, pt;
-       short mx, my;
+       struct amifb_par *par = dev_id;
 
-       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 (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 (!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);
-               }
+
+       if (do_blank) {
+               ami_do_blank(par);
+               do_blank = 0;
        }
-       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);
+
+       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
+        */
+
+static void *aligned_chipptr;
+
+static inline u_long __init chipalloc(u_long size)
+{
+       aligned_chipptr = amiga_chip_alloc(size, "amifb [RAM]");
+       if (!aligned_chipptr) {
+               pr_err("amifb: No Chip RAM for frame buffer");
+               return 0;
        }
+       memset(aligned_chipptr, 0, size);
+       return (u_long)aligned_chipptr;
+}
+
+static inline void chipfree(void)
+{
+       if (aligned_chipptr)
+               amiga_chip_free(aligned_chipptr);
 }
 
 
        /*
-        * Initialise the Copper Initialisation List
+        * Initialisation
         */
 
-static void __init ami_init_copper(void)
+static int __init amifb_probe(struct platform_device *pdev)
 {
-       copins *cop = copdisplay.init;
-       u_long p;
-       int i;
+       struct fb_info *info;
+       int tag, i, err = 0;
+       u_long chipptr;
+       u_int defmode;
 
-       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]);
+#ifndef MODULE
+       char *option = NULL;
+
+       if (fb_get_options("amifb", &option)) {
+               amifb_video_off();
+               return -ENODEV;
        }
+       amifb_setup(option);
+#endif
+       custom.dmacon = DMAF_ALL | DMAF_MASTER;
 
-       (cop++)->l = CMOVE(IF_SETCLR | IF_COPER, intreq);
-       copdisplay.wait = cop;
-       (cop++)->l = CEND;
-       (cop++)->l = CMOVE(0, copjmp2);
-       cop->l = CEND;
+       info = framebuffer_alloc(sizeof(struct amifb_par), &pdev->dev);
+       if (!info) {
+               dev_err(&pdev->dev, "framebuffer_alloc failed\n");
+               return -ENOMEM;
+       }
 
-       custom.cop1lc = (u_short *)ZTWO_PADDR(copdisplay.init);
-       custom.copjmp1 = 0;
-}
+       strcpy(info->fix.id, "Amiga ");
+       info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+       info->fix.accel = FB_ACCEL_AMIGABLITT;
 
-static void ami_reinit_copper(void)
-{
-       struct amifb_par *par = &currentpar;
+       switch (amiga_chipset) {
+#ifdef CONFIG_FB_AMIGA_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;
+               info->fix.smem_len = VIDEOMEMSIZE_OCS;
+               break;
+#endif /* CONFIG_FB_AMIGA_OCS */
 
-       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);
-}
+#ifdef CONFIG_FB_AMIGA_ECS
+       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(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:
+#ifdef CONFIG_FB_AMIGA_OCS
+               printk("Unknown graphics chipset, defaulting to OCS\n");
+               strcat(info->fix.id, "Unknown");
+               goto default_chipset;
+#else /* CONFIG_FB_AMIGA_OCS */
+               err = -ENODEV;
+               goto release;
+#endif /* CONFIG_FB_AMIGA_OCS */
+               break;
+       }
 
        /*
-        * Build the Copper List
+        * Calculate the Pixel Clock Values for this Machine
         */
 
-static void ami_build_copper(void)
-{
-       struct amifb_par *par = &currentpar;
-       copins *copl, *cops;
-       u_long p;
+       {
+       u_long tmp = DIVUL(200000000000ULL, amiga_eclock);
 
-       currentcop = 1 - currentcop;
+       pixclock[TAG_SHRES] = (tmp + 4) / 8;    /* SHRES:  35 ns / 28 MHz */
+       pixclock[TAG_HIRES] = (tmp + 2) / 4;    /* HIRES:  70 ns / 14 MHz */
+       pixclock[TAG_LORES] = (tmp + 1) / 2;    /* LORES: 140 ns /  7 MHz */
+       }
 
-       copl = copdisplay.list[currentcop][1];
+       /*
+        * Replace the Tag Values with the Real Pixel Clock Values
+        */
 
-       (copl++)->l = CWAIT(0, 10);
-       (copl++)->l = CMOVE(par->bplcon0, bplcon0);
-       (copl++)->l = CMOVE(0, sprpt[0]);
-       (copl++)->l = CMOVE2(0, sprpt[0]);
+       for (i = 0; i < NUM_TOTAL_MODES; i++) {
+               struct fb_videomode *mode = &ami_modedb[i];
+               tag = mode->pixclock;
+               if (tag == TAG_SHRES || tag == TAG_HIRES || tag == TAG_LORES) {
+                       mode->pixclock = pixclock[tag];
+               }
+       }
 
-       if (par->bplcon0 & BPC0_LACE) {
-               cops = copdisplay.list[currentcop][0];
+       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;
+       }
 
-               (cops++)->l = CWAIT(0, 10);
-               (cops++)->l = CMOVE(par->bplcon0, bplcon0);
-               (cops++)->l = CMOVE(0, sprpt[0]);
-               (cops++)->l = CMOVE2(0, sprpt[0]);
+       info->fbops = &amifb_ops;
+       info->flags = FBINFO_DEFAULT;
+       info->device = &pdev->dev;
 
-               (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
-               }
+       if (!fb_find_mode(&info->var, info, mode_option, ami_modedb,
+                         NUM_TOTAL_MODES, &ami_modedb[defmode], 4)) {
+               err = -EINVAL;
+               goto release;
        }
-       copdisplay.rebuild[1] = copl;
 
-       ami_update_par();
-       ami_rebuild_copper();
-}
+       fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
+                                &info->modelist);
+
+       round_down_bpp = 0;
+       chipptr = chipalloc(info->fix.smem_len + SPRITEMEMSIZE +
+                           DUMMYSPRITEMEMSIZE + COPINITSIZE +
+                           4 * COPLISTSIZE);
+       if (!chipptr) {
+               err = -ENOMEM;
+               goto release;
+       }
+
+       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);
+       assignchunk(copdisplay.list[0][0], copins *, chipptr, COPLISTSIZE);
+       assignchunk(copdisplay.list[0][1], copins *, chipptr, COPLISTSIZE);
+       assignchunk(copdisplay.list[1][0], copins *, chipptr, COPLISTSIZE);
+       assignchunk(copdisplay.list[1][1], copins *, chipptr, COPLISTSIZE);
 
        /*
-        * Rebuild the Copper List
-        *
-        * We only change the things that are not static
+        * access the videomem with writethrough cache
         */
+       info->fix.smem_start = (u_long)ZTWO_PADDR(videomemory);
+       videomemory = (u_long)ioremap_writethrough(info->fix.smem_start,
+                                                  info->fix.smem_len);
+       if (!videomemory) {
+               dev_warn(&pdev->dev,
+                        "Unable to map videomem cached writethrough\n");
+               info->screen_base = (char *)ZTWO_VADDR(info->fix.smem_start);
+       } else
+               info->screen_base = (char *)videomemory;
 
-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;
+       memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
 
-       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;
+       /*
+        * Make sure the Copper has something to do
+        */
+       ami_init_copper();
 
-       ami_set_sprite();
+       /*
+        * Enable Display DMA
+        */
+       custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
+                       DMAF_BLITTER | DMAF_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;
+       err = request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
+                         "fb vertb handler", info->par);
+       if (err)
+               goto disable_dma;
 
-       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;
-       }
+       err = fb_alloc_cmap(&info->cmap, 1 << info->var.bits_per_pixel, 0);
+       if (err)
+               goto free_irq;
+
+       dev_set_drvdata(&pdev->dev, info);
+
+       err = register_framebuffer(info);
+       if (err)
+               goto unset_drvdata;
+
+       printk("fb%d: %s frame buffer device, using %dK of video memory\n",
+              info->node, info->fix.id, info->fix.smem_len>>10);
+
+       return 0;
+
+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;
 }
 
+
 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;
 }
index 63409c122ae804ec9fea9dd684cfac1b516a32ef..ced4419e56e2f3ca6c3166e372625408b7ff165d 100644 (file)
@@ -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;
 
@@ -397,7 +400,7 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
        var->lower_margin = min_t(u32, var->lower_margin,
                        ATMEL_LCDC_VFP);
        var->right_margin = min_t(u32, var->right_margin,
-                       (ATMEL_LCDC_HFP >> ATMEL_LCDC_HFP_OFFSET) + 1);
+                       (ATMEL_LCDC_HFP >> ATMEL_LCDC_HFP_OFFSET) + 2);
        var->hsync_len = min_t(u32, var->hsync_len,
                        (ATMEL_LCDC_HPW >> ATMEL_LCDC_HPW_OFFSET) + 1);
        var->left_margin = min_t(u32, var->left_margin,
@@ -582,7 +585,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
        lcdc_writel(sinfo, ATMEL_LCDC_TIM1, value);
 
        /* Horizontal timing */
-       value = (info->var.right_margin - 1) << ATMEL_LCDC_HFP_OFFSET;
+       value = (info->var.right_margin - 2) << ATMEL_LCDC_HFP_OFFSET;
        value |= (info->var.hsync_len - 1) << ATMEL_LCDC_HPW_OFFSET;
        value |= (info->var.left_margin - 1);
        dev_dbg(info->device, "  * LCDTIM2 = %08lx\n", value);
@@ -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;
index 6df7c54db0a3470b1150d1eb8f5089967628eb73..6ea505c6f0c89c3986f4184002f91b054c691d20 100644 (file)
@@ -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 = {
index 7b2c40abae15b21e5ba26f460d809c216fb8e30a..0c189b32a4c5429f632bb812a784b9a4f8868607 100644 (file)
@@ -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 (file)
index f99af93..0000000
+++ /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 (file)
index c0ea832..0000000
+++ /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 (file)
index 0c647d7..0000000
+++ /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");
-
index d837d63c456feac5f5886ec6c31bb733c405bba3..18742c26463b2676a35c510e8da271a32ed256f2 100644 (file)
@@ -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_devtype);
 
 MODULE_DESCRIPTION("Freescale mxs framebuffer driver");
 MODULE_AUTHOR("Sascha Hauer, Pengutronix");
index d1fbbd888cf436b6ed8ce9d05e442ff3f605514b..e10f551ade2121eba471f4ddca476cc4e0b49d20 100644 (file)
@@ -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");
index eb381db7fe519dcd449f919515cc2a9513d8c969..8d546dd55e814d9c622629fd4398ca5ac90a2084 100644 (file)
@@ -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,
index dbd59b8e5b36520e76c472c5621b35bb7c262415..51a87e149e242b8262fd8c79fba84a07cb4a94de 100644 (file)
@@ -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,
index 150e8bae35a15d6148241e5f261b34464566c871..dc9408dc93d1ed36f702187aebab9e5d7605b84b 100644 (file)
@@ -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,
index 2ba9d0ca187c866f97ec1c56b725865adecde137..8365e77e09ffc41d8e48b48e08e26c0798fc646e 100644 (file)
@@ -303,7 +303,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,
        },
 };
index 2462b9ec66623f2fa33d6f0b4852a8938e5ac85a..e6649aa8959135be0181744ea5e528ac4189e2c5 100644 (file)
@@ -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,
index 18ead6f0184d136dcfc884e21db207748e18a0ef..8384b941f6ba1dd922bdeffec17fede7f180fdca 100644 (file)
@@ -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>");
index 1ed8b366618df6234b83183f46d3ac18e6641b98..1d71c08a818f7d1fc646496f9ae9c32d77943c88 100644 (file)
@@ -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");
index 0753b1cfcb8bc9eb6df5fa234ac2441b9c48470b..e84677e6f5edcfbd35e4c7f833929651e85e8cf7 100644 (file)
@@ -621,7 +621,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
@@ -1589,77 +1590,9 @@ static int s3c_fb_resume(struct device *dev)
 
        return 0;
 }
-
-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;
-}
-
-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);
-
-       if (!sfb->variant.has_clksel)
-               clk_enable(sfb->lcd_clk);
-
-       /* setup gpio and output polarity controls */
-       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
 
 
@@ -1984,12 +1917,7 @@ 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,
-};
+static UNIVERSAL_DEV_PM_OPS(s3cfb_pm_ops, s3c_fb_suspend, s3c_fb_resume, NULL);
 
 static struct platform_driver s3c_fb_driver = {
        .probe          = s3c_fb_probe,
@@ -2002,18 +1930,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");
index ee4c0df217f78bd07403873e28fda2abc3cc9abc..77f34c614c86bc73cd21cd189b542c5f07c1bab3 100644 (file)
@@ -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>
 #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);
 
index 37d764ad56b052a8249dc8d9062c7af07a09d167..3c1de981a18cf77a49fbe2b9239112e29ecfe547 100644 (file)
@@ -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;
                }
index 45e47d8471634d2bd9f57c2ef5e3da88cdc8494b..83b16e237a0e2f4fcf4d2438ea2f3439851129c8 100644 (file)
@@ -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");
index 72ee96bc6b3e4ca20f68bef852b0c498c2408cc9..05151b82f40f9867bd36ea5579610a5e6ae82af4 100644 (file)
@@ -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 */
@@ -261,15 +245,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
@@ -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));
index facffc2549766e3ebefd5b8a13e78721523946eb..a264ebf971a090a963e6c475ddad8975b7b370bb 100644 (file)
@@ -420,7 +420,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);
 }
 
@@ -1709,18 +1709,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>");
index 4d63490209cdf1431430aa343a513d29e11ba846..f45d83ecfd21ee6a6ee106128f3e8818458d100c 100644 (file)
@@ -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");
index a78254cf8e83eb971db5bd7f6cb499745a6741f6..3690effbedccc2bf552c66e997ca5257b1b4c20a 100644 (file)
@@ -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,
index 777c21dd7a6ba8b126d4a63feec5765b48a24db7..2a5fe6ede845a96dcfdf40c6e48c5295c11ba756 100644 (file)
@@ -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");
index 2375e5bbf572e8c55d0e65d1a94ddca813634ce9..90a2e30272ad7ae90e4b106426dd37c486c73cd6 100644 (file)
@@ -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");
index 96e34a569169db21d47f2b1ac3e687cb68bcb071..c8703bd61b74f6c2a9a77c8e7ebdb1aadcfa63d0 100644 (file)
@@ -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");
index 45832b7ef7d2c39107d719a1c58a378709c5dc57..55be3865015bd103aabd9a1bdb1d7837c6c0530d 100644 (file)
@@ -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 "
index fcb6cd90f64d8ade134626076a622ac4a2a16118..18084525402ace0afd1c08ada58e2c2a50f5cfad 100644 (file)
@@ -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 (file)
index 3bf70d6..0000000
+++ /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
index 7e749088910d3ed2e926070eb9e7326c7753495b..74bc53bcfdcf6bf6d68ed6e799ca267790c9a66a 100644 (file)
 #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)
index 6cb95c977de9c2455e7c5007a6cf641d0524f3e2..434d56b4a1a58db0ab4b4c08993b1630e70d235b 100644 (file)
@@ -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