Merge ~pieq/plainbox-provider-checkbox:1655211-graphics-driver into plainbox-provider-checkbox:master

[Pierre Equoy]

Update graphics_driver script to handle Matrox cards

One of the devices being tested uses a Matrox card. This card is using a kernel mode setting (kms) driver called 'modesetting' to work, but this use case was not handled in our graphics_driver script that displays information about drivers currently in use.

Please note: we still don't take the 'mga' user space driver into account since 'mga' is a legacy driver that is most likely not used anymore (Matrox now focuses on using modesetting).

To test, you can use an Xorg.0.log file from the device such as [1].

Before:

% ./graphics_driver
------------- VIDEO DRIVER INFORMATION -------------
ERROR: No video driver loaded! Possibly in failsafe mode!
(…)

After:

% ./graphics_driver
------------- VIDEO DRIVER INFORMATION -------------
Video Driver: modesetting
Driver Version: 1.18.4
(…)

[1] https://i302900887.restricted.launchpadlibrarian.net/302900887/Xorg.0.log?token=Cbff9BG2NKR2G07LNgG4Nxv5f51pnrGW

[Maciej Kisielewski (kissiel)]

Looks good! +1

// Matrox - I haven't seen that name in a while :D

review: Approve

diff --git a/bin/graphics_driver b/bin/graphics_driver
index e1b6abd..dfb5522 100755
--- a/bin/graphics_driver
+++ b/bin/graphics_driver
@@ -183,11 +183,14 @@ class XorgLog(object):
 
             # EDID and Modelines
             # We use this part to determine which driver is in use
-            # For Intel / RADEON
+            # For Intel / RADEON / Matrox (using modesetting)
             m = re.search(r'\(II\) (.*)\(\d+\): EDID for output (.*)', line)
             if m:
                 self.displays[display_name] = display
-                self.video_driver = m.group(1)
+                if m.group(1) == "modeset":
+                    self.video_driver = "modesetting"
+                else:
+                    self.video_driver = m.group(1)
                 display_name = m.group(2)
                 display = {'Output': display_name}
                 continue