1
=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
2
--- src/server/graphics/nested/nested_display_configuration.cpp	2017-01-17 02:18:28 +0000
3
+++ src/server/graphics/nested/nested_display_configuration.cpp	2017-01-18 07:59:36 +0000
4
@@ -107,6 +107,12 @@
5
107
    uint32_t preferred_index = mir_output_get_preferred_mode_index(output);
107
    uint32_t preferred_index = mir_output_get_preferred_mode_index(output);
6
108
    uint32_t current_index   = mir_output_get_current_mode_index(output);
108
    uint32_t current_index   = mir_output_get_current_mode_index(output);
7
109
109
8
110
    std::vector<uint8_t> edid;
9
111
    auto edid_size = mir_output_get_edid_size(output);
10
112
    auto edid_start = mir_output_get_edid(output);
11
113
    if (edid_size && edid_start)
12
114
        edid.assign(edid_start, edid_start+edid_size);
13
115
14
110
    return mg::DisplayConfigurationOutput{
116
    return mg::DisplayConfigurationOutput{
15
111
        DisplayConfigurationOutputId(output_id),
117
        DisplayConfigurationOutputId(output_id),
16
112
        DisplayConfigurationCardId(0), // Information not around
118
        DisplayConfigurationCardId(0), // Information not around
17
@@ -127,7 +133,7 @@
18
127
        local_config.subpixel_arrangement,
133
        local_config.subpixel_arrangement,
19
128
        local_config.gamma,
134
        local_config.gamma,
20
129
        local_config.gamma_supported,
135
        local_config.gamma_supported,
22
130
        {}
136
        std::move(edid)
23
131
    };
137
    };
24
132
}
138
}
25
133
139
26
134
140
27
=== modified file 'tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp'
28
--- tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-01-17 02:18:28 +0000
29
+++ tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-01-18 07:59:36 +0000
30
@@ -36,6 +36,24 @@
31
36
uint32_t const default_physical_width_mm = 0;
36
uint32_t const default_physical_width_mm = 0;
32
37
uint32_t const default_physical_height_mm = 0;
37
uint32_t const default_physical_height_mm = 0;
33
38
38
34
39
unsigned char const valid_edid[] =
35
40
    "\x00\xff\xff\xff\xff\xff\xff\x00\x10\xac\x46\xf0\x4c\x4a\x31\x41"
36
41
    "\x05\x19\x01\x04\xb5\x34\x20\x78\x3a\x1d\xf5\xae\x4f\x35\xb3\x25"
37
42
    "\x0d\x50\x54\xa5\x4b\x00\x81\x80\xa9\x40\xd1\x00\x71\x4f\x01\x01"
38
43
    "\x01\x01\x01\x01\x01\x01\x28\x3c\x80\xa0\x70\xb0\x23\x40\x30\x20"
39
44
    "\x36\x00\x06\x44\x21\x00\x00\x1a\x00\x00\x00\xff\x00\x59\x43\x4d"
40
45
    "\x30\x46\x35\x31\x52\x41\x31\x4a\x4c\x0a\x00\x00\x00\xfc\x00\x44"
41
46
    "\x45\x4c\x4c\x20\x55\x32\x34\x31\x33\x0a\x20\x20\x00\x00\x00\xfd"
42
47
    "\x00\x38\x4c\x1e\x51\x11\x00\x0a\x20\x20\x20\x20\x20\x20\x01\x42"
43
48
    "\x02\x03\x1d\xf1\x50\x90\x05\x04\x03\x02\x07\x16\x01\x1f\x12\x13"
44
49
    "\x14\x20\x15\x11\x06\x23\x09\x1f\x07\x83\x01\x00\x00\x02\x3a\x80"
45
50
    "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x06\x44\x21\x00\x00\x1e\x01"
46
51
    "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\x06\x44\x21\x00\x00"
47
52
    "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x06\x44\x21"
48
53
    "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x06"
49
54
    "\x44\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
50
55
    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09";
51
56
52
39
}
57
}
53
40
58
54
41
std::shared_ptr<MirDisplayConfig> mt::build_trivial_configuration()
59
std::shared_ptr<MirDisplayConfig> mt::build_trivial_configuration()
55
@@ -62,6 +80,7 @@
56
62
    output->set_preferred_mode(default_preferred_mode);
80
    output->set_preferred_mode(default_preferred_mode);
57
63
    output->set_power_mode(mir_power_mode_on);
81
    output->set_power_mode(mir_power_mode_on);
58
64
    output->set_orientation(mir_orientation_normal);
82
    output->set_orientation(mir_orientation_normal);
59
83
    output->set_edid(valid_edid, sizeof(valid_edid));
60
65
84
61
66
    return std::make_shared<MirDisplayConfig>(conf);
