9 files changed, 264 insertions, 220 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3f3ce13fef43..d0c821992a99 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1889,10 +1889,11 @@ config FB_W100
 config FB_SH_MOBILE_LCDC
         tristate "SuperH Mobile LCDC framebuffer support"
         depends on FB && SUPERH
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        default m
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        select FB_DEFERRED_IO
         ---help---
           Frame buffer driver for the on-chip SH-Mobile LCD controller.
 
@@ -2021,17 +2022,19 @@ config FB_COBALT
         depends on FB && MIPS_COBALT
 
 config FB_SH7760
-       bool "SH7760/SH7763 LCDC support"
-       depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763)
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-       help
-         Support for the SH7760/SH7763 integrated (D)STN/TFT LCD Controller.
-         Supports display resolutions up to 1024x1024 pixel, grayscale and
-         color operation, with depths ranging from 1 bpp to 8 bpp monochrome
-         and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
-         panels <= 320 pixel horizontal resolution.
+        bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
+        depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \
+                || CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721)
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Support for the SH7760/SH7763/SH7720/SH7721 integrated
+          (D)STN/TFT LCD Controller.
+          Supports display resolutions up to 1024x1024 pixel, grayscale and
+          color operation, with depths ranging from 1 bpp to 8 bpp monochrome
+          and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
+          panels <= 320 pixel horizontal resolution.
 
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 0b2adefe9e3d..4bcff81b50e0 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -81,9 +81,6 @@
 #ifdef CONFIG_ATARI
 #include <asm/atariints.h>
 #endif
-#ifdef CONFIG_MAC
-#include <asm/macints.h>
-#endif
 #if defined(__mc68000__)
 #include <asm/machdep.h>
 #include <asm/setup.h>
@@ -160,8 +157,6 @@ static int fbcon_set_origin(struct vc_data *);
 
 /* # VBL ints between cursor state changes */
 #define ATARI_CURSOR_BLINK_RATE         (42)
-#define MAC_CURSOR_BLINK_RATE           (32)
-#define DEFAULT_CURSOR_BLINK_RATE       (20)
 
 static int vbl_cursor_cnt;
 static int fbcon_cursor_noblink;
@@ -210,19 +205,6 @@ static void fbcon_start(void);
 static void fbcon_exit(void);
 static struct device *fbcon_device;
 
-#ifdef CONFIG_MAC
-/*
- * On the Macintoy, there may or may not be a working VBL int. We need to probe
- */
-static int vbl_detected;
-
-static irqreturn_t fb_vbl_detect(int irq, void *dummy)
-{
-        vbl_detected++;
-        return IRQ_HANDLED;
-}
-#endif
-
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
 static inline void fbcon_set_rotation(struct fb_info *info)
 {
@@ -421,7 +403,7 @@ static void fb_flashcursor(struct work_struct *work)
         release_console_sem();
 }
 
