1
=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
2
--- include/client/mir_toolkit/mir_display_configuration.h	2016-12-08 04:08:06 +0000
3
+++ include/client/mir_toolkit/mir_display_configuration.h	2016-12-14 04:10:39 +0000
4
@@ -373,6 +373,18 @@
5
373
void mir_output_disable(MirOutput* output);
373
void mir_output_disable(MirOutput* output);
6
374
374
7
375
/**
375
/**
8
376
 * Get a descriptive manufacturer/model string for the connected display.
9
377
 * The format of this string is arbitrary and driver-specific but should be
10
378
 * human-readable and helpful for someone to identify which physical display
11
379
 * this is. Note this function is not called get_name because that would imply
12
380
 * the returned value is different for each output, whereas it may not be.
13
381
 *
14
382
 * \returns  A nul-terminated string or NULL if none available. This string
15
383
 *           remains valid for the lifetime of the MirOutput object.
16
384
 */
17
385
char const* mir_output_get_model(MirOutput const* output);
18
386
19
387
/**
20
376
 * Get the physical width of the connected display, in millimetres.
388
 * Get the physical width of the connected display, in millimetres.
21
377
 *
389
 *
22
378
 * A best-effort report of the physical width of the display connected to this
390
 * A best-effort report of the physical width of the display connected to this
23
379
391
24
=== modified file 'src/client/display_configuration_api.cpp'
25
--- src/client/display_configuration_api.cpp	2016-12-08 04:08:06 +0000
26
+++ src/client/display_configuration_api.cpp	2016-12-14 04:10:39 +0000
27
@@ -21,6 +21,7 @@
28
21
#include "mir/output_type_names.h"
21
#include "mir/output_type_names.h"
29
22
#include "display_configuration.h"
22
#include "display_configuration.h"
30
23
#include "mir/uncaught.h"
23
#include "mir/uncaught.h"
31
24
#include "mir/graphics/edid.h"
32
24
25
33
25
namespace mcl = mir::client;
26
namespace mcl = mir::client;
34
26
namespace mp = mir::protobuf;
27
namespace mp = mir::protobuf;
35
@@ -86,6 +87,30 @@
36
86
    output->set_used(0);
87
    output->set_used(0);
37
87
}
88
}
38
88
89
39
90
char const* mir_output_get_model(MirOutput const* output)
40
91
{
41
92
    // In future this might be provided by the server itself...
42
93
    if (output->has_model())
43
94
        return output->model().c_str();
44
95
45
96
    // But if not we use the same member for caching our EDID probe...
46
97
    using mir::graphics::Edid;
47
98
    if (mir_output_get_edid_size(output) >= Edid::minimum_size)
48
99
    {
49
100
        auto edid = reinterpret_cast<Edid const*>(mir_output_get_edid(output));
50
101
        Edid::MonitorName name;
51
102
        if (!edid->get_monitor_name(name))
52
103
        {
53
104
            auto len = edid->get_manufacturer(name);
54
105
            snprintf(name+len, sizeof(name)-len, " %hu", edid->product_code());
55
106
        }
56
107
        const_cast<MirOutput*>(output)->set_model(name);
57
108
        return output->model().c_str();
58
109
    }
59
110
60
111
    return nullptr;
61
112
}
62
113
63
89
int mir_display_config_get_max_simultaneous_outputs(MirDisplayConfig const* config)
114
int mir_display_config_get_max_simultaneous_outputs(MirDisplayConfig const* config)
64
90
{
115
{
65
91
    return config->display_card(0).max_simultaneous_outputs();
116
    return config->display_card(0).max_simultaneous_outputs();
66
92
117
67
=== modified file 'src/client/symbols.map'
68
--- src/client/symbols.map	2016-12-13 02:50:57 +0000
69
+++ src/client/symbols.map	2016-12-14 04:10:39 +0000
70
@@ -502,4 +502,5 @@
71
502
    mir_touchpad_configuration_set_middle_mouse_button_emulation;
502
    mir_touchpad_configuration_set_middle_mouse_button_emulation;
72
503
    mir_touchpad_configuration_set_scroll_modes;
503
    mir_touchpad_configuration_set_scroll_modes;
73
504
    mir_touchpad_configuration_set_tap_to_click;
504
    mir_touchpad_configuration_set_tap_to_click;
74
505
    mir_output_get_model;
75
505
} MIR_CLIENT_0.25;
506
} MIR_CLIENT_0.25;
76
506
507
77
=== modified file 'src/common/CMakeLists.txt'
78
--- src/common/CMakeLists.txt	2016-11-15 23:48:01 +0000
79
+++ src/common/CMakeLists.txt	2016-12-14 04:10:39 +0000
80
@@ -22,6 +22,7 @@
81
22
  ${CMAKE_CURRENT_SOURCE_DIR}/libname.cpp ${PROJECT_SOURCE_DIR}/include/common/mir/libname.h
22
  ${CMAKE_CURRENT_SOURCE_DIR}/libname.cpp ${PROJECT_SOURCE_DIR}/include/common/mir/libname.h
82
23
  ${PROJECT_SOURCE_DIR}/include/common/mir/posix_rw_mutex.h
23
  ${PROJECT_SOURCE_DIR}/include/common/mir/posix_rw_mutex.h
83
24
  posix_rw_mutex.cpp
24
  posix_rw_mutex.cpp
84
25
  edid.cpp
85
25
)
26
)
86
26
27
87
27
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
28
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
88
28
29
89
=== added file 'src/common/edid.cpp'
90
--- src/common/edid.cpp	1970-01-01 00:00:00 +0000
91
+++ src/common/edid.cpp	2016-12-14 04:10:39 +0000
92
@@ -0,0 +1,67 @@
93
1
/*
94
2
 * Copyright © 2016 Canonical Ltd.
95
3
 *
96
4
 * This program is free software: you can redistribute it and/or modify it
97
5
 * under the terms of the GNU Lesser General Public License version 3,
98
6
 * as published by the Free Software Foundation.
99
7
 *
100
8
 * This program is distributed in the hope that it will be useful,
101
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
102
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
103
11
 * GNU Lesser General Public License for more details.
104
12
 *
105
13
 * You should have received a copy of the GNU Lesser General Public License
106
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
107
15
 *
108
16
 * Authored by: Daniel van Vugt <daniel.van.vugt@canonical.com>
109
17
 */
