Merge lp:~vanvugt/mir/fix-1407558 into lp:mir

[Daniel van Vugt]

Report vertical refresh rates to two decimal places so that one can tell
the difference between common frequencies such as 59.94 vs 60.00Hz.
(LP: #1407558)

I'm kind of undecided about this. Although slightly on the side of
preferring two decimal places because that's the precision most commonly
used in the industry. If people do round then they tend to round to the
nearest whole number. Never one decimal place.

[Alan Griffiths (alan-griffiths)]

Ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2194
http://jenkins.qa.ubuntu.com/job/mir-ci/2558/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/555
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/679
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3811
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16794

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2558/rebuild

review: Approve (continuous-integration)

=== modified file 'src/platforms/mesa/real_kms_display_configuration.cpp'
--- src/platforms/mesa/real_kms_display_configuration.cpp	2014-12-18 18:30:27 +0000
+++ src/platforms/mesa/real_kms_display_configuration.cpp	2015-01-05 10:46:45 +0000
@@ -54,10 +54,13 @@
         return 0.0;
 
     /* mode.clock is in KHz */
-    double vrefresh_hz = mode.clock * 1000.0 / (mode.htotal * mode.vtotal);
+    double hz = (mode.clock * 100000LL /
+                 ((long)mode.htotal * (long)mode.vtotal)
+                ) / 100.0;
 
-    /* Round to first decimal */
-    return round(vrefresh_hz * 10.0) / 10.0;
+    // Actually we don't need floating point at all for this...
+    // TODO: Consider converting our structs to fixed-point ints
+    return hz;
 }
 
 mg::DisplayConfigurationOutputType

=== modified file 'src/utils/out.c'
--- src/utils/out.c	2014-03-06 06:05:17 +0000
+++ src/utils/out.c	2015-01-05 10:46:45 +0000
@@ -177,7 +177,7 @@
                            mode->vertical_resolution);
                 }
 
-                printf("%6.1f%c%c",
+                printf("%6.2f%c%c",
                        mode->refresh_rate,
                        (m == out->current_mode) ? '*' : ' ',
                        (m == out->preferred_mode) ? '+' : ' ');

=== modified file 'tests/unit-tests/graphics/mesa/test_display_configuration.cpp'
--- tests/unit-tests/graphics/mesa/test_display_configuration.cpp	2014-12-19 02:31:34 +0000
+++ tests/unit-tests/graphics/mesa/test_display_configuration.cpp	2015-01-05 10:46:45 +0000
@@ -56,8 +56,8 @@
     /* Calculate vertical refresh rate from DRM mode information */
     if (mode.htotal != 0.0 && mode.vtotal != 0.0)
     {
-        vrefresh_hz = mode.clock * 1000.0 / (mode.htotal * mode.vtotal);
-        vrefresh_hz = round(vrefresh_hz * 10.0) / 10.0;
+        vrefresh_hz = (mode.clock * 100000LL /
+                       ((long)mode.htotal * (long)mode.vtotal)) / 100.0;
     }
 
     return mg::DisplayConfigurationMode{size, vrefresh_hz};