-#if defined(CONFIG_ATARI) || defined(CONFIG_MAC)
+#ifdef CONFIG_ATARI
 static int cursor_blink_rate;
 static irqreturn_t fb_vbl_handler(int irq, void *dev_id)
 {
@@ -949,9 +931,7 @@ static const char *fbcon_startup(void)
         struct fb_info *info = NULL;
         struct fbcon_ops *ops;
         int rows, cols;
-        int irqres;
 
-        irqres = 1;
         /*
          *  If num_registered_fb is zero, this is a call for the dummy part.
          *  The frame buffer devices weren't initialized yet.
@@ -1040,56 +1020,11 @@ static const char *fbcon_startup(void)
 #ifdef CONFIG_ATARI
         if (MACH_IS_ATARI) {
                 cursor_blink_rate = ATARI_CURSOR_BLINK_RATE;
-                irqres =
-                    request_irq(IRQ_AUTO_4, fb_vbl_handler,
+                (void)request_irq(IRQ_AUTO_4, fb_vbl_handler,
                                 IRQ_TYPE_PRIO, "framebuffer vbl",
                                 info);
         }
-#endif                          /* CONFIG_ATARI */
-
-#ifdef CONFIG_MAC
-        /*
-         * On a Macintoy, the VBL interrupt may or may not be active. 
-         * As interrupt based cursor is more reliable and race free, we 
-         * probe for VBL interrupts.
-         */
-        if (MACH_IS_MAC) {
-                int ct = 0;
-                /*
-                 * Probe for VBL: set temp. handler ...
-                 */
-                irqres = request_irq(IRQ_MAC_VBL, fb_vbl_detect, 0,
-                                     "framebuffer vbl", info);
-                vbl_detected = 0;
-
-                /*
-                 * ... and spin for 20 ms ...
-                 */
-                while (!vbl_detected && ++ct < 1000)
-                        udelay(20);
-
-                if (ct == 1000)
-                        printk
-                            ("fbcon_startup: No VBL detected, using timer based cursor.\n");
-
-                free_irq(IRQ_MAC_VBL, fb_vbl_detect);
-
-                if (vbl_detected) {
-                        /*
-                         * interrupt based cursor ok
-                         */
-                        cursor_blink_rate = MAC_CURSOR_BLINK_RATE;
-                        irqres =
-                            request_irq(IRQ_MAC_VBL, fb_vbl_handler, 0,
-                                        "framebuffer vbl", info);
-                } else {
-                        /*
-                         * VBL not detected: fall through, use timer based cursor
-                         */
-                        irqres = 1;
-                }
-        }
-#endif                          /* CONFIG_MAC */
+#endif /* CONFIG_ATARI */
 
         fbcon_add_cursor_timer(info);
         fbcon_has_exited = 0;
@@ -3520,11 +3455,8 @@ static void fbcon_exit(void)
                 return;
 
 #ifdef CONFIG_ATARI
-        free_irq(IRQ_AUTO_4, fb_vbl_handler);
-#endif
-#ifdef CONFIG_MAC
-        if (MACH_IS_MAC && vbl_detected)
-                free_irq(IRQ_MAC_VBL, fb_vbl_handler);
+        if (MACH_IS_ATARI)
+                free_irq(IRQ_AUTO_4, fb_vbl_handler);
 #endif
 
         kfree((void *)softback_buf);
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index b0be7eac32d8..49fcbe8f18ac 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -298,10 +298,10 @@ static int controlfb_mmap(struct fb_info *info,
                        return -EINVAL;
                start = info->fix.mmio_start;
                len = PAGE_ALIGN((start & ~PAGE_MASK)+info->fix.mmio_len);
-               pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE|_PAGE_GUARDED;
+               vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
        } else {
                /* framebuffer */
-               pgprot_val(vma->vm_page_prot) |= _PAGE_WRITETHRU;
+               vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
        }
        start &= PAGE_MASK;
        if ((vma->vm_end - vma->vm_start + off) > len)
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 41d62632dcdb..39d5d643a50b 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1513,7 +1513,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb)
 
         iop = ioremap(0x3000000, 0x5000);
         if (iop == NULL) {
-                prom_printf("iga5000: cannot map I/O\n");
+                printk(KERN_ERR "iga5000: cannot map I/O\n");
                 return -ENOMEM;
         }
 
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 4835bdc4e9f1..082026546aee 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -24,6 +24,19 @@
 #include <linux/rmap.h>
 #include <linux/pagemap.h>
 
+struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
+{
+        void *screen_base = (void __force *) info->screen_base;
+        struct page *page;
+
+        if (is_vmalloc_addr(screen_base + offs))
+                page = vmalloc_to_page(screen_base + offs);
+        else
+                page = pfn_to_page((info->fix.smem_start + offs) >> PAGE_SHIFT);
+
+        return page;
+}
+
 /* this is to find and return the vmalloc-ed fb pages */
 static int fb_deferred_io_fault(struct vm_area_struct *vma,
                                 struct vm_fault *vmf)
@@ -31,14 +44,12 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
         unsigned long offset;
         struct page *page;
         struct fb_info *info = vma->vm_private_data;
-        /* info->screen_base is virtual memory */
-        void *screen_base = (void __force *) info->screen_base;
 
         offset = vmf->pgoff << PAGE_SHIFT;
         if (offset >= info->fix.smem_len)
                 return VM_FAULT_SIGBUS;
 
