Merge 195349 "Reland "gpu: Fix Vivante's "hisilicon" GPUs""

content/gpu/gpu_info_collector_android.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 "content/gpu/gpu_info_collector.h"
 
 #include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 56 matching lines @@
   // Create a short-lived context on the UI thread to collect the GL strings.
   if (!CollectGraphicsInfoGL(gpu_info))
     return false;
 
   std::string vendor(StringToLowerASCII(gpu_info->gl_vendor));
   std::string renderer(StringToLowerASCII(gpu_info->gl_renderer));
   bool is_img = vendor.find("imagination") != std::string::npos;
   bool is_arm = vendor.find("arm") != std::string::npos;
   bool is_qualcomm = vendor.find("qualcomm") != std::string::npos;
   bool is_mali_t604 = is_arm && renderer.find("mali-t604") != std::string::npos;
+  bool is_hisilicon = vendor.find("hisilicon") != std::string::npos;
 
   base::android::BuildInfo* build_info =
       base::android::BuildInfo::GetInstance();
   std::string model = build_info->model();
   model = StringToLowerASCII(model);
   bool is_nexus7 = model.find("nexus 7") != std::string::npos;
   bool is_nexus10 = model.find("nexus 10") != std::string::npos;
 
   // Virtual contexts crash when switching surfaces, but only on SDK 16,
   // so we us full context switching for now. If virtual contexts can
   // avoid some of it's extra surface switches, or Qualcomm gives us
   // a more directed work-around, we can remove this.
   int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int();
 
   // IMG: avoid context switching perf problems, crashes with share groups
   // Mali-T604: http://crbug.com/154715
   // QualComm, NVIDIA: Crashes with share groups
-  if (is_img || is_mali_t604 || is_nexus7 || (is_qualcomm && sdk_int != 16)) {
+  if (is_hisilicon || is_img || is_mali_t604 || is_nexus7
+      || (is_qualcomm && sdk_int != 16)) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableVirtualGLContexts);
   }
 
   gfx::DeviceDisplayInfo info;
   int default_tile_size = 256;
 
   // For very high resolution displays (eg. Nexus 10), set the default
   // tile size to be 512. This should be removed in favour of a generic
   // hueristic that works across all platforms and devices, once that
@@ skipping 42 matching lines @@
       gpu_info->gl_version_string);
   return true;
 }
 
 void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
                   const content::GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu_info_collector