Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/21/13 15:49
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index 818965e..b6d3490 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -6,6 +6,7 @@ Phoronix Test Suite (Git)
- pts-core: Set SKIP_TEST_SUPPORT_CHECKS=1 environment variable for debugging purposes to run tests on unsupported platforms
- pts_Graph: Only render as much room for pts_OverViewGraph as there are for what will be rendered (bar graph values)
- phodevi: Ensure DVD drives don't get reported on BSD operating systems when requesting disk drives
+- phodevi: Improve graphics processor detection on Solaris 11 11/11 for non-NVIDIA GPUs
- system_monitor: Add support for handling i915_energy monitor reading in microJoules for each test run
- system_monitor: Place timer support for individual test runs within the module
diff --git a/pts-core/objects/phodevi/components/phodevi_gpu.php b/pts-core/objects/phodevi/components/phodevi_gpu.php
index 4a69266..bcf0d8c 100644
--- a/pts-core/objects/phodevi/components/phodevi_gpu.php
+++ b/pts-core/objects/phodevi/components/phodevi_gpu.php
@@ -964,17 +964,38 @@ class phodevi_gpu extends phodevi_device_interface
$info .= ' SLI';
}
}
-
- if(phodevi::is_solaris())
+ else if(phodevi::is_solaris())
{
if(($cut = strpos($info, 'DRI ')) !== false)
{
$info = substr($info, ($cut + 4));
}
+
if(($cut = strpos($info, ' Chipset')) !== false)
{
$info = substr($info, 0, $cut);
}
+
+ if($info == false && isset(phodevi::$vfs->xorg_log))
+ {
+ $xorg_log = phodevi::$vfs->xorg_log;
+ if(($x = strpos($xorg_log, '(0): Chipset: ')) !== false)
+ {
+ $xorg_log = substr($xorg_log, ($x + 14));
+ $xorg_log = str_replace(array('(R)', '"'), null, substr($xorg_log, 0, strpos($xorg_log, PHP_EOL)));
+
+ if(($c = strpos($xorg_log, '[')) || ($c = strpos($xorg_log, '(')))
+ {
+ $xorg_log = substr($xorg_log, 0, $c);
+ }
+
+ if(phodevi::is_product_string($xorg_log))
+ {
+ $info = $xorg_log;
+ }
+ }
+
+ }
}
else if(phodevi::is_bsd())
Copyright © 2013 by Phoronix Media