-        page = vmalloc_to_page(screen_base + offset);
+        page = fb_deferred_io_page(info, offset);
         if (!page)
                 return VM_FAULT_SIGBUS;
 
@@ -60,6 +71,10 @@ int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync)
 {
         struct fb_info *info = file->private_data;
 
+        /* Skip if deferred io is complied-in but disabled on this fbdev */
+        if (!info->fbdefio)
+                return 0;
+
         /* Kill off the delayed work */
         cancel_rearming_delayed_work(&info->deferred_work);
 
@@ -184,7 +199,6 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_open);
 
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
-        void *screen_base = (void __force *) info->screen_base;
         struct fb_deferred_io *fbdefio = info->fbdefio;
         struct page *page;
         int i;
@@ -195,9 +209,12 @@ void fb_deferred_io_cleanup(struct fb_info *info)
 
         /* clear out the mapping that we setup */
         for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {
-                page = vmalloc_to_page(screen_base + i);
+                page = fb_deferred_io_page(info, i);
                 page->mapping = NULL;
         }
+
+        info->fbops->fb_mmap = NULL;
+        mutex_destroy(&fbdefio->lock);
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
 
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index ee380d5f3410..d66887e8cbb1 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -36,7 +36,6 @@
 #include <asm/irq.h>
 #include <asm/macintosh.h>
 #include <asm/io.h>
-#include <asm/machw.h>
 
 /* Common DAC base address for the LC, RBV, Valkyrie, and IIvx */
 #define DAC_BASE 0x50f24000
@@ -78,34 +77,34 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
                            unsigned int green, unsigned int blue,
                            struct fb_info *fb_info);
 
-static volatile struct {
+static struct {
         unsigned char addr;
         /* Note: word-aligned */
         char pad[3];
         unsigned char lut;
-} *valkyrie_cmap_regs;
+} __iomem *valkyrie_cmap_regs;
 
-static volatile struct {
+static struct {
         unsigned char addr;
         unsigned char lut;
-} *v8_brazil_cmap_regs;
+} __iomem *v8_brazil_cmap_regs;
 
-static volatile struct {
+static struct {
         unsigned char addr;
         char pad1[3]; /* word aligned */
         unsigned char lut;
         char pad2[3]; /* word aligned */
         unsigned char cntl; /* a guess as to purpose */
-} *rbv_cmap_regs;
+} __iomem *rbv_cmap_regs;
 
-static volatile struct {
+static struct {
         unsigned long reset;
         unsigned long pad1[3];
         unsigned char pad2[3];
         unsigned char lut;
-} *dafb_cmap_regs;
+} __iomem *dafb_cmap_regs;
 
