Merge lp:~nick-dedekind/mir/edid-configuration-update into lp:mir

[Nick Dedekind]

Added EDID to output configuration update. (LP: #1660017)

Added EDID to output configuration update.

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

PASSED: Continuous integration, rev:4024
https://mir-jenkins.ubuntu.com/job/mir-ci/2987/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3968
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4054
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4044
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4044
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4044
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3995/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/3995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3995/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/3995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3995/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/3995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3995/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/3995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3995/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

No test?

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I'd be happy to accept this without a test (like a community contribution - don't look a gift horse in the mouth) but a test would be better...

review: Approve

[Kevin DuBois (kdub)]

alright by me (and sure, a test would be better)

review: Approve

[Daniel van Vugt (vanvugt)]

I have now verified manually that this fixes hotplugging bug 1660017.

Land it now, and I'll look at an automated regression test separately...

review: Approve

=== modified file 'src/platforms/mesa/server/kms/real_kms_display_configuration.cpp'
--- src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-01-18 02:29:37 +0000
+++ src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-02-13 14:49:09 +0000
@@ -370,6 +370,7 @@
         output.current_format = mir_pixel_format_xrgb_8888;
         output.subpixel_arrangement = kms_subpixel_to_mir_subpixel(connector.subpixel);
         output.gamma = gamma;
+        output.edid = edid;
     }
 }