Add logic to detect AMD linux driver version for both Brahma/Catalyst drivers.

gpu/config/gpu_info_collector_linux.cc

 // Copyright 2014 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 "gpu/config/gpu_info_collector_linux.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 28 matching lines @@
 // This checks if a system supports PCI bus.
 // We check the existence of /sys/bus/pci or /sys/bug/pci_express.
 bool IsPciSupported() {
   const base::FilePath pci_path("/sys/bus/pci/");
   const base::FilePath pcie_path("/sys/bus/pci_express/");
   return (base::PathExists(pci_path) ||
           base::PathExists(pcie_path));
 }
 #endif  // defined(USE_LIBPCI)
 
-// Scan /etc/ati/amdpcsdb.default for "ReleaseVersion".
+// Scan /sys/module/amdgpu/version.
 // Return empty string on failing.
-std::string CollectDriverVersionATI() {
-  const base::FilePath::CharType kATIFileName[] =
-      FILE_PATH_LITERAL("/etc/ati/amdpcsdb.default");
-  base::FilePath ati_file_path(kATIFileName);
+std::string CollectDriverVersionAMDBrahma() {
+  const base::FilePath ati_file_path("/sys/module/amdgpu/version");
   if (!base::PathExists(ati_file_path))
     return std::string();
   std::string contents;
+  if (!base::ReadFileToString(ati_file_path, &contents))
+    return std::string();
+  size_t begin = contents.find_first_of("0123456789");
+  if (begin != std::string::npos) {
+    size_t end = contents.find_first_not_of("0123456789.", begin);
+    if (end == std::string::npos)
+      return contents.substr(begin);
+    else
+      return contents.substr(begin, end - begin);
+  }
+  return std::string();
+}
+
+// Scan /etc/ati/amdpcsdb.default for "ReleaseVersion".
+// Return empty string on failing.
+std::string CollectDriverVersionAMDCatalyst() {
+  const base::FilePath ati_file_path("/etc/ati/amdpcsdb.default");
+  if (!base::PathExists(ati_file_path))
+    return std::string();
+  std::string contents;
   if (!base::ReadFileToString(ati_file_path, &contents))
     return std::string();
   base::StringTokenizer t(contents, "\r\n");
   while (t.GetNext()) {
     std::string line = t.token();
     if (base::StartsWith(line, "ReleaseVersion=",
                          base::CompareCase::SENSITIVE)) {
       size_t begin = line.find_first_of("0123456789");
       if (begin != std::string::npos) {
         size_t end = line.find_first_not_of("0123456789.", begin);
@@ skipping 134 matching lines @@
 }
 
 CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   CollectInfoResult result = CollectPCIVideoCardInfo(gpu_info);
 
   std::string driver_version;
   switch (gpu_info->gpu.vendor_id) {
     case kVendorIDAMD:
-      driver_version = CollectDriverVersionATI();
+      driver_version = CollectDriverVersionAMDBrahma();
       if (!driver_version.empty()) {
-        gpu_info->driver_vendor = "ATI / AMD";
+        gpu_info->driver_vendor = "ATI / AMD (Brahma)";
         gpu_info->driver_version = driver_version;
+      } else {
+        driver_version = CollectDriverVersionAMDCatalyst();
+        if (!driver_version.empty()) {
+          gpu_info->driver_vendor = "ATI / AMD (Catalyst)";
+          gpu_info->driver_version = driver_version;
+        }
       }
       break;
     case kVendorIDNVidia:
       driver_version = CollectDriverVersionNVidia();
       if (!driver_version.empty()) {
         gpu_info->driver_vendor = "NVIDIA";
         gpu_info->driver_version = driver_version;
       }
       break;
     case kVendorIDIntel:
@@ skipping 59 matching lines @@
   gpu_info->driver_version = driver_version;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu