Merge lp:~vanvugt/mir/output-model into lp:mir

[Daniel van Vugt]

Add a descriptive string for the connected monitor, if available.

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Hmm, I might have gone overboard with the fallback logic. That's needed apparently on laptops and tablets which don't provide a nice "monitor name". There's a risk though that the fallback vendor and product codes are just confusing to people. Although they're useful to me as someone who likes to modify/fix laptop screens, that's not a user-friendly activity.

[Cemil Azizoglu (cemil-azizoglu)]

Looks good other than the typo ('nul' instead of 'null')

+ * \returns A nul-terminated string or NULL if none available. This string

review: Approve

[Daniel van Vugt (vanvugt)]

That's not a typo. "nul" refers to character '\0' to distinguish it from "NULL" which is a pointer.

  https://en.wikipedia.org/wiki/Null_character

Although Google suggests the industry has changed in recent years and often likes to spell it as "null" these days. I don't mind too much either way but "nul" with a single L is historically the more accurate term when referring to character zero.

[Alan Griffiths (alan-griffiths)]

Mild "needs fixing" for the magic numbers (in particular there's a relationship between 13 and 14 that ought to be explicit).

review: Needs Fixing

[Cemil Azizoglu (cemil-azizoglu)]

> That's not a typo. "nul" refers to character '\0' to distinguish it from
> "NULL" which is a pointer.
>
> https://en.wikipedia.org/wiki/Null_character
>
> Although Google suggests the industry has changed in recent years and often
> likes to spell it as "null" these days. I don't mind too much either way but
> "nul" with a single L is historically the more accurate term when referring to
> character zero.

Didn't know that. Thanks.

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

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

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Bug 1616312

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

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

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

54 and 4 are still "magic"

review: Abstain

=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
--- include/client/mir_toolkit/mir_display_configuration.h	2016-12-08 04:08:06 +0000
+++ include/client/mir_toolkit/mir_display_configuration.h	2016-12-09 06:37:22 +0000
@@ -373,6 +373,18 @@
 void mir_output_disable(MirOutput* output);
 
 /**
+ * Get a descriptive manufacturer/model string for the connected display.
+ * The format of this string is arbitrary and driver-specific but should be
+ * human-readable and helpful for someone to identify which physical display
+ * this is. Note this function is not called get_name because that would imply
+ * the returned value is different for each output, whereas it may not be.
+ *
+ * \returns  A nul-terminated string or NULL if none available. This string
+ *           remains valid for the lifetime of the MirOutput object.
+ */
+char const* mir_output_get_model(MirOutput const* output);
+
+/**
  * Get the physical width of the connected display, in millimetres.
  *
  * A best-effort report of the physical width of the display connected to this

=== modified file 'src/client/display_configuration_api.cpp'
--- src/client/display_configuration_api.cpp	2016-12-08 04:08:06 +0000
+++ src/client/display_configuration_api.cpp	2016-12-09 06:37:22 +0000
@@ -21,6 +21,7 @@
 #include "mir/output_type_names.h"
 #include "display_configuration.h"
 #include "mir/uncaught.h"
+#include "mir/edid.h"
 
 namespace mcl = mir::client;
 namespace mp = mir::protobuf;
@@ -86,6 +87,30 @@
     output->set_used(0);
 }
 
+char const* mir_output_get_model(MirOutput const* output)
+{
+    // In future this might be provided by the server itself...
+    if (output->has_model())
+        return output->model().c_str();
+
+    // But if not we use the same member for caching our EDID probe...
+    using mir::EDID;
+    if (mir_output_get_edid_size(output) >= EDID::minimum_size)
+    {
+        auto edid = reinterpret_cast<EDID const*>(mir_output_get_edid(output));
+        EDID::MonitorName name;
+        if (!edid->get_monitor_name(name))
+        {
+            auto len = edid->get_manufacturer(name);
+            snprintf(name+len, sizeof(name)-len, " %hu", edid->product_code());
+        }
+        const_cast<MirOutput*>(output)->set_model(name);
+        return output->model().c_str();
+    }
+
+    return nullptr;
+}
+
 int mir_display_config_get_max_simultaneous_outputs(MirDisplayConfig const* config)
 {
     return config->display_card(0).max_simultaneous_outputs();

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2016-12-08 04:08:06 +0000
+++ src/client/symbols.map	2016-12-09 06:37:22 +0000
@@ -502,4 +502,5 @@
     mir_touchpad_configuration_set_middle_mouse_button_emulation;
     mir_touchpad_configuration_set_scroll_modes;
     mir_touchpad_configuration_set_tap_to_click;
+    mir_output_get_model;
 } MIR_CLIENT_0.25;

=== added file 'src/include/common/mir/edid.h'
--- src/include/common/mir/edid.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/edid.h	2016-12-09 06:37:22 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#ifndef MIR_EDID_H_
+#define MIR_EDID_H_
+
+#include <endian.h>
+#include <cstdint>
+#include <cstring>
+
+namespace mir
+{
+
+struct EDID
+{
+    EDID() = delete;
+    EDID(EDID const&) = delete;
+    EDID(EDID const&&) = delete;
+
+    enum { minimum_size = 128 };
+    typedef char MonitorName[14];  // up to 13 characters
+    typedef char Manufacturer[4];  // always 3 characters
+
+    size_t get_monitor_name(MonitorName str) const
+    {
+        size_t len = get_string(string_monitor_name, str);
+        if (char* pad = strchr(str, '\n'))
+        {
+            *pad = '\0';
+            len = pad - str;
+        }
+        return len;
+    }
+
+    size_t get_manufacturer(Manufacturer str) const
+    {
+        // Confusingly this field is more like big endian. Others are little.
+        auto man = static_cast<uint16_t>(manufacturer[0]) << 8 | manufacturer[1];
+        str[0] = ((man >> 10) & 31) + 'A' - 1;
+        str[1] = ((man >> 5) & 31) + 'A' - 1;
+        str[2] = (man & 31) + 'A' - 1;
+        str[3] = '\0';
+        return 3;
+    }
+
+    uint16_t product_code() const
+    {
+        return le16toh(product_code_le);
+    }
+
+private:
+    /* Pretty much every field in an EDID requires some kind of conversion
+       and reinterpretation. So keep those details private... */
+   
+    enum StringDescriptorType
+    {
+        string_monitor_serial_number = 0xff,
+        string_unspecified_text = 0xfe,
+        string_monitor_name = 0xfc,
+    };
+
+    size_t get_string(StringDescriptorType type, char str[14]) const
+    {
+        size_t len = 0;
+        for (int d = 0; d < 4; ++d)
+        {
+            auto& desc = descriptor[d];
+            if (!desc.other.zero0 && desc.other.type == type)
+            {
+                len = sizeof desc.other.text;
+                memcpy(str, desc.other.text, len);
+                break;
+            }
+        }
+        str[len] = '\0';
+        return len;
+    }
+
+    union Descriptor
+    {
+        struct
+        {
+            uint16_t  pixel_clock_le;
+            uint8_t   todo[16];
+        } detailed_timing;
+        struct
+        {
+            uint16_t zero0;
+            uint8_t  zero2;
+            uint8_t  type;
+            uint8_t  zero4;
+            uint8_t  text[13];
+        } other;
+    };
+
+    /* 0x00 */ uint8_t  header[8];
+    /* 0x08 */ uint8_t  manufacturer[2];
+    /* 0x0a */ uint16_t product_code_le;
+    /* 0x0c */ uint32_t serial_number_le;
+    /* 0x10 */ uint8_t  week_of_manufacture;
+    /* 0x11 */ uint8_t  year_of_manufacture;
+    /* 0x12 */ uint8_t  edid_version;
+    /* 0x13 */ uint8_t  edid_revision;
+    /* 0x14 */ uint8_t  input_bitmap;
+    /* 0x15 */ uint8_t  max_horz_cm;
+    /* 0x16 */ uint8_t  max_vert_cm;
+    /* 0x17 */ uint8_t  gamma;
+    /* 0x18 */ uint8_t  features_bitmap;
+    /* 0x19 */ uint8_t  red_green_bits_1to0;
+    /* 0x1a */ uint8_t  blue_white_bits_1to0;
+    /* 0x1b */ uint8_t  red_x_bits_9to2;
+    /* 0x1c */ uint8_t  red_y_bits_9to2;
+    /* 0x1d */ uint8_t  green_x_bits_9to2;
+    /* 0x1e */ uint8_t  green_y_bits_9to2;
+    /* 0x1f */ uint8_t  blue_x_bits_9to2;
+    /* 0x20 */ uint8_t  blue_y_bits_9to2;
+    /* 0x21 */ uint8_t  white_x_bits_9to2;
+    /* 0x22 */ uint8_t  white_y_bits_9to2;
+    /* 0x23 */ uint8_t  established_timings[2];
+    /* 0x25 */ uint8_t  reserved_timings;
+    /* 0x26 */ uint8_t  standard_timings[2][8];
+    /* 0x36 */ Descriptor descriptor[4];
+    /* 0x7e */ uint8_t  num_extensions;  /* each is another 128-byte block */
+    /* 0x7f */ uint8_t  checksum;
+};
+
+} // namespace mir
+
+#endif // MIR_EDID_H_

