1 files changed, 54 insertions, 3 deletions

diff --git a/include/linux/fb.h b/include/linux/fb.h
index be913ec87169..dff7a728948c 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -4,6 +4,8 @@
 #include <asm/types.h>
 #include <linux/i2c.h>
 
+struct dentry;
+
 /* Definitions of frame buffers                                         */
 
 #define FB_MAJOR                29
@@ -525,12 +527,20 @@ struct fb_cursor_user {
 #define FB_EVENT_MODE_CHANGE_ALL        0x0B
 /*      A software display blank change occured */
 #define FB_EVENT_CONBLANK               0x0C
+/*      Get drawing requirements        */
+#define FB_EVENT_GET_REQ                0x0D
 
 struct fb_event {
         struct fb_info *info;
         void *data;
 };
 
+struct fb_blit_caps {
+        u32 x;
+        u32 y;
+        u32 len;
+        u32 flags;
+};
 
 extern int fb_register_client(struct notifier_block *nb);
 extern int fb_unregister_client(struct notifier_block *nb);
@@ -556,11 +566,25 @@ struct fb_pixmap {
         u32 scan_align;         /* alignment per scanline               */
         u32 access_align;       /* alignment per read/write (bits)      */
         u32 flags;              /* see FB_PIXMAP_*                      */
+        u32 blit_x;             /* supported bit block dimensions (1-32)*/
+        u32 blit_y;             /* Format: blit_x = 1 << (width - 1)    */
+                                /*         blit_y = 1 << (height - 1)   */
+                                /* if 0, will be set to 0xffffffff (all)*/
         /* access methods */
         void (*writeio)(struct fb_info *info, void __iomem *dst, void *src, unsigned int size);
         void (*readio) (struct fb_info *info, void *dst, void __iomem *src, unsigned int size);
 };
 
+#ifdef CONFIG_FB_DEFERRED_IO
+struct fb_deferred_io {
+        /* delay between mkwrite and deferred handler */
+        unsigned long delay;
+        struct mutex lock; /* mutex that protects the page list */
+        struct list_head pagelist; /* list of touched pages */
+        /* callback */
+        void (*deferred_io)(struct fb_info *info, struct list_head *pagelist);
+};
+#endif
 
 /*
  * Frame buffer operations
@@ -579,8 +603,10 @@ struct fb_ops {
         /* For framebuffers with strange non linear layouts or that do not
          * work with normal memory mapped access
          */
-        ssize_t (*fb_read)(struct file *file, char __user *buf, size_t count, loff_t *ppos);
-        ssize_t (*fb_write)(struct file *file, const char __user *buf, size_t count, loff_t *ppos);
+        ssize_t (*fb_read)(struct fb_info *info, char __user *buf,
+                           size_t count, loff_t *ppos);
+        ssize_t (*fb_write)(struct fb_info *info, const char __user *buf,
+                            size_t count, loff_t *ppos);
 
         /* checks var and eventually tweaks it to something supported,
          * DO NOT MODIFY PAR */
@@ -634,10 +660,13 @@ struct fb_ops {
 
         /* restore saved state */
         void (*fb_restore_state)(struct fb_info *info);
+
+        /* get capability given var */
+        void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps,
+                            struct fb_var_screeninfo *var);
 };
 
 #ifdef CONFIG_FB_TILEBLITTING
-
 #define FB_TILE_CURSOR_NONE        0
 #define FB_TILE_CURSOR_UNDERLINE   1
 #define FB_TILE_CURSOR_LOWER_THIRD 2
@@ -709,6 +738,8 @@ struct fb_tile_ops {
         /* cursor */
         void (*fb_tilecursor)(struct fb_info *info,
                               struct fb_tilecursor *cursor);
+        /* get maximum length of the tile map */
+        int (*fb_get_tilemax)(struct fb_info *info);
 };
 #endif /* CONFIG_FB_TILEBLITTING */
 
@@ -778,6 +809,10 @@ struct fb_info {
         struct mutex bl_curve_mutex;    
         u8 bl_curve[FB_BACKLIGHT_LEVELS];
 #endif
+#ifdef CONFIG_FB_DEFERRED_IO
+        struct delayed_work deferred_work;
+        struct fb_deferred_io *fbdefio;
+#endif
 
         struct fb_ops *fbops;
         struct device *device;          /* This is the parent */
@@ -879,6 +914,16 @@ extern int fb_blank(struct fb_info *info, int blank);
 extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); 
 extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); 
 extern void cfb_imageblit(struct fb_info *info, const struct fb_image *image);
+/*
+ * Drawing operations where framebuffer is in system RAM
+ */
+extern void sys_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
+extern void sys_copyarea(struct fb_info *info, const struct fb_copyarea *area);
+extern void sys_imageblit(struct fb_info *info, const struct fb_image *image);
+extern ssize_t fb_sys_read(struct fb_info *info, char __user *buf,
+                           size_t count, loff_t *ppos);
+extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
+                            size_t count, loff_t *ppos);
 
 /* drivers/video/fbmem.c */
 extern int register_framebuffer(struct fb_info *fb_info);
@@ -913,6 +958,12 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
         }
 }
 
+/* drivers/video/fb_defio.c */
+extern void fb_deferred_io_init(struct fb_info *info);
+extern void fb_deferred_io_cleanup(struct fb_info *info);
+extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry,
+                                int datasync);
+
 /* drivers/video/fbsysfs.c */
 extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
 extern void framebuffer_release(struct fb_info *info);