Bug 1116812 - Blacklist two intel GPUs that are trigger driver crashe…

…s frequently. r=jrmuizel
iaxat · Mar 25, 2015 · b7fe284 · b7fe284
1 parent 7fb0f71
commit b7fe284
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/widget/GfxDriverInfo.cpp b/widget/GfxDriverInfo.cpp
@@ -247,6 +247,10 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id)
       APPEND_DEVICE(0x0df6);
       APPEND_DEVICE(0x0df7);
       break;
+    case Bug1116812:
+      APPEND_DEVICE(0x2e32);
+      APPEND_DEVICE(0x2a02);
+      break;
     case AMDRadeonHD5800:
       APPEND_DEVICE(0x6899);
       break;

diff --git a/widget/GfxDriverInfo.h b/widget/GfxDriverInfo.h
@@ -87,6 +87,7 @@ enum DeviceFamily {
   Nvidia310M,
   AMDRadeonHD5800,
   Bug1137716,
+  Bug1116812,
   DeviceFamilyMax
 };
 

diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
@@ -1050,6 +1050,14 @@ GfxInfo::GetGfxDriverInfo()
       nsIGfxInfo::FEATURE_DIRECT2D, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
       DRIVER_LESS_THAN_OR_EQUAL, V(8,15,10,2302) );
 
+    /* Disable D3D11 layers on Intel G41 express graphics and Intel GM965, Intel X3100, for causing device resets.
+     * See bug 1116812.
+     */
+    APPEND_TO_DRIVER_BLOCKLIST2(DRIVER_OS_ALL,
+        (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorIntel), (GfxDeviceFamily*) GfxDriverInfo::GetDeviceFamily(Bug1116812),
+      nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
+      DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions );
+
     /* Disable D2D on AMD Catalyst 14.4 until 14.6
      * See bug 984488
      */