=== modified file 'src/protobuf/mir_protobuf.proto'
--- src/protobuf/mir_protobuf.proto	2016-12-08 04:08:06 +0000
+++ src/protobuf/mir_protobuf.proto	2016-12-09 06:37:22 +0000
@@ -241,6 +241,7 @@
   optional bytes  gamma_blue = 22;
   optional uint32 gamma_supported = 23;
   optional bytes edid = 24;
+  optional string model = 25;
 }
 
 message Connection {

=== modified file 'src/server/report/logging/display_configuration_report.cpp'
--- src/server/report/logging/display_configuration_report.cpp	2016-11-30 03:00:24 +0000
+++ src/server/report/logging/display_configuration_report.cpp	2016-12-09 06:37:22 +0000
@@ -20,6 +20,7 @@
 #include "mir/graphics/display_configuration.h"
 #include "mir/output_type_names.h"
 #include "mir/logging/logger.h"
+#include "mir/edid.h"
 
 #include <boost/exception/diagnostic_information.hpp>
 #include <cmath>
@@ -93,6 +94,22 @@
                     );
         if (out.connected)
         {
+            using mir::EDID;
+            if (out.edid.size() >= EDID::minimum_size)
+            {
+                auto edid = reinterpret_cast<EDID const*>(out.edid.data());
+                EDID::MonitorName name;
+                if (edid->get_monitor_name(name))
+                    logger->log(component, severity,
+                                "%sEDID monitor name: %s", indent, name);
+                EDID::Manufacturer man;
+                edid->get_manufacturer(man);
+                logger->log(component, severity,
+                            "%sEDID manufacturer: %s", indent, man);
+                logger->log(component, severity,
+                            "%sEDID product code: %hu", indent, edid->product_code());
+            }
+
             int width_mm = out.physical_size_mm.width.as_int();
             int height_mm = out.physical_size_mm.height.as_int();
             float inches =

=== modified file 'src/utils/out.c'
--- src/utils/out.c	2016-12-08 04:08:06 +0000
+++ src/utils/out.c	2016-12-09 06:37:22 +0000
@@ -426,6 +426,10 @@
 
             if (state == mir_output_connection_state_connected)
             {
+                char const* model = mir_output_get_model(out);
+                if (model)
+                    printf(", \"%s\"", model);
+
                 MirOutputMode const* current_mode =
                     mir_output_get_current_mode(out);
                 if (current_mode)

=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
--- tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-08 04:08:06 +0000
+++ tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-09 06:37:22 +0000
@@ -1085,6 +1085,74 @@
     client.disconnect();
 }
 
+TEST_F(DisplayConfigurationTest, client_receives_model_string_from_edid)
+{
+    static unsigned char const edid[129] =
+        "\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";
+
+    mtd::StubDisplayConfigurationOutput monitor{
+        mg::DisplayConfigurationOutputId{48},
+        {{{1920, 1200}, 60.0}},
+        {mir_pixel_format_abgr_8888}};
+    monitor.edid.assign(edid, edid+128);
+
+    auto config = std::make_shared<mtd::StubDisplayConfig>(
+                      std::vector<mg::DisplayConfigurationOutput>{monitor});
+
+    apply_config_change_and_wait_for_propagation(config);
+
+    DisplayClient client{new_connection()};
+    client.connect();
+
+    auto base_config = client.get_base_config();
+    auto output = mir_display_config_get_output(base_config.get(), 0);
+
+    EXPECT_STREQ("DELL U2413", mir_output_get_model(output));
+
+    client.disconnect();
+}
+
+TEST_F(DisplayConfigurationTest, client_receives_fallback_string_from_edid)
+{
+    static unsigned char const edid[129] =
+        "\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\x11\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";
+
+    mtd::StubDisplayConfigurationOutput monitor{
+        mg::DisplayConfigurationOutputId{2},
+        {{{3210, 2800}, 60.0}},
+        {mir_pixel_format_abgr_8888}};
+    monitor.edid.assign(edid, edid+128);
+
+    auto config = std::make_shared<mtd::StubDisplayConfig>(
+                      std::vector<mg::DisplayConfigurationOutput>{monitor});
+
+    apply_config_change_and_wait_for_propagation(config);
+
+    DisplayClient client{new_connection()};
+    client.connect();
+
+    auto base_config = client.get_base_config();
+    auto output = mir_display_config_get_output(base_config.get(), 0);
+
+    EXPECT_STREQ("DEL 61510", mir_output_get_model(output));
+
+    client.disconnect();
+}
+
 namespace
 {
 MATCHER_P(IsSameModeAs, mode, "")

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2016-11-15 23:48:01 +0000
+++ tests/unit-tests/CMakeLists.txt	2016-12-09 06:37:22 +0000
@@ -82,6 +82,7 @@
   test_posix_rw_mutex.cpp
   test_posix_timestamp.cpp
   test_observer_multiplexer.cpp
+  test_edid.cpp
 )
 
 CMAKE_DEPENDENT_OPTION(

=== added file 'tests/unit-tests/test_edid.cpp'
--- tests/unit-tests/test_edid.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/test_edid.cpp	2016-12-09 06:37:22 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel van Vugt <[e-mail]>
+ */
+
+#include "mir/edid.h"
+#include <gtest/gtest.h>
+
+using mir::EDID;
+
+namespace
+{
+unsigned char const dell_u2413_edid[129] =
+    "\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";
+} // namespace
+
+TEST(EDID, has_correct_size)
+{
+    EXPECT_EQ(128u, sizeof(EDID));
+    EXPECT_EQ(128u, EDID::minimum_size);
+}
+
+TEST(EDID, can_get_name)
+{
+    auto edid = reinterpret_cast<EDID const*>(dell_u2413_edid);
+    EDID::MonitorName name;
+    int len = edid->get_monitor_name(name);
+    EXPECT_EQ(10, len);
+    EXPECT_STREQ("DELL U2413", name);
+}
+
+TEST(EDID, can_get_manufacturer)
+{
+    auto edid = reinterpret_cast<EDID const*>(dell_u2413_edid);
+    EDID::Manufacturer man;
+    int len = edid->get_manufacturer(man);
+    EXPECT_EQ(3, len);
+    EXPECT_STREQ("DEL", man);
+}
+
+TEST(EDID, can_get_product_code)
+{
+    auto edid = reinterpret_cast<EDID const*>(dell_u2413_edid);
+    EXPECT_EQ(61510u, edid->product_code());
+}