1
=== modified file 'include/platform/mir/graphics/platform_authentication.h'
2
--- include/platform/mir/graphics/platform_authentication.h	2017-04-28 03:49:54 +0000
3
+++ include/platform/mir/graphics/platform_authentication.h	2017-05-12 10:00:59 +0000
4
@@ -21,6 +21,7 @@
5
21
21
6
22
#include "mir/optional_value.h"
22
#include "mir/optional_value.h"
7
23
#include "mir/fd.h"
23
#include "mir/fd.h"
8
24
#include "mir/module_deleter.h"
9
24
#include <memory>
25
#include <memory>
10
25
#include <vector>
26
#include <vector>
11
26
27
12
@@ -75,6 +76,17 @@
13
75
    PlatformAuthentication& operator=(PlatformAuthentication const&) = delete;
76
    PlatformAuthentication& operator=(PlatformAuthentication const&) = delete;
14
76
};
77
};
15
77
78
16
79
class PlatformAuthenticationFactory
17
80
{
18
81
public:
19
82
    virtual ~PlatformAuthenticationFactory() = default;
20
83
    virtual UniqueModulePtr<PlatformAuthentication> create_platform_authentication() = 0;
21
84
protected:
22
85
    PlatformAuthenticationFactory() = default;
23
86
    PlatformAuthenticationFactory(PlatformAuthenticationFactory const&) = delete;
24
87
    PlatformAuthenticationFactory& operator=(PlatformAuthenticationFactory const&) = delete;
25
88
};
26
89
27
78
}
90
}
28
79
}
91
}
29
80
92
30
81
93
31
=== modified file 'include/renderers/gl/mir/renderer/gl/egl_platform.h'
32
--- include/renderers/gl/mir/renderer/gl/egl_platform.h	2017-03-15 11:22:17 +0000
33
+++ include/renderers/gl/mir/renderer/gl/egl_platform.h	2017-05-12 10:00:59 +0000
34
@@ -19,7 +19,7 @@
35
19
#ifndef MIR_RENDERER_GL_EGL_PLATFORM_H_
19
#ifndef MIR_RENDERER_GL_EGL_PLATFORM_H_
36
20
#define MIR_RENDERER_GL_EGL_PLATFORM_H_
20
#define MIR_RENDERER_GL_EGL_PLATFORM_H_
37
21
21
39
22
#include <EGL/egl.h>
22
typedef void* MirServerEGLNativeDisplayType;
40
23
23
41
24
namespace mir
24
namespace mir
42
25
{
25
{
43
@@ -32,7 +32,7 @@
44
32
{
32
{
45
33
public:
33
public:
46
34
    virtual ~EGLPlatform() = default;
34
    virtual ~EGLPlatform() = default;
48
35
    virtual EGLNativeDisplayType egl_native_display() const = 0;
35
    virtual MirServerEGLNativeDisplayType egl_native_display() const = 0;
49
36
36
50
37
protected:
37
protected:
51
38
    EGLPlatform() = default;
38
    EGLPlatform() = default;
52
39
39
53
=== modified file 'src/platforms/mesa/server/CMakeLists.txt'
54
--- src/platforms/mesa/server/CMakeLists.txt	2017-04-28 03:49:54 +0000
55
+++ src/platforms/mesa/server/CMakeLists.txt	2017-05-12 10:00:59 +0000
56
@@ -19,6 +19,8 @@
57
19
  gbm_buffer.cpp
19
  gbm_buffer.cpp
58
20
  ipc_operations.cpp
20
  ipc_operations.cpp
59
21
  software_buffer.cpp
21
  software_buffer.cpp
60
22
  gbm_platform.cpp
61
23
  nested_authentication.cpp
62
22
  drm_native_platform.cpp
24
  drm_native_platform.cpp
63
23
)
25
)
64
24
26
65
25
27
66
=== modified file 'src/platforms/mesa/server/drm_native_platform.cpp'
67
--- src/platforms/mesa/server/drm_native_platform.cpp	2017-03-23 17:18:29 +0000
68
+++ src/platforms/mesa/server/drm_native_platform.cpp	2017-05-12 10:00:59 +0000
69
@@ -77,3 +77,12 @@
70
77
{
77
{
71
78
    return {mir::Fd(IntOwnedFd{drm.fd})};
78
    return {mir::Fd(IntOwnedFd{drm.fd})};
72
79
}
79
}
73
80
74
81
mgm::DRMNativePlatformAuthFactory::DRMNativePlatformAuthFactory(helpers::DRMHelper& drm) : drm(drm)
75
82
{
76
83
}
77
84
78
85
mir::UniqueModulePtr<mg::PlatformAuthentication> mgm::DRMNativePlatformAuthFactory::create_platform_authentication()
79
86
{
80
87
    return make_module_ptr<mgm::DRMNativePlatform>(drm); 
81
88
}
82
80
89
83
=== modified file 'src/platforms/mesa/server/drm_native_platform.h'
84
--- src/platforms/mesa/server/drm_native_platform.h	2017-03-23 17:18:29 +0000
85
+++ src/platforms/mesa/server/drm_native_platform.h	2017-05-12 10:00:59 +0000
86
@@ -32,8 +32,18 @@
87
32
{
32
{
88
33
class DRMHelper;
33
class DRMHelper;
89
34
}
34
}
92
35
class DRMNativePlatform : public graphics::NativeDisplayPlatform,
35
93
36
                          public graphics::PlatformAuthentication
36
class DRMNativePlatformAuthFactory : public graphics::NativeDisplayPlatform,
94
37
                                     public graphics::PlatformAuthenticationFactory
95
38
{
96
39
public:
97
40
    DRMNativePlatformAuthFactory(helpers::DRMHelper&);
98
41
    UniqueModulePtr<PlatformAuthentication> create_platform_authentication() override;
99
42
private:
100
43
    helpers::DRMHelper& drm;
101
44
};
102
45
103
46
class DRMNativePlatform : public graphics::PlatformAuthentication
104
37
{
47
{
105
38
public:
48
public:
106
39
    DRMNativePlatform(helpers::DRMHelper&);
49
    DRMNativePlatform(helpers::DRMHelper&);
107
40
50
108
=== added file 'src/platforms/mesa/server/gbm_platform.cpp'
109
--- src/platforms/mesa/server/gbm_platform.cpp	1970-01-01 00:00:00 +0000
110
+++ src/platforms/mesa/server/gbm_platform.cpp	2017-05-12 10:00:59 +0000
111
@@ -0,0 +1,88 @@
112
1
/*
113
2
 * Copyright © 2017 Canonical Ltd.
114
3
 *
115
4
 * This program is free software: you can redistribute it and/or modify it
116
5
 * under the terms of the GNU Lesser General Public License version 3,
117
6
 * as published by the Free Software Foundation.
118
7
 *
119
8
 * This program is distributed in the hope that it will be useful,
120
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
121
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
122
11
 * GNU Lesser General Public License for more details.
123
12
 *
124
13
 * You should have received a copy of the GNU Lesser General Public License
125
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
126
15
 *
127
16
 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
128
17
 */
129
18
130
19
#include "gbm_platform.h"
131
20
#include "mir/graphics/platform_authentication.h"
132
21
#include "buffer_allocator.h"
133
22
#include "ipc_operations.h"
134
23
#include "nested_authentication.h"
135
24
#include <boost/throw_exception.hpp>
136
25
137
26
namespace mg = mir::graphics;
138
27
namespace mgm = mir::graphics::mesa;
139
28
140
29
mgm::GBMPlatform::GBMPlatform(
141
30
    BypassOption bypass_option,
142
31
    BufferImportMethod import_method,
143
32
    std::shared_ptr<mg::PlatformAuthentication> const& platform_authentication) :
144
33
    bypass_option(bypass_option),
145
34
    import_method(import_method),
146
35
    platform_authentication(platform_authentication),
147
36
    gbm{std::make_shared<mgm::helpers::GBMHelper>()},
148
37
    auth{std::make_shared<mgm::NestedAuthentication>(platform_authentication)}
149
38
{
150
39
    auto master = platform_authentication->drm_fd();
151
40
    auto auth = platform_authentication->auth_extension();
152
41
    if (master.is_set())
153
42
    {
154
43
        gbm->setup(master.value());
155
44
    }
156
45
    else if (auth.is_set())
157
46
    {
158
47
        gbm->setup(auth.value()->auth_fd());
159
48
    }
160
49
    else
161
50
    {
162
51
        BOOST_THROW_EXCEPTION(std::logic_error("no authentication fd to make gbm buffers"));
163
52
    }
164
53
}
165
54
166
55
mgm::GBMPlatform::GBMPlatform(
167
56
    BypassOption bypass_option,
168
57
    BufferImportMethod import_method,
169
58
    std::shared_ptr<mir::udev::Context> const& udev,
170
59
    std::shared_ptr<mgm::helpers::DRMHelper> const& drm) :
171
60
    bypass_option(bypass_option),
172
61
    import_method(import_method),
173
62
    udev(udev),
174
63
    drm(drm),
175
64
    gbm{std::make_shared<mgm::helpers::GBMHelper>()},
176
65
    auth{drm}
177
66
{
178
67
    gbm->setup(*drm);
179
68
}
180
69
181
70
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgm::GBMPlatform::create_buffer_allocator()
182
71
{
183
72
    return make_module_ptr<mgm::BufferAllocator>(gbm->device, bypass_option, import_method);
184
73
}
185
74
186
75
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgm::GBMPlatform::make_ipc_operations() const
187
76
{
188
77
    return make_module_ptr<mg::mesa::IpcOperations>(auth);
189
78
}
190
79
191
80
mg::NativeRenderingPlatform* mgm::GBMPlatform::native_rendering_platform()
192
81
{
193
82
    return this;
194
83
}
195
84
196
85
MirServerEGLNativeDisplayType mgm::GBMPlatform::egl_native_display() const
197
86
{
198
87
    return gbm->device;
199
88
}
200
0
89
201
=== added file 'src/platforms/mesa/server/gbm_platform.h'
202
--- src/platforms/mesa/server/gbm_platform.h	1970-01-01 00:00:00 +0000
203
+++ src/platforms/mesa/server/gbm_platform.h	2017-05-12 10:00:59 +0000
204
@@ -0,0 +1,65 @@
205
1
/*
206
2
 * Copyright © 2017 Canonical Ltd.
207
3
 *
208
4
 * This program is free software: you can redistribute it and/or modify it
209
5
 * under the terms of the GNU Lesser General Public License version 3,
210
6
 * as published by the Free Software Foundation.
211
7
 *
212
8
 * This program is distributed in the hope that it will be useful,
213
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
214
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
215
11
 * GNU Lesser General Public License for more details.
216
12
 *
217
13
 * You should have received a copy of the GNU Lesser General Public License
218
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
219
15
 *
220
16
 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
221
17
 */
222
18
223
19
#ifndef MIR_GRAPHICS_MESA_GBM_PLATFORM_H_
224
20
#define MIR_GRAPHICS_MESA_GBM_PLATFORM_H_
225
21
226
22
#include "mir/graphics/platform.h"
227
23
#include "display_helpers.h"
228
24
#include "platform_common.h"
229
25
#include "mir/renderer/gl/egl_platform.h"
230
26
#include "buffer_allocator.h"
231
27
232
28
namespace mir
233
29
{
234
30
namespace graphics
235
31
{
236
32
namespace mesa
237
33
{
238
34
class GBMPlatform : public graphics::RenderingPlatform,
239
35
                    public graphics::NativeRenderingPlatform,
240
36
                    public renderer::gl::EGLPlatform
241
37
{
242
38
public:
243
39
    GBMPlatform(
244
40
        BypassOption option,
245
41
        BufferImportMethod import_method,
246
42
        std::shared_ptr<PlatformAuthentication> const& platform_authentication);
247
43
    GBMPlatform(
248
44
        BypassOption bypass_option,
249
45
        BufferImportMethod import_method,
250
46
        std::shared_ptr<mir::udev::Context> const& udev,
251
47
        std::shared_ptr<helpers::DRMHelper> const& drm);
252
48
253
49
    UniqueModulePtr<GraphicBufferAllocator> create_buffer_allocator() override;
254
50
    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
255
51
    NativeRenderingPlatform* native_rendering_platform() override;
256
52
    MirServerEGLNativeDisplayType egl_native_display() const override;
257
53
private:
258
54
    BypassOption const bypass_option;
259
55
    BufferImportMethod const import_method;
260
56
    std::shared_ptr<graphics::PlatformAuthentication> const platform_authentication;
261
57
    std::shared_ptr<mir::udev::Context> udev;
262
58
    std::shared_ptr<graphics::mesa::helpers::DRMHelper> drm;
263
59
    std::shared_ptr<helpers::GBMHelper> const gbm;
264
60
    std::shared_ptr<DRMAuthentication> const auth;
265
61
};
266
62
}
267
63
}
268
64
}
269
65
#endif /* MIR_GRAPHICS_MESA_GBM_PLATFORM_H_ */
270
0
66
271
=== modified file 'src/platforms/mesa/server/kms/CMakeLists.txt'
272
--- src/platforms/mesa/server/kms/CMakeLists.txt	2017-04-28 03:49:54 +0000
273
+++ src/platforms/mesa/server/kms/CMakeLists.txt	2017-05-12 10:00:59 +0000
274
@@ -33,7 +33,6 @@
275
33
  page_flipper.h
33
  page_flipper.h
276
34
  kms_page_flipper.cpp
34
  kms_page_flipper.cpp
277
35
  linux_virtual_terminal.cpp
35
  linux_virtual_terminal.cpp
278
36
  nested_authentication.cpp
279
37
  platform.cpp
36
  platform.cpp
280
38
  kms_display_configuration.h
37
  kms_display_configuration.h
281
39
  real_kms_display_configuration.cpp
38
  real_kms_display_configuration.cpp
282
40
39
283
=== modified file 'src/platforms/mesa/server/kms/guest_platform.cpp'
284
--- src/platforms/mesa/server/kms/guest_platform.cpp	2017-04-28 03:49:54 +0000
285
+++ src/platforms/mesa/server/kms/guest_platform.cpp	2017-05-12 10:00:59 +0000
286
@@ -53,42 +53,52 @@
287
53
    else
53
    else
288
54
        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir failed to set the gbm device."));
54
        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir failed to set the gbm device."));
289
55
}
55
}
320
56
56
}
321
57
struct AuthenticationWrapper : mg::NativeDisplayPlatform,
57
322
58
                               mg::PlatformAuthentication
58
mgm::GuestPlatform::NestedAuthFactory::NestedAuthFactory(
323
59
{
59
    std::shared_ptr<mg::PlatformAuthentication> const& auth) :
324
60
    AuthenticationWrapper(std::shared_ptr<PlatformAuthentication> const& auth) :
60
    auth(auth)
325
61
        auth(auth)
61
{
326
62
    {
62
}
327
63
    }
63
328
64
64
mir::UniqueModulePtr<mg::PlatformAuthentication>
329
65
    mir::optional_value<std::shared_ptr<mg::MesaAuthExtension>> auth_extension() override
65
mgm::GuestPlatform::NestedAuthFactory::create_platform_authentication()
330
66
    {
66
{
331
67
        return auth->auth_extension();
67
    struct AuthenticationWrapper : mg::PlatformAuthentication
332
68
    }
68
    {
333
69
69
        AuthenticationWrapper(std::shared_ptr<PlatformAuthentication> const& auth) :
334
70
    mir::optional_value<std::shared_ptr<mg::SetGbmExtension>> set_gbm_extension() override
70
            auth(auth)
335
71
    {
71
        {
336
72
        return auth->set_gbm_extension();
72
        }
337
73
    }
73
338
74
74
        mir::optional_value<std::shared_ptr<mg::MesaAuthExtension>> auth_extension() override
339
75
    mg::PlatformOperationMessage platform_operation(
75
        {
340
76
        unsigned int op, mg::PlatformOperationMessage const& msg) override
76
            return auth->auth_extension();
341
77
    {
77
        }
342
78
        return auth->platform_operation(op, msg);
78
343
79
    }
79
        mir::optional_value<std::shared_ptr<mg::SetGbmExtension>> set_gbm_extension() override
344
80
    mir::optional_value<mir::Fd> drm_fd() override
80
        {
345
81
    {
81
            return auth->set_gbm_extension();
346
82
        return auth->drm_fd();
82
        }
347
83
    }
83
348
84
    std::shared_ptr<mg::PlatformAuthentication> const auth;
84
        mg::PlatformOperationMessage platform_operation(
349
85
};
85
            unsigned int op, mg::PlatformOperationMessage const& msg) override
350
86
        {
351
87
            return auth->platform_operation(op, msg);
352
88
        }
353
89
        mir::optional_value<mir::Fd> drm_fd() override
354
90
        {
355
91
            return auth->drm_fd();
356
92
        }
357
93
        std::shared_ptr<mg::PlatformAuthentication> const auth;
358
94
    };
359
95
    return make_module_ptr<AuthenticationWrapper>(auth);
360
86
}
96
}
361
87
97
362
88
mgm::GuestPlatform::GuestPlatform(
98
mgm::GuestPlatform::GuestPlatform(
363
89
    std::shared_ptr<mg::PlatformAuthentication> const& platform_authentication) :
99
    std::shared_ptr<mg::PlatformAuthentication> const& platform_authentication) :
