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

[Daniel van Vugt]

Avoid crashing on systems that don't have hardware gamma ramps,
like VirtualBox (LP: #1638220)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3798
https://mir-jenkins.ubuntu.com/job/mir-ci/2091/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2688
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2751
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2743
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2743
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2743
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2717
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2717/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2717
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2717/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2717
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2717/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2717
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2717/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2717
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2717/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2717
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2717/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2091/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Alan Griffiths (alan-griffiths)]

Code is a little verbose, but OK

review: Approve

=== modified file 'src/platforms/mesa/server/kms/real_kms_output.cpp'
--- src/platforms/mesa/server/kms/real_kms_output.cpp	2016-10-12 13:31:04 +0000
+++ src/platforms/mesa/server/kms/real_kms_output.cpp	2016-11-01 09:40:38 +0000
@@ -296,15 +296,17 @@
             std::invalid_argument("set_gamma: mismatch gamma LUT sizes"));
     }
 
-    if (drmModeCrtcSetGamma(
+    int ret = drmModeCrtcSetGamma(
         drm_fd,
         current_crtc->crtc_id,
         gamma.red.size(),
         const_cast<uint16_t*>(gamma.red.data()),
         const_cast<uint16_t*>(gamma.green.data()),
-        const_cast<uint16_t*>(gamma.blue.data())) != 0)
-    {
-        BOOST_THROW_EXCEPTION(
-            std::system_error(errno, std::system_category(), "drmModeCrtcSetGamma Failed"));
-    }
+        const_cast<uint16_t*>(gamma.blue.data()));
+
+    int err = -ret;
+    if (err)
+        mir::log_warning("drmModeCrtcSetGamma failed: %s", strerror(err));
+
+    // TODO: return bool in future? Then do what with it?
 }
 
=== modified file 'tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp'
--- tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp	2016-10-12 13:31:04 +0000
+++ tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp	2016-11-01 09:40:38 +0000
@@ -397,3 +397,28 @@
     EXPECT_TRUE(output.set_crtc(fb_id));
     output.set_gamma(gamma);
 }
+
+TEST_F(RealKMSOutputTest, drm_set_gamma_failure_does_not_throw)
+{   // Regression test for LP: #1638220
+    using namespace testing;
+
+    uint32_t const fb_id{67};
+
+    setup_outputs_connected_crtc();
+
+    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
+                              mt::fake_shared(mock_page_flipper)};
+
+    mg::GammaCurves gamma{{1}, {2}, {3}};
+
+    EXPECT_CALL(mock_drm, drmModeCrtcSetGamma(mock_drm.fake_drm.fd(), crtc_ids[0],
+                                              gamma.red.size(),
+                                              const_cast<uint16_t*>(gamma.red.data()),
+                                              const_cast<uint16_t*>(gamma.green.data()),
+                                              const_cast<uint16_t*>(gamma.blue.data())))
+        .WillOnce(Return(-ENOSYS));
+
+    EXPECT_TRUE(output.set_crtc(fb_id));
+
+    EXPECT_NO_THROW(output.set_gamma(gamma););
+}