efifb/imacfb consolidation + hardware support

Remove imacfb entirely, merging its DMI table into the (otherwise very
similar) efifb driver.  This also adds hardware support for many of the
newer Intel Apple hardware.  This has been fairly well tested; we've been
shipping it in Fedora for some time.

Signed-off-by: Peter Jones <pjones@redhat.com>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Jaya Kumar <jayakumar.lkml@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 184 insertions, 399 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e63e5648e0a6..3b296e410f91 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -689,23 +689,14 @@ config FB_VESA
 
 config FB_EFI
         bool "EFI-based Framebuffer Support"
-        depends on (FB = y) && X86
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        help
-          This is the EFI frame buffer device driver. If the firmware on
-          your platform is UEFI2.0, select Y to add support for
-          Graphics Output Protocol for early console messages to appear.
-
-config FB_IMAC
-        bool "Intel-based Macintosh Framebuffer Support"
         depends on (FB = y) && X86 && EFI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
-          This is the frame buffer device driver for the Intel-based Macintosh
+          This is the EFI frame buffer device driver. If the firmware on
+          your platform is EFI 1.10 or UEFI 2.0, select Y to add support for
+          using the EFI framebuffer as your console.
 
 config FB_N411
        tristate "N411 Apollo/Hecuba devkit support"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index dcae8d402fb2..2bc94d8eb3c8 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -125,7 +125,6 @@ obj-$(CONFIG_FB_CARMINE)          += carminefb.o
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
 obj-$(CONFIG_FB_VESA)             += vesafb.o
-obj-$(CONFIG_FB_IMAC)             += imacfb.o
 obj-$(CONFIG_FB_EFI)              += efifb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index bd779ae44b1e..daf9b81878a4 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -12,6 +12,7 @@
 #include <linux/fb.h>
 #include <linux/platform_device.h>
 #include <linux/screen_info.h>
+#include <linux/dmi.h>
 
 #include <video/vga.h>
 
@@ -33,6 +34,105 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {
         .visual                 = FB_VISUAL_TRUECOLOR,
 };
 
+enum {
+        M_I17,          /* 17-Inch iMac */
+        M_I20,          /* 20-Inch iMac */
+        M_I20_SR,       /* 20-Inch iMac (Santa Rosa) */
+        M_I24,          /* 24-Inch iMac */
+        M_MINI,         /* Mac Mini */
+        M_MB,           /* MacBook */
+        M_MB_2,         /* MacBook, 2nd rev. */
+        M_MB_3,         /* MacBook, 3rd rev. */
+        M_MB_SR,        /* MacBook, 2nd gen, (Santa Rosa) */
+        M_MBA,          /* MacBook Air */
+        M_MBP,          /* MacBook Pro */
+        M_MBP_2,        /* MacBook Pro 2nd gen */
+        M_MBP_SR,       /* MacBook Pro (Santa Rosa) */
+        M_MBP_4,        /* MacBook Pro, 4th gen */
+        M_UNKNOWN       /* placeholder */
+};
+
+static struct efifb_dmi_info {
+        char *optname;
+        unsigned long base;
+        int stride;
+        int width;
+        int height;
+} dmi_list[] = {
+        [M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900 },
+        [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
+        [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
+        [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
+        [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
+        [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
+        [M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
+        [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
+        [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
+        [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
+        [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
+        [M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
+};
+
+static int set_system(const struct dmi_system_id *id);
+
+#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)               \
+        { set_system, name, {                                   \
+                DMI_MATCH(DMI_BIOS_VENDOR, vendor),             \
+                DMI_MATCH(DMI_PRODUCT_NAME, name) },            \
+          &dmi_list[enumid] }
+
+static struct dmi_system_id __initdata dmi_system_table[] = {
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
+        {},
+};
+
+static int set_system(const struct dmi_system_id *id)
+{
+        struct efifb_dmi_info *info = id->driver_data;
+        if (info->base == 0)
+                return -ENODEV;
+
+        printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+                         "(%dx%d, stride %d)\n", id->ident,
+                         (void *)info->base, info->width, info->height,
+                         info->stride);
+
+        /* Trust the bootloader over the DMI tables */
+        if (screen_info.lfb_base == 0)
+                screen_info.lfb_base = info->base;
+        if (screen_info.lfb_linelength == 0)
+                screen_info.lfb_linelength = info->stride;
+        if (screen_info.lfb_width == 0)
+                screen_info.lfb_width = info->width;
+        if (screen_info.lfb_height == 0)
+                screen_info.lfb_height = info->height;
+
+        return 0;
+}
+
 static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
                            struct fb_info *info)
@@ -67,6 +167,38 @@ static struct fb_ops efifb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
+static int __init efifb_setup(char *options)
+{
+        char *this_opt;
+        int i;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt) continue;
+
+                for (i = 0; i < M_UNKNOWN; i++) {
+                        if (!strcmp(this_opt, dmi_list[i].optname) &&
+                                        dmi_list[i].base != 0) {
+                                screen_info.lfb_base = dmi_list[i].base;
+                                screen_info.lfb_linelength = dmi_list[i].stride;
+                                screen_info.lfb_width = dmi_list[i].width;
+                                screen_info.lfb_height = dmi_li