-static volatile struct {
+static struct {
         unsigned char addr;     /* OFFSET: 0x00 */
         unsigned char pad1[15];
         unsigned char lut;      /* OFFSET: 0x10 */
@@ -114,16 +113,16 @@ static volatile struct {
         unsigned char pad3[7];
         unsigned long vbl_addr; /* OFFSET: 0x28 */
         unsigned int  status2;  /* OFFSET: 0x2C */
-} *civic_cmap_regs;
+} __iomem *civic_cmap_regs;
 
-static volatile struct {
+static struct {
         char    pad1[0x40];
         unsigned char   clut_waddr;     /* 0x40 */
         char    pad2;
         unsigned char   clut_data;      /* 0x42 */
         char    pad3[0x3];
         unsigned char   clut_raddr;     /* 0x46 */
-} *csc_cmap_regs;
+} __iomem *csc_cmap_regs;
 
 /* We will leave these the way they are for the time being */
 struct mdc_cmap_regs {
@@ -507,10 +506,10 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
                            struct fb_info *info)
 {
         mdelay(1);
-        csc_cmap_regs->clut_waddr = regno;
-        csc_cmap_regs->clut_data = red;
-        csc_cmap_regs->clut_data = green;
-        csc_cmap_regs->clut_data = blue;
+        nubus_writeb(regno, &csc_cmap_regs->clut_waddr);
+        nubus_writeb(red,   &csc_cmap_regs->clut_data);
+        nubus_writeb(green, &csc_cmap_regs->clut_data);
+        nubus_writeb(blue,  &csc_cmap_regs->clut_data);
         return 0;
 }
 
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 4b5d80771904..38ac805db97d 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -460,12 +460,16 @@ static void ps3fb_sync_image(struct device *dev, u64 frame_offset,
                 line_length |= (u64)src_line_length << 32;
 
         src_offset += GPU_FB_START;
+
+        mutex_lock(&ps3_gpu_mutex);
         status = lv1_gpu_context_attribute(ps3fb.context_handle,
                                            L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT,
                                            dst_offset, GPU_IOIF + src_offset,
                                            L1GPU_FB_BLIT_WAIT_FOR_COMPLETION |
                                            (width << 16) | height,
                                            line_length);
+        mutex_unlock(&ps3_gpu_mutex);
+
         if (status)
                 dev_err(dev,
                         "%s: lv1_gpu_context_attribute FB_BLIT failed: %d\n",
@@ -784,15 +788,6 @@ static int ps3fb_wait_for_vsync(u32 crtc)
         return 0;
 }
 
-static void ps3fb_flip_ctl(int on, void *data)
-{
-        struct ps3fb_priv *priv = data;
-        if (on)
-                atomic_dec_if_positive(&priv->ext_flip);
-        else
-                atomic_inc(&priv->ext_flip);
-}
-
 
     /*
      * ioctl
@@ -1228,7 +1223,6 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
         }
 
         ps3fb.task = task;
-        ps3av_register_flip_ctl(ps3fb_flip_ctl, &ps3fb);
 
         return 0;
 
@@ -1258,10 +1252,9 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
 
         dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__);
 
-        ps3fb_flip_ctl(0, &ps3fb);      /* flip off */
+        atomic_inc(&ps3fb.ext_flip);    /* flip off */
         ps3fb.dinfo->irq.mask = 0;
 
-        ps3av_register_flip_ctl(NULL, NULL);
         if (ps3fb.task) {
                 struct task_struct *task = ps3fb.task;
                 ps3fb.task = NULL;
@@ -1296,8 +1289,8 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
 }
 
 static struct ps3_system_bus_driver ps3fb_driver = {
-        .match_id       = PS3_MATCH_ID_GRAPHICS,
-        .match_sub_id   = PS3_MATCH_SUB_ID_FB,
+        .match_id       = PS3_MATCH_ID_GPU,
+        .match_sub_id   = PS3_MATCH_SUB_ID_GPU_FB,
         .core.name      = DEVICE_NAME,
         .core.owner     = THIS_MODULE,
         .probe          = ps3fb_probe,
@@ -1355,4 +1348,4 @@ module_exit(ps3fb_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("PS3 GPU Frame Buffer Driver");
 MODULE_AUTHOR("Sony Computer Entertainment Inc.");
-MODULE_ALIAS(PS3_MODULE_ALIAS_GRAPHICS);
+MODULE_ALIAS(PS3_MODULE_ALIAS_GPU_FB);
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index 8d0212da4514..653bdfee3057 100644
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -13,6 +13,8 @@
  *
  * Thanks to Siegfried Schaefer <s.schaefer at schaefer-edv.de>
  *     for his original source and testing!
+ *
+ * sh7760_setcolreg get from drivers/video/sh_mobile_lcdcfb.c
  */
 
 #include <linux/completion.h>
@@ -53,29 +55,6 @@ static irqreturn_t sh7760fb_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static void sh7760fb_wait_vsync(struct fb_info *info)
-{
-        struct sh7760fb_par *par = info->par;
-
-        if (par->pd->novsync)
-                return;
-
-        iowrite16(ioread16(par->base + LDINTR) & ~VINT_CHECK,
-                  par->base + LDINTR);
-
-        if (par->irq < 0) {
-                /* poll for vert. retrace: status bit is sticky */
-                while (!(ioread16(par->base + LDINTR) & VINT_CHECK))
-                        cpu_relax();
-        } else {
-                /* a "wait_for_irq_event(par->irq)" would be extremely nice */
-                init_completion(&par->vsync);
-                enable_irq(par->irq);
-                wait_for_completion(&par->vsync);
-                disable_irq_nosync(par->irq);
-        }
-}
-
 /* wait_for_lps - wait until power supply has reached a certain state. */
 static int wait_for_lps(struct sh7760fb_par *par, int val)
 {
@@ -117,55 +96,28 @@ static int sh7760fb_blank(int blank, struct fb_info *info)
         return wait_for_lps(par, lps);
 }
 
-/* set color registers */
-static int sh7760fb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+static int sh7760_setcolreg (u_int regno,
+        u_int red, u_int green, u_int blue,
+        u_int transp, struct fb_info *info)
 {
-        struct sh7760fb_par *par = info->par;
-        u32 s = cmap->start;
-        u32 l = cmap->len;
-        u16 *r = cmap->red;
-        u16 *g = cmap->green;
-        u16 *b = cmap->blue;
-        u32 col, tmo;
-        int ret;
+        u32 *palette = info->pseudo_palette;
 
-        ret = 0;
+        if (regno >= 16)
+                return -EINVAL;
 
-        sh7760fb_wait_vsync(info);
+        /* only FB_VISUAL_TRUECOLOR supported */
 
-        /* request palette access */
-        iowrite16(LDPALCR_PALEN, par->base + LDPALCR);
+        red >>= 16 - info->var.red.length;
+        green >>= 16 - info->var.green.length;
+        blue >>= 16 - info->var.blue.length;
+        transp >>= 16 - info->var.transp.length;
 
-        /* poll for access grant */
-        tmo = 100;
-        while (!(ioread16(par->base + LDPALCR) & LDPALCR_PALS) && (--tmo))
-                cpu_relax();
+        palette[regno] = (red << info->var.red.offset) |
+                (green << info->var.green.offset) |
+                (blue << info->var.blue.offset) |
+                (transp << info->var.transp.offset);
 
-        if (!tmo) {
-                ret = 1;
-                dev_dbg(info->dev, "no palette access!\n");
-                goto out;
-        }
-
-        while (l && (s < 256)) {
-                col = ((*r) & 0xff) << 16;
-                col |= ((*g) & 0xff) << 8;
-                col |= ((*b) & 0xff);
-                col &= SH7760FB_PALETTE_MASK;
-                iowrite32(col, par->base + LDPR(s));
-
-                if (s < 16)
-                        ((u32 *) (info->pseudo_palette))[s] = s;
-
-                s++;
-                l--;
-                r++;
-                g++;
-                b++;
-        }
-out:
-        iowrite16(0, par->base + LDPALCR);
-        return ret;
+        return 0;
 }
 
 static void encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info,
@@ -406,7 +358,7 @@ static struct fb_ops sh7760fb_ops = {
         .owner = THIS_MODULE,
         .fb_blank = sh7760fb_blank,
         .fb_check_var = sh7760fb_check_var,
-        .fb_setcmap = sh7760fb_setcmap,
+        .fb_setcolreg = sh7760_setcolreg,
         .fb_set_par = sh7760fb_set_par,
         .fb_fillrect = cfb_fillrect,
         .fb_copyarea = cfb_copyarea,
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index efff672fd7b8..0e2b8fd24df1 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -16,7 +16,9 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
 #include <video/sh_mobile_lcdc.h>
+#include <asm/atomic.h>
 
 #define PALETTE_NR 16
 
@@ -30,11 +32,15 @@ struct sh_mobile_lcdc_chan {
         u32 pseudo_palette[PALETTE_NR];
         struct fb_info info;
         dma_addr_t dma_handle;
+        struct fb_deferred_io defio;
 };
 
 struct sh_mobile_lcdc_priv {
         void __iomem *base;
+        int irq;
 #ifdef CONFIG_HAVE_CLK
+        atomic_t clk_usecnt;
+        struct clk *dot_clk;
         struct clk *clk;
 #endif
         unsigned long lddckr;
@@ -56,7 +62,7 @@ struct sh_mobile_lcdc_priv {
 
 /* per-channel registers */
 enum { LDDCKPAT1R, LDDCKPAT2R, LDMT1R, LDMT2R, LDMT3R, LDDFR, LDSM1R,
-       LDSA1R, LDMLSR, LDHCNR, LDHSYNR, LDVLNR, LDVSYNR, LDPMR };
+       LDSM2R, LDSA1R, LDMLSR, LDHCNR, LDHSYNR, LDVLNR, LDVSYNR, LDPMR };
 
 static unsigned long lcdc_offs_mainlcd[] = {
         [LDDCKPAT1R] = 0x400,
@@ -66,6 +72,7 @@ static unsigned long lcdc_offs_mainlcd[] = {
         [LDMT3R] = 0x420,
         [LDDFR] = 0x424,
         [LDSM1R] = 0x428,
+        [LDSM2R] = 0x42c,
         [LDSA1R] = 0x430,
         [LDMLSR] = 0x438,
         [LDHCNR] = 0x448,
@@ -83,6 +90,7 @@ static unsigned long lcdc_offs_sublcd[] = {
         [LDMT3R] = 0x608,
         [LDDFR] = 0x60c,
         [LDSM1R] = 0x610,
+        [LDSM2R] = 0x614,
         [LDSA1R] = 0x618,
         [LDMLSR] = 0x620,
         [LDHCNR] = 0x624,
@@ -96,6 +104,8 @@ static unsigned long lcdc_offs_sublcd[] = {
 #define LCDC_RESET      0x00000100
 #define DISPLAY_BEU     0x00000008
 #define LCDC_ENABLE     0x00000001
+#define LDINTR_FE       0x00000400
+#define LDINTR_FS       0x00000004
 
 static void lcdc_write_chan(struct sh_mobile_lcdc_chan *chan,
                             int reg_nr, unsigned long data)
@@ -170,6 +180,65 @@ struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
         lcdc_sys_read_data,
 };
 
+#ifdef CONFIG_HAVE_CLK
+static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv)
+{
+        if (atomic_inc_and_test(&priv->clk_usecnt)) {
+                clk_enable(priv->clk);
+                if (priv->dot_clk)
+                        clk_enable(priv->dot_clk);
+        }
+}
+
+static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv)
+{
+        if (atomic_sub_return(1, &priv->clk_usecnt) == -1) {
+                if (priv->dot_clk)
+                        clk_disable(priv->dot_clk);
+                clk_disable(priv->clk);
+        }
+}
+#else
+static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv) {}
+static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) {}
+#endif
+
+static void sh_mobile_lcdc_deferred_io(struct fb_info *info,
+                                       struct list_head *pagelist)
+{
+        struct sh_mobile_lcdc_chan *ch = info->par;
+
+        /* enable clocks before accessing hardware */
+        sh_mobile_lcdc_clk_on(ch->lcdc);
+
+        /* trigger panel update */
+        lcdc_write_chan(ch, LDSM2R, 1);
+}
+
+static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
+{
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+
+        if (fbdefio)
+                schedule_delayed_work(&info->deferred_work, fbdefio->delay);
+}
+
+static irqreturn_t sh_mobile_lcdc_irq(int irq, void *data)
+{
+        struct sh_mobile_lcdc_priv *priv = data;
+        unsigned long tmp;
+
+        /* acknowledge interrupt */
+        tmp = lcdc_read(priv, _LDINTR);
+        tmp &= 0xffffff00; /* mask in high 24 bits */
+        tmp |= 0x000000ff ^ LDINTR_FS; /* status in low 8 */
+        lcdc_write(priv, _LDINTR, tmp);
+
+        /* disable clocks */
+        sh_mobile_lcdc_clk_off(priv);
+        return IRQ_HANDLED;
+}
+
 static void sh_mobile_lcdc_start_stop(struct sh_mobile_lcdc_priv *priv,
                                       int start)
 {
@@ -207,6 +276,11 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
         int k, m;
         int ret = 0;
 
+        /* enable clocks before accessing the hardware */
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++)
+                if (priv->ch[k].enabled)
+                        sh_mobile_lcdc_clk_on(priv);
+
         /* reset */
         lcdc_write(priv, _LDCNT2R, lcdc_read(priv, _LDCNT2R) | LCDC_RESET);
         lcdc_wait_bit(priv, _LDCNT2R, LCDC_RESET, 0);
@@ -249,7 +323,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
         lcdc_write(priv, _LDDCKSTPR, 0);
         lcdc_wait_bit(priv, _LDDCKSTPR, ~0, 0);
 
-        /* interrupts are disabled */
+        /* interrupts are disabled to begin with */
         lcdc_write(priv, _LDINTR, 0);
 
         for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
@@ -310,9 +384,6 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
                         return ret;
         }
 
-        /* --- display_lcdc_data() --- */
-        lcdc_write(priv, _LDINTR, 0x00000f00);
-
         /* word and long word swap */
         lcdc_write(priv, _LDDDSR, lcdc_read(priv, _LDDDSR) | 6);
 
@@ -334,8 +405,24 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
                 /* set line size */
                 lcdc_write_chan(ch, LDMLSR, ch->info.fix.line_length);
 
-                /* continuous read mode */
-                lcdc_write_chan(ch, LDSM1R, 0);
+                /* setup deferred io if SYS bus */
+                tmp = ch->cfg.sys_bus_cfg.deferred_io_msec;
+                if (ch->ldmt1r_value & (1 << 12) && tmp) {
+                        ch->defio.deferred_io = sh_mobile_lcdc_deferred_io;
+                        ch->defio.delay = msecs_to_jiffies(tmp);
+                        ch->info.fbdefio = &ch->defio;
+                        fb_deferred_io_init(&ch->info);
+
+                        /* one-shot mode */
+                        lcdc_write_chan(ch, LDSM1R, 1);
+
+                        /* enable "Frame End Interrupt Enable" bit */
+                        lcdc_write(priv, _LDINTR, LDINTR_FE);
+
+                } else {
+                        /* continuous read mode */
+                        lcdc_write_chan(ch, LDSM1R, 0);
+                }
         }
 
         /* display output */
@@ -359,6 +446,7 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
 {
         struct sh_mobile_lcdc_chan *ch;
         struct sh_mobile_lcdc_board_cfg *board_cfg;
+        unsigned long tmp;
         int k;
 
         /* tell the board code to disable the panel */
@@ -367,10 +455,22 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
                 board_cfg = &ch->cfg.board_cfg;
                 if (board_cfg->display_off)
                         board_cfg->display_off(board_cfg->board_data);
+
+                /* cleanup deferred io if SYS bus */
+                tmp = ch->cfg.sys_bus_cfg.deferred_io_msec;
+                if (ch->ldmt1r_value & (1 << 12) && tmp) {
+                        fb_deferred_io_cleanup(&ch->info);
+                        ch->info.fbdefio = NULL;
+                }
         }
 
         /* stop the lcdc */
         sh_mobile_lcdc_start_stop(priv, 0);
+
+        /* stop clocks */
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++)
+                if (priv->ch[k].enabled)
+                        sh_mobile_lcdc_clk_off(priv);
 }
 
 static int sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch)
