Figure out whether we have enough information to make the final GPU blacklisting decision.

content/gpu/gpu_main.cc

 // Copyright (c) 2012 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 <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 30 matching lines @@
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "content/public/common/sandbox_init.h"
 #endif
 
 namespace {
 void WarmUpSandbox(const content::GPUInfo&, bool);
-#if defined(OS_LINUX)
-void CollectGraphicsInfo(content::GPUInfo*);
-#endif
 }
 
 // Main function for starting the Gpu process.
 int GpuMain(const content::MainFunctionParams& parameters) {
   TRACE_EVENT0("gpu", "GpuMain");
 
   base::Time start_time = base::Time::Now();
 
   const CommandLine& command_line = parameters.command_line;
   if (command_line.HasSwitch(switches::kGpuStartupDialog)) {
@@ skipping 51 matching lines @@
   gpu_info.driver_vendor =
       command_line.GetSwitchValueASCII(switches::kGpuDriverVendor);
   gpu_info.driver_version =
       command_line.GetSwitchValueASCII(switches::kGpuDriverVersion);
   content::GetContentClient()->SetGpuInfo(gpu_info);
 
   // We need to track that information for the WarmUpSandbox function.
   bool initialized_gl_context = false;
   // Load and initialize the GL implementation and locate the GL entry points.
   if (gfx::GLSurface::InitializeOneOff()) {
-#if defined(OS_LINUX)
-    // We collect full GPU info on demand in Win/Mac, i.e., when about:gpu
-    // page opens.  This is because we can make blacklist decisions based on
-    // preliminary GPU info.
-    // However, on Linux, we may not have enough info for blacklisting.
-    if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id ||
-        gpu_info.driver_vendor.empty() || gpu_info.driver_version.empty()) {
-      CollectGraphicsInfo(&gpu_info);
+    if (!command_line.HasSwitch(switches::kSkipGpuFullInfoCollection)) {
+      if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info))
+        VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
+      content::GetContentClient()->SetGpuInfo(gpu_info);
+
       // We know that CollectGraphicsInfo will initialize a GLContext.
       initialized_gl_context = true;

[Ken Russell (switch to Gerrit), 2012/10/09 18:52:55]

Now CollectGraphicsInfo might have failed above, so is it correct to always set
this to true?

[Zhenyao Mo, 2012/10/09 19:20:47]

For this we need to evaluate the effects of this variable
initialized_gl_context, however, this CL does not change the behavior (before
it's also possible to fail, only it's on Linux only; now it's for all
platforms).  I'll try to clean this up in a separate CL.

     }
 
 #if !defined(OS_CHROMEOS)
     if (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA
         gpu_info.driver_vendor == "NVIDIA") {
       base::ThreadRestrictions::AssertIOAllowed();
       if (access("/dev/nvidiactl", R_OK) != 0) {
         VLOG(1) << "NVIDIA device file /dev/nvidiactl access denied";
         gpu_info.gpu_accessible = false;
         dead_on_arrival = true;
       }
     }
 #endif  // OS_CHROMEOS
-#endif  // OS_LINUX
   } else {
     VLOG(1) << "gfx::GLSurface::InitializeOneOff failed";
     gpu_info.gpu_accessible = false;
     gpu_info.finalized = true;
     dead_on_arrival = true;
   }
 
   {
     const bool should_initialize_gl_context = !initialized_gl_context &&
                                               !dead_on_arrival;
@@ skipping 147 matching lines @@
   }
 
   {
     TRACE_EVENT0("gpu", "Initialize DXVA");
     // Initialize H/W video decoding stuff which fails in the sandbox.
     DXVAVideoDecodeAccelerator::PreSandboxInitialization();
   }
 #endif
 }
 
-#if defined(OS_LINUX)
-void CollectGraphicsInfo(content::GPUInfo* gpu_info) {
-  if (!gpu_info_collector::CollectGraphicsInfo(gpu_info))
-    VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
-  content::GetContentClient()->SetGpuInfo(*gpu_info);
-}
-#endif
-
 }  // namespace.