110
18
111
19
#include "mir/graphics/edid.h"
112
20
#include <endian.h>
113
21
#include <cstring>
114
22
115
23
using mir::graphics::Edid;
116
24
117
25
size_t Edid::get_monitor_name(MonitorName str) const
118
26
{
119
27
    size_t len = get_string(string_monitor_name, str);
120
28
    if (char* pad = strchr(str, '\n'))
121
29
    {
122
30
        *pad = '\0';
123
31
        len = pad - str;
124
32
    }
125
33
    return len;
126
34
}
127
35
128
36
size_t Edid::get_manufacturer(Manufacturer str) const
129
37
{
130
38
    // Confusingly this field is more like big endian. Others are little.
131
39
    auto man = static_cast<uint16_t>(manufacturer[0]) << 8 | manufacturer[1];
132
40
    str[0] = ((man >> 10) & 31) + 'A' - 1;
133
41
    str[1] = ((man >> 5) & 31) + 'A' - 1;
134
42
    str[2] = (man & 31) + 'A' - 1;
135
43
    str[3] = '\0';
136
44
    return 3;
137
45
}
138
46
139
47
uint16_t Edid::product_code() const
140
48
{
141
49
    return le16toh(product_code_le);
142
50
}
143
51
144
52
size_t Edid::get_string(StringDescriptorType type, char str[14]) const
145
53
{
146
54
    size_t len = 0;
147
55
    for (int d = 0; d < 4; ++d)
148
56
    {
149
57
        auto& desc = descriptor[d];
150
58
        if (!desc.other.zero0 && desc.other.type == type)
151
59
        {
152
60
            len = sizeof desc.other.text;
153
61
            memcpy(str, desc.other.text, len);
154
62
            break;
155
63
        }
156
64
    }
157
65
    str[len] = '\0';
158
66
    return len;
159
67
}
160
0
68
161
=== modified file 'src/common/symbols.map'
162
--- src/common/symbols.map	2016-11-15 23:48:01 +0000
163
+++ src/common/symbols.map	2016-12-14 04:10:39 +0000
164
@@ -403,3 +403,10 @@
165
403
      mir::PosixRWMutex::unlock_shared*;