@@ -413,9 +513,13 @@ static int sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch)
         return -EINVAL;
 }
 
-static int sh_mobile_lcdc_setup_clocks(struct device *dev, int clock_source,
+static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev,
+                                       int clock_source,
                                        struct sh_mobile_lcdc_priv *priv)
 {
+#ifdef CONFIG_HAVE_CLK
+        char clk_name[8];
+#endif
         char *str;
         int icksel;
 
@@ -430,14 +534,21 @@ static int sh_mobile_lcdc_setup_clocks(struct device *dev, int clock_source,
         priv->lddckr = icksel << 16;
 
 #ifdef CONFIG_HAVE_CLK
+        atomic_set(&priv->clk_usecnt, -1);
+        snprintf(clk_name, sizeof(clk_name), "lcdc%d", pdev->id);
+        priv->clk = clk_get(&pdev->dev, clk_name);
+        if (IS_ERR(priv->clk)) {
+                dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+                return PTR_ERR(priv->clk);
+        }
+        
         if (str) {
-                priv->clk = clk_get(dev, str);
-                if (IS_ERR(priv->clk)) {
-                        dev_err(dev, "cannot get clock %s\n", str);
-                        return PTR_ERR(priv->clk);
+                priv->dot_clk = clk_get(&pdev->dev, str);
+                if (IS_ERR(priv->dot_clk)) {
+                        dev_err(&pdev->dev, "cannot get dot clock %s\n", str);
+                        clk_put(priv->clk);
+                        return PTR_ERR(priv->dot_clk);
                 }
-
-                clk_enable(priv->clk);
         }
 #endif
 
@@ -475,11 +586,34 @@ static struct fb_fix_screeninfo sh_mobile_lcdc_fix  = {
         .accel =        FB_ACCEL_NONE,
 };
 
+static void sh_mobile_lcdc_fillrect(struct fb_info *info,
+                                    const struct fb_fillrect *rect)
+{
+        sys_fillrect(info, rect);
+        sh_mobile_lcdc_deferred_io_touch(info);
+}
+
+static void sh_mobile_lcdc_copyarea(struct fb_info *info,
+                                    const struct fb_copyarea *area)
+{
+        sys_copyarea(info, area);
+        sh_mobile_lcdc_deferred_io_touch(info);
+}
+
+static void sh_mobile_lcdc_imageblit(struct fb_info *info,
+                                     const struct fb_image *image)
+{
+        sys_imageblit(info, image);
+        sh_mobile_lcdc_deferred_io_touch(info);
+}
+
 static struct fb_ops sh_mobile_lcdc_ops = {
         .fb_setcolreg   = sh_mobile_lcdc_setcolreg,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
+        .fb_read        = fb_sys_read,
+        .fb_write       = fb_sys_write,
+        .fb_fillrect    = sh_mobile_lcdc_fillrect,
+        .fb_copyarea    = sh_mobile_lcdc_copyarea,
+        .fb_imageblit   = sh_mobile_lcdc_imageblit,
 };
 
 static int sh_mobile_lcdc_set_bpp(struct fb_var_screeninfo *var, int bpp)
@@ -540,8 +674,9 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "cannot find IO resource\n");
+        i = platform_get_irq(pdev, 0);
+        if (!res || i < 0) {
+                dev_err(&pdev->dev, "cannot get platform resources\n");
                 error = -ENOENT;
                 goto err0;
         }
@@ -553,6 +688,14 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                 goto err0;
         }
 
+        error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED,
+                            pdev->dev.bus_id, priv);
+        if (error) {
+                dev_err(&pdev->dev, "unable to request irq\n");
+                goto err1;
+        }
+
+        priv->irq = i;
         platform_set_drvdata(pdev, priv);
         pdata = pdev->dev.platform_data;
 
