Merge 131225 - Disable image transport surface on AMD's dynamic switchable graphics.

content/browser/gpu/gpu_data_manager_impl.cc

Index: content/browser/gpu/gpu_data_manager_impl.cc
===================================================================
--- content/browser/gpu/gpu_data_manager_impl.cc	(revision 131659)
+++ content/browser/gpu/gpu_data_manager_impl.cc	(working copy)
@@ -239,6 +239,12 @@
     base::AutoLock auto_lock(gpu_info_lock_);
     if (gpu_info_.optimus)
       command_line->AppendSwitch(switches::kReduceGpuSandbox);
+    if (gpu_info_.amd_switchable) {
+      // The image transport surface currently doesn't work with AMD Dynamic
+      // Switchable graphics.
+      command_line->AppendSwitch(switches::kReduceGpuSandbox);
+      command_line->AppendSwitch(switches::kDisableImageTransportSurface);
+    }
   }
 }
 
@@ -340,6 +346,7 @@
     object->finalized = other.finalized;
     object->initialization_time = other.initialization_time;
     object->optimus |= other.optimus;
+    object->amd_switchable |= other.amd_switchable;
 
     if (object->driver_vendor.empty()) {
       changed |= object->driver_vendor != other.driver_vendor;