1
=== modified file 'src/platform/graphics/android/android_display.cpp'
2
--- src/platform/graphics/android/android_display.cpp	2014-03-27 13:38:00 +0000
3
+++ src/platform/graphics/android/android_display.cpp	2014-04-09 14:53:50 +0000
4
@@ -49,11 +49,16 @@
5
49
49
6
50
void mga::AndroidDisplay::for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f)
50
void mga::AndroidDisplay::for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f)
7
51
{
51
{
9
52
    f(*display_buffer);
52
    std::lock_guard<decltype(configuration_mutex)> lock{configuration_mutex};
10
53
11
54
    if (display_buffer->configuration().power_mode == mir_power_mode_on)
12
55
        f(*display_buffer);
13
53
}
56
}
14
54
57
15
55
std::unique_ptr<mg::DisplayConfiguration> mga::AndroidDisplay::configuration() const
58
std::unique_ptr<mg::DisplayConfiguration> mga::AndroidDisplay::configuration() const
16
56
{
59
{
17
60
    std::lock_guard<decltype(configuration_mutex)> lock{configuration_mutex};
18
61
19
57
    return std::unique_ptr<mg::DisplayConfiguration>(
62
    return std::unique_ptr<mg::DisplayConfiguration>(
20
58
        new mga::AndroidDisplayConfiguration(display_buffer->configuration()));
63
        new mga::AndroidDisplayConfiguration(display_buffer->configuration()));
21
59
}
64
}
22
@@ -66,6 +71,8 @@
23
66
            std::logic_error("Invalid or inconsistent display configuration"));
71
            std::logic_error("Invalid or inconsistent display configuration"));
24
67
    }
72
    }
25
68
73
26
74
    std::lock_guard<decltype(configuration_mutex)> lock{configuration_mutex};