364
90
    platform_authentication{platform_authentication},
100
    platform_authentication{platform_authentication},
366
91
    auth(std::make_shared<AuthenticationWrapper>(platform_authentication))
101
    auth_factory{platform_authentication}
367
92
{
102
{
368
93
    auto ext = platform_authentication->auth_extension();
103
    auto ext = platform_authentication->auth_extension();
369
94
    if (!ext.is_set())
104
    if (!ext.is_set())
370
@@ -117,7 +127,7 @@
371
117
127
372
118
mg::NativeDisplayPlatform* mgm::GuestPlatform::native_display_platform()
128
mg::NativeDisplayPlatform* mgm::GuestPlatform::native_display_platform()
373
119
{
129
{
375
120
    return auth.get();
130
    return &auth_factory;
376
121
}
131
}
377
122
132
378
123
mg::NativeRenderingPlatform* mgm::GuestPlatform::native_rendering_platform()
133
mg::NativeRenderingPlatform* mgm::GuestPlatform::native_rendering_platform()
379
@@ -125,7 +135,7 @@
380
125
    return this;
135
    return this;
381
126
}
136
}
382
127
137
384
128
EGLNativeDisplayType mgm::GuestPlatform::egl_native_display() const
138
MirEGLNativeDisplayType mgm::GuestPlatform::egl_native_display() const
385
129
{
139
{
386
130
    return gbm.device;
140
    return gbm.device;
387
131
}
141
}
388
132
142
389
=== modified file 'src/platforms/mesa/server/kms/guest_platform.h'
390
--- src/platforms/mesa/server/kms/guest_platform.h	2017-04-28 03:49:54 +0000
391
+++ src/platforms/mesa/server/kms/guest_platform.h	2017-05-12 10:00:59 +0000
392
@@ -22,6 +22,7 @@
393
22
#define MIR_GRAPHICS_MESA_GUEST_PLATFORM_H_
22
#define MIR_GRAPHICS_MESA_GUEST_PLATFORM_H_
394
23
23
395
24
#include "mir/graphics/platform.h"
24
#include "mir/graphics/platform.h"
396
25
#include "mir/graphics/platform_authentication.h"
397
25
#include "mir/graphics/platform_ipc_package.h"
26
#include "mir/graphics/platform_ipc_package.h"
398
26
#include "mir/renderer/gl/egl_platform.h"
27
#include "mir/renderer/gl/egl_platform.h"
399
27
#include "display_helpers.h"
28
#include "display_helpers.h"
400
@@ -51,11 +52,18 @@
401
51
    std::vector<ExtensionDescription> extensions() const override;