403
      mir::PosixRWMutex::unlock_shared*;
166
404
    };
404
    };
167
405
} MIR_COMMON_0.25;
405
} MIR_COMMON_0.25;
168
406
169
407
MIR_COMMON_0.26 {
170
408
 global:
171
409
  extern "C++" {
172
410
      mir::graphics::Edid::*;
173
411
  };
174
412
} MIR_COMMON_0.25;
175
406
413
176
=== added directory 'src/include/common/mir/graphics'
177
=== added file 'src/include/common/mir/graphics/edid.h'
178
--- src/include/common/mir/graphics/edid.h	1970-01-01 00:00:00 +0000
179
+++ src/include/common/mir/graphics/edid.h	2016-12-14 04:10:39 +0000
180
@@ -0,0 +1,111 @@
181
1
/*
182
2
 * Copyright © 2016 Canonical Ltd.
183
3
 *
184
4
 * This program is free software: you can redistribute it and/or modify it
185
5
 * under the terms of the GNU Lesser General Public License version 3,
186
6
 * as published by the Free Software Foundation.
187
7
 *
188
8
 * This program is distributed in the hope that it will be useful,
189
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
190
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
191
11
 * GNU Lesser General Public License for more details.
192
12
 *
193
13
 * You should have received a copy of the GNU Lesser General Public License
194
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
195
15
 *
196
16
 * Authored by: Daniel van Vugt <daniel.van.vugt@canonical.com>
197
17
 */
