fbdev: defio and Metronomefb

[sfrench/cifs-2.6.git] / drivers / video / fb_defio.c

diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 1a8643f053d87af079ceb8b32e19e19a765892c9..24843fdd5395d981c0d27000b895fd0dc8ba32d9 100644 (file)
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2006 Jaya Kumar
  *
  * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
+ * License. See the file COPYING in the main directory of this archive
  * for more details.
  */
 
@@ -19,34 +19,41 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/list.h>
-#include <asm/uaccess.h>
 
 /* to support deferred IO */
 #include <linux/rmap.h>
 #include <linux/pagemap.h>
 
 /* this is to find and return the vmalloc-ed fb pages */
-static struct page* fb_deferred_io_nopage(struct vm_area_struct *vma,
-                                       unsigned long vaddr, int *type)
+static int fb_deferred_io_fault(struct vm_area_struct *vma,
+                               struct vm_fault *vmf)
 {
        unsigned long offset;
        struct page *page;
        struct fb_info *info = vma->vm_private_data;
-       /* info->screen_base is in System RAM */
+       /* info->screen_base is virtual memory */
        void *screen_base = (void __force *) info->screen_base;
 
-       offset = (vaddr - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
+       offset = vmf->pgoff << PAGE_SHIFT;
        if (offset >= info->fix.smem_len)
-               return NOPAGE_SIGBUS;
+               return VM_FAULT_SIGBUS;
 
        page = vmalloc_to_page(screen_base + offset);
        if (!page)
-               return NOPAGE_OOM;
+               return VM_FAULT_SIGBUS;
 
        get_page(page);
-       if (type)
-               *type = VM_FAULT_MINOR;
-       return page;
+
+       if (vma->vm_file)
+               page->mapping = vma->vm_file->f_mapping;
+       else
+               printk(KERN_ERR "no mapping available\n");
+
+       BUG_ON(!page->mapping);
+       page->index = vmf->pgoff;
+
+       vmf->page = page;
+       return 0;
 }
 
 int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync)
@@ -85,7 +92,7 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
 }
 
 static struct vm_operations_struct fb_deferred_io_vm_ops = {
-       .nopage         = fb_deferred_io_nopage,
+       .fault          = fb_deferred_io_fault,
        .page_mkwrite   = fb_deferred_io_mkwrite,
 };
 
@@ -140,11 +147,20 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
 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;
 
        BUG_ON(!fbdefio);
        cancel_delayed_work(&info->deferred_work);
        flush_scheduled_work();
+
+       /* 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->mapping = NULL;
+       }
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);