52
    std::vector<ExtensionDescription> extensions() const override;
402
52
53
403
53
    NativeRenderingPlatform* native_rendering_platform() override;
54
    NativeRenderingPlatform* native_rendering_platform() override;
405
54
    EGLNativeDisplayType egl_native_display() const override;
55
    MirServerEGLNativeDisplayType egl_native_display() const override;
406
55
56
407
56
private:
57
private:
408
57
    std::shared_ptr<graphics::PlatformAuthentication> const platform_authentication;
58
    std::shared_ptr<graphics::PlatformAuthentication> const platform_authentication;
410
58
    std::shared_ptr<graphics::NativeDisplayPlatform> auth;
59
411
60
    struct NestedAuthFactory : graphics::NativeDisplayPlatform,
412
61
                               graphics::PlatformAuthenticationFactory
413
62
    {
414
63
        NestedAuthFactory(std::shared_ptr<graphics::PlatformAuthentication> const&);
415
64
        UniqueModulePtr<graphics::PlatformAuthentication> create_platform_authentication() override;
416
65
        std::shared_ptr<graphics::PlatformAuthentication> const auth;
417
66
    } auth_factory;
418
59
    helpers::GBMHelper gbm;
67
    helpers::GBMHelper gbm;
419
60
};
68
};
420
61
}
69
}
421
62
70
422
=== modified file 'src/platforms/mesa/server/kms/platform.cpp'
423
--- src/platforms/mesa/server/kms/platform.cpp	2017-04-28 03:49:54 +0000
424
+++ src/platforms/mesa/server/kms/platform.cpp	2017-05-12 10:00:59 +0000
425
@@ -26,6 +26,7 @@
426
26
#include "mir/graphics/platform_operation_message.h"
26
#include "mir/graphics/platform_operation_message.h"
427
27
#include "mir/graphics/platform_authentication.h"
27
#include "mir/graphics/platform_authentication.h"
428
28
#include "mir/graphics/native_buffer.h"
28
#include "mir/graphics/native_buffer.h"
429
29
#include "mir/graphics/platform_authentication.h"
430
29
#include "mir/emergency_cleanup_registry.h"
30
#include "mir/emergency_cleanup_registry.h"
431
30
#include "mir/udev/wrapper.h"
31
#include "mir/udev/wrapper.h"
432
31
#include "mesa_extensions.h"
32
#include "mesa_extensions.h"
433
@@ -83,7 +84,7 @@
434
83
                }
