1
=== modified file 'src/platforms/mesa/server/display_helpers.cpp'
2
--- src/platforms/mesa/server/display_helpers.cpp	2017-01-18 02:29:37 +0000
3
+++ src/platforms/mesa/server/display_helpers.cpp	2017-02-28 00:55:32 +0000
4
@@ -321,6 +321,31 @@
5
321
{
321
{
6
322
}
322
}
7
323
323
8
324
mgmh::EGLHelper::EGLHelper(
9
325
    GLConfig const& gl_config,
10
326
    GBMHelper const& gbm,
11
327
    gbm_surface* surface,
12
328
    EGLContext shared_context)
13
329
    : EGLHelper(gl_config)
14
330
{
15
331
    setup(gbm, surface, shared_context);
16
332
}
17
333
18
334
mgmh::EGLHelper::EGLHelper(EGLHelper&& from)
19
335
    : depth_buffer_bits{from.depth_buffer_bits},
20
336
      stencil_buffer_bits{from.stencil_buffer_bits},
21
337
      egl_display{from.egl_display},
22
338
      egl_config{from.egl_config},
23
339
      egl_context{from.egl_context},
24
340
      egl_surface{from.egl_surface},
25
341
      should_terminate_egl{from.should_terminate_egl}
26
342
{
27
343
    from.should_terminate_egl = false;
28
344
    from.egl_display = EGL_NO_DISPLAY;
29
345
    from.egl_context = EGL_NO_CONTEXT;
30
346
    from.egl_surface = EGL_NO_SURFACE;
31
347
}
32
348
33
324
void mgmh::EGLHelper::setup(GBMHelper const& gbm)
349
void mgmh::EGLHelper::setup(GBMHelper const& gbm)
34
325
{
350
{
35
326
    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
351
    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
36
327
352
37
=== modified file 'src/platforms/mesa/server/display_helpers.h'
38
--- src/platforms/mesa/server/display_helpers.h	2017-01-18 02:29:37 +0000
39
+++ src/platforms/mesa/server/display_helpers.h	2017-02-28 00:55:32 +0000
40
@@ -102,7 +102,13 @@
41
102
{
102
{
42
103
public:
103
public:
43
104
    EGLHelper(GLConfig const& gl_config);
104
    EGLHelper(GLConfig const& gl_config);
44
105
    EGLHelper(
45
106
        GLConfig const& gl_config,
46
107
        GBMHelper const& gbm,
47
108
        gbm_surface* surface,
48
109
        EGLContext shared_context);
49
105
    ~EGLHelper() noexcept;
110
    ~EGLHelper() noexcept;
50
111
    EGLHelper(EGLHelper&& from);
51
106
112
52
107
    EGLHelper(const EGLHelper&) = delete;
113
    EGLHelper(const EGLHelper&) = delete;
53
108
    EGLHelper& operator=(const EGLHelper&) = delete;
114
    EGLHelper& operator=(const EGLHelper&) = delete;
54
109
115
55
=== modified file 'src/platforms/mesa/server/kms/CMakeLists.txt'
56
--- src/platforms/mesa/server/kms/CMakeLists.txt	2017-01-18 02:29:37 +0000
57
+++ src/platforms/mesa/server/kms/CMakeLists.txt	2017-02-28 00:55:32 +0000
58
@@ -30,12 +30,16 @@
59
30
  display.cpp
30
  display.cpp
60
31
  display_buffer.cpp
31
  display_buffer.cpp
61
32
  guest_platform.cpp
32
  guest_platform.cpp
62
33
  page_flipper.h
63
33
  kms_page_flipper.cpp
34
  kms_page_flipper.cpp
64
34
  linux_virtual_terminal.cpp
35
  linux_virtual_terminal.cpp
65
35
  nested_authentication.cpp
36
  nested_authentication.cpp
66
36
  platform.cpp
37
  platform.cpp
67
38
  kms_display_configuration.h
68
37
  real_kms_display_configuration.cpp
39
  real_kms_display_configuration.cpp
69
40
  kms_output.h
70
38
  real_kms_output.cpp
41
  real_kms_output.cpp
71
42
  kms_output_container.h
72
39
  real_kms_output_container.cpp
43
  real_kms_output_container.cpp
73
40
)
44
)
74
41
45
75
42
46
76
=== modified file 'src/platforms/mesa/server/kms/display.cpp'
77
--- src/platforms/mesa/server/kms/display.cpp	2017-02-15 07:38:33 +0000
78
+++ src/platforms/mesa/server/kms/display.cpp	2017-02-28 00:55:32 +0000
79
@@ -414,18 +414,25 @@
80
414
                }
414
                }
81
415
415
82
416
                auto surface = gbm->create_scanout_surface(width, height);
416
                auto surface = gbm->create_scanout_surface(width, height);
83
417
                auto const raw_surface = surface.get();
84
417
418
85
418
                std::unique_ptr<DisplayBuffer> db{
419
                std::unique_ptr<DisplayBuffer> db{
86
419
                    new DisplayBuffer{bypass_option,
420
                    new DisplayBuffer{bypass_option,
87
420
                    drm,
88
421
                    gbm,
89
422
                    listener,
421
                    listener,
90
423
                    kms_outputs,
422
                    kms_outputs,
92
424
                    std::move(surface),
423
                    GBMOutputSurface{
93
424
                        drm->fd,
94
425
                        std::move(surface),
95
426
                        width, height,
96
427
                        helpers::EGLHelper{
97
428
                            *gl_config,
98
429
                            *gbm,
99
430
                            raw_surface,
100
431
                            shared_egl.context()
101
432
                        }
102
433
                    },
103
425
                    bounding_rect,
434
                    bounding_rect,
107
426
                    orientation,
435
                    orientation}};
105
427
                    *gl_config,
106
428
                    shared_egl.context()}};
108
429
436
109
430
                display_buffers_new.push_back(std::move(db));
437
                display_buffers_new.push_back(std::move(db));
110
431
            }
438
            }
111
432
439
112
=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
113
--- src/platforms/mesa/server/kms/display_buffer.cpp	2017-02-21 01:04:13 +0000
114
+++ src/platforms/mesa/server/kms/display_buffer.cpp	2017-02-28 00:55:32 +0000
115
@@ -39,13 +39,13 @@
116
39
namespace mgm = mir::graphics::mesa;
39
namespace mgm = mir::graphics::mesa;
117
40
namespace geom = mir::geometry;
40
namespace geom = mir::geometry;
118
41
41
120
42
mgm::GBMFrontBuffer::GBMFrontBuffer()
42
mgm::GBMOutputSurface::FrontBuffer::FrontBuffer()
121
43
    : surf{nullptr},
43
    : surf{nullptr},
122
44
      bo{nullptr}
44
      bo{nullptr}
123
45
{
45
{
124
46
}
46
}
125
47
47
127
48
mgm::GBMFrontBuffer::GBMFrontBuffer(gbm_surface* surface)
48
mgm::GBMOutputSurface::FrontBuffer::FrontBuffer(gbm_surface* surface)
128
49
    : surf{surface},
49
    : surf{surface},
129
50
      bo{gbm_surface_lock_front_buffer(surface)}
50
      bo{gbm_surface_lock_front_buffer(surface)}
130
51
{
51
{
131
@@ -55,7 +55,7 @@
132
55
    }
55
    }
133
56
}
56
}
134
57
57
136
58
mgm::GBMFrontBuffer::~GBMFrontBuffer()
58
mgm::GBMOutputSurface::FrontBuffer::~FrontBuffer()
137
59
{
59
{
138
60
    if (surf)
60
    if (surf)
139
61
    {
61
    {
140
@@ -63,7 +63,7 @@
141
63
    }
63
    }
142
64
}
64
}
143
65
65
145
66
mgm::GBMFrontBuffer::GBMFrontBuffer(GBMFrontBuffer&& from)
66
mgm::GBMOutputSurface::FrontBuffer::FrontBuffer(FrontBuffer&& from)
146
67
    : surf{from.surf},
67
    : surf{from.surf},
147
68
      bo{from.bo}
68
      bo{from.bo}
