Bug 595364 - blacklist some intel cards for D2D - r=bjacob, a=blocking-beta7
authorBenoit Jacob <bjacob@mozilla.com>
Tue, 28 Sep 2010 22:24:59 -0700
changeset 54704 b07c0925efe5
parent 54703 f94f0477848e
child 54705 8cd9614fdddf
push id16008
push userbjacob@mozilla.com
push date2010-09-28 22:38 +0000
treeherdermozilla-central@b07c0925efe5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob, blocking-beta7
bugs595364
milestone2.0b7pre
Bug 595364 - blacklist some intel cards for D2D - r=bjacob, a=blocking-beta7
widget/src/windows/GfxInfo.cpp
--- a/widget/src/windows/GfxInfo.cpp
+++ b/widget/src/windows/GfxInfo.cpp
@@ -440,25 +440,24 @@ static const PRUint32 deviceFamilyIntelG
     0x2A02, /* IntelGL960_1 */
     0x2A03, /* IntelGL960_2 */
     0x2A12, /* IntelGM965_1 */
     0x2A13, /* IntelGM965_2 */
     0
 };
 
 // see bug 595364 comment 10
-// We have Direct2D crashes with these Intel GMA X3000 cards. They seem to constitute the first
-// generation of DX10 cards.
-static const PRUint32 deviceFamilyIntelGMAX3000BlockDirect2D[] = {
+static const PRUint32 deviceFamilyIntelBlockDirect2D[] = {
     0x2982, /* IntelG35_1 */
     0x2983, /* IntelG35_2 */
     0x2A02, /* IntelGL960_1 */
     0x2A03, /* IntelGL960_2 */
     0x2A12, /* IntelGM965_1 */
-    0x2A13  /* IntelGM965_2 */
+    0x2A13, /* IntelGM965_2 */
+    0
 };
 
 static const PRUint32 deviceFamilyIntelGMAX4500HD[] = {
     0x2A42, /* IntelGMA4500MHD_1 */
     0x2A43, /* IntelGMA4500MHD_2 */
     0x2E42, /* IntelB43_1 */
     0x2E43, /* IntelB43_2 */
     0x2E92, /* IntelB43_3 */
@@ -490,17 +489,17 @@ static const GfxDriverInfo driverInfo[] 
   /*
    * Intel entries
    */
 
   /*
    * Implement special Direct2D blocklist from bug 595364
    */
   { allWindowsVersions,
-    vendorIntel, deviceFamilyIntelGMAX3000BlockDirect2D,
+    vendorIntel, deviceFamilyIntelBlockDirect2D,
     nsIGfxInfo::FEATURE_DIRECT2D, nsIGfxInfo::FEATURE_BLOCKED,
     DRIVER_LESS_THAN, allDriverVersions },
 
   /* implement the blocklist from bug 594877
    * Block all features on any drivers before this, as there's a crash when a MS Hotfix is installed.
    * The crash itself is Direct2D-related, but for safety we block all features.
    */
 #define IMPLEMENT_INTEL_DRIVER_BLOCKLIST(winVer, devFamily, driverVer) \
@@ -516,24 +515,24 @@ static const GfxDriverInfo driverInfo[] 
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsXP, deviceFamilyIntelGMAX3000, V(6,14,10,5218))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsXP, deviceFamilyIntelGMAX4500HD, V(6,14,10,5284))
 
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMA500,   V(7,14,10,1006))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMA900,   allDriverVersions)
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMA950,   V(7,14,10,1504))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMA3150,  V(7,14,10,2124))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMAX3000, V(7,15,10,1666))
-  IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMAX4500HD, V(8,15,10,2182))
+  IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindowsVista, deviceFamilyIntelGMAX4500HD, V(8,15,10,2202))
 
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMA500,   V(5,0,0,2026))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMA900,   allDriverVersions)
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMA950,   V(8,15,10,1930))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMA3150,  V(8,14,10,2117))
   IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMAX3000, V(8,15,10,1930))
-  IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMAX4500HD, V(8,15,10,2182))
+  IMPLEMENT_INTEL_DRIVER_BLOCKLIST(gfxWindowsPlatform::kWindows7, deviceFamilyIntelGMAX4500HD, V(8,15,10,2202))
 
   /* OpenGL on any Intel hardware is not suggested */
   { allWindowsVersions,
     vendorIntel, allDevices,
     nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_NOT_SUGGESTED,
     DRIVER_LESS_THAN, allDriverVersions },
   { allWindowsVersions,
     vendorIntel, allDevices,