84
                }
435
84
            }));
85
            }));
436
85
86
438
86
    native_platform = std::make_unique<mgm::DRMNativePlatform>(*drm.front());
87
    auth_factory = std::make_unique<DRMNativePlatformAuthFactory>(*drm.front());
439
87
}
88
}
440
88
89
441
89
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgm::Platform::create_buffer_allocator()
90
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgm::Platform::create_buffer_allocator()
442
@@ -106,7 +107,7 @@
443
106
107
444
107
mg::NativeDisplayPlatform* mgm::Platform::native_display_platform()
108
mg::NativeDisplayPlatform* mgm::Platform::native_display_platform()
445
108
{
109
{
447
109
    return native_platform.get();
110
    return auth_factory.get();
448
110
}
111
}
449
111
112
450
112
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgm::Platform::make_ipc_operations() const
113
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgm::Platform::make_ipc_operations() const
451
@@ -119,7 +120,7 @@
452
119
    return this;
120
    return this;
453
120
}
121
}
454
121
122
456
122
EGLNativeDisplayType mgm::Platform::egl_native_display() const
123
MirServerEGLNativeDisplayType mgm::Platform::egl_native_display() const
457
123
{
124
{
458
124
    return gbm->device;
125
    return gbm->device;
459
125
}
126
}
460
126
127
461
=== modified file 'src/platforms/mesa/server/kms/platform.h'
462
--- src/platforms/mesa/server/kms/platform.h	2017-04-28 03:49:54 +0000
463
+++ src/platforms/mesa/server/kms/platform.h	2017-05-12 10:00:59 +0000
464
@@ -56,7 +56,7 @@
465
56
    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
