Merge drm/drm-fixes into drm-misc-fixes

[platform/kernel/linux-rpi.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 05e40fc..02d09cb 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -216,7 +216,6 @@ struct fb_deferred_io {
        struct mutex lock; /* mutex that protects the pageref list */
        struct list_head pagereflist; /* list of pagerefs for touched pages */
        /* callback */
-       void (*first_io)(struct fb_info *info);
        void (*deferred_io)(struct fb_info *info, struct list_head *pagelist);
 };
 #endif
@@ -424,8 +423,6 @@ struct fb_tile_ops {
  */
 #define FBINFO_MISC_ALWAYS_SETPAR   0x40000
 
-/* where the fb is a firmware driver, and can be replaced with a proper one */
-#define FBINFO_MISC_FIRMWARE        0x80000
 /*
  * Host and GPU endianness differ.
  */
@@ -500,30 +497,10 @@ struct fb_info {
        void *fbcon_par;                /* fbcon use-only private area */
        /* From here on everything is device dependent */
        void *par;
-       /* we need the PCI or similar aperture base/size not
-          smem_start/size as smem_start may just be an object
-          allocated inside the aperture so may not actually overlap */
-       struct apertures_struct {
-               unsigned int count;
-               struct aperture {
-                       resource_size_t base;
-                       resource_size_t size;
-               } ranges[0];
-       } *apertures;
 
        bool skip_vt_switch; /* no VT switch on suspend/resume required */
 };
 
-static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
-       struct apertures_struct *a;
-
-       a = kzalloc(struct_size(a, ranges, max_num), GFP_KERNEL);
-       if (!a)
-               return NULL;
-       a->count = max_num;
-       return a;
-}
-
 #define FBINFO_FLAG_DEFAULT    FBINFO_DEFAULT
 
 /* This will go away