85
    return std::make_shared<MirDisplayConfig>(conf);
62
67
}
86
}
63
@@ -101,6 +120,7 @@
64
101
        output->set_preferred_mode(default_preferred_mode);
120
        output->set_preferred_mode(default_preferred_mode);
65
102
        output->set_power_mode(mir_power_mode_on);
121
        output->set_power_mode(mir_power_mode_on);
66
103
        output->set_orientation(mir_orientation_normal);
122
        output->set_orientation(mir_orientation_normal);
67
123
        output->set_edid(valid_edid, sizeof(valid_edid));
68
104
    }
124
    }
69
105
125
70
106
    return std::make_shared<MirDisplayConfig>(conf);
126
    return std::make_shared<MirDisplayConfig>(conf);
71
107
127
72
=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
73
--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-01-17 02:18:28 +0000
74
+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-01-18 07:59:36 +0000
75
@@ -147,6 +147,28 @@
76
147
        });
147
        });
77
148
}
148
}
78
149
149
79
150
TEST(NestedDisplayConfiguration, includes_host_edid)
80
151
{
81
152
    auto host_conf = mt::build_trivial_configuration();
82
153
    auto const output = mir_display_config_get_output(host_conf.get(), 0);
83
154
    auto edid_start = mir_output_get_edid(output);
84
155
    auto edid_size = mir_output_get_edid_size(output);
85
156
86
157
    ASSERT_NE(nullptr, edid_start);
87
158
    ASSERT_NE(0, edid_size);
88
159
89
160
    std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
90
161
91
162
    mgn::NestedDisplayConfiguration nested_conf(host_conf);
92
163
    int matches = 0;
93
164
    nested_conf.for_each_output([&](mg::DisplayConfigurationOutput const& output)
94
165
        {
95
166
            ASSERT_EQ(host_edid, output.edid);
96
167
            ++matches;
97
168
        });
98
169
    EXPECT_NE(0, matches);
99
170
}
100
171
101
150
TEST(NestedDisplayConfiguration, clone_matches_original_configuration)
172
TEST(NestedDisplayConfiguration, clone_matches_original_configuration)
102
151
{
173
{
103
152
    mgn::NestedDisplayConfiguration config(mt::build_non_trivial_configuration());
174
    mgn::NestedDisplayConfiguration config(mt::build_non_trivial_configuration());
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-01-18
Andreas Pokorny (community)			Approve on 2017-01-18
Alan Griffiths		2017-01-18	Approve on 2017-01-18
Review via email: mp+314985@code.launchpad.net
1	=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
2	--- src/server/graphics/nested/nested_display_configuration.cpp 2017-01-17 02:18:28 +0000
3	+++ src/server/graphics/nested/nested_display_configuration.cpp 2017-01-18 07:59:36 +0000
4	@@ -107,6 +107,12 @@
5	107	uint32_t preferred_index = mir_output_get_preferred_mode_index(output);	107	uint32_t preferred_index = mir_output_get_preferred_mode_index(output);
6	108	uint32_t current_index = mir_output_get_current_mode_index(output);	108	uint32_t current_index = mir_output_get_current_mode_index(output);
7	109		109
8			110	std::vector<uint8_t> edid;
9			111	auto edid_size = mir_output_get_edid_size(output);
10			112	auto edid_start = mir_output_get_edid(output);
11			113	if (edid_size && edid_start)
12			114	edid.assign(edid_start, edid_start+edid_size);
13			115
14	110	return mg::DisplayConfigurationOutput{	116	return mg::DisplayConfigurationOutput{
15	111	DisplayConfigurationOutputId(output_id),	117	DisplayConfigurationOutputId(output_id),
16	112	DisplayConfigurationCardId(0), // Information not around	118	DisplayConfigurationCardId(0), // Information not around
17	@@ -127,7 +133,7 @@
18	127	local_config.subpixel_arrangement,	133	local_config.subpixel_arrangement,
19	128	local_config.gamma,	134	local_config.gamma,
20	129	local_config.gamma_supported,	135	local_config.gamma_supported,
22	130	{}	136	std::move(edid)
23	131	};	137	};
24	132	}	138	}
25	133		139
26	134		140
27	=== modified file 'tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp'
28	--- tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp 2017-01-17 02:18:28 +0000
29	+++ tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp 2017-01-18 07:59:36 +0000
30	@@ -36,6 +36,24 @@
31	36	uint32_t const default_physical_width_mm = 0;	36	uint32_t const default_physical_width_mm = 0;
32	37	uint32_t const default_physical_height_mm = 0;	37	uint32_t const default_physical_height_mm = 0;
33	38		38
34			39	unsigned char const valid_edid[] =
35			40	"\x00\xff\xff\xff\xff\xff\xff\x00\x10\xac\x46\xf0\x4c\x4a\x31\x41"
36			41	"\x05\x19\x01\x04\xb5\x34\x20\x78\x3a\x1d\xf5\xae\x4f\x35\xb3\x25"
37			42	"\x0d\x50\x54\xa5\x4b\x00\x81\x80\xa9\x40\xd1\x00\x71\x4f\x01\x01"
38			43	"\x01\x01\x01\x01\x01\x01\x28\x3c\x80\xa0\x70\xb0\x23\x40\x30\x20"
39			44	"\x36\x00\x06\x44\x21\x00\x00\x1a\x00\x00\x00\xff\x00\x59\x43\x4d"
40			45	"\x30\x46\x35\x31\x52\x41\x31\x4a\x4c\x0a\x00\x00\x00\xfc\x00\x44"
41			46	"\x45\x4c\x4c\x20\x55\x32\x34\x31\x33\x0a\x20\x20\x00\x00\x00\xfd"
42			47	"\x00\x38\x4c\x1e\x51\x11\x00\x0a\x20\x20\x20\x20\x20\x20\x01\x42"
43			48	"\x02\x03\x1d\xf1\x50\x90\x05\x04\x03\x02\x07\x16\x01\x1f\x12\x13"
44			49	"\x14\x20\x15\x11\x06\x23\x09\x1f\x07\x83\x01\x00\x00\x02\x3a\x80"
45			50	"\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x06\x44\x21\x00\x00\x1e\x01"
46			51	"\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\x06\x44\x21\x00\x00"
47			52	"\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\x06\x44\x21"
48			53	"\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x06"
49			54	"\x44\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
50			55	"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09";
51			56
52	39	}	57	}
53	40		58
54	41	std::shared_ptr<MirDisplayConfig> mt::build_trivial_configuration()	59	std::shared_ptr<MirDisplayConfig> mt::build_trivial_configuration()
55	@@ -62,6 +80,7 @@
56	62	output->set_preferred_mode(default_preferred_mode);	80	output->set_preferred_mode(default_preferred_mode);
57	63	output->set_power_mode(mir_power_mode_on);	81	output->set_power_mode(mir_power_mode_on);
58	64	output->set_orientation(mir_orientation_normal);	82	output->set_orientation(mir_orientation_normal);
59			83	output->set_edid(valid_edid, sizeof(valid_edid));
60	65		84
61	66	return std::make_shared<MirDisplayConfig>(conf);	85	return std::make_shared<MirDisplayConfig>(conf);
62	67	}	86	}
63	@@ -101,6 +120,7 @@
64	101	output->set_preferred_mode(default_preferred_mode);	120	output->set_preferred_mode(default_preferred_mode);
65	102	output->set_power_mode(mir_power_mode_on);	121	output->set_power_mode(mir_power_mode_on);
66	103	output->set_orientation(mir_orientation_normal);	122	output->set_orientation(mir_orientation_normal);
67			123	output->set_edid(valid_edid, sizeof(valid_edid));
68	104	}	124	}
69	105		125
70	106	return std::make_shared<MirDisplayConfig>(conf);	126	return std::make_shared<MirDisplayConfig>(conf);
71	107		127
72	=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
73	--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp 2017-01-17 02:18:28 +0000
74	+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp 2017-01-18 07:59:36 +0000
75	@@ -147,6 +147,28 @@
76	147	});	147	});
77	148	}	148	}
78	149		149
79			150	TEST(NestedDisplayConfiguration, includes_host_edid)
80			151	{
81			152	auto host_conf = mt::build_trivial_configuration();
82			153	auto const output = mir_display_config_get_output(host_conf.get(), 0);
83			154	auto edid_start = mir_output_get_edid(output);
84			155	auto edid_size = mir_output_get_edid_size(output);
85			156
86			157	ASSERT_NE(nullptr, edid_start);
87			158	ASSERT_NE(0, edid_size);
88			159
89			160	std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
90			161
91			162	mgn::NestedDisplayConfiguration nested_conf(host_conf);
92			163	int matches = 0;
93			164	nested_conf.for_each_output([&](mg::DisplayConfigurationOutput const& output)
94			165	{
95			166	ASSERT_EQ(host_edid, output.edid);
96			167	++matches;
97			168	});
98			169	EXPECT_NE(0, matches);
99			170	}
100			171
101	150	TEST(NestedDisplayConfiguration, clone_matches_original_configuration)	172	TEST(NestedDisplayConfiguration, clone_matches_original_configuration)
102	151	{	173	{
103	152	mgn::NestedDisplayConfiguration config(mt::build_non_trivial_configuration());	174	mgn::NestedDisplayConfiguration config(mt::build_non_trivial_configuration());