56
    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
466
57
57
467
58
    NativeRenderingPlatform* native_rendering_platform() override;
58
    NativeRenderingPlatform* native_rendering_platform() override;
469
59
    EGLNativeDisplayType egl_native_display() const override;
59
    MirServerEGLNativeDisplayType egl_native_display() const override;
470
60
60
471
61
    std::shared_ptr<mir::udev::Context> udev;
61
    std::shared_ptr<mir::udev::Context> udev;
472
62
    std::vector<std::shared_ptr<helpers::DRMHelper>> const drm;
62
    std::vector<std::shared_ptr<helpers::DRMHelper>> const drm;
473
@@ -68,7 +68,7 @@
474
68
    BypassOption bypass_option() const;
68
    BypassOption bypass_option() const;
475
69
private:
69
private:
476
70
    BypassOption const bypass_option_;
70
    BypassOption const bypass_option_;
478
71
    std::unique_ptr<DRMNativePlatform> native_platform;
71
    std::unique_ptr<DRMNativePlatformAuthFactory> auth_factory;
479
72
};
72
};
480
73
73
481
74
}
74
}
482
75
75
483
=== modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
484
--- src/platforms/mesa/server/kms/platform_symbols.cpp	2017-04-28 03:49:54 +0000
485
+++ src/platforms/mesa/server/kms/platform_symbols.cpp	2017-05-12 10:00:59 +0000
486
@@ -17,6 +17,7 @@
487
17
 */
17
 */
488
18
18
489
19
#include "platform.h"
19
#include "platform.h"
490
20
#include "gbm_platform.h"
491
20
#include "guest_platform.h"
21
#include "guest_platform.h"
492
21
#include "linux_virtual_terminal.h"
22
#include "linux_virtual_terminal.h"
493
22
#include "mir/options/program_option.h"
23
#include "mir/options/program_option.h"
494
@@ -251,3 +252,40 @@
495
251
    mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
252
    mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
496
252
    return mir::make_module_ptr<mgm::GuestPlatform>(platform_authentication);
253
    return mir::make_module_ptr<mgm::GuestPlatform>(platform_authentication);
497
253
}
254
}
498
255
499
256
mir::UniqueModulePtr<mir::graphics::DisplayPlatform> create_display_platform(
500
257
    std::shared_ptr<mo::Option> const& options,
501
258
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
502
259
    std::shared_ptr<mg::DisplayReport> const& report,
503
260
    std::shared_ptr<mir::logging::Logger> const&)
504
261
{
505
262
    mir::assert_entry_point_signature<mg::CreateDisplayPlatform>(&create_display_platform);
506
263
    // ensure mesa finds the mesa mir-platform symbols
507
264
    auto real_fops = std::make_shared<RealVTFileOperations>();
508
265
    auto real_pops = std::unique_ptr<RealPosixProcessOperations>(new RealPosixProcessOperations{});
509
266
    auto vt = std::make_shared<mgm::LinuxVirtualTerminal>(
510
267
        real_fops,
511
268
        std::move(real_pops),
512
269
        options->get<int>(vt_option_name),
513
270
        report);
514
271
515
272
    auto bypass_option = mgm::BypassOption::allowed;
516
273
    if (!options->get<bool>(bypass_option_name))
517
274
        bypass_option = mgm::BypassOption::prohibited;
518
275
519
276
    return mir::make_module_ptr<mgm::Platform>(
520
277
        report, vt, *emergency_cleanup_registry, bypass_option);
521
278
}
522
279
523
280
mir::UniqueModulePtr<mir::graphics::RenderingPlatform> create_rendering_platform(
524
281
    std::shared_ptr<mir::options::Option> const& options,
525
282
    std::shared_ptr<mir::graphics::PlatformAuthentication> const& platform_authentication)
