Merge Linux 4.4.203-rc2 into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index b48a14e..479d664 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -288,10 +288,18 @@ struct fb_ops {
        int (*fb_ioctl)(struct fb_info *info, unsigned int cmd,
                        unsigned long arg);
 
+       /* perform fb specific ioctl v2 (optional) - provides file param */
+       int (*fb_ioctl_v2)(struct fb_info *info, unsigned int cmd,
+                       unsigned long arg, struct file *file);
+
        /* Handle 32bit compat ioctl (optional) */
        int (*fb_compat_ioctl)(struct fb_info *info, unsigned cmd,
                        unsigned long arg);
 
+       /* Handle 32bit compat ioctl (optional) */
+       int (*fb_compat_ioctl_v2)(struct fb_info *info, unsigned cmd,
+                       unsigned long arg, struct file *file);
+
        /* perform fb specific mmap */
        int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma);
 
@@ -460,17 +468,8 @@ struct fb_info {
        struct fb_cmap cmap;            /* Current cmap */
        struct list_head modelist;      /* mode list */
        struct fb_videomode *mode;      /* current mode */
+       struct file *file;              /* current file node */
 
-#ifdef CONFIG_FB_BACKLIGHT
-       /* assigned backlight device */
-       /* set before framebuffer registration, 
-          remove after unregister */
-       struct backlight_device *bl_dev;
-
-       /* Backlight level curve */
-       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;