Merge lp:~alan-griffiths/mir/fix-1699484 into lp:mir

[Alan Griffiths]

Add missing GBM initialization for Mir on Mir on Mesa that got lost when we split out rendering platforms.

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

PASSED: Continuous integration, rev:4199
https://mir-jenkins.ubuntu.com/job/mir-ci/3464/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4728
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4886
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4765/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4765
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4765/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Confirmed working on Intel. I can check AMD tomorrow, NVidia too if needed

review: Approve (tentative)

[Alan Griffiths (alan-griffiths)]

Also fixes the different manifestation seen on Artful

[Brandon Schaefer (brandontschaefer)]

Nice, lgtm

review: Approve

=== modified file 'src/platforms/mesa/server/gbm_platform.cpp'
--- src/platforms/mesa/server/gbm_platform.cpp	2017-05-12 10:00:15 +0000
+++ src/platforms/mesa/server/gbm_platform.cpp	2017-06-28 09:05:51 +0000
@@ -50,6 +50,12 @@
     {
         BOOST_THROW_EXCEPTION(std::logic_error("no authentication fd to make gbm buffers"));
     }
+
+    {
+        auto gbm_extension = platform_authentication->set_gbm_extension();
+        if (gbm_extension.is_set())
+            gbm_extension.value()->set_gbm_device(gbm->device);
+    }
 }
 
 mgm::GBMPlatform::GBMPlatform(