Kyle McMartin 3c5d4d
--- vanilla-2.6.35.3.orig/drivers/video/efifb.c
Kyle McMartin 3c5d4d
+++ vanilla-2.6.35.3/drivers/video/efifb.c
Kyle McMartin 3c5d4d
@@ -39,7 +39,11 @@ enum {
Kyle McMartin 3c5d4d
 	M_I20,		/* 20-Inch iMac */
Kyle McMartin 3c5d4d
 	M_I20_SR,	/* 20-Inch iMac (Santa Rosa) */
Kyle McMartin 3c5d4d
 	M_I24,		/* 24-Inch iMac */
Kyle McMartin 3c5d4d
+	M_I24_8_1,	/* 24-Inch iMac, 8,1th gen */
Kyle McMartin 3c5d4d
+	M_I24_10_1,	/* 24-Inch iMac, 10,1th gen */
Kyle McMartin 3c5d4d
 	M_MINI,		/* Mac Mini */
Kyle McMartin 3c5d4d
+	M_MINI_3_1,	/* Mac Mini, 3,1th gen */
Kyle McMartin 3c5d4d
+	M_MINI_4_1,	/* Mac Mini, 4,1th gen */
Kyle McMartin 3c5d4d
 	M_MB,		/* MacBook */
Kyle McMartin 3c5d4d
 	M_MB_2,		/* MacBook, 2nd rev. */
Kyle McMartin 3c5d4d
 	M_MB_3,		/* MacBook, 3rd rev. */
Kyle McMartin 3c5d4d
@@ -47,6 +51,7 @@ enum {
Kyle McMartin 3c5d4d
 	M_MBA,		/* MacBook Air */
Kyle McMartin 3c5d4d
 	M_MBP,		/* MacBook Pro */
Kyle McMartin 3c5d4d
 	M_MBP_2,	/* MacBook Pro 2nd gen */
Kyle McMartin 3c5d4d
+	M_MBP_2_2,	/* MacBook Pro 2,2nd gen */
Kyle McMartin 3c5d4d
 	M_MBP_SR,	/* MacBook Pro (Santa Rosa) */
Kyle McMartin 3c5d4d
 	M_MBP_4,	/* MacBook Pro, 4th gen */
Kyle McMartin 3c5d4d
 	M_MBP_5_1,    /* MacBook Pro, 5,1th gen */
Kyle McMartin 3c5d4d
@@ -64,11 +69,16 @@ static struct efifb_dmi_info {
Kyle McMartin 3c5d4d
 	[M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
Kyle McMartin 3c5d4d
 	[M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
Kyle McMartin 3c5d4d
 	[M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
Kyle McMartin 3c5d4d
+	[M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200 },
Kyle McMartin 3c5d4d
+	[M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080 },
Kyle McMartin 3c5d4d
 	[M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
Kyle McMartin 3c5d4d
+	[M_MINI_3_1]= { "mini31", 0x40010000, 1024 * 4, 1024, 768 },
Kyle McMartin 3c5d4d
+	[M_MINI_4_1]= { "mini41", 0xc0010000, 2048 * 4, 1920, 1200 },
Kyle McMartin 3c5d4d
 	[M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
Kyle McMartin 3c5d4d
 	[M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
Kyle McMartin 3c5d4d
 	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
Kyle McMartin 3c5d4d
 	[M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
Kyle McMartin 3c5d4d
+	[M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900 },
Kyle McMartin 3c5d4d
 	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
Kyle McMartin 3c5d4d
 	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
Kyle McMartin 3c5d4d
 	[M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 },
Kyle McMartin 3c5d4d
@@ -92,7 +102,11 @@ static struct dmi_system_id __initdata d
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
Kyle McMartin 3c5d4d
+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac8,1", M_I24_8_1),
Kyle McMartin 3c5d4d
+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac10,1", M_I24_10_1),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
Kyle McMartin 3c5d4d
+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini3,1", M_MINI_3_1),
Kyle McMartin 3c5d4d
+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini4,1", M_MINI_4_1),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
Kyle McMartin 3c5d4d
 	/* At least one of these two will be right; maybe both? */
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
Kyle McMartin 3c5d4d
@@ -104,6 +118,7 @@ static struct dmi_system_id __initdata d
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
Kyle McMartin 3c5d4d
+	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,2", M_MBP_2_2),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
Kyle McMartin 3c5d4d
 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),