526
283
{
527
284
    mir::assert_entry_point_signature<mg::CreateRenderingPlatform>(&create_rendering_platform);
528
285
529
286
    auto bypass_option = mgm::BypassOption::allowed;
530
287
    if (!options->get<bool>(bypass_option_name))
531
288
        bypass_option = mgm::BypassOption::prohibited;
532
289
    return mir::make_module_ptr<mgm::GBMPlatform>(
533
290
        bypass_option, mgm::BufferImportMethod::gbm_native_pixmap, platform_authentication);
534
291
}
535
254
292
536
=== renamed file 'src/platforms/mesa/server/kms/nested_authentication.cpp' => 'src/platforms/mesa/server/nested_authentication.cpp'
537
--- src/platforms/mesa/server/kms/nested_authentication.cpp	2017-04-28 03:49:54 +0000
538
+++ src/platforms/mesa/server/nested_authentication.cpp	2017-05-12 10:00:59 +0000
539
@@ -21,7 +21,6 @@
540
21
#include "nested_authentication.h"
21
#include "nested_authentication.h"
541
22
22
542
23
#include "mir_toolkit/mesa/platform_operation.h"
23
#include "mir_toolkit/mesa/platform_operation.h"
543
24
#include "mir_toolkit/extensions/mesa_drm_auth.h"
544
25
24
545
26
#include <boost/exception/errinfo_errno.hpp>
25
#include <boost/exception/errinfo_errno.hpp>
546
27
#include <boost/throw_exception.hpp>
26
#include <boost/throw_exception.hpp>
547
28
27
548
=== renamed file 'src/platforms/mesa/server/kms/nested_authentication.h' => 'src/platforms/mesa/server/nested_authentication.h'
549
=== modified file 'src/platforms/mesa/server/x11/graphics/graphics.cpp'
550
--- src/platforms/mesa/server/x11/graphics/graphics.cpp	2017-04-28 03:49:54 +0000
551
+++ src/platforms/mesa/server/x11/graphics/graphics.cpp	2017-05-12 10:00:59 +0000
552
@@ -19,6 +19,8 @@
553
19
#include "mir/graphics/display_report.h"
19
#include "mir/graphics/display_report.h"
554
20
#include "mir/options/option.h"
20
#include "mir/options/option.h"
555
21
#include "platform.h"
21
#include "platform.h"
556
22
#include "gbm_platform.h"
557
23
#include "platform_common.h"
558
22
#include "guest_platform.h"
24
#include "guest_platform.h"
559
23
#include "../X11_resources.h"
25
#include "../X11_resources.h"
560
24
#include "mir/module_deleter.h"
26
#include "mir/module_deleter.h"
561
@@ -29,6 +31,7 @@
562
29
31
563
30
namespace mo = mir::options;
32
namespace mo = mir::options;
564
31
namespace mg = mir::graphics;
33
namespace mg = mir::graphics;
565
34
namespace mgm = mir::graphics::mesa;
566
32
namespace mx = mir::X;
35
namespace mx = mir::X;
567
33
namespace mgx = mg::X;
36
namespace mgx = mg::X;
568
34
namespace geom = mir::geometry;
37
namespace geom = mir::geometry;
569
@@ -56,11 +59,12 @@
570
56
        BOOST_THROW_EXCEPTION(std::runtime_error("Malformed display size option"));
59
        BOOST_THROW_EXCEPTION(std::runtime_error("Malformed display size option"));
571
57
60
572
58
    return mir::make_module_ptr<mgx::Platform>(
61
    return mir::make_module_ptr<mgx::Platform>(
578
59
               x11_resources.get_conn(),
62
        x11_resources.get_conn(),
579
60
               geom::Size{std::stoi(display_dims_str.substr(0, pos)),
63
        geom::Size{
580
61
                          std::stoi(display_dims_str.substr(pos+1, display_dims_str.find(':')))},
64
            std::stoi(display_dims_str.substr(0, pos)),
581
62
               report
65
            std::stoi(display_dims_str.substr(pos+1, display_dims_str.find(':')))},
582
63
           );
66
        report
583
67
    );
584
64
}
68
}
585
65
69
586
66
mir::UniqueModulePtr<mg::Platform> create_guest_platform(
70
mir::UniqueModulePtr<mg::Platform> create_guest_platform(
587
@@ -117,3 +121,39 @@
588
117
    mir::assert_entry_point_signature<mg::DescribeModule>(&describe_graphics_module);
121
    mir::assert_entry_point_signature<mg::DescribeModule>(&describe_graphics_module);
589
118
    return &description;
122
    return &description;
590
119
}
123
}
591
124
592
125
mir::UniqueModulePtr<mir::graphics::DisplayPlatform> create_display_platform(
593
126
    std::shared_ptr<mo::Option> const& options,
594
127
    std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
595
128
    std::shared_ptr<mg::DisplayReport> const& report,
596
129
    std::shared_ptr<mir::logging::Logger> const&)
597
130
{
598
131
    mir::assert_entry_point_signature<mg::CreateDisplayPlatform>(&create_display_platform);
599
132
600
133
    if (!x11_resources.get_conn())
601
134
        BOOST_THROW_EXCEPTION(std::runtime_error("Need valid x11 display"));
602
135
603
136
    auto display_dims_str = options->get<std::string>(x11_displays_option_name);
604
137
    auto pos = display_dims_str.find('x');
605
138
    if (pos == std::string::npos)
606
139
        BOOST_THROW_EXCEPTION(std::runtime_error("Malformed display size option"));
607
140
608
141
    return mir::make_module_ptr<mgx::Platform>(
609
142
               x11_resources.get_conn(),
610
143
               geom::Size{std::stoi(display_dims_str.substr(0, pos)),
611
144
                          std::stoi(display_dims_str.substr(pos+1, display_dims_str.find(':')))},
612
145
               report
613
146
           );
614
147
}
615
148
616
149
mir::UniqueModulePtr<mir::graphics::RenderingPlatform> create_rendering_platform(
617
150
    std::shared_ptr<mir::options::Option> const&,
618
151
    std::shared_ptr<mir::graphics::PlatformAuthentication> const&)