148
69
{
69
{
149
@@ -71,7 +71,7 @@
150
71
    const_cast<gbm_bo*&>(from.bo) = nullptr;
71
    const_cast<gbm_bo*&>(from.bo) = nullptr;
151
72
}
72
}
152
73
73
154
74
auto mgm::GBMFrontBuffer::operator=(GBMFrontBuffer&& from) -> GBMFrontBuffer&
74
auto mgm::GBMOutputSurface::FrontBuffer::operator=(FrontBuffer&& from) -> FrontBuffer&
155
75
{
75
{
156
76
    if (surf)
76
    if (surf)
157
77
    {
77
    {
158
@@ -87,57 +87,24 @@
159
87
    return *this;
87
    return *this;
160
88
}
88
}
161
89
89
163
90
auto mgm::GBMFrontBuffer::operator=(std::nullptr_t) -> GBMFrontBuffer&
90
auto mgm::GBMOutputSurface::FrontBuffer::operator=(std::nullptr_t) -> FrontBuffer&
164
91
{
91
{
166
92
    return *this = GBMFrontBuffer{};
92
    return *this = FrontBuffer{};
167
93
}
93
}
168
94
94
170
95
mgm::GBMFrontBuffer::operator gbm_bo*()
95
mgm::GBMOutputSurface::FrontBuffer::operator gbm_bo*()
171
96
{
96
{
172
97
    return bo;
97
    return bo;
173
98
}
98
}
174
99
99
176
100
mgm::GBMFrontBuffer::operator bool() const
100
mgm::GBMOutputSurface::FrontBuffer::operator bool() const
177
101
{
101
{
178
102
    return (surf != nullptr) && (bo != nullptr);
102
    return (surf != nullptr) && (bo != nullptr);
179
103
}
103
}
180
104
104
181
105
class mgm::DRMFB
182
106
{
183
107
public:
184
108
    DRMFB(gbm_bo* bo, uint32_t drm_fb_id)
185
109
        : bo{bo}, drm_fb_id{drm_fb_id}
186
110
    {
187
111
    }
188
112
189
113
    ~DRMFB()
190
114
    {
191
115
        if (drm_fb_id)
192
116
        {
193
117
            int drm_fd = gbm_device_get_fd(gbm_bo_get_device(bo));
194
118
            drmModeRmFB(drm_fd, drm_fb_id);
195
119
        }
196
120
    }
197
121
198
122
    uint32_t get_drm_fb_id() const
199
123
    {
200
124
        return drm_fb_id;
201
125
    }
202
126
203
127
private:
204
128
    gbm_bo *bo;
205
129
    uint32_t drm_fb_id;
206
130
};
207
131
208
132
namespace
105
namespace
209
133
{
106
{
210
134
107
211
135
void bo_user_data_destroy(gbm_bo* /*bo*/, void *data)
212
136
{
213
137
    auto bufobj = static_cast<mgm::DRMFB*>(data);
214
138
    delete bufobj;
215
139
}
216
140
217
141
void ensure_egl_image_extensions()
108
void ensure_egl_image_extensions()
218
142
{
109
{
219
143
    std::string ext_string;
110
    std::string ext_string;
220
@@ -153,22 +120,15 @@
221
153
120
222
154
mgm::DisplayBuffer::DisplayBuffer(
121
mgm::DisplayBuffer::DisplayBuffer(
223
155
    mgm::BypassOption option,
122
    mgm::BypassOption option,
224
156
    std::shared_ptr<helpers::DRMHelper> const& drm,
225
157
    std::shared_ptr<helpers::GBMHelper> const& gbm,
226
158
    std::shared_ptr<DisplayReport> const& listener,
123
    std::shared_ptr<DisplayReport> const& listener,
227
159
    std::vector<std::shared_ptr<KMSOutput>> const& outputs,
124
    std::vector<std::shared_ptr<KMSOutput>> const& outputs,
229
160
    GBMSurfaceUPtr surface_gbm_param,
125
    GBMOutputSurface&& surface_gbm,
230
161
    geom::Rectangle const& area,
126
    geom::Rectangle const& area,
234
162
    MirOrientation rot,
127
    MirOrientation rot)
232
163
    GLConfig const& gl_config,
233
164
    EGLContext shared_context)
235
165
    : listener(listener),
128
    : listener(listener),
236
166
      bypass_option(option),
129
      bypass_option(option),
237
167
      drm(drm),
238
168
      gbm(gbm),
239
169
      outputs(outputs),
130
      outputs(outputs),
242
170
      egl{gl_config},
131
      surface{std::move(surface_gbm)},
241
171
      surface_gbm{std::move(surface_gbm_param)},
243
172
      area(area),
132
      area(area),
244
173
      transform{mg::transformation(rot)},
133
      transform{mg::transformation(rot)},
245
174
      needs_set_crtc{false},
134
      needs_set_crtc{false},
246
@@ -187,8 +147,6 @@
247
187
        fb_height = area_height;
147
        fb_height = area_height;
248
188
    }
148
    }
249
189
149
250
190
    egl.setup(*gbm, surface_gbm.get(), shared_context);
251
191
252
192
    listener->report_successful_setup_of_native_resources();
150
    listener->report_successful_setup_of_native_resources();
253
193
151
254
194
    make_current();
152
    make_current();
255
@@ -199,22 +157,21 @@
256
199
157
257
200
    glClear(GL_COLOR_BUFFER_BIT);
158
    glClear(GL_COLOR_BUFFER_BIT);
258
201
159
261
202
    if (!egl.swap_buffers())
160
    surface.swap_buffers();
260
203
        fatal_error("Failed to perform initial surface buffer swap");
262
204
161
263
205
    listener->report_successful_egl_buffer_swap_on_construction();
162
    listener->report_successful_egl_buffer_swap_on_construction();
264
206
163
266
207
    visible_composite_frame = GBMFrontBuffer{surface_gbm.get()};
164
    visible_composite_frame = surface.lock_front();
267
208
    if (!visible_composite_frame)
165
    if (!visible_composite_frame)
268
209
        fatal_error("Failed to get frontbuffer");
166
        fatal_error("Failed to get frontbuffer");
269
210
167
271
211
    set_crtc(get_drm_fb(visible_composite_frame));
168
    set_crtc(*outputs.front()->fb_for(visible_composite_frame, fb_width, fb_height));
272
212
169
273
213
    release_current();
170
    release_current();
274
214
171
275
215
    listener->report_successful_drm_mode_set_crtc_on_construction();
172
    listener->report_successful_drm_mode_set_crtc_on_construction();
276
216
    listener->report_successful_display_construction();
173
    listener->report_successful_display_construction();
278
217
    egl.report_egl_configuration(
174
    surface.report_egl_configuration(
279
218
        [&listener] (EGLDisplay disp, EGLConfig cfg)
175
        [&listener] (EGLDisplay disp, EGLConfig cfg)
280
219
        {
176
        {
281
220
            listener->report_egl_configuration(disp, cfg);
177
            listener->report_egl_configuration(disp, cfg);
282
@@ -258,7 +215,7 @@
283
258
            if (native->flags & mir_buffer_flag_can_scanout &&
215
            if (native->flags & mir_buffer_flag_can_scanout &&
284
259
                bypass_buffer->size() == geom::Size{fb_width,fb_height})
216
                bypass_buffer->size() == geom::Size{fb_width,fb_height})
285
260
            {
217
            {
287
261
                if (auto bufobj = get_buffer_object(native->bo))
218
                if (auto bufobj = outputs.front()->fb_for(native->bo, fb_width, fb_height))
288
262
                {
219
                {
289
263
                    bypass_buf = bypass_buffer;
220
                    bypass_buf = bypass_buffer;
290
264
                    bypass_bufobj = bufobj;
221
                    bypass_bufobj = bufobj;
291
@@ -281,13 +238,12 @@
292
281
238
293
282
void mgm::DisplayBuffer::swap_buffers()
239
void mgm::DisplayBuffer::swap_buffers()
294
283
{
240
{
297
284
    if (!egl.swap_buffers())
241
    surface.swap_buffers();
296
285
        fatal_error("Failed to perform buffer swap");
298
286
    bypass_buf = nullptr;
242
    bypass_buf = nullptr;
299
287
    bypass_bufobj = nullptr;
243
    bypass_bufobj = nullptr;
300
288
}
244
}
301
289
245
303
290
void mgm::DisplayBuffer::set_crtc(DRMFB const* forced_frame)
246
void mgm::DisplayBuffer::set_crtc(FBHandle const& forced_frame)
304
291
{
247
{
305
292
    for (auto& output : outputs)
248
    for (auto& output : outputs)
306
293
    {
249
    {
307
@@ -298,7 +254,7 @@
308
298
         * sometimes it's really not there). Xorg often reports similar
254
         * sometimes it's really not there). Xorg often reports similar
309
299
         * errors, and it's not fatal.
255
         * errors, and it's not fatal.
310
300
         */
256
         */
312
301
        if (!output->set_crtc(forced_frame->get_drm_fb_id()))
257
        if (!output->set_crtc(forced_frame))
313
302
            mir::log_error("Failed to set DRM CRTC. "
258
            mir::log_error("Failed to set DRM CRTC. "
314
303
                "Screen contents may be incomplete. "
259
                "Screen contents may be incomplete. "
315
304
                "Try plugging the monitor in again.");
260
                "Try plugging the monitor in again.");
316
@@ -315,15 +271,15 @@
317
315
     */
271
     */
318
316
    wait_for_page_flip();
272
    wait_for_page_flip();
319
317
273
321
318
    mgm::DRMFB *bufobj;
274
    mgm::FBHandle *bufobj;
322
319
    if (bypass_buf)
275
    if (bypass_buf)
323
320
    {
276
    {
324
321
        bufobj = bypass_bufobj;
277
        bufobj = bypass_bufobj;
325
322
    }
278
    }
326
323
    else
279
    else
327
324
    {
280
    {
330
325
        scheduled_composite_frame = GBMFrontBuffer(surface_gbm.get());
281
        scheduled_composite_frame = surface.lock_front();
331
326
        bufobj = get_drm_fb(scheduled_composite_frame);
282
        bufobj = outputs.front()->fb_for(scheduled_composite_frame, fb_width, fb_height);
332
327
        if (!bufobj)
283
        if (!bufobj)
333
328
            fatal_error("Failed to get front buffer object");
284
            fatal_error("Failed to get front buffer object");
334
329
    }
285
    }
335
@@ -332,7 +288,7 @@
336
332
     * Try to schedule a page flip as first preference to avoid tearing.
288
     * Try to schedule a page flip as first preference to avoid tearing.
337
333
     * [will complete in a background thread]
289
     * [will complete in a background thread]
338
334
     */
290
     */
340
335
    if (!needs_set_crtc && !schedule_page_flip(bufobj))
291
    if (!needs_set_crtc && !schedule_page_flip(*bufobj))
341
336
        needs_set_crtc = true;
292
        needs_set_crtc = true;
342
337
293
343
338
    /*
294
    /*
344
@@ -341,7 +297,7 @@
345
341
     */
297
     */
346
342
    if (needs_set_crtc)
298
    if (needs_set_crtc)
347
343
    {
299
    {
349
344
        set_crtc(bufobj);
300
        set_crtc(*bufobj);
350
345
        needs_set_crtc = false;
301
        needs_set_crtc = false;
351
346
    }
302
    }
352
347
303
353
@@ -406,55 +362,7 @@
354
406
    return recommend_sleep;
362
    return recommend_sleep;
355
407
}
363
}
356
408
364
406
409
mgm::DRMFB* mgm::DisplayBuffer::get_drm_fb(GBMFrontBuffer& bo)
365
bool mgm::DisplayBuffer::schedule_page_flip(FBHandle const& bufobj)
358
410
{
359
411
    return get_buffer_object(bo);
360
412
}
361
413
362
414
mgm::DRMFB* mgm::DisplayBuffer::get_buffer_object(
363
415
    struct gbm_bo *bo)
364
416
{
365
417
    if (!bo)
366
418
        return nullptr;
367
419
368
420
    /*
369
421
     * Check if we have already set up this gbm_bo (the gbm implementation is
370
422
     * free to reuse gbm_bos). If so, return the associated DRMFB.
371
423
     */
372
424
    auto bufobj = static_cast<DRMFB*>(gbm_bo_get_user_data(bo));
373
425
    if (bufobj)
374
426
        return bufobj;
375
427
376
428
    uint32_t fb_id{0};
377
429
    uint32_t handles[4] = {gbm_bo_get_handle(bo).u32, 0, 0, 0};
378
430
    uint32_t strides[4] = {gbm_bo_get_stride(bo), 0, 0, 0};
379
431
    uint32_t offsets[4] = {0, 0, 0, 0};
380
432
381
433
    auto format = gbm_bo_get_format(bo);
382
434
    /*
383
435
     * Mir might use the old GBM_BO_ enum formats, but KMS and the rest of
384
436
     * the world need fourcc formats, so convert...
385
437
     */
386
438
    if (format == GBM_BO_FORMAT_XRGB8888)
387
439
        format = GBM_FORMAT_XRGB8888;
388
440
    else if (format == GBM_BO_FORMAT_ARGB8888)
389
441
        format = GBM_FORMAT_ARGB8888;
390
442
391
443
    /* Create a KMS FB object with the gbm_bo attached to it. */
392
444
    auto ret = drmModeAddFB2(drm->fd, fb_width, fb_height, format,
393
445
                             handles, strides, offsets, &fb_id, 0);
394
446
    if (ret)
395
447
        return nullptr;
396
448
397
449
    /* Create a DRMFB and associate it with the gbm_bo */
398
450
    bufobj = new DRMFB{bo, fb_id};
399
451
    gbm_bo_set_user_data(bo, bufobj, bo_user_data_destroy);
400
452
401
453
    return bufobj;
402
454
}
403
455
404
456
405
457
bool mgm::DisplayBuffer::schedule_page_flip(DRMFB* bufobj)
407
458
{
366
{
408
459
    /*
367
    /*
409
460
     * Schedule the current front buffer object for display. Note that
368
     * Schedule the current front buffer object for display. Note that
410
@@ -462,7 +370,7 @@
411
462
     */
370
     */
412
463
    for (auto& output : outputs)
371
    for (auto& output : outputs)
413
464
    {
372
    {
415
465
        if (output->schedule_page_flip(bufobj->get_drm_fb_id()))
373
        if (output->schedule_page_flip(bufobj))
416
466
            page_flips_pending = true;
374
            page_flips_pending = true;
417
467
    }
375
    }
418
468
376
419
@@ -494,19 +402,17 @@
420
494
402
421
495
void mgm::DisplayBuffer::make_current()
403
void mgm::DisplayBuffer::make_current()
422
496
{
404
{
427
497
    if (!egl.make_current())
405
    surface.make_current();
424
498
    {
425
499
        fatal_error("Failed to make EGL surface current");
426
500
    }
428
501
}
406
}
429
502
407
430
503
void mgm::DisplayBuffer::bind()
408
void mgm::DisplayBuffer::bind()
431
504
{
409
{
432
410
    surface.bind();
433
505
}
411
}
434
506
412
435
507
void mgm::DisplayBuffer::release_current()
413
void mgm::DisplayBuffer::release_current()
436
508
{
414
{
438
509
    egl.release_current();
415
    surface.release_current();
439
510
}
416
}
440
511
417
441
512
void mgm::DisplayBuffer::schedule_set_crtc()
418
void mgm::DisplayBuffer::schedule_set_crtc()
442
@@ -518,3 +424,62 @@
443
518
{
424
{
444
519
    return this;
425
    return this;
445
520
}
426
}
446
427
447
428
mgm::GBMOutputSurface::GBMOutputSurface(
448
429
    int drm_fd,
449
430
    GBMSurfaceUPtr&& surface,
450
431
    uint32_t width,
451
432
    uint32_t height,
452
433
    helpers::EGLHelper&& egl)
453
434
    : drm_fd{drm_fd},
454
435
      width{width},
455
436
      height{height},
456
437
      egl{std::move(egl)},
457
438
      surface{std::move(surface)}
458
439
{
459
440
}
460
441
461
442
mgm::GBMOutputSurface::GBMOutputSurface(GBMOutputSurface&& from)
462
443
    : drm_fd{from.drm_fd},
463
444
      width{from.width},
464
445
      height{from.height},
465
446
      egl{std::move(from.egl)},
466
447
      surface{std::move(from.surface)}
467
448
{
468
449
}
469
450
470
451
471
452
void mgm::GBMOutputSurface::make_current()
472
453
{
473
454
    if (!egl.make_current())
474
455
    {
475
456
        fatal_error("Failed to make EGL surface current");
476
457
    }
477
458
}
478
459
479
460
void mgm::GBMOutputSurface::release_current()
480
461
{
481
462
    egl.release_current();
482
463
}
483
464
484
465
void mgm::GBMOutputSurface::swap_buffers()
485
466
{
486
467
    if (!egl.swap_buffers())
487
468
        fatal_error("Failed to perform buffer swap");
488
469
}
489
470
490
471
void mgm::GBMOutputSurface::bind()
491
472
{
492
473
493
474
}
494
475
495
476
auto mgm::GBMOutputSurface::lock_front() -> FrontBuffer
496
477
{
497
478
    return FrontBuffer{surface.get()};
498
479
}
499
480
500
481
void mgm::GBMOutputSurface::report_egl_configuration(
501
482
    std::function<void(EGLDisplay, EGLConfig)> const& to)
502
483
{
503
484
    egl.report_egl_configuration(to);
504
485
}
505
521
486
506
=== modified file 'src/platforms/mesa/server/kms/display_buffer.h'
507
--- src/platforms/mesa/server/kms/display_buffer.h	2017-02-21 01:04:13 +0000
508
+++ src/platforms/mesa/server/kms/display_buffer.h	2017-02-28 00:55:32 +0000
509
@@ -41,26 +41,55 @@
510
41
{
41
{
511
42
42
512
43
class Platform;
43
class Platform;
514
44
class DRMFB;
44
class FBHandle;
515
45
class KMSOutput;
45
class KMSOutput;
516
46
class NativeBuffer;
517
46
47
519
47
class GBMFrontBuffer
48
class GBMOutputSurface : public renderer::gl::RenderTarget
520
48
{
49
{
521
49
public:
50
public:
533
50
    GBMFrontBuffer(gbm_surface* surface);
51
    class FrontBuffer
534
51
    GBMFrontBuffer();
52
    {
535
52
    ~GBMFrontBuffer();
53
    public:
536
53
54
        FrontBuffer();
537
54
    GBMFrontBuffer(GBMFrontBuffer&& from);
55
        ~FrontBuffer();
538
55
56
539
56
    GBMFrontBuffer& operator=(GBMFrontBuffer&& from);
57
        FrontBuffer(FrontBuffer&& from);
540
57
    GBMFrontBuffer& operator=(std::nullptr_t);
58
541
58
59
        FrontBuffer& operator=(FrontBuffer&& from);
542
59
    operator gbm_bo*();
60
        FrontBuffer& operator=(std::nullptr_t);
543
60
    operator bool() const;
61
544
62
        operator gbm_bo*();
545
63
        operator bool() const;
546
64
    private:
547
65
        friend class GBMOutputSurface;
548
66
        FrontBuffer(gbm_surface* surface);
549
67
550
68
        gbm_surface* const surf;
551
69
        gbm_bo* const bo;
552
70
    };
553
71
554
72
    GBMOutputSurface(
555
73
        int drm_fd,
556
74
        GBMSurfaceUPtr&& surface,
557
75
        uint32_t width,
558
76
        uint32_t height,
559
77
        helpers::EGLHelper&& egl);
560
78
    GBMOutputSurface(GBMOutputSurface&& from);
561
79
562
80
    // gl::RenderTarget
563
81
    void make_current() override;
564
82
    void release_current() override;
565
83
    void swap_buffers() override;
566
84
    void bind() override;
567
85
568
86
    FrontBuffer lock_front();
569
87
    void report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)> const& to);
570
61
private:
88
private:
573
62
    gbm_surface* const surf;
89
    int const drm_fd;
574
63
    gbm_bo* const bo;
90
    uint32_t width, height;
575
91
    helpers::EGLHelper egl;
576
92
    GBMSurfaceUPtr surface;
577
64
};
93
};
578
65
94
579
66
class DisplayBuffer : public graphics::DisplayBuffer,
95
class DisplayBuffer : public graphics::DisplayBuffer,
580
@@ -70,15 +99,11 @@
581
70
{
99
{
582
71
public:
100
public:
583
72
    DisplayBuffer(BypassOption bypass_options,
101
    DisplayBuffer(BypassOption bypass_options,
584
73
                  std::shared_ptr<helpers::DRMHelper> const& drm,
585
74
                  std::shared_ptr<helpers::GBMHelper> const& gbm,
586
75
                  std::shared_ptr<DisplayReport> const& listener,
102
                  std::shared_ptr<DisplayReport> const& listener,
587
76
                  std::vector<std::shared_ptr<KMSOutput>> const& outputs,
103
                  std::vector<std::shared_ptr<KMSOutput>> const& outputs,
589
77
                  GBMSurfaceUPtr surface_gbm,
104
                  GBMOutputSurface&& surface_gbm,
590
78
                  geometry::Rectangle const& area,
105
                  geometry::Rectangle const& area,
594
79
                  MirOrientation rot,
106
                  MirOrientation rot);
592
80
                  GLConfig const& gl_config,
593
81
                  EGLContext shared_context);
595
82
    ~DisplayBuffer();
107
    ~DisplayBuffer();
596
83
108
597
84
    geometry::Rectangle view_area() const override;
109
    geometry::Rectangle view_area() const override;
598
@@ -101,30 +126,24 @@
599
101
    void wait_for_page_flip();
126
    void wait_for_page_flip();
600
102
127
601
103
private:
128
private:
606
104
    DRMFB* get_drm_fb(GBMFrontBuffer& bo);
129
    bool schedule_page_flip(FBHandle const& bufobj);
607
105
    DRMFB* get_buffer_object(struct gbm_bo *bo);
130
    void set_crtc(FBHandle const&);
604
106
    bool schedule_page_flip(DRMFB* bufobj);
605
107
    void set_crtc(DRMFB const*);
608
108
131
609
109
    std::shared_ptr<graphics::Buffer> visible_bypass_frame, scheduled_bypass_frame;
132
    std::shared_ptr<graphics::Buffer> visible_bypass_frame, scheduled_bypass_frame;
610
110
    std::shared_ptr<Buffer> bypass_buf{nullptr};
133
    std::shared_ptr<Buffer> bypass_buf{nullptr};
612
111
    DRMFB* bypass_bufobj{nullptr};
134
    FBHandle* bypass_bufobj{nullptr};
613
112
    std::shared_ptr<DisplayReport> const listener;
135
    std::shared_ptr<DisplayReport> const listener;
614
113
    BypassOption bypass_option;
136
    BypassOption bypass_option;
618
114
    /* DRM helper from mgm::Platform */
137
616
115
    std::shared_ptr<helpers::DRMHelper> const drm;
617
116
    std::shared_ptr<helpers::GBMHelper> const gbm;
619
117
    std::vector<std::shared_ptr<KMSOutput>> outputs;
138
    std::vector<std::shared_ptr<KMSOutput>> outputs;
620
118
139
621
119
    /*
140
    /*
622
120
     * Destruction order is important here:
141
     * Destruction order is important here:
623
121
     *  - The GBM surface depends on EGL
624
122
     *  - The GBMFrontBuffers depend on the GBM surface
142
     *  - The GBMFrontBuffers depend on the GBM surface
625
123
     */
143
     */
630
124
    helpers::EGLHelper egl;
144
    GBMOutputSurface surface;
631
125
    GBMSurfaceUPtr surface_gbm;
145
    GBMOutputSurface::FrontBuffer visible_composite_frame;
632
126
    GBMFrontBuffer visible_composite_frame;
146
    GBMOutputSurface::FrontBuffer scheduled_composite_frame;
629
127
    GBMFrontBuffer scheduled_composite_frame;
633
128
147
634
129
    geometry::Rectangle area;
148
    geometry::Rectangle area;
635
130
    uint32_t fb_width, fb_height;
149
    uint32_t fb_width, fb_height;
636
131
150
637
=== modified file 'src/platforms/mesa/server/kms/kms_output.h'
638
--- src/platforms/mesa/server/kms/kms_output.h	2017-02-15 07:38:33 +0000
639
+++ src/platforms/mesa/server/kms/kms_output.h	2017-02-28 00:55:32 +0000
640
@@ -35,6 +35,8 @@
641
35
namespace mesa
35
namespace mesa
642
36
{
36
{
643
37
37
644
38
class FBHandle;
645
39
646
38
class KMSOutput
40
class KMSOutput
647
39
{
41
{
648
40
public:
42
public:
649
@@ -52,9 +54,9 @@
650
52
     */
54
     */
651
53
    virtual int max_refresh_rate() const = 0;
55
    virtual int max_refresh_rate() const = 0;
652
54
56
654
55
    virtual bool set_crtc(uint32_t fb_id) = 0;
57
    virtual bool set_crtc(FBHandle const& fb) = 0;
655
56
    virtual void clear_crtc() = 0;
58
    virtual void clear_crtc() = 0;
657
57
    virtual bool schedule_page_flip(uint32_t fb_id) = 0;
59
    virtual bool schedule_page_flip(FBHandle const& fb) = 0;
658
58
    virtual void wait_for_page_flip() = 0;
60
    virtual void wait_for_page_flip() = 0;
659
59
61
660
60
    virtual bool set_cursor(gbm_bo* buffer) = 0;
62
    virtual bool set_cursor(gbm_bo* buffer) = 0;
661
@@ -66,6 +68,8 @@
662
66
    virtual void set_gamma(GammaCurves const& gamma) = 0;
68
    virtual void set_gamma(GammaCurves const& gamma) = 0;
663
67
    virtual Frame last_frame() const = 0;
69
    virtual Frame last_frame() const = 0;
664
68
70
665
71
    virtual FBHandle* fb_for(gbm_bo* bo, uint32_t width, uint32_t height) const = 0;
666
72
667
69
protected:
73
protected:
668
70
    KMSOutput() = default;
74
    KMSOutput() = default;
669
71
    KMSOutput(const KMSOutput&) = delete;
75
    KMSOutput(const KMSOutput&) = delete;
670
72
76
671
=== modified file 'src/platforms/mesa/server/kms/real_kms_output.cpp'
672
--- src/platforms/mesa/server/kms/real_kms_output.cpp	2017-02-15 07:38:33 +0000
673
+++ src/platforms/mesa/server/kms/real_kms_output.cpp	2017-02-28 00:55:32 +0000
674
@@ -31,6 +31,43 @@
675
31
namespace mgk = mg::kms;
31
namespace mgk = mg::kms;
676
32
namespace geom = mir::geometry;
32
namespace geom = mir::geometry;
677
33
33
678
34
class mgm::FBHandle
679
35
{
680
36
public:
681
37
    FBHandle(gbm_bo* bo, uint32_t drm_fb_id)
682
38
        : bo{bo}, drm_fb_id{drm_fb_id}
683
39
    {
684
40
    }
685
41
686
42
    ~FBHandle()
687
43
    {
688
44
        if (drm_fb_id)
689
45
        {
690
46
            int drm_fd = gbm_device_get_fd(gbm_bo_get_device(bo));
691
47
            drmModeRmFB(drm_fd, drm_fb_id);
692
48
        }
693
49
    }
694
50
695
51
    uint32_t get_drm_fb_id() const
696
52
    {
697
53
        return drm_fb_id;
698
54
    }
699
55
700
56
private:
701
57
    gbm_bo *bo;
702
58
    uint32_t drm_fb_id;
703
59
};
704
60
705
61
namespace
706
62
{
707
63
void bo_user_data_destroy(gbm_bo* /*bo*/, void *data)
708
64
{
709
65
    auto bufobj = static_cast<mgm::FBHandle*>(data);
710
66
    delete bufobj;
711
67
}
712
68
713
69
}
714
70
715
34
mgm::RealKMSOutput::RealKMSOutput(int drm_fd, uint32_t connector_id,
71
mgm::RealKMSOutput::RealKMSOutput(int drm_fd, uint32_t connector_id,
716
35
                                  std::shared_ptr<PageFlipper> const& page_flipper)
72
                                  std::shared_ptr<PageFlipper> const& page_flipper)
717
36
    : drm_fd{drm_fd}, connector_id{connector_id}, page_flipper{page_flipper},
73
    : drm_fd{drm_fd}, connector_id{connector_id}, page_flipper{page_flipper},
718
@@ -108,7 +145,7 @@
719
108
    mode_index = kms_mode_index;
145
    mode_index = kms_mode_index;
720
109
}
146
}
721
110
147
723
111
bool mgm::RealKMSOutput::set_crtc(uint32_t fb_id)
148
bool mgm::RealKMSOutput::set_crtc(FBHandle const& fb)
724
112
{
149
{
725
113
    if (!ensure_crtc())
150
    if (!ensure_crtc())
726
114
    {
151
    {
727
@@ -118,7 +155,7 @@
728
118
    }
155
    }
729
119
156
730
120
    auto ret = drmModeSetCrtc(drm_fd, current_crtc->crtc_id,
157
    auto ret = drmModeSetCrtc(drm_fd, current_crtc->crtc_id,
732
121
                              fb_id, fb_offset.dx.as_int(), fb_offset.dy.as_int(),
158
                              fb.get_drm_fb_id(), fb_offset.dx.as_int(), fb_offset.dy.as_int(),
733
122
                              &connector->connector_id, 1,
159
                              &connector->connector_id, 1,
734
123
                              &connector->modes[mode_index]);
160
                              &connector->modes[mode_index]);
735
124
    if (ret)
161
    if (ret)
736
@@ -159,7 +196,7 @@
737
159
    current_crtc = nullptr;
196
    current_crtc = nullptr;
738
160
}
197
}
739
161
198
741
162
bool mgm::RealKMSOutput::schedule_page_flip(uint32_t fb_id)
199
bool mgm::RealKMSOutput::schedule_page_flip(FBHandle const& fb)
742
163
{
200
{
743
164
    std::unique_lock<std::mutex> lg(power_mutex);
201
    std::unique_lock<std::mutex> lg(power_mutex);
744
165
    if (power_mode != mir_power_mode_on)
202
    if (power_mode != mir_power_mode_on)
745
@@ -170,7 +207,7 @@
746
170
                       mgk::connector_name(connector).c_str());
207
                       mgk::connector_name(connector).c_str());
747
171
        return false;
208
        return false;
748
172
    }
209
    }
750
173
    return page_flipper->schedule_flip(current_crtc->crtc_id, fb_id, connector_id);
210
    return page_flipper->schedule_flip(current_crtc->crtc_id, fb.get_drm_fb_id(), connector_id);
751
174
}
211
}
752
175
212
753
176
void mgm::RealKMSOutput::wait_for_page_flip()
213
void mgm::RealKMSOutput::wait_for_page_flip()
754
@@ -319,3 +356,44 @@
755
319
356
756
320
    // TODO: return bool in future? Then do what with it?
357
    // TODO: return bool in future? Then do what with it?
757
321
}
358
}
758
359
759
360
mgm::FBHandle* mgm::RealKMSOutput::fb_for(gbm_bo* bo, uint32_t width, uint32_t height) const
760
361
{
761
362
    if (!bo)
762
363
        return nullptr;
763
364
764
365
    /*
765
366
     * Check if we have already set up this gbm_bo (the gbm implementation is
766
367
     * free to reuse gbm_bos). If so, return the associated FBHandle.
767
368
     */
768
369
    auto bufobj = static_cast<FBHandle*>(gbm_bo_get_user_data(bo));
769
370
    if (bufobj)
770
371
        return bufobj;
771
372
772
373
    uint32_t fb_id{0};
773
374
    uint32_t handles[4] = {gbm_bo_get_handle(bo).u32, 0, 0, 0};
774
375
    uint32_t strides[4] = {gbm_bo_get_stride(bo), 0, 0, 0};
775
376
    uint32_t offsets[4] = {0, 0, 0, 0};
776
377
777
378
    auto format = gbm_bo_get_format(bo);
778
379
    /*
779
380
     * Mir might use the old GBM_BO_ enum formats, but KMS and the rest of
780
381
     * the world need fourcc formats, so convert...
781
382
     */
782
383
    if (format == GBM_BO_FORMAT_XRGB8888)
783
384
        format = GBM_FORMAT_XRGB8888;
784
385
    else if (format == GBM_BO_FORMAT_ARGB8888)
785
386
        format = GBM_FORMAT_ARGB8888;
786
387
787
388
    /* Create a KMS FB object with the gbm_bo attached to it. */
788
389
    auto ret = drmModeAddFB2(drm_fd, width, height, format,
789
390
                             handles, strides, offsets, &fb_id, 0);
790
391
    if (ret)
791
392
        return nullptr;
792
393
793
394
    /* Create a FBHandle and associate it with the gbm_bo */
794
395
    bufobj = new FBHandle{bo, fb_id};
795
396
    gbm_bo_set_user_data(bo, bufobj, bo_user_data_destroy);
796
397
797
398
    return bufobj;
798
399
}
799
322
400
800
=== modified file 'src/platforms/mesa/server/kms/real_kms_output.h'
801
--- src/platforms/mesa/server/kms/real_kms_output.h	2017-02-15 07:38:33 +0000
802
+++ src/platforms/mesa/server/kms/real_kms_output.h	2017-02-28 00:55:32 +0000
803
@@ -47,9 +47,9 @@
804
47
    geometry::Size size() const override;
47
    geometry::Size size() const override;
805
48
    int max_refresh_rate() const override;
48
    int max_refresh_rate() const override;
806
49
49
808
50
    bool set_crtc(uint32_t fb_id) override;
50
    bool set_crtc(FBHandle const& fb) override;
809
51
    void clear_crtc() override;
51
    void clear_crtc() override;
811
52
    bool schedule_page_flip(uint32_t fb_id) override;
52
    bool schedule_page_flip(FBHandle const& fb) override;
812
53
    void wait_for_page_flip() override;
53
    void wait_for_page_flip() override;
813
54
54
814
55
    bool set_cursor(gbm_bo* buffer) override;
55
    bool set_cursor(gbm_bo* buffer) override;
815
@@ -62,6 +62,8 @@
816
62
62
817
63
    Frame last_frame() const override;
63
    Frame last_frame() const override;
818
64
64
819
65
    FBHandle* fb_for(gbm_bo* bo, uint32_t width, uint32_t height) const override;
820
66
821
65
private:
67
private:
822
66
    bool ensure_crtc();
68
    bool ensure_crtc();
823
67
    void restore_saved_crtc();
69
    void restore_saved_crtc();
824
68
70
825
=== modified file 'tests/unit-tests/platforms/mesa/kms/mock_kms_output.h'
826
--- tests/unit-tests/platforms/mesa/kms/mock_kms_output.h	2017-02-15 07:38:33 +0000
827
+++ tests/unit-tests/platforms/mesa/kms/mock_kms_output.h	2017-02-28 00:55:32 +0000
828
@@ -24,6 +24,15 @@
829
24
24
830
25
namespace mir
25
namespace mir
831
26
{
26
{
832
27
833
28
namespace graphics
834
29
{
835
30
namespace mesa
836
31
{
837
32
class DRMFB;
838
33
}
839
34
}
840
35
841
27
namespace test
36
namespace test
842
28
{
37
{
843
29
38
844
@@ -34,9 +43,19 @@
845
34
    MOCK_CONST_METHOD0(size, geometry::Size());
43
    MOCK_CONST_METHOD0(size, geometry::Size());
846
35
    MOCK_CONST_METHOD0(max_refresh_rate, int());
44
    MOCK_CONST_METHOD0(max_refresh_rate, int());
847
36
45
849
37
    MOCK_METHOD1(set_crtc, bool(uint32_t));
46
    bool set_crtc(graphics::mesa::FBHandle const& fb) override
850
47
    {
851
48
        return set_crtc_thunk(&fb);
852
49
    }
853
50
854
51
    MOCK_METHOD1(set_crtc_thunk, bool(graphics::mesa::FBHandle const*));
855
38
    MOCK_METHOD0(clear_crtc, void());
52
    MOCK_METHOD0(clear_crtc, void());
857
39
    MOCK_METHOD1(schedule_page_flip, bool(uint32_t));
53
858
54
    bool schedule_page_flip(graphics::mesa::FBHandle const& fb) override
859
55
    {
860
56
        return schedule_page_flip_thunk(&fb);
861
57
    }
862
58
    MOCK_METHOD1(schedule_page_flip_thunk, bool(graphics::mesa::FBHandle const*));
863
40
    MOCK_METHOD0(wait_for_page_flip, void());
59
    MOCK_METHOD0(wait_for_page_flip, void());
864
41
60
865
42
    MOCK_CONST_METHOD0(last_frame, graphics::Frame());
61
    MOCK_CONST_METHOD0(last_frame, graphics::Frame());
866
@@ -48,6 +67,8 @@
867
48
67
868
49
    MOCK_METHOD1(set_power_mode, void(MirPowerMode));
68
    MOCK_METHOD1(set_power_mode, void(MirPowerMode));
869
50
    MOCK_METHOD1(set_gamma, void(mir::graphics::GammaCurves const&));
69
    MOCK_METHOD1(set_gamma, void(mir::graphics::GammaCurves const&));
870
70
871
71
    MOCK_CONST_METHOD3(fb_for, graphics::mesa::FBHandle*(gbm_bo*, uint32_t, uint32_t));
872
51
};
72
};
873
52
73
874
53
} // namespace test
74
} // namespace test
875
54
75
876
=== modified file 'tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp'
877
--- tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp	2017-01-27 08:13:36 +0000
878
+++ tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp	2017-02-28 00:55:32 +0000
879
@@ -85,12 +85,14 @@
880
85
        fake_devices.add_standard_device("standard-drm-devices");
85
        fake_devices.add_standard_device("standard-drm-devices");
881
86
86
882
87
        mock_kms_output = std::make_shared<NiceMock<MockKMSOutput>>();
87
        mock_kms_output = std::make_shared<NiceMock<MockKMSOutput>>();
884
88
        ON_CALL(*mock_kms_output, set_crtc(_))
88
        ON_CALL(*mock_kms_output, set_crtc_thunk(_))
885
89
            .WillByDefault(Return(true));
89
            .WillByDefault(Return(true));
887
90
        ON_CALL(*mock_kms_output, schedule_page_flip(_))
90
        ON_CALL(*mock_kms_output, schedule_page_flip_thunk(_))
888
91
            .WillByDefault(Return(true));
91
            .WillByDefault(Return(true));
889
92
        ON_CALL(*mock_kms_output, max_refresh_rate())
92
        ON_CALL(*mock_kms_output, max_refresh_rate())
890
93
            .WillByDefault(Return(mock_refresh_rate));
93
            .WillByDefault(Return(mock_refresh_rate));
891
94
        ON_CALL(*mock_kms_output, fb_for(_,_,_))
892
95
            .WillByDefault(Return(reinterpret_cast<FBHandle*>(0x12ad)));
893
94
96
894
95
        ON_CALL(*mock_bypassable_buffer, size())
97
        ON_CALL(*mock_bypassable_buffer, size())
895
96
            .WillByDefault(Return(display_area.size));
98
            .WillByDefault(Return(display_area.size));
896
@@ -108,6 +110,18 @@
897
108
    }
110
    }
898
109
111
899
110
protected:
112
protected:
900
113
    GBMOutputSurface make_output_surface()
901
114
    {
902
115
        helpers::EGLHelper egl{gl_config};
903
116
        return GBMOutputSurface{
904
117
            drm->fd,
905
118
            GBMSurfaceUPtr{nullptr},
906
119
            static_cast<uint32_t>(width),
907
120
            static_cast<uint32_t>(height),
908
121
            std::move(egl)
909
122
        };
910
123
    }
911
124
912
111
    int const width{56};
125
    int const width{56};
913
112
    int const height{78};
126
    int const height{78};
914
113
    mir::geometry::Rectangle const display_area{{12,34}, {width,height}};
127
    mir::geometry::Rectangle const display_area{{12,34}, {width,height}};
915
@@ -135,15 +149,11 @@
916
135
{
149
{
917
136
    graphics::mesa::DisplayBuffer db(
150
    graphics::mesa::DisplayBuffer db(
918
137
        graphics::mesa::BypassOption::allowed,
151
        graphics::mesa::BypassOption::allowed,
919
138
        drm,
920
139
        gbm,
921
140
        null_display_report(),
152
        null_display_report(),
924
141
        {},
153
        {mock_kms_output},
925
142
        nullptr,
154
        make_output_surface(),
926
143
        display_area,
155
        display_area,
930
144
        mir_orientation_normal,
156
        mir_orientation_normal);
928
145
        gl_config,
929
146
        mock_egl.fake_egl_context);
931
147
157
932
148
    EXPECT_EQ(display_area, db.view_area());
158
    EXPECT_EQ(display_area, db.view_area());
933
149
}
159
}
934
@@ -152,15 +162,11 @@
935
152
{
162
{
936
153
    graphics::mesa::DisplayBuffer db(
163
    graphics::mesa::DisplayBuffer db(
937
154
        graphics::mesa::BypassOption::allowed,
164
        graphics::mesa::BypassOption::allowed,
938
155
        drm,
939
156
        gbm,
940
157
        null_display_report(),
165
        null_display_report(),
941
158
        {mock_kms_output},
166
        {mock_kms_output},
943
159
        nullptr,
167
        make_output_surface(),
944
160
        display_area,
168
        display_area,
948
161
        mir_orientation_normal,
169
        mir_orientation_normal);
946
162
        gl_config,
947
163
        mock_egl.fake_egl_context);
949
164
170
950
165
    auto original_count = mock_bypassable_buffer.use_count();
171
    auto original_count = mock_bypassable_buffer.use_count();
951
166
172
952
@@ -180,15 +186,11 @@
953
180
{
186
{
954
181
    graphics::mesa::DisplayBuffer db(
187
    graphics::mesa::DisplayBuffer db(
955
182
        graphics::mesa::BypassOption::allowed,
188
        graphics::mesa::BypassOption::allowed,
956
183
        drm,
957
184
        gbm,
958
185
        null_display_report(),
189
        null_display_report(),
959
186
        {mock_kms_output},
190
        {mock_kms_output},
961
187
        nullptr,
191
        make_output_surface(),
962
188
        display_area,
192
        display_area,
966
189
        mir_orientation_normal,
193
        mir_orientation_normal);
964
190
        gl_config,
965
191
        mock_egl.fake_egl_context);
967
192
194
968
193
    for (int frame = 0; frame < 5; ++frame)
195
    for (int frame = 0; frame < 5; ++frame)
969
194
    {
196
    {
970
@@ -210,15 +212,11 @@
971
210
212
972
211
    graphics::mesa::DisplayBuffer db(
213
    graphics::mesa::DisplayBuffer db(
973
212
        graphics::mesa::BypassOption::allowed,
214
        graphics::mesa::BypassOption::allowed,
974
213
        drm,
975
214
        gbm,
976
215
        null_display_report(),
215
        null_display_report(),
977
216
        {mock_kms_output},
216
        {mock_kms_output},
979
217
        nullptr,
217
        make_output_surface(),
980
218
        display_area,
218
        display_area,
984
219
        mir_orientation_normal,
219
        mir_orientation_normal);
982
220
        gl_config,
983
221
        mock_egl.fake_egl_context);
985
222
220
986
223
    for (int frame = 0; frame < 5; ++frame)
221
    for (int frame = 0; frame < 5; ++frame)
987
224
    {
222
    {
988
@@ -234,15 +232,11 @@
989
234
{
232
{
990
235
    graphics::mesa::DisplayBuffer db(
233
    graphics::mesa::DisplayBuffer db(
991
236
        graphics::mesa::BypassOption::allowed,
234
        graphics::mesa::BypassOption::allowed,
992
237
        drm,
993
238
        gbm,
994
239
        null_display_report(),
235
        null_display_report(),
995
240
        {mock_kms_output},
236
        {mock_kms_output},
997
241
        nullptr,
237
        make_output_surface(),
998
242
        display_area,
238
        display_area,
1002
243
        mir_orientation_normal,
239
        mir_orientation_normal);
1000
244
        gl_config,
1001
245
        mock_egl.fake_egl_context);
1003
246
240
1004
247
    auto original_count = mock_bypassable_buffer.use_count();
241
    auto original_count = mock_bypassable_buffer.use_count();
1005
248
242
1006
@@ -259,37 +253,29 @@
1007
259
{
253
{
1008
260
    graphics::mesa::DisplayBuffer db(
254
    graphics::mesa::DisplayBuffer db(
1009
261
        graphics::mesa::BypassOption::allowed,
255
        graphics::mesa::BypassOption::allowed,
1010
262
        drm,
1011
263
        gbm,
1012
264
        null_display_report(),
256
        null_display_report(),
1013
265
        {mock_kms_output},
257
        {mock_kms_output},
1015
266
        nullptr,
258
        make_output_surface(),
1016
267
        display_area,
259
        display_area,
1020
268
        mir_orientation_normal,
260
        mir_orientation_normal);
1018
269
        gl_config,
1019
270
        mock_egl.fake_egl_context);
1021
271
261
1022
272
    EXPECT_TRUE(db.overlay(bypassable_list));
262
    EXPECT_TRUE(db.overlay(bypassable_list));
1023
273
}
263
}
1024
274
264
1025
275
TEST_F(MesaDisplayBufferTest, failed_bypass_falls_back_gracefully)
265
TEST_F(MesaDisplayBufferTest, failed_bypass_falls_back_gracefully)
1026
276
{  // Regression test for LP: #1398296
266
{  // Regression test for LP: #1398296
1031
277
    EXPECT_CALL(mock_drm, drmModeAddFB2(_, _, _, _, _, _, _, _, _))
267
    EXPECT_CALL(*mock_kms_output, fb_for(_,_,_))
1032
278
        .WillOnce(Return(0))    // During the DisplayBuffer constructor
268
        .WillOnce(Return(reinterpret_cast<FBHandle*>(0xaabb)))  // During the DisplayBuffer constructor
1033
279
        .WillOnce(Return(-22))  // Fail first bypass attempt
269
        .WillOnce(Return(nullptr)) // Fail first bypass attempt
1034
280
        .WillOnce(Return(0));   // Succeed second bypass attempt
270
        .WillOnce(Return(reinterpret_cast<FBHandle*>(0xbbcc))); // Succeed second bypass attempt
1035
281
271
1036
282
    graphics::mesa::DisplayBuffer db(
272
    graphics::mesa::DisplayBuffer db(
1037
283
        graphics::mesa::BypassOption::allowed,
273
        graphics::mesa::BypassOption::allowed,
1038
284
        drm,
1039
285
        gbm,
1040
286
        null_display_report(),
274
        null_display_report(),
1041
287
        {mock_kms_output},
275
        {mock_kms_output},
1043
288
        nullptr,
276
        make_output_surface(),
1044
289
        display_area,
277
        display_area,
1048
290
        mir_orientation_normal,
278
        mir_orientation_normal);
1046
291
        gl_config,
1047
292
        mock_egl.fake_egl_context);
1049
293
279
1050
294
    EXPECT_FALSE(db.overlay(bypassable_list));
280
    EXPECT_FALSE(db.overlay(bypassable_list));
1051
295
    // And then we recover. DRM finds enough resources to AddFB ...
281
    // And then we recover. DRM finds enough resources to AddFB ...
1052
@@ -310,15 +296,11 @@
1053
310
296
1054
311
    graphics::mesa::DisplayBuffer db(
297
    graphics::mesa::DisplayBuffer db(
1055
312
        graphics::mesa::BypassOption::allowed,
298
        graphics::mesa::BypassOption::allowed,
1056
313
        drm,
1057
314
        gbm,
1058
315
        null_display_report(),
299
        null_display_report(),
1059
316
        {mock_kms_output},
300
        {mock_kms_output},
1061
317
        nullptr,
301
        make_output_surface(),
1062
318
        display_area,
302
        display_area,
1066
319
        mir_orientation_normal,
303
        mir_orientation_normal);
1064
320
        gl_config,
1065
321
        mock_egl.fake_egl_context);
1067
322
304
1068
323
    EXPECT_FALSE(db.overlay(list));
305
    EXPECT_FALSE(db.overlay(list));
1069
324
}
306
}
1070
@@ -327,15 +309,11 @@
1071
327
{
309
{
1072
328
    graphics::mesa::DisplayBuffer db(
310
    graphics::mesa::DisplayBuffer db(
1073
329
        graphics::mesa::BypassOption::allowed,
311
        graphics::mesa::BypassOption::allowed,
1074
330
        drm,
1075
331
        gbm,
1076
332
        null_display_report(),
312
        null_display_report(),
1079
333
        {},
313
        {mock_kms_output},
1080
334
        nullptr,
314
        make_output_surface(),
1081
335
        display_area,
315
        display_area,
1085
336
        mir_orientation_right,
316
        mir_orientation_right);
1083
337
        gl_config,
1084
338
        mock_egl.fake_egl_context);
1086
339
317
1087
340
    EXPECT_FALSE(db.overlay(bypassable_list));
318
    EXPECT_FALSE(db.overlay(bypassable_list));
1088
341
}
319
}
1089
@@ -349,15 +327,11 @@
1090
349
327
1091
350
    graphics::mesa::DisplayBuffer db(
328
    graphics::mesa::DisplayBuffer db(
1092
351
        graphics::mesa::BypassOption::allowed,
329
        graphics::mesa::BypassOption::allowed,
1093
352
        drm,
1094
353
        gbm,
1095
354
        null_display_report(),
330
        null_display_report(),
1098
355
        {},
331
        {mock_kms_output},
1099
356
        nullptr,
332
        make_output_surface(),
1100
357
        display_area,
333
        display_area,
1104
358
        mir_orientation_normal,
334
        mir_orientation_normal);
1102
359
        gl_config,
1103
360
        mock_egl.fake_egl_context);
1105
361
335
1106
362
    EXPECT_FALSE(db.overlay(list));
336
    EXPECT_FALSE(db.overlay(list));
1107
363
}
337
}
1108
@@ -371,15 +345,11 @@
1109
371
345
1110
372
    graphics::mesa::DisplayBuffer db(
346
    graphics::mesa::DisplayBuffer db(
1111
373
        graphics::mesa::BypassOption::allowed,
347
        graphics::mesa::BypassOption::allowed,
1112
374
        drm,
1113
375
        gbm,
1114
376
        null_display_report(),
348
        null_display_report(),
1117
377
        {},
349
        {mock_kms_output},
1118
378
        nullptr,
350
        make_output_surface(),
1119
379
        display_area,
351
        display_area,
1123
380
        mir_orientation_normal,
352
        mir_orientation_normal);
1121
381
        gl_config,
1122
382
        mock_egl.fake_egl_context);
1124
383
353
1125
384
    // If you find yourself using gbm_ functions on a Shm buffer then you're
354
    // If you find yourself using gbm_ functions on a Shm buffer then you're
1126
385
    // asking for a crash (LP: #1493721) ...
355
    // asking for a crash (LP: #1493721) ...
1127
@@ -394,119 +364,31 @@
1128
394
364
1129
395
    graphics::mesa::DisplayBuffer db(
365
    graphics::mesa::DisplayBuffer db(
1130
396
        graphics::mesa::BypassOption::allowed,
366
        graphics::mesa::BypassOption::allowed,
1131
397
        drm,
1132
398
        gbm,
1133
399
        null_display_report(),
367
        null_display_report(),
1136
400
        {},
368
        {mock_kms_output},
1137
401
        nullptr,
369
        make_output_surface(),
1138
402
        display_area,
370
        display_area,
1142
403
        mir_orientation_left,
371
        mir_orientation_left);
1140
404
        gl_config,
1141
405
        mock_egl.fake_egl_context);
1143
406
372
1144
407
    EXPECT_EQ(rotate_left, db.transformation());
373
    EXPECT_EQ(rotate_left, db.transformation());
1145
408
}
374
}
1146
409
375
1147
410
TEST_F(MesaDisplayBufferTest, normal_rotation_constructs_normal_fb)
1148
411
{
1149
412
    EXPECT_CALL(mock_gbm, gbm_bo_get_user_data(_))
1150
413
        .WillOnce(Return((void*)0));
1151
414
    EXPECT_CALL(mock_drm, drmModeAddFB2(_, width, height, _, _, _, _, _, _))
1152
415
        .Times(1);
1153
416
1154
417
    graphics::mesa::DisplayBuffer db(
1155
418
        graphics::mesa::BypassOption::allowed,
1156
419
        drm,
1157
420
        gbm,
1158
421
        null_display_report(),
1159
422
        {},
1160
423
        nullptr,
1161
424
        display_area,
1162
425
        mir_orientation_normal,
1163
426
        gl_config,
1164
427
        mock_egl.fake_egl_context);
1165
428
}
1166
429
1167
430
TEST_F(MesaDisplayBufferTest, left_rotation_constructs_transposed_fb)
1168
431
{
1169
432
    EXPECT_CALL(mock_gbm, gbm_bo_get_user_data(_))
1170
433
        .WillOnce(Return((void*)0));
1171
434
    EXPECT_CALL(mock_drm, drmModeAddFB2(_, height, width, _, _, _, _, _, _))
1172
435
        .Times(1);
1173
436
1174
437
    graphics::mesa::DisplayBuffer db(
1175
438
        graphics::mesa::BypassOption::allowed,
1176
439
        drm,
1177
440
        gbm,
1178
441
        null_display_report(),
1179
442
        {},
1180
443
        nullptr,
1181
444
        display_area,
1182
445
        mir_orientation_left,
1183
446
        gl_config,
1184
447
        mock_egl.fake_egl_context);
1185
448
}
1186
449
1187
450
TEST_F(MesaDisplayBufferTest, inverted_rotation_constructs_normal_fb)
1188
451
{
1189
452
    EXPECT_CALL(mock_gbm, gbm_bo_get_user_data(_))
1190
453
        .WillOnce(Return((void*)0));
1191
454
    EXPECT_CALL(mock_drm, drmModeAddFB2(_, width, height, _, _, _, _, _, _))
1192
455
        .Times(1);
1193
456
1194
457
    graphics::mesa::DisplayBuffer db(
1195
458
        graphics::mesa::BypassOption::allowed,
1196
459
        drm,
1197
460
        gbm,
1198
461
        null_display_report(),
1199
462
        {},
1200
463
        nullptr,
1201
464
        display_area,
1202
465
        mir_orientation_inverted,
1203
466
        gl_config,
1204
467
        mock_egl.fake_egl_context);
1205
468
}
1206
469
1207
470
TEST_F(MesaDisplayBufferTest, right_rotation_constructs_transposed_fb)
1208
471
{
1209
472
    EXPECT_CALL(mock_gbm, gbm_bo_get_user_data(_))
1210
473
        .WillOnce(Return((void*)0));
1211
474
    EXPECT_CALL(mock_drm, drmModeAddFB2(_, height, width, _, _, _, _, _, _))
1212
475
        .Times(1);
1213
476
1214
477
    graphics::mesa::DisplayBuffer db(
1215
478
        graphics::mesa::BypassOption::allowed,
1216
479
        drm,
1217
480
        gbm,
1218
481
        null_display_report(),
1219
482
        {},
1220
483
        nullptr,
1221
484
        display_area,
1222
485
        mir_orientation_right,
1223
486
        gl_config,
1224
487
        mock_egl.fake_egl_context);
1225
488
}
1226
489
1227
490
TEST_F(MesaDisplayBufferTest, clone_mode_first_flip_flips_but_no_wait)
376
TEST_F(MesaDisplayBufferTest, clone_mode_first_flip_flips_but_no_wait)
1228
491
{
377
{
1229
492
    // Ensure clone mode can do multiple page flips in parallel without
378
    // Ensure clone mode can do multiple page flips in parallel without
1230
493
    // blocking on either (at least till the second post)
379
    // blocking on either (at least till the second post)
1232
494
    EXPECT_CALL(*mock_kms_output, schedule_page_flip(_))
380
    EXPECT_CALL(*mock_kms_output, schedule_page_flip_thunk(_))
1233
495
        .Times(2);
381
        .Times(2);
1234
496
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
382
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
1235
497
        .Times(0);
383
        .Times(0);
1236
498
384
1237
499
    graphics::mesa::DisplayBuffer db(
385
    graphics::mesa::DisplayBuffer db(
1238
500
        graphics::mesa::BypassOption::allowed,
386
        graphics::mesa::BypassOption::allowed,
1239
501
        drm,
1240
502
        gbm,
1241
503
        null_display_report(),
387
        null_display_report(),
1242
504
        {mock_kms_output, mock_kms_output},
388
        {mock_kms_output, mock_kms_output},
1244
505
        nullptr,
389
        make_output_surface(),
1245
506
        display_area,
390
        display_area,
1249
507
        mir_orientation_normal,
391
        mir_orientation_normal);
1247
508
        gl_config,
1248
509
        mock_egl.fake_egl_context);
1250
510
392
1251
511
    db.swap_buffers();
393
    db.swap_buffers();
1252
512
    db.post();
394
    db.post();
1253
@@ -514,22 +396,18 @@
1254
514
396
1255
515
TEST_F(MesaDisplayBufferTest, single_mode_first_post_flips_with_wait)
397
TEST_F(MesaDisplayBufferTest, single_mode_first_post_flips_with_wait)
1256
516
{
398
{
1258
517
    EXPECT_CALL(*mock_kms_output, schedule_page_flip(_))
399
    EXPECT_CALL(*mock_kms_output, schedule_page_flip_thunk(_))
1259
518
        .Times(1);
400
        .Times(1);
1260
519
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
401
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
1261
520
        .Times(1);
402
        .Times(1);
1262
521
403
1263
522
    graphics::mesa::DisplayBuffer db(
404
    graphics::mesa::DisplayBuffer db(
1264
523
        graphics::mesa::BypassOption::allowed,
405
        graphics::mesa::BypassOption::allowed,
1265
524
        drm,
1266
525
        gbm,
1267
526
        null_display_report(),
406
        null_display_report(),
1268
527
        {mock_kms_output},
407
        {mock_kms_output},
1270
528
        nullptr,
408
        make_output_surface(),
1271
529
        display_area,
409
        display_area,
1275
530
        mir_orientation_normal,
410
        mir_orientation_normal);
1273
531
        gl_config,
1274
532
        mock_egl.fake_egl_context);
1276
533
411
1277
534
    db.swap_buffers();
412
    db.swap_buffers();
1278
535
    db.post();
413
    db.post();
1279
@@ -541,26 +419,22 @@
1280
541
419
1281
542
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
420
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
1282
543
        .Times(0);
421
        .Times(0);
1284
544
    EXPECT_CALL(*mock_kms_output, schedule_page_flip(_))
422
    EXPECT_CALL(*mock_kms_output, schedule_page_flip_thunk(_))
1285
545
        .Times(2);
423
        .Times(2);
1286
546
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
424
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
1287
547
        .Times(2);
425
        .Times(2);
1289
548
    EXPECT_CALL(*mock_kms_output, schedule_page_flip(_))
426
    EXPECT_CALL(*mock_kms_output, schedule_page_flip_thunk(_))
1290
549
        .Times(2);
427
        .Times(2);
1291
550
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
428
    EXPECT_CALL(*mock_kms_output, wait_for_page_flip())
1292
551
        .Times(0);
429
        .Times(0);
1293
552
430
1294
553
    graphics::mesa::DisplayBuffer db(
431
    graphics::mesa::DisplayBuffer db(
1295
554
        graphics::mesa::BypassOption::allowed,
432
        graphics::mesa::BypassOption::allowed,
1296
555
        drm,
1297
556
        gbm,
1298
557
        null_display_report(),
433
        null_display_report(),
1299
558
        {mock_kms_output, mock_kms_output},
434
        {mock_kms_output, mock_kms_output},
1301
559
        nullptr,
435
        make_output_surface(),
1302
560
        display_area,
436
        display_area,
1306
561
        mir_orientation_normal,
437
        mir_orientation_normal);
1304
562
        gl_config,
1305
563
        mock_egl.fake_egl_context);
1307
564
438
1308
565
    db.swap_buffers();
439
    db.swap_buffers();
1309
566
    db.post();
440
    db.post();
1310
@@ -578,15 +452,11 @@
1311
578
452
1312
579
    graphics::mesa::DisplayBuffer db(
453
    graphics::mesa::DisplayBuffer db(
1313
580
        graphics::mesa::BypassOption::allowed,
454
        graphics::mesa::BypassOption::allowed,
1314
581
        drm,
1315
582
        gbm,
1316
583
        null_display_report(),
455
        null_display_report(),
1317
584
        {mock_kms_output},
456
        {mock_kms_output},
1319
585
        nullptr,
457
        make_output_surface(),
1320
586
        display_area,
458
        display_area,
1324
587
        mir_orientation_normal,
459
        mir_orientation_normal);
1322
588
        gl_config,
1323
589
        mock_egl.fake_egl_context);
1325
590
460
1326
591
    EXPECT_FALSE(db.overlay(list));
461
    EXPECT_FALSE(db.overlay(list));
1327
592
}
462
}
1328
@@ -607,15 +477,11 @@
1329
607
477
1330
608
    graphics::mesa::DisplayBuffer db(
478
    graphics::mesa::DisplayBuffer db(
1331
609
        graphics::mesa::BypassOption::allowed,
479
        graphics::mesa::BypassOption::allowed,
1332
610
        drm,
1333
611
        gbm,
1334
612
        null_display_report(),
480
        null_display_report(),
1335
613
        {mock_kms_output},
481
        {mock_kms_output},
1337
614
        nullptr,
482
        make_output_surface(),
1338
615
        display_area,
483
        display_area,
1342
616
        mir_orientation_normal,
484
        mir_orientation_normal);
1340
617
        gl_config,
1341
618
        mock_egl.fake_egl_context);
1343
619
485
1344
620
    EXPECT_FALSE(db.overlay(list));
486
    EXPECT_FALSE(db.overlay(list));
1345
621
}
487
}
1346
622
488
1347
=== modified file 'tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp'
1348
--- tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp	2017-01-18 02:29:37 +0000
1349
+++ tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp	2017-02-28 00:55:32 +0000
1350
@@ -66,6 +66,9 @@
1351
66
    {
66
    {
1352
67
        ON_CALL(mock_page_flipper, wait_for_flip(_))
67
        ON_CALL(mock_page_flipper, wait_for_flip(_))
1353
68
            .WillByDefault(Return(mg::Frame{}));
68
            .WillByDefault(Return(mg::Frame{}));
1354
69
1355
70
        ON_CALL(mock_gbm, gbm_bo_get_handle(_))
1356
71
            .WillByDefault(Return(gbm_bo_handle{0}));
1357
69
    }
72
    }
1358
70
73
1359
71
    void setup_outputs_connected_crtc()
74
    void setup_outputs_connected_crtc()
1360
@@ -106,12 +109,22 @@
1361
106
        resources.prepare();
109
        resources.prepare();
1362
107
    }
110
    }
1363
108
111
1364
112
    void append_fb_id(uint32_t fb_id)
1365
113
    {
1366
114
        EXPECT_CALL(mock_drm, drmModeAddFB2(_,_,_,_,_,_,_,_,_))
1367
115
            .WillOnce(
1368
116
                DoAll(
1369
117
                    SetArgPointee<7>(fb_id),
1370
118
                    Return(0)));
1371
119
    }
1372
120
1373
109
    testing::NiceMock<mtd::MockDRM> mock_drm;
121
    testing::NiceMock<mtd::MockDRM> mock_drm;
1374
110
    testing::NiceMock<mtd::MockGBM> mock_gbm;
122
    testing::NiceMock<mtd::MockGBM> mock_gbm;
1375
111
    MockPageFlipper mock_page_flipper;
123
    MockPageFlipper mock_page_flipper;
1376
112
    NullPageFlipper null_page_flipper;
124
    NullPageFlipper null_page_flipper;
1377
113
125
1378
114
    std::vector<drmModeModeInfo> modes_empty;
126
    std::vector<drmModeModeInfo> modes_empty;
1379
127
    gbm_bo* const fake_bo{reinterpret_cast<gbm_bo*>(0x123ba)};
1380
115
    uint32_t const invalid_id;
128
    uint32_t const invalid_id;
1381
116
    std::vector<uint32_t> const crtc_ids;
129
    std::vector<uint32_t> const crtc_ids;
1382
117
    std::vector<uint32_t> const encoder_ids;
130
    std::vector<uint32_t> const encoder_ids;
1383
@@ -139,10 +152,11 @@
1384
139
{
152
{
1385
140
    using namespace testing;
153
    using namespace testing;
1386
141
154
1387
142
    uint32_t const fb_id{67};
1388
143
1389
144
    setup_outputs_connected_crtc();
155
    setup_outputs_connected_crtc();
1390
145
156
1391
157
    uint32_t const fb_id{42};
1392
158
    append_fb_id(fb_id);
1393
159
1394
146
    {
160
    {
1395
147
        InSequence s;
161
        InSequence s;
1396
148
162
1397
@@ -166,8 +180,10 @@
1398
166
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
180
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
1399
167
                              mt::fake_shared(mock_page_flipper)};
181
                              mt::fake_shared(mock_page_flipper)};
1400
168
182
1403
169
    EXPECT_TRUE(output.set_crtc(fb_id));
183
    auto fb = output.fb_for(fake_bo, 1920, 1024);
1404
170
    EXPECT_TRUE(output.schedule_page_flip(fb_id));
184
1405
185
    EXPECT_TRUE(output.set_crtc(*fb));
1406
186
    EXPECT_TRUE(output.schedule_page_flip(*fb));
1407
171
    output.wait_for_page_flip();
187
    output.wait_for_page_flip();
1408
172
}
188
}
1409
173
189
1410
@@ -199,11 +215,15 @@
1411
199
            .Times(1);
215
            .Times(1);
1412
200
    }
216
    }
1413
201
217
1414
218
    append_fb_id(fb_id);
1415
219
1416
202
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
220
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
1417
203
                              mt::fake_shared(mock_page_flipper)};
221
                              mt::fake_shared(mock_page_flipper)};
1418
204
222
1421
205
    EXPECT_TRUE(output.set_crtc(fb_id));
223
    auto fb = output.fb_for(fake_bo, 1920, 756);
1422
206
    EXPECT_TRUE(output.schedule_page_flip(fb_id));
224
1423
225
    EXPECT_TRUE(output.set_crtc(*fb));
1424
226
    EXPECT_TRUE(output.schedule_page_flip(*fb));
1425
207
    output.wait_for_page_flip();
227
    output.wait_for_page_flip();
1426
208
}
228
}
1427
209
229
1428
@@ -219,7 +239,7 @@
1429
219
    {
239
    {
1430
220
        InSequence s;
240
        InSequence s;
1431
221
241
1433
222
        EXPECT_CALL(mock_drm, drmModeSetCrtc(_, crtc_ids[0], fb_id, _, _, _, _, _))
242
        EXPECT_CALL(mock_drm, drmModeSetCrtc(_, crtc_ids[0], _, _, _, _, _, _))
1434
223
            .Times(1)
243
            .Times(1)
1435
224
            .WillOnce(Return(1));
244
            .WillOnce(Return(1));
1436
225
245
1437
@@ -232,13 +252,18 @@
1438
232
        EXPECT_CALL(mock_drm, drmModeSetCrtc(_, _, _, _, _, _, _, _))
252
        EXPECT_CALL(mock_drm, drmModeSetCrtc(_, _, _, _, _, _, _, _))
1439
233
            .Times(0);
253
            .Times(0);
1440
234
    }
254
    }
1446
235
255
    append_fb_id(fb_id);
1447
236
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
256
1448
237
                              mt::fake_shared(mock_page_flipper)};
257
    mgm::RealKMSOutput output{
1449
238
258
        mock_drm.fake_drm.fd(),
1450
239
    EXPECT_FALSE(output.set_crtc(fb_id));
259
        connector_ids[0],
1451
260
        mt::fake_shared(mock_page_flipper)};
1452
261
1453
262
    auto fb = output.fb_for(fake_bo, 1280, 1024);
1454
263
1455
264
    EXPECT_FALSE(output.set_crtc(*fb));
1456
240
    EXPECT_NO_THROW({
265
    EXPECT_NO_THROW({
1458
241
        EXPECT_FALSE(output.schedule_page_flip(fb_id));
266
        EXPECT_FALSE(output.schedule_page_flip(*fb));
1459
242
    });
267
    });
1460
243
    EXPECT_THROW({  // schedule failed. It's programmer error if you then wait.
268
    EXPECT_THROW({  // schedule failed. It's programmer error if you then wait.
1461
244
        output.wait_for_page_flip();
269
        output.wait_for_page_flip();
1462
@@ -299,7 +324,9 @@
1463
299
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
324
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
1464
300
                              mt::fake_shared(mock_page_flipper)};
325
                              mt::fake_shared(mock_page_flipper)};
1465
301
326
1467
302
    EXPECT_TRUE(output.set_crtc(987));
327
    auto fb = output.fb_for(fake_bo, 1292, 222);
1468
328
1469
329
    EXPECT_TRUE(output.set_crtc(*fb));
1470
303
    EXPECT_NO_THROW({
330
    EXPECT_NO_THROW({
1471
304
        output.move_cursor({123, 456});
331
        output.move_cursor({123, 456});
1472
305
    });
332
    });
1473
@@ -323,7 +350,9 @@
1474
323
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
350
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
1475
324
                              mt::fake_shared(mock_page_flipper)};
351
                              mt::fake_shared(mock_page_flipper)};
1476
325
352
1478
326
    EXPECT_TRUE(output.set_crtc(987));
353
    auto fb = output.fb_for(fake_bo, 1292, 222);
1479
354
1480
355
    EXPECT_TRUE(output.set_crtc(*fb));
1481
327
    struct gbm_bo *dummy = reinterpret_cast<struct gbm_bo*>(0x1234567);
356
    struct gbm_bo *dummy = reinterpret_cast<struct gbm_bo*>(0x1234567);
1482
328
    EXPECT_NO_THROW({
357
    EXPECT_NO_THROW({
1483
329
        output.set_cursor(dummy);
358
        output.set_cursor(dummy);
1484
@@ -348,7 +377,9 @@
1485
348
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
377
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
1486
349
                              mt::fake_shared(mock_page_flipper)};
378
                              mt::fake_shared(mock_page_flipper)};
1487
350
379
1489
351
    EXPECT_TRUE(output.set_crtc(987));
380
    auto fb = output.fb_for(fake_bo, 1292, 222);
1490
381
1491
382
    EXPECT_TRUE(output.set_crtc(*fb));
1492
352
    struct gbm_bo *dummy = reinterpret_cast<struct gbm_bo*>(0x1234567);
383
    struct gbm_bo *dummy = reinterpret_cast<struct gbm_bo*>(0x1234567);
1493
353
    output.set_cursor(dummy);
384
    output.set_cursor(dummy);
1494
354
    EXPECT_FALSE(output.has_cursor());
385
    EXPECT_FALSE(output.has_cursor());
1495
@@ -394,7 +425,12 @@
1496
394
                                              const_cast<uint16_t*>(gamma.blue.data())))
425
                                              const_cast<uint16_t*>(gamma.blue.data())))
1497
395
        .Times(1);
426
        .Times(1);
1498
396
427
1500
397
    EXPECT_TRUE(output.set_crtc(fb_id));
428
    append_fb_id(fb_id);
1501
429
1502
430
    auto fb = output.fb_for(fake_bo, 1292, 222);
1503
431
1504
432
    EXPECT_TRUE(output.set_crtc(*fb));
1505
433
1506
398
    output.set_gamma(gamma);
434
    output.set_gamma(gamma);
1507
399
}
435
}
1508
400
436
1509
@@ -418,7 +454,11 @@
1510
418
                                              const_cast<uint16_t*>(gamma.blue.data())))
454
                                              const_cast<uint16_t*>(gamma.blue.data())))
1511
419
        .WillOnce(Return(-ENOSYS));
455
        .WillOnce(Return(-ENOSYS));
1512
420
456
1514
421
    EXPECT_TRUE(output.set_crtc(fb_id));
457
    append_fb_id(fb_id);
1515
458
1516
459
    auto fb = output.fb_for(fake_bo, 1292, 222);
1517
460
1518
461
    EXPECT_TRUE(output.set_crtc(*fb));
1519
422
462
1520
423
    EXPECT_NO_THROW(output.set_gamma(gamma););
463
    EXPECT_NO_THROW(output.set_gamma(gamma););
1521
424
}
464
}
Status:	Merged
Approved by:	Daniel van Vugt on 2017-03-13
Approved revision:	no longer in the source branch.
Merged at revision:	4080
Proposed branch:	lp:~raof/mir/factor-out-gbm-output-surface
Merge into:	lp:mir
Diff against target:	1521 lines (+426/-389) 12 files modified src/platforms/mesa/server/display_helpers.cpp (+25/-0) src/platforms/mesa/server/display_helpers.h (+6/-0) src/platforms/mesa/server/kms/CMakeLists.txt (+4/-0) src/platforms/mesa/server/kms/display.cpp (+13/-6) src/platforms/mesa/server/kms/display_buffer.cpp (+89/-124) src/platforms/mesa/server/kms/display_buffer.h (+53/-34) src/platforms/mesa/server/kms/kms_output.h (+6/-2) src/platforms/mesa/server/kms/real_kms_output.cpp (+82/-4) src/platforms/mesa/server/kms/real_kms_output.h (+4/-2) tests/unit-tests/platforms/mesa/kms/mock_kms_output.h (+23/-2) tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp (+63/-197) tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp (+58/-18)
To merge this branch:	bzr merge lp:~raof/mir/factor-out-gbm-output-surface
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Approve on 2017-03-13
Alan Griffiths		2017-02-23	Approve on 2017-02-28
Mir CI Bot	continuous-integration		Approve on 2017-02-28
Review via email: mp+318062@code.launchpad.net