Do not lose secondary gpus and make sure to have an active gpu on multiple gpu configurations

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 512 matching lines @@
         command_line->HasSwitch(switches::kGpuTestingDeviceId)) {
       base::HexStringToUInt(
           command_line->GetSwitchValueASCII(switches::kGpuTestingVendorId),
           &gpu_info.gpu.vendor_id);
       base::HexStringToUInt(
           command_line->GetSwitchValueASCII(switches::kGpuTestingDeviceId),
           &gpu_info.gpu.device_id);
       gpu_info.gpu.active = true;
       gpu_info.secondary_gpus.clear();
     }
+
+    if (command_line->HasSwitch(switches::kGpuTestingSecondaryVendorId) &&
+        command_line->HasSwitch(switches::kGpuTestingSecondaryDeviceId)) {
+      gpu_info.gpu.active = false;
+
+      gpu::GPUInfo::GPUDevice secondary_device;
+      secondary_device.active = false;
+      base::HexStringToUInt(command_line->GetSwitchValueASCII(
+                                switches::kGpuTestingSecondaryVendorId),
+                            &secondary_device.vendor_id);
+      base::HexStringToUInt(command_line->GetSwitchValueASCII(
+                                switches::kGpuTestingSecondaryDeviceId),
+                            &secondary_device.device_id);
+      gpu_info.secondary_gpus.push_back(secondary_device);
+    }
   }
 #if defined(ARCH_CPU_X86_FAMILY)
   if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) {
     gpu_info.context_info_state = gpu::kCollectInfoNonFatalFailure;
 #if defined(OS_WIN)
     gpu_info.dx_diagnostics_info_state = gpu::kCollectInfoNonFatalFailure;
 #endif  // OS_WIN
   }
 #endif  // ARCH_CPU_X86_FAMILY
 
@@ skipping 69 matching lines @@
 
 void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
   // No further update of gpu_info if falling back to SwiftShader.
   if (use_swiftshader_)
     return;
 
   bool was_info_available = IsCompleteGpuInfoAvailable();
   gpu::MergeGPUInfo(&gpu_info_, gpu_info);
   if (IsCompleteGpuInfoAvailable()) {
     complete_gpu_info_already_requested_ = true;
+#if !defined(OS_MACOSX)
+    // Skip osx because gpu identification is done with DisplayReconfigCallback.
+    gpu::IdentifyActiveGPU(&gpu_info_);
+#endif
   } else if (was_info_available) {
     // Allow future requests to go through properly.
     complete_gpu_info_already_requested_ = false;
   }
 
   UpdateGpuInfoHelper();
 }
 
 void GpuDataManagerImplPrivate::UpdateVideoMemoryUsageStats(
     const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
@@ skipping 72 matching lines @@
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
       !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
     command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
   }
 #endif
 
   // Pass GPU and driver information to GPU process. We try to avoid full GPU
   // info collection at GPU process startup, but we need gpu vendor_id,
   // device_id, driver_vendor, driver_version for deciding whether we need to
   // collect full info (on Linux) and for crash reporting purpose.
+  // TODO(j.isorce): http://crbug.com/547025 Passes secondary_gpus as well
+  // otherwise the GPU process might enable gpu driver bug workarounds for
+  // inactive gpus on multiple gpu configuration.
   command_line->AppendSwitchASCII(switches::kGpuVendorID,
       base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id));
   command_line->AppendSwitchASCII(switches::kGpuDeviceID,
       base::StringPrintf("0x%04x", gpu_info_.gpu.device_id));
   command_line->AppendSwitchASCII(switches::kGpuDriverVendor,
       gpu_info_.driver_vendor);
   command_line->AppendSwitchASCII(switches::kGpuDriverVersion,
       gpu_info_.driver_version);
 }
 
@@ skipping 473 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content