Nouveau doesn't dedicated data, so just the Chipset line is parsed.

1 files changed, 68 insertions, 32 deletions

diff --git a/data/lib/rhbzpage.js b/data/lib/rhbzpage.js
index 026e7ac..8d52174 100644
--- a/data/lib/rhbzpage.js
+++ b/data/lib/rhbzpage.js
@@ -19,16 +19,30 @@ var RawhideColor = new Color(0, 119, 0); // or "green", or RGB 0, 119, 0, or
 // 120, 0, 23
 var RHITColor = new Color(102, 0, 102); // RGB 102, 0, 102; HSL 300, 0, 20
 
+// [   126.386] (--) NOUVEAU(0): Chipset: "NVIDIA NVaf"
 var logAnalyzeLogic = {
     "AnalyzeInterestingLine": {
-        "re": "^\\[[ .0-9]+\\]\\s*\\(--\\) PCI:\\*\\([0-9:]+\\)\\s*" +
-            "([0-9a-f:]+).*$",
-        "func": chipsetMagic
+    /*
+    [   126.378] (--) PCI:*(0:4:0:0) 10de:08a0:106b:00c2 rev 162, Mem @ 0xd2000000/16777216, \
+    0xc0000000/268435456, 0xd0000000/33554432, I/O @ 0x00001000/128, BIOS @ 0x????????/131072
+    */
+        re: [
+            "^\\[[ .0-9]+\\]\\s*\\(--\\) PCI:\\*\\([0-9:]+\\)\\s*" +
+                "([0-9a-f:]+).*$",
+            "^\\s*\\[?[ 0-9.]*\\]?\\s*\\(--\\) "+
+                "([A-Za-z]+)\\([0-9]?\\): Chipset: (.*)$",
+              ],
+        func: chipsetMagic
     },
+    /*
+    [   126.385] (WW) Falling back to old probe method for vesa
+    [   126.385] (WW) Falling back to old probe method for fbdev
+    [   126.386] (--) NOUVEAU(0): Chipset: "NVIDIA NVaf"
+    Backtrace:
+    */
     "AnalyzeXorgLogBacktrace": {
-        "re": "^\\s*(\\[[0-9 .]*\\])?\\s*(\\((EE|WW)\\)|.*"+
-            " [cC]hipsets?: )|\\s*Backtrace",
-        "func": analyzeXorg
+        re: "^\\s*(\\[[0-9 .]*\\])?\\s*(\\((EE|WW)\\)|.* [cC]hipset:.*)|\\s*Backtrace",
+        func: analyzeXorg
     }
 };
 
@@ -540,25 +554,33 @@ function addCheckXorgLogLink(attList) {
  * Given line to be parsed, find out which chipset it is and fill in the
  * whiteboard
  *
- * @param iLine String with the whole unparsed "interesting line"
+ * @param PCIidArrObj object with two fields
+ *        id Array manufacturer-ID and product-ID (PCI IDs)
+ *        chipsetLine RE
  * @param driverStr String with the driver name
  * @return None
  */
-function fillInWhiteBoard(PCIidArr) {
+function fillInWhiteBoard(PCIidArrObj) {
     var outStr = "";
     var cardIDStr = "";
     var cardIDArr = [];
     var cardName = "";
-    var PCIid = (PCIidArr[0] + "," + PCIidArr[1]).toUpperCase();
+    var PCIid = (PCIidArrObj.id[0] + "," + PCIidArrObj.id[1]).toUpperCase();
 
-    try {
-        cardName = constantData.chipNames[PCIid][0];
-    } catch (e if e instanceof TypeError)  {
-        alert("PCI ID " + PCIid + " is not known!");
-        return ; // early termination
-    } catch (e) {
-        throw e;
+    if (PCIidArrObj.id[0].toLowerCase() == "10de") {
+        cardName = PCIidArrObj.chipsetLine[2].replace(/\s*nvidia\s*/ig,"").
+            replace('"','','g');
+    } else {
+        try {
+            cardName = constantData.chipNames[PCIid][0];
+        } catch (e if e instanceof TypeError)  {
+            alert("PCI ID " + PCIid + " is not known!");
+            return ; // early termination
+        } catch (e) {
+            throw e;
+        }
     }
+
     clickMouse("editme_action");
     var titleElem = document.getElementById('short_desc');
     titleElem.value = '[' + cardName + ']\u00A0' + titleElem.value;
@@ -579,14 +601,16 @@ function fillInChipMagic(XlogID) {
 
 function chipsetMagic (interestingLineArr) {
     // parse Xorg.0.log
-    var RE = new RegExp(logAnalyzeLogic['AnalyzeInterestingLine'].re);
     if (interestingLineArr.length >0) {
-        var interestingArray = RE.exec(interestingLineArr[0]);
+        var interestingArray = interestingLineArr[0];
         if (interestingArray.length > 1) {
             var interestingPCIID = interestingArray[1].trim().split(":");
             createNewButton("short_desc_nonedit_display", false, {
                 "name": "Fill In",
-                "chipMagic": interestingPCIID,
+                "chipMagic": {
+                    "id": interestingPCIID,
+                    "chipsetLine": interestingLineArr[1]
+                },
             });
         }
     }
@@ -594,21 +618,20 @@ function chipsetMagic (interestingLineArr) {
 
 function analyzeXorg(results) {
     var innerString = "";
-    results = removeDuplicates(results);
-    // Remove headers
-    if (results.length >= 1) {
-        results.splice(0, 1);
-    }
+
     if (results.length > 0) {
-        results.forEach(function(l) {
-            innerString += l + "<br>\n";
+        results.splice(0, 1); // remove headers
+        results.sort();
+
+        results.forEach(function(lRE) {
+            innerString += lRE.input + "<br>\n";
         });
-        // Add a summary
         innerString += "----------<br>\n" +
             results.length + " interesting lines found.";
     } else {
         innerString += "No matching lines found!";
     }
+
     postMessage(new Message("OpenStringInPanel",
         '<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">' +
         "<html><head><title>Xorg.0.log analysis</title></head><body><pre>\n" +
@@ -624,11 +647,24 @@ function analyzeXorgLog(attachID, backMsg) {
 }
 
 function findInterestingLine(wholeLog, backMsg) {
-    var RE = new RegExp(logAnalyzeLogic[backMsg].re);
-    var results = wholeLog.split("\n").
-        filter(function(line) {
-            return (RE.test(line));
-    });
+    var REstr = logAnalyzeLogic[backMsg].re;
+    var REarr = [];
+    if (typeof REstr == "string") {
+        REarr = [new RegExp(REstr)];
+    } else if (Array.isArray(REstr)) {
+        REarr = REstr.map(function (reone) {
+            return new RegExp(reone);
+        });
+    }
+    var results = [];
+    wholeLog.split("\n").
+        forEach(function(line) {
+            REarr.forEach(function (re, reIdx) {
+                if (re.test(line)) {
+                    results.push(re.exec(line));
+                }
+            });
+        });
     logAnalyzeLogic[backMsg].func(results);
 }