Mir

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

Proposed by Nick Dedekind on 2017-02-13
Status: Merged
Approved by: Daniel van Vugt on 2017-02-15
Approved revision: 4024
Merged at revision: 4033
Proposed branch: lp:~nick-dedekind/mir/edid-configuration-update
Merge into: lp:mir
Diff against target: 10 lines (+1/-0)
1 file modified
src/platforms/mesa/server/kms/real_kms_display_configuration.cpp (+1/-0)
To merge this branch: bzr merge lp:~nick-dedekind/mir/edid-configuration-update
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve on 2017-02-15
Kevin DuBois (community) Approve on 2017-02-14
Cemil Azizoglu (community) 2017-02-13 Needs Fixing on 2017-02-13
Mir CI Bot continuous-integration Approve on 2017-02-13
Review via email: mp+317111@code.launchpad.net

Commit message

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

Description of the change

Added EDID to output configuration update.

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

No test?

review: Needs Fixing
Daniel van Vugt (vanvugt) wrote :

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) wrote :

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

review: Approve
Daniel van Vugt (vanvugt) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mesa/server/kms/real_kms_display_configuration.cpp'
2--- src/platforms/mesa/server/kms/real_kms_display_configuration.cpp 2017-01-18 02:29:37 +0000
3+++ src/platforms/mesa/server/kms/real_kms_display_configuration.cpp 2017-02-13 14:49:09 +0000
4@@ -370,6 +370,7 @@
5 output.current_format = mir_pixel_format_xrgb_8888;
6 output.subpixel_arrangement = kms_subpixel_to_mir_subpixel(connector.subpixel);
7 output.gamma = gamma;
8+ output.edid = edid;
9 }
10 }
11

Subscribers

People subscribed via source and target branches