@@ -587,8 +730,7 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        error = sh_mobile_lcdc_setup_clocks(&pdev->dev,
-                                            pdata->clock_source, priv);
+        error = sh_mobile_lcdc_setup_clocks(pdev, pdata->clock_source, priv);
         if (error) {
                 dev_err(&pdev->dev, "unable to setup clocks\n");
                 goto err1;
@@ -637,6 +779,7 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                 info->fix.smem_start = priv->ch[i].dma_handle;
                 info->screen_base = buf;
                 info->device = &pdev->dev;
+                info->par = &priv->ch[i];
         }
 
         if (error)
@@ -664,6 +807,10 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                          (int) priv->ch[i].cfg.lcd_cfg.xres,
                          (int) priv->ch[i].cfg.lcd_cfg.yres,
                          priv->ch[i].cfg.bpp);
+
+                /* deferred io mode: disable clock to save power */
+                if (info->fbdefio)
+                        sh_mobile_lcdc_clk_off(priv);
         }
 
         return 0;
@@ -697,15 +844,16 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
         }
 
 #ifdef CONFIG_HAVE_CLK
-        if (priv->clk) {
-                clk_disable(priv->clk);
-                clk_put(priv->clk);
-        }
+        if (priv->dot_clk)
+                clk_put(priv->dot_clk);
+        clk_put(priv->clk);
 #endif
 
         if (priv->base)
                 iounmap(priv->base);
 
+        if (priv->irq)
+                free_irq(priv->irq, priv);
         kfree(priv);
         return 0;
 }