619
152
{
620
153
    mir::assert_entry_point_signature<mg::CreateRenderingPlatform>(&create_rendering_platform);
621
154
    auto udev = std::make_shared<mir::udev::Context>();
622
155
    auto drm = std::make_shared<mgm::helpers::DRMHelper>(mgm::helpers::DRMNodeToUse::render);
623
156
    drm->setup(udev);
624
157
    return mir::make_module_ptr<mgm::GBMPlatform>(
625
158
        mgm::BypassOption::prohibited, mgm::BufferImportMethod::dma_buf, udev, drm);
626
159
}
627
120
160
628
=== modified file 'src/platforms/mesa/server/x11/graphics/guest_platform.cpp'
629
--- src/platforms/mesa/server/x11/graphics/guest_platform.cpp	2017-04-28 03:49:54 +0000
630
+++ src/platforms/mesa/server/x11/graphics/guest_platform.cpp	2017-05-12 10:00:59 +0000
631
@@ -35,7 +35,7 @@
632
35
{
35
{
633
36
    drm->setup(udev);
36
    drm->setup(udev);
634
37
    gbm.setup(*drm);
37
    gbm.setup(*drm);
636
38
    native_platform = std::make_unique<mgm::DRMNativePlatform>(*drm);
38
    auth_factory = std::make_unique<mgm::DRMNativePlatformAuthFactory>(*drm);
637
39
}
39
}
638
40
40
639
41
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgx::GuestPlatform::create_buffer_allocator()
41
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgx::GuestPlatform::create_buffer_allocator()
640
@@ -60,7 +60,7 @@
641
60
60
642
61
mg::NativeDisplayPlatform* mgx::GuestPlatform::native_display_platform()
61
mg::NativeDisplayPlatform* mgx::GuestPlatform::native_display_platform()
643
62
{
62
{
645
63
    return native_platform.get();
63
    return auth_factory.get();
646
64
}
64
}
647
65
65
648
66
mg::NativeRenderingPlatform* mgx::GuestPlatform::native_rendering_platform()
66
mg::NativeRenderingPlatform* mgx::GuestPlatform::native_rendering_platform()
649
@@ -68,7 +68,7 @@
650
68
    return this;
68
    return this;
651
69
}
69
}
652
70
70
654
71
EGLNativeDisplayType mgx::GuestPlatform::egl_native_display() const
71
MirServerEGLNativeDisplayType mgx::GuestPlatform::egl_native_display() const
655
72
{
72
{
656
73
    return gbm.device;
73
    return gbm.device;
657
74
}
74
}
658
75
75
659
=== modified file 'src/platforms/mesa/server/x11/graphics/guest_platform.h'
660
--- src/platforms/mesa/server/x11/graphics/guest_platform.h	2017-04-28 03:49:54 +0000
661
+++ src/platforms/mesa/server/x11/graphics/guest_platform.h	2017-05-12 10:00:59 +0000
662
@@ -50,13 +50,13 @@
663
50
    std::vector<ExtensionDescription> extensions() const override;
50
    std::vector<ExtensionDescription> extensions() const override;
664
51
51
665
52
    NativeRenderingPlatform* native_rendering_platform() override;
52
    NativeRenderingPlatform* native_rendering_platform() override;
667
53
    EGLNativeDisplayType egl_native_display() const override;
53
    MirServerEGLNativeDisplayType egl_native_display() const override;
668
54
54
669
55
private:
55
private:
670
56
    std::shared_ptr<mir::udev::Context> udev;
56
    std::shared_ptr<mir::udev::Context> udev;
671
57
    std::shared_ptr<graphics::mesa::helpers::DRMHelper> const drm;
57
    std::shared_ptr<graphics::mesa::helpers::DRMHelper> const drm;
672
58
    graphics::mesa::helpers::GBMHelper gbm;
58
    graphics::mesa::helpers::GBMHelper gbm;
674
59
    std::unique_ptr<graphics::mesa::DRMNativePlatform> native_platform;
59
    std::unique_ptr<mesa::DRMNativePlatformAuthFactory> auth_factory;
675
60
};
60
};
676
61
61
677
62
}
62
}
678
63
63
679
=== modified file 'src/platforms/mesa/server/x11/graphics/platform.cpp'
680
--- src/platforms/mesa/server/x11/graphics/platform.cpp	2017-04-28 03:49:54 +0000
681
+++ src/platforms/mesa/server/x11/graphics/platform.cpp	2017-05-12 10:00:59 +0000
682
@@ -41,7 +41,7 @@
683
41
41
684
42
    drm->setup(udev);
42
    drm->setup(udev);
685
43
    gbm.setup(*drm);
43
    gbm.setup(*drm);
687
44
    native_platform = std::make_unique<mgm::DRMNativePlatform>(*drm);
44
    auth_factory = std::make_unique<mgm::DRMNativePlatformAuthFactory>(*drm);