198
18
199
19
#ifndef MIR_GRAPHICS_EDID_H_
200
20
#define MIR_GRAPHICS_EDID_H_
201
21
202
22
#include <cstdint>
203
23
#include <cstddef>
204
24
205
25
namespace mir { namespace graphics {
206
26
207
27
struct Edid
208
28
{
209
29
    Edid() = delete;
210
30
    Edid(Edid const&) = delete;
211
31
    Edid(Edid const&&) = delete;
212
32
213
33
    enum { minimum_size = 128 };
214
34
    typedef char MonitorName[14];  // up to 13 characters
215
35
    typedef char Manufacturer[4];  // always 3 characters
216
36
217
37
    size_t get_monitor_name(MonitorName str) const;
218
38
    size_t get_manufacturer(Manufacturer str) const;
219
39
    uint16_t product_code() const;
220
40
221
41
private:
222
42
    /* Pretty much every field in an EDID requires some kind of conversion
223
43
       and reinterpretation. So keep those details private... */
224
44
   
225
45
    enum StringDescriptorType
226
46
    {
227
47
        string_monitor_serial_number = 0xff,
228
48
        string_unspecified_text = 0xfe,
229
49
        string_monitor_name = 0xfc,
230
50
    };
231
51
232
52
    size_t get_string(StringDescriptorType type, char str[14]) const;
233
53
234
54
    union Descriptor
235
55
    {
236
56
        struct
237
57
        {
238
58
            uint16_t pixel_clock_le;
239
59
            uint8_t  todo[16];
240
60
        } detailed_timing;
241
61
        struct
242
62
        {
243
63
            uint16_t zero0;
244
64
            uint8_t  zero2;
245
65
            uint8_t  type;
246
66
            uint8_t  zero4;
247
67
            uint8_t  text[13];
248
68
        } other;
249
69
    };
250
70
251
71
#ifdef __clang__
252
72
#pragma clang diagnostic push
253
73
#pragma clang diagnostic ignored "-Wunused-private-field"
254
74
#endif
255
75
    /* 0x00 */ uint8_t  header[8];
256
76
    /* 0x08 */ uint8_t  manufacturer[2];
257
77
    /* 0x0a */ uint16_t product_code_le;
258
78
    /* 0x0c */ uint32_t serial_number_le;
259
79
    /* 0x10 */ uint8_t  week_of_manufacture;
260
80
    /* 0x11 */ uint8_t  year_of_manufacture;
261
81
    /* 0x12 */ uint8_t  edid_version;
262
82
    /* 0x13 */ uint8_t  edid_revision;
263
83
    /* 0x14 */ uint8_t  input_bitmap;
264
84
    /* 0x15 */ uint8_t  max_horz_cm;
265
85
    /* 0x16 */ uint8_t  max_vert_cm;
266
86
    /* 0x17 */ uint8_t  gamma;
267
87
    /* 0x18 */ uint8_t  features_bitmap;
268
88
    /* 0x19 */ uint8_t  red_green_bits_1to0;
269
89
    /* 0x1a */ uint8_t  blue_white_bits_1to0;
270
90
    /* 0x1b */ uint8_t  red_x_bits_9to2;
271
91
    /* 0x1c */ uint8_t  red_y_bits_9to2;
272
92
    /* 0x1d */ uint8_t  green_x_bits_9to2;
273
93
    /* 0x1e */ uint8_t  green_y_bits_9to2;
274
94
    /* 0x1f */ uint8_t  blue_x_bits_9to2;
275
95
    /* 0x20 */ uint8_t  blue_y_bits_9to2;
276
96
    /* 0x21 */ uint8_t  white_x_bits_9to2;
277
97
    /* 0x22 */ uint8_t  white_y_bits_9to2;
278
98
    /* 0x23 */ uint8_t  established_timings[2];
279
99
    /* 0x25 */ uint8_t  reserved_timings;
280
100
    /* 0x26 */ uint8_t  standard_timings[2][8];
281
101
    /* 0x36 */ Descriptor descriptor[4];
282
102
    /* 0x7e */ uint8_t  num_extensions;  /* each is another 128-byte block */
283
103
    /* 0x7f */ uint8_t  checksum;
284
104
#ifdef __clang__
285
105
#pragma clang diagnostic pop
286
106
#endif
287
107
};
288
108
289
109
} } // namespace mir::graphics
290
110
291
111
#endif // MIR_GRAPHICS_EDID_H_
292
0
112
293
=== modified file 'src/protobuf/mir_protobuf.proto'
294
--- src/protobuf/mir_protobuf.proto	2016-12-08 04:08:06 +0000
295
+++ src/protobuf/mir_protobuf.proto	2016-12-14 04:10:39 +0000
296
@@ -241,6 +241,7 @@
297
241
  optional bytes  gamma_blue = 22;
241
  optional bytes  gamma_blue = 22;
298
242
  optional uint32 gamma_supported = 23;
242
  optional uint32 gamma_supported = 23;
299
243
  optional bytes edid = 24;
243
  optional bytes edid = 24;
300
244
  optional string model = 25;