27
75
28
69
    configuration.for_each_output([&](mg::DisplayConfigurationOutput const& output)
76
    configuration.for_each_output([&](mg::DisplayConfigurationOutput const& output)
29
70
    {
77
    {
30
71
        display_buffer->configure(output);
78
        display_buffer->configure(output);
31
72
79
32
=== modified file 'src/platform/graphics/android/android_display.h'
33
--- src/platform/graphics/android/android_display.h	2014-03-27 13:38:00 +0000
34
+++ src/platform/graphics/android/android_display.h	2014-04-09 14:53:50 +0000
35
@@ -23,6 +23,7 @@
36
23
#include "gl_context.h"
23
#include "gl_context.h"
37
24
24
38
25
#include <memory>
25
#include <memory>
39
26
#include <mutex>
40
26
27
41
27
namespace mir
28
namespace mir
42
28
{
29
{
43
@@ -68,6 +69,7 @@
44
68
private:
69
private:
45
69
    std::shared_ptr<DisplayBuilder> const display_builder;
70
    std::shared_ptr<DisplayBuilder> const display_builder;
46
70
    GLContext gl_context;
71
    GLContext gl_context;
47
72
    mutable std::mutex configuration_mutex;
48
71
73
49
72
    //we only have a primary display at the moment
74
    //we only have a primary display at the moment
50
73
    std::unique_ptr<ConfigurableDisplayBuffer> const display_buffer;
75
    std::unique_ptr<ConfigurableDisplayBuffer> const display_buffer;
51
74
76
52
=== modified file 'src/platform/graphics/mesa/display.cpp'
53
--- src/platform/graphics/mesa/display.cpp	2014-03-27 09:52:04 +0000
54
+++ src/platform/graphics/mesa/display.cpp	2014-04-09 14:53:50 +0000
55
@@ -337,11 +337,19 @@
56
337
{
337
{
57
338
    current_display_configuration.for_each_output([&](DisplayConfigurationOutput const& conf_output)
338
    current_display_configuration.for_each_output([&](DisplayConfigurationOutput const& conf_output)
58
339
    {
339
    {
60
340
        if (conf_output.connected && !conf_output.used)
340
        /*
61
341
         * An output may be unused either because it's explicitly not used
62
342
         * (DisplayConfigurationOutput::used) or because its power mode is
63
343
         * not mir_power_mode_on.
64
344
         */
65
345
        if (conf_output.connected &&
66
346
            (!conf_output.used || (conf_output.power_mode != mir_power_mode_on)))
67
341
        {
347
        {
68
342
            uint32_t const connector_id = current_display_configuration.get_kms_connector_id(conf_output.id);
348
            uint32_t const connector_id = current_display_configuration.get_kms_connector_id(conf_output.id);
69
343
            auto kms_output = output_container.get_kms_output_for(connector_id);
349
            auto kms_output = output_container.get_kms_output_for(connector_id);
70
350
71
344
            kms_output->clear_crtc();
351
            kms_output->clear_crtc();
72
352
            kms_output->set_power_mode(conf_output.power_mode);
73
345
        }
353
        }
74
346
    });
354
    });
75
347
}
355
}
76
348
356
77
=== modified file 'src/platform/graphics/overlapping_output_grouping.cpp'
78
--- src/platform/graphics/overlapping_output_grouping.cpp	2014-03-10 03:02:32 +0000
79
+++ src/platform/graphics/overlapping_output_grouping.cpp	2014-04-09 14:53:50 +0000
80
@@ -76,6 +76,7 @@
81
76
    conf.for_each_output([&](DisplayConfigurationOutput const& conf_output)
76
    conf.for_each_output([&](DisplayConfigurationOutput const& conf_output)
82
77
    {
77
    {
83
78
        if (conf_output.connected && conf_output.used &&
78
        if (conf_output.connected && conf_output.used &&
84
79
            conf_output.power_mode == mir_power_mode_on &&
85
79
            conf_output.current_mode_index < conf_output.modes.size())
80
            conf_output.current_mode_index < conf_output.modes.size())
86
80
        {
81
        {
87
81
            add_output(conf_output);
82
            add_output(conf_output);
88
82
83
89
=== modified file 'tests/unit-tests/graphics/CMakeLists.txt'
90
--- tests/unit-tests/graphics/CMakeLists.txt	2014-03-12 02:46:58 +0000
91
+++ tests/unit-tests/graphics/CMakeLists.txt	2014-04-09 14:53:50 +0000
92
@@ -8,6 +8,7 @@
93
8
    ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_properties.cpp
8
    ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_properties.cpp
94
9
    ${CMAKE_CURRENT_SOURCE_DIR}/test_pixel_format_utils.cpp
9
    ${CMAKE_CURRENT_SOURCE_DIR}/test_pixel_format_utils.cpp
95
10
    ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp
10
    ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp
96
11
    ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp
97
11
)
12
)
98
12
13
99
13
add_subdirectory(nested/)
14
add_subdirectory(nested/)
100
14
15
101
=== modified file 'tests/unit-tests/graphics/mesa/CMakeLists.txt'
102
--- tests/unit-tests/graphics/mesa/CMakeLists.txt	2014-03-06 06:05:17 +0000
103
+++ tests/unit-tests/graphics/mesa/CMakeLists.txt	2014-04-09 14:53:50 +0000
104
@@ -12,7 +12,6 @@
105
12
  ${CMAKE_CURRENT_SOURCE_DIR}/test_linux_virtual_terminal.cpp
12
  ${CMAKE_CURRENT_SOURCE_DIR}/test_linux_virtual_terminal.cpp
106
13
  ${CMAKE_CURRENT_SOURCE_DIR}/test_internal_native_display.cpp
13
  ${CMAKE_CURRENT_SOURCE_DIR}/test_internal_native_display.cpp
107
14
  ${CMAKE_CURRENT_SOURCE_DIR}/test_internal_native_surface.cpp
14
  ${CMAKE_CURRENT_SOURCE_DIR}/test_internal_native_surface.cpp
108
15
  ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp
109
16
  ${CMAKE_CURRENT_SOURCE_DIR}/test_cursor.cpp
15
  ${CMAKE_CURRENT_SOURCE_DIR}/test_cursor.cpp
110
17
  ${CMAKE_CURRENT_SOURCE_DIR}/test_native_platform.cpp
16
  ${CMAKE_CURRENT_SOURCE_DIR}/test_native_platform.cpp
111
18
  ${CMAKE_CURRENT_SOURCE_DIR}/test_anonymous_shm_file.cpp
17
  ${CMAKE_CURRENT_SOURCE_DIR}/test_anonymous_shm_file.cpp
112
19
18
113
=== modified file 'tests/unit-tests/graphics/test_display.cpp'
114
--- tests/unit-tests/graphics/test_display.cpp	2014-03-27 09:52:04 +0000
115
+++ tests/unit-tests/graphics/test_display.cpp	2014-04-09 14:53:50 +0000
116
@@ -199,3 +199,26 @@
117
199
    EXPECT_CALL(mock_egl, eglMakeCurrent(_,EGL_NO_SURFACE,EGL_NO_SURFACE,EGL_NO_CONTEXT))
199
    EXPECT_CALL(mock_egl, eglMakeCurrent(_,EGL_NO_SURFACE,EGL_NO_SURFACE,EGL_NO_CONTEXT))
118
200
        .Times(AtLeast(0));
200
        .Times(AtLeast(0));
119
201
}
201
}
120
202
121
203
TEST_F(DisplayTest, does_not_expose_display_buffer_for_output_with_power_mode_off)
122
204
{
123
205
    using namespace testing;
124
206
    auto display = create_display();
125
207
    int db_count{0};
126
208
127
209
    display->for_each_display_buffer([&] (mg::DisplayBuffer&) { ++db_count; });
128
210
    EXPECT_THAT(db_count, Eq(1));
129
211
130
212
    auto conf = display->configuration();
131
213
    conf->for_each_output(
132
214
        [] (mg::UserDisplayConfigurationOutput& output)
133
215
        {
134
216
            output.power_mode = mir_power_mode_off;
135
217
        });
136
218
137
219
    display->configure(*conf);
138
220
139
221
    db_count = 0;
140
222
    display->for_each_display_buffer([&] (mg::DisplayBuffer&) { ++db_count; });
141
223
    EXPECT_THAT(db_count, Eq(0));
142
224
}
143
202
225
144
=== renamed file 'tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp' => 'tests/unit-tests/graphics/test_overlapping_output_grouping.cpp'
145
--- tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp	2014-03-26 05:48:59 +0000
146
+++ tests/unit-tests/graphics/test_overlapping_output_grouping.cpp	2014-04-09 14:53:50 +0000
147
@@ -37,10 +37,22 @@
148
37
public:
37
public:
149
38
    struct OutputInfo
38
    struct OutputInfo
150
39
    {
39
    {
151
40
        OutputInfo(
152
41
            geom::Rectangle const& rect,
153
42
            bool connected,
154
43
            bool used,
155
44
            MirOrientation orientation,
156
45
            MirPowerMode power_mode = mir_power_mode_on)
157
46
            : rect(rect), connected{connected}, used{used},
158
47
              orientation{orientation}, power_mode{power_mode}
159
48
        {
160
49
        }
161
50
162
40
        geom::Rectangle rect;
51
        geom::Rectangle rect;
163
41
        bool connected;
52
        bool connected;
164
42
        bool used;
53
        bool used;
165
43
        MirOrientation orientation;
54
        MirOrientation orientation;
166
55
        MirPowerMode power_mode;
167
44
    };
56
    };
168
45
57
169
46
    StubDisplayConfiguration(std::vector<OutputInfo> const& info)
58
    StubDisplayConfiguration(std::vector<OutputInfo> const& info)
170
@@ -81,7 +93,7 @@
171
81
                info.rect.top_left,
93
                info.rect.top_left,
172
82
                i - 1,
94
                i - 1,
173
83
                mir_pixel_format_invalid,
95
                mir_pixel_format_invalid,
175
84
                mir_power_mode_on,
96
                info.power_mode,
176
85
                info.orientation
97
                info.orientation
177
86
            };
98
            };
178
87
99
179
@@ -291,3 +303,17 @@
180
291
303
181
292
    check_groupings(info, expected_groups);
304
    check_groupings(info, expected_groups);
182
293
}
305
}
183
306
184
307
TEST_F(OverlappingOutputGroupingTest, ignores_outputs_with_power_mode_not_on)
185
308
{
186
309
    std::vector<StubDisplayConfiguration::OutputInfo> info
187
310
    {
188
311
        {{{0,0}, {100, 100}}, true, true, mir_orientation_normal, mir_power_mode_off},
189
312
        {{{0,0}, {100, 100}}, true, true, mir_orientation_normal, mir_power_mode_standby},
190
313
        {{{0,0}, {100, 100}}, true, true, mir_orientation_normal, mir_power_mode_suspend}
191
314
    };
192
315
193
316
    std::vector<geom::Rectangles> expected_groups;
194
317
195
318
    check_groupings(info, expected_groups);
196
319
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-04-11
Kevin DuBois (community)			Approve on 2014-04-09
Alberto Aguirre (community)		2014-04-08	Approve on 2014-04-08
Review via email: mp+214758@code.launchpad.net