688
45
}
45
}
689
46
46
690
47
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgx::Platform::create_buffer_allocator()
47
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgx::Platform::create_buffer_allocator()
691
@@ -59,7 +59,7 @@
692
59
59
693
60
mg::NativeDisplayPlatform* mgx::Platform::native_display_platform()
60
mg::NativeDisplayPlatform* mgx::Platform::native_display_platform()
694
61
{
61
{
696
62
    return native_platform.get();
62
    return auth_factory.get();
697
63
}
63
}
698
64
64
699
65
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgx::Platform::make_ipc_operations() const
65
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgx::Platform::make_ipc_operations() const
700
66
66
701
=== modified file 'src/platforms/mesa/server/x11/graphics/platform.h'
702
--- src/platforms/mesa/server/x11/graphics/platform.h	2017-04-28 03:49:54 +0000
703
+++ src/platforms/mesa/server/x11/graphics/platform.h	2017-05-12 10:00:59 +0000
704
@@ -66,7 +66,7 @@
705
66
    std::shared_ptr<DisplayReport> const report;
66
    std::shared_ptr<DisplayReport> const report;
706
67
    mesa::helpers::GBMHelper gbm;
67
    mesa::helpers::GBMHelper gbm;
707
68
    mir::geometry::Size const size;
68
    mir::geometry::Size const size;
709
69
    std::unique_ptr<mesa::DRMNativePlatform> native_platform;
69
    std::unique_ptr<mesa::DRMNativePlatformAuthFactory> auth_factory;
710
70
};
70
};
711
71
71
712
72
}
72
}
713
73
73
714
=== modified file 'src/server/graphics/nested/platform.h'
715
--- src/server/graphics/nested/platform.h	2017-04-28 03:49:54 +0000
716
+++ src/server/graphics/nested/platform.h	2017-05-12 10:00:59 +0000
717
@@ -54,7 +54,7 @@
718
54
    NativeDisplayPlatform* native_display_platform() override;
54
    NativeDisplayPlatform* native_display_platform() override;
719
55
    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
55
    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
720
56
    NativeRenderingPlatform* native_rendering_platform() override;
56
    NativeRenderingPlatform* native_rendering_platform() override;
722
57
    EGLNativeDisplayType egl_native_display() const override;
57
    MirServerEGLNativeDisplayType egl_native_display() const override;
723
58
    std::vector<mir::ExtensionDescription> extensions() const override;
58
    std::vector<mir::ExtensionDescription> extensions() const override;
724
59
private:
59
private:
725
60
    std::shared_ptr<mir::SharedLibrary> const library; 
60
    std::shared_ptr<mir::SharedLibrary> const library; 
726
61
61
727
=== modified file 'tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp'
728
--- tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp	2017-04-28 03:49:54 +0000
729
+++ tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp	2017-05-12 10:00:59 +0000
730
@@ -18,7 +18,7 @@
731
18
18
732
19
#include "mir/graphics/platform_authentication.h"
19
#include "mir/graphics/platform_authentication.h"
733
20
#include "mir/graphics/platform_operation_message.h"
20
#include "mir/graphics/platform_operation_message.h"
735
21
#include "src/platforms/mesa/server/kms/nested_authentication.h"
21
#include "src/platforms/mesa/server/nested_authentication.h"
736
22
#include "mir_toolkit/mesa/platform_operation.h"
22
#include "mir_toolkit/mesa/platform_operation.h"
737
23
#include "mir/test/doubles/mock_drm.h"
23
#include "mir/test/doubles/mock_drm.h"
738
24
#include "mir/test/doubles/mock_platform_authentication.h"
24
#include "mir/test/doubles/mock_platform_authentication.h"
Status:	Merged
Approved by:	Alan Griffiths on 2017-05-16
Approved revision:	no longer in the source branch.
Merged at revision:	4169
Proposed branch:	lp:~alan-griffiths/mir/split-mesa
Merge into:	lp:mir
Diff against target:	738 lines (+342/-61) 21 files modified include/platform/mir/graphics/platform_authentication.h (+12/-0) include/renderers/gl/mir/renderer/gl/egl_platform.h (+2/-2) src/platforms/mesa/server/CMakeLists.txt (+2/-0) src/platforms/mesa/server/drm_native_platform.cpp (+9/-0) src/platforms/mesa/server/drm_native_platform.h (+12/-2) src/platforms/mesa/server/gbm_platform.cpp (+88/-0) src/platforms/mesa/server/gbm_platform.h (+65/-0) src/platforms/mesa/server/kms/CMakeLists.txt (+0/-1) src/platforms/mesa/server/kms/guest_platform.cpp (+43/-33) src/platforms/mesa/server/kms/guest_platform.h (+10/-2) src/platforms/mesa/server/kms/platform.cpp (+4/-3) src/platforms/mesa/server/kms/platform.h (+2/-2) src/platforms/mesa/server/kms/platform_symbols.cpp (+38/-0) src/platforms/mesa/server/nested_authentication.cpp (+0/-1) src/platforms/mesa/server/x11/graphics/graphics.cpp (+45/-5) src/platforms/mesa/server/x11/graphics/guest_platform.cpp (+3/-3) src/platforms/mesa/server/x11/graphics/guest_platform.h (+2/-2) src/platforms/mesa/server/x11/graphics/platform.cpp (+2/-2) src/platforms/mesa/server/x11/graphics/platform.h (+1/-1) src/server/graphics/nested/platform.h (+1/-1) tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp (+1/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/split-mesa
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration	2017-05-11	Approve on 2017-05-16
Andreas Pokorny (community)			Approve on 2017-05-16
Daniel van Vugt		2017-05-11	Abstain on 2017-05-15
Cemil Azizoglu		2017-05-11	Pending
Chris Halse Rogers		2017-05-11	Pending
Review via email: mp+323901@code.launchpad.net