301
244
}
245
}
302
245
246
303
246
message Connection {
247
message Connection {
304
247
248
305
=== modified file 'src/server/report/logging/display_configuration_report.cpp'
306
--- src/server/report/logging/display_configuration_report.cpp	2016-11-30 03:00:24 +0000
307
+++ src/server/report/logging/display_configuration_report.cpp	2016-12-14 04:10:39 +0000
308
@@ -20,6 +20,7 @@
309
20
#include "mir/graphics/display_configuration.h"
20
#include "mir/graphics/display_configuration.h"
310
21
#include "mir/output_type_names.h"
21
#include "mir/output_type_names.h"
311
22
#include "mir/logging/logger.h"
22
#include "mir/logging/logger.h"
312
23
#include "mir/graphics/edid.h"
313
23
24
314
24
#include <boost/exception/diagnostic_information.hpp>
25
#include <boost/exception/diagnostic_information.hpp>
315
25
#include <cmath>
26
#include <cmath>
316
@@ -93,6 +94,22 @@
317
93
                    );
94
                    );
318
94
        if (out.connected)
95
        if (out.connected)
319
95
        {
96
        {
320
97
            using mir::graphics::Edid;
321
98
            if (out.edid.size() >= Edid::minimum_size)
322
99
            {
323
100
                auto edid = reinterpret_cast<Edid const*>(out.edid.data());
324
101
                Edid::MonitorName name;
325
102
                if (edid->get_monitor_name(name))
326
103
                    logger->log(component, severity,
327
104
                                "%sEDID monitor name: %s", indent, name);
328
105
                Edid::Manufacturer man;
329
106
                edid->get_manufacturer(man);
330
107
                logger->log(component, severity,
331
108
                            "%sEDID manufacturer: %s", indent, man);
332
109
                logger->log(component, severity,
333
110
                            "%sEDID product code: %hu", indent, edid->product_code());
334
111
            }
335
112
336
96
            int width_mm = out.physical_size_mm.width.as_int();
113
            int width_mm = out.physical_size_mm.width.as_int();
337
97
            int height_mm = out.physical_size_mm.height.as_int();
114
            int height_mm = out.physical_size_mm.height.as_int();
338
98
            float inches =
115
            float inches =
339
99
116
340
=== modified file 'src/utils/out.c'
341
--- src/utils/out.c	2016-12-08 04:08:06 +0000
342
+++ src/utils/out.c	2016-12-14 04:10:39 +0000
343
@@ -426,6 +426,10 @@
344
426
426
345
427
            if (state == mir_output_connection_state_connected)
427
            if (state == mir_output_connection_state_connected)
346
428
            {
428
            {
347
429
                char const* model = mir_output_get_model(out);
348
430
                if (model)
349
431
                    printf(", \"%s\"", model);
350
432
351
429
                MirOutputMode const* current_mode =
433
                MirOutputMode const* current_mode =
352
430
                    mir_output_get_current_mode(out);
434
                    mir_output_get_current_mode(out);
353
431
                if (current_mode)
435
                if (current_mode)
354
432
436
355
=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
356
--- tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-08 04:08:06 +0000
357
+++ tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-14 04:10:39 +0000
358
@@ -1085,6 +1085,90 @@
359
1085
    client.disconnect();
1085
    client.disconnect();
360
1086
}
1086
}
361
1087
1087
362
1088
TEST_F(DisplayConfigurationTest, client_receives_model_string_from_edid)
363
1089
{
364
1090
    static unsigned char const edid[] =
365
1091
        "\x00\xff\xff\xff\xff\xff\xff\x00\x10\xac\x46\xf0\x4c\x4a\x31\x41"
366
1092
        "\x05\x19\x01\x04\xb5\x34\x20\x78\x3a\x1d\xf5\xae\x4f\x35\xb3\x25"
367
1093
        "\x0d\x50\x54\xa5\x4b\x00\x81\x80\xa9\x40\xd1\x00\x71\x4f\x01\x01"
368
1094
        "\x01\x01\x01\x01\x01\x01\x28\x3c\x80\xa0\x70\xb0\x23\x40\x30\x20"
369
1095
        "\x36\x00\x06\x44\x21\x00\x00\x1a\x00\x00\x00\xff\x00\x59\x43\x4d"
370
1096
        "\x30\x46\x35\x31\x52\x41\x31\x4a\x4c\x0a\x00\x00\x00\xfc\x00\x44"
371
1097
        "\x45\x4c\x4c\x20\x55\x32\x34\x31\x33\x0a\x20\x20\x00\x00\x00\xfd"
372
1098
        "\x00\x38\x4c\x1e\x51\x11\x00\x0a\x20\x20\x20\x20\x20\x20\x01\x42"
373
1099
        "\x02\x03\x1d\xf1\x50\x90\x05\x04\x03\x02\x07\x16\x01\x1f\x12\x13"
374
1100
        "\x14\x20\x15\x11\x06\x23\x09\x1f\x07\x83\x01\x00\x00\x02\x3a\x80"
375
1101
        "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x06\x44\x21\x00\x00\x1e\x01"
376
1102
        "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\x06\x44\x21\x00\x00"
377
1103
        "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x06\x44\x21"
378
1104
        "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x06"
379
1105
        "\x44\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
380
1106
        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09";
381
1107
382
1108
    mtd::StubDisplayConfigurationOutput monitor{
383
1109
        mg::DisplayConfigurationOutputId{48},
384
1110
        {{{1920, 1200}, 60.0}},
385
1111
        {mir_pixel_format_abgr_8888}};
386
1112
    monitor.edid.assign(edid, edid+sizeof(edid)-1);
387
1113
388
1114
    auto config = std::make_shared<mtd::StubDisplayConfig>(
389
1115
                      std::vector<mg::DisplayConfigurationOutput>{monitor});
390
1116
391
1117
    apply_config_change_and_wait_for_propagation(config);
392
1118
393
1119
    DisplayClient client{new_connection()};
394
1120
    client.connect();
395
1121
396
1122
    auto base_config = client.get_base_config();
397
1123
    auto output = mir_display_config_get_output(base_config.get(), 0);
398
1124
399
1125
    EXPECT_STREQ("DELL U2413", mir_output_get_model(output));
400
1126
401
1127
    client.disconnect();
402
1128
}
403
1129
404
1130
TEST_F(DisplayConfigurationTest, client_receives_fallback_string_from_edid)
405
1131
{
406
1132
    static unsigned char const edid[] =
407
1133
        "\x00\xff\xff\xff\xff\xff\xff\x00\x10\xac\x46\xf0\x4c\x4a\x31\x41"
408
1134
        "\x05\x19\x01\x04\xb5\x34\x20\x78\x3a\x1d\xf5\xae\x4f\x35\xb3\x25"
409
1135
        "\x0d\x50\x54\xa5\x4b\x00\x81\x80\xa9\x40\xd1\x00\x71\x4f\x01\x01"
410
1136
        "\x01\x01\x01\x01\x01\x01\x28\x3c\x80\xa0\x70\xb0\x23\x40\x30\x20"
411
1137
        "\x36\x00\x06\x44\x21\x00\x00\x1a\x00\x00\x00\xff\x00\x59\x43\x4d"
412
1138
        "\x30\x46\x35\x31\x52\x41\x31\x4a\x4c\x0a\x00\x00\x00\x11\x00\x44"
413
1139
        "\x45\x4c\x4c\x20\x55\x32\x34\x31\x33\x0a\x20\x20\x00\x00\x00\xfd"
414
1140
        "\x00\x38\x4c\x1e\x51\x11\x00\x0a\x20\x20\x20\x20\x20\x20\x01\x42"
415
1141
        "\x02\x03\x1d\xf1\x50\x90\x05\x04\x03\x02\x07\x16\x01\x1f\x12\x13"
416
1142
        "\x14\x20\x15\x11\x06\x23\x09\x1f\x07\x83\x01\x00\x00\x02\x3a\x80"
417
1143
        "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x06\x44\x21\x00\x00\x1e\x01"
418
1144
        "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\x06\x44\x21\x00\x00"
419
1145
        "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x06\x44\x21"
420
1146
        "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x06"
421
1147
        "\x44\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
422
1148
        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09";
423
1149
424
1150
    mtd::StubDisplayConfigurationOutput monitor{
425
1151
        mg::DisplayConfigurationOutputId{2},
426
1152
        {{{3210, 2800}, 60.0}},
427
1153
        {mir_pixel_format_abgr_8888}};
428
1154
    monitor.edid.assign(edid, edid+sizeof(edid)-1);
429
1155
430
1156
    auto config = std::make_shared<mtd::StubDisplayConfig>(
431
1157
                      std::vector<mg::DisplayConfigurationOutput>{monitor});
432
1158
433
1159
    apply_config_change_and_wait_for_propagation(config);
434
1160
435
1161
    DisplayClient client{new_connection()};
436
1162
    client.connect();
437
1163
438
1164
    auto base_config = client.get_base_config();
439
1165
    auto output = mir_display_config_get_output(base_config.get(), 0);
440
1166
441
1167
    EXPECT_STREQ("DEL 61510", mir_output_get_model(output));
442
1168
443
1169
    client.disconnect();
444
1170
}
445
1171
446
1088
namespace
1172
namespace
447
1089
{
1173
{
448
1090
MATCHER_P(IsSameModeAs, mode, "")
1174
MATCHER_P(IsSameModeAs, mode, "")
449
1091
1175
450
=== modified file 'tests/unit-tests/CMakeLists.txt'
451
--- tests/unit-tests/CMakeLists.txt	2016-11-15 23:48:01 +0000
452
+++ tests/unit-tests/CMakeLists.txt	2016-12-14 04:10:39 +0000
453
@@ -82,6 +82,7 @@
454
82
  test_posix_rw_mutex.cpp
82
  test_posix_rw_mutex.cpp
455
83
  test_posix_timestamp.cpp
83
  test_posix_timestamp.cpp
456
84
  test_observer_multiplexer.cpp
84
  test_observer_multiplexer.cpp
457
85
  test_edid.cpp
458
85
)
86
)
459
86
87
460
87
CMAKE_DEPENDENT_OPTION(
88
CMAKE_DEPENDENT_OPTION(
461
88
89
462
=== added file 'tests/unit-tests/test_edid.cpp'
463
--- tests/unit-tests/test_edid.cpp	1970-01-01 00:00:00 +0000
464
+++ tests/unit-tests/test_edid.cpp	2016-12-14 04:10:39 +0000
465
@@ -0,0 +1,73 @@
466
1
/*
467
2
 * Copyright © 2016 Canonical Ltd.
468
3
 *
469
4
 * This program is free software: you can redistribute it and/or modify it
470
5
 * under the terms of the GNU General Public License version 3,
471
6
 * as published by the Free Software Foundation.
472
7
 *
473
8
 * This program is distributed in the hope that it will be useful,
474
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
475
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
476
11
 * GNU General Public License for more details.
477
12
 *
478
13
 * You should have received a copy of the GNU General Public License
479
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
480
15
 *
481
16
 * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
482
17
 */
483
18
484
19
#include "mir/graphics/edid.h"
485
20
#include <gtest/gtest.h>
486
21
487
22
using mir::graphics::Edid;
488
23
489
24
namespace
490
25
{
491
26
unsigned char const dell_u2413_edid[] =
492
27
    "\x00\xff\xff\xff\xff\xff\xff\x00\x10\xac\x46\xf0\x4c\x4a\x31\x41"
493
28
    "\x05\x19\x01\x04\xb5\x34\x20\x78\x3a\x1d\xf5\xae\x4f\x35\xb3\x25"
494
29
    "\x0d\x50\x54\xa5\x4b\x00\x81\x80\xa9\x40\xd1\x00\x71\x4f\x01\x01"
495
30
    "\x01\x01\x01\x01\x01\x01\x28\x3c\x80\xa0\x70\xb0\x23\x40\x30\x20"
496
31
    "\x36\x00\x06\x44\x21\x00\x00\x1a\x00\x00\x00\xff\x00\x59\x43\x4d"
497
32
    "\x30\x46\x35\x31\x52\x41\x31\x4a\x4c\x0a\x00\x00\x00\xfc\x00\x44"
498
33
    "\x45\x4c\x4c\x20\x55\x32\x34\x31\x33\x0a\x20\x20\x00\x00\x00\xfd"
499
34
    "\x00\x38\x4c\x1e\x51\x11\x00\x0a\x20\x20\x20\x20\x20\x20\x01\x42"
500
35
    "\x02\x03\x1d\xf1\x50\x90\x05\x04\x03\x02\x07\x16\x01\x1f\x12\x13"
501
36
    "\x14\x20\x15\x11\x06\x23\x09\x1f\x07\x83\x01\x00\x00\x02\x3a\x80"
502
37
    "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x06\x44\x21\x00\x00\x1e\x01"
503
38
    "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\x06\x44\x21\x00\x00"
504
39
    "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x06\x44\x21"
505
40
    "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x06"
506
41
    "\x44\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
507
42
    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09";
508
43
} // namespace
509
44
510
45
TEST(EDID, has_correct_size)
511
46
{
512
47
    EXPECT_EQ(128u, sizeof(Edid));
513
48
    EXPECT_EQ(128u, Edid::minimum_size);
514
49
}
515
50
516
51
TEST(EDID, can_get_name)
517
52
{
518
53
    auto edid = reinterpret_cast<Edid const*>(dell_u2413_edid);
519
54
    Edid::MonitorName name;
520
55
    int len = edid->get_monitor_name(name);
521
56
    EXPECT_EQ(10, len);
522
57
    EXPECT_STREQ("DELL U2413", name);
523
58
}
524
59
525
60
TEST(EDID, can_get_manufacturer)
526
61
{
527
62
    auto edid = reinterpret_cast<Edid const*>(dell_u2413_edid);
528
63
    Edid::Manufacturer man;
529
64
    int len = edid->get_manufacturer(man);
530
65
    EXPECT_EQ(3, len);
531
66
    EXPECT_STREQ("DEL", man);
532
67
}
533
68
534
69
TEST(EDID, can_get_product_code)
535
70
{
536
71
    auto edid = reinterpret_cast<Edid const*>(dell_u2413_edid);
537
72
    EXPECT_EQ(61510u, edid->product_code());
538
73
}
Status:	Merged
Approved by:	Daniel van Vugt on 2016-12-14
Approved revision:	no longer in the source branch.
Merged at revision:	3882
Proposed branch:	lp:~vanvugt/mir/output-model
Merge into:	lp:mir
Diff against target:	538 lines (+404/-0) 13 files modified include/client/mir_toolkit/mir_display_configuration.h (+12/-0) src/client/display_configuration_api.cpp (+25/-0) src/client/symbols.map (+1/-0) src/common/CMakeLists.txt (+1/-0) src/common/edid.cpp (+67/-0) src/common/symbols.map (+7/-0) src/include/common/mir/graphics/edid.h (+111/-0) src/protobuf/mir_protobuf.proto (+1/-0) src/server/report/logging/display_configuration_report.cpp (+17/-0) src/utils/out.c (+4/-0) tests/acceptance-tests/test_new_display_configuration.cpp (+84/-0) tests/unit-tests/CMakeLists.txt (+1/-0) tests/unit-tests/test_edid.cpp (+73/-0)
To merge this branch:	bzr merge lp:~vanvugt/mir/output-model
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration	2016-12-09	Approve on 2016-12-14
Alan Griffiths		2016-12-09	Needs Fixing on 2016-12-13
Cemil Azizoglu (community)		2016-12-09	Approve on 2016-12-09
Mir development team		2016-12-09	Pending
Review via email: mp+312880@code.launchpad.net