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

[Daniel van Vugt]

Provide missing EDID data in nested servers (LP: #1651633)

[Alan Griffiths (alan-griffiths)]

Looks good

review: Approve

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

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

FAILED: Continuous integration, rev:3956
https://mir-jenkins.ubuntu.com/job/mir-ci/2755/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3602/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3673
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3663
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3663
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3663
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3629/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3629
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3629/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3629
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3629/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/3629
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3629/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/3629
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3629/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/3629
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3629/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

lp:1655929

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

review: Approve (continuous-integration)

=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
--- src/server/graphics/nested/nested_display_configuration.cpp	2017-01-17 02:18:28 +0000
+++ src/server/graphics/nested/nested_display_configuration.cpp	2017-01-18 07:59:36 +0000
@@ -107,6 +107,12 @@
     uint32_t preferred_index = mir_output_get_preferred_mode_index(output);
     uint32_t current_index   = mir_output_get_current_mode_index(output);
 
+    std::vector<uint8_t> edid;
+    auto edid_size = mir_output_get_edid_size(output);
+    auto edid_start = mir_output_get_edid(output);
+    if (edid_size && edid_start)
+        edid.assign(edid_start, edid_start+edid_size);
+
     return mg::DisplayConfigurationOutput{
         DisplayConfigurationOutputId(output_id),
         DisplayConfigurationCardId(0), // Information not around
@@ -127,7 +133,7 @@
         local_config.subpixel_arrangement,
         local_config.gamma,
         local_config.gamma_supported,
-        {}
+        std::move(edid)
     };
 }
 

=== modified file 'tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp'
--- tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-01-17 02:18:28 +0000
+++ tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-01-18 07:59:36 +0000
@@ -36,6 +36,24 @@
 uint32_t const default_physical_width_mm = 0;
 uint32_t const default_physical_height_mm = 0;
 
+unsigned char const valid_edid[] =
+    "\x00\xff\xff\xff\xff\xff\xff\x00\x10\xac\x46\xf0\x4c\x4a\x31\x41"
+    "\x05\x19\x01\x04\xb5\x34\x20\x78\x3a\x1d\xf5\xae\x4f\x35\xb3\x25"
+    "\x0d\x50\x54\xa5\x4b\x00\x81\x80\xa9\x40\xd1\x00\x71\x4f\x01\x01"
+    "\x01\x01\x01\x01\x01\x01\x28\x3c\x80\xa0\x70\xb0\x23\x40\x30\x20"
+    "\x36\x00\x06\x44\x21\x00\x00\x1a\x00\x00\x00\xff\x00\x59\x43\x4d"
+    "\x30\x46\x35\x31\x52\x41\x31\x4a\x4c\x0a\x00\x00\x00\xfc\x00\x44"
+    "\x45\x4c\x4c\x20\x55\x32\x34\x31\x33\x0a\x20\x20\x00\x00\x00\xfd"
+    "\x00\x38\x4c\x1e\x51\x11\x00\x0a\x20\x20\x20\x20\x20\x20\x01\x42"
+    "\x02\x03\x1d\xf1\x50\x90\x05\x04\x03\x02\x07\x16\x01\x1f\x12\x13"
+    "\x14\x20\x15\x11\x06\x23\x09\x1f\x07\x83\x01\x00\x00\x02\x3a\x80"
+    "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x06\x44\x21\x00\x00\x1e\x01"
+    "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\x06\x44\x21\x00\x00"
+    "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x06\x44\x21"
+    "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x06"
+    "\x44\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09";
+
 }
 
 std::shared_ptr<MirDisplayConfig> mt::build_trivial_configuration()
@@ -62,6 +80,7 @@
     output->set_preferred_mode(default_preferred_mode);
     output->set_power_mode(mir_power_mode_on);
     output->set_orientation(mir_orientation_normal);
+    output->set_edid(valid_edid, sizeof(valid_edid));
 
     return std::make_shared<MirDisplayConfig>(conf);
 }
@@ -101,6 +120,7 @@
         output->set_preferred_mode(default_preferred_mode);
         output->set_power_mode(mir_power_mode_on);
         output->set_orientation(mir_orientation_normal);
+        output->set_edid(valid_edid, sizeof(valid_edid));
     }
 
     return std::make_shared<MirDisplayConfig>(conf);

=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-01-17 02:18:28 +0000
+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-01-18 07:59:36 +0000
@@ -147,6 +147,28 @@
         });
 }
 
+TEST(NestedDisplayConfiguration, includes_host_edid)
+{
+    auto host_conf = mt::build_trivial_configuration();
+    auto const output = mir_display_config_get_output(host_conf.get(), 0);
+    auto edid_start = mir_output_get_edid(output);
+    auto edid_size = mir_output_get_edid_size(output);
+
+    ASSERT_NE(nullptr, edid_start);
+    ASSERT_NE(0, edid_size);
+
+    std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
+
+    mgn::NestedDisplayConfiguration nested_conf(host_conf);
+    int matches = 0;
+    nested_conf.for_each_output([&](mg::DisplayConfigurationOutput const& output)
+        {
+            ASSERT_EQ(host_edid, output.edid);
+            ++matches;
+        });
+    EXPECT_NE(0, matches);
+}
+
 TEST(NestedDisplayConfiguration, clone_matches_original_configuration)
 {
     mgn::NestedDisplayConfiguration config(mt::build_non_trivial_configuration());