From 45f1c7b8eb9dc70b476b050a9e319d45061c9ae8 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Fri, 13 Apr 2018 14:06:52 +0200 Subject: [PATCH] Bug 1447141: Blacklist all acceleration on a small subset of AMD device/driver combinations that show up in content crashes. r=milan MozReview-Commit-ID: FTBPGRTdmUG --- widget/GfxDriverInfo.cpp | 8 ++++++++ widget/GfxDriverInfo.h | 1 + widget/windows/GfxInfo.cpp | 11 +++++++++++ 3 files changed, 20 insertions(+) diff --git a/widget/GfxDriverInfo.cpp b/widget/GfxDriverInfo.cpp index 0233a910f77e..edc0fbed8cfa 100644 --- a/widget/GfxDriverInfo.cpp +++ b/widget/GfxDriverInfo.cpp @@ -306,6 +306,14 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) case Bug1155608: APPEND_DEVICE(0x2e22); /* IntelG45_1 */ break; + case Bug1447141: + APPEND_DEVICE(0x9991); + APPEND_DEVICE(0x9993); + APPEND_DEVICE(0x9996); + APPEND_DEVICE(0x9998); + APPEND_DEVICE(0x9901); + APPEND_DEVICE(0x990b); + break; case Bug1207665: APPEND_DEVICE(0xa001); /* Intel Media Accelerator 3150 */ APPEND_DEVICE(0xa002); diff --git a/widget/GfxDriverInfo.h b/widget/GfxDriverInfo.h index a85724dd7837..a8c4bfa2e2f2 100644 --- a/widget/GfxDriverInfo.h +++ b/widget/GfxDriverInfo.h @@ -98,6 +98,7 @@ enum DeviceFamily { Bug1116812, Bug1155608, Bug1207665, + Bug1447141, DeviceFamilyMax }; diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 4724595865df..b1530c12c5ce 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -1393,6 +1393,17 @@ GfxInfo::GetGfxDriverInfo() nsIGfxInfo::FEATURE_ADVANCED_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_BETWEEN_INCLUSIVE, V(23,21,13,8569), V(23,21,13,9135), "FEATURE_FAILURE_BUG_1419264", "Windows 10"); + + // Bug 1447141, for causing device creation crashes. + APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Windows7, + (nsAString&)GfxDriverInfo::GetDeviceVendor(VendorAMD), (GfxDeviceFamily*)GfxDriverInfo::GetDeviceFamily(Bug1447141), + GfxDriverInfo::allFeatures, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, + DRIVER_EQUAL, V(15, 201, 2201, 0), "FEATURE_FAILURE_BUG_1447141_1"); + APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Windows7, + (nsAString&)GfxDriverInfo::GetDeviceVendor(VendorAMD), (GfxDeviceFamily*)GfxDriverInfo::GetDeviceFamily(Bug1447141), + GfxDriverInfo::allFeatures, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, + DRIVER_EQUAL, V(15, 201, 1701, 0), "FEATURE_FAILURE_BUG_1447141_1"); + } return *mDriverInfo; }