[1/2] i915: Remove 'pipe A force' quirk for 855GM and 845G

Commit Message

Ben Hutchings March 20, 2011, 11:07 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3106c0d..a490f75 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7345,19 +7345,34 @@  struct intel_quirk intel_quirks[] = {
 
 	/* Thinkpad R31 needs pipe A force quirk */
 	{ 0x3577, 0x1014, 0x0505, quirk_pipea_force },
+	/* Dell Latitude D400 needs pipe A force quirk (LP: #228519) */
+	{ 0x3582, 0x1028, 0x0139, quirk_pipea_force },
+	/* Dell Latitude D500 needs pipe A force quirk */
+	{ 0x3582, 0x1028, 0x0152, quirk_pipea_force },
+	/* Dell Latitude D505 needs pipe A force quirk (LP: #235643) */
+	{ 0x3582, 0x1028, 0x0163, quirk_pipea_force },
+	/* Dell Latitude X300 needs pipe A force quirk */
+	{ 0x3582, 0x1028, 0x014f, quirk_pipea_force },
+	/* Dell Inspiron 510m needs pipe A force quirk */
+	{ 0x3582, 0x1028, 0x0164, quirk_pipea_force },
+	/* Toshiba Satellite A30 needs pipe A force quirk */
+	{ 0x3582, 0x1179, 0xff00, quirk_pipea_force },
 	/* Toshiba Protege R-205, S-209 needs pipe A force quirk */
 	{ 0x2592, 0x1179, 0x0001, quirk_pipea_force },
+	/* Intel 855GM hardware (See LP: #216490) */
+	{ 0x3582, 0x1028, 0x00c8, quirk_pipea_force },
+	/* Intel 855GM hardware (See Novell Bugzilla #406123) */
+	{ 0x3582, 0x10cf, 0x1215, quirk_pipea_force },
+	/* HP Pavilion ze4944ea needs pipe A force quirk (See LP: #242389) */
+	{ 0x3582, 0x103c, 0x3084, quirk_pipea_force },
 
 	/* ThinkPad X30 needs pipe A force quirk (LP: #304614) */
 	{ 0x3577,  0x1014, 0x0513, quirk_pipea_force },
 	/* ThinkPad X40 needs pipe A force quirk */
+	{ 0x3582, 0x1014, 0x0557, quirk_pipea_force },
 
 	/* ThinkPad T60 needs pipe A force quirk (bug #16494) */
 	{ 0x2782, 0x17aa, 0x201a, quirk_pipea_force },
-
-	/* 855 & before need to leave pipe A & dpll A up */
-	{ 0x3582, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
-	{ 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
 };
 
 static void intel_init_quirks(struct drm_device *dev)