1
=== modified file 'src/platforms/eglstream-kms/server/platform_symbols.cpp'
2
--- src/platforms/eglstream-kms/server/platform_symbols.cpp	2017-05-08 03:04:26 +0000
3
+++ src/platforms/eglstream-kms/server/platform_symbols.cpp	2017-05-25 06:24:14 +0000
4
@@ -105,6 +105,19 @@
5
105
    mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);
105
    mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);
6
106
}
106
}
7
107
107
8
108
namespace
9
109
{
10
110
char const* drm_node_for_device(EGLDeviceEXT device)
11
111
{
12
112
    auto const device_path = eglQueryDeviceStringEXT(device, EGL_DRM_DEVICE_FILE_EXT);
13
113
    if (!device_path)
14
114
    {
15
115
        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to determine DRM device node path from EGLDevice"));
16
116
    }
17
117
    return device_path;
18
118
}
19
119
}
20
120
21
108
mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /*options*/)
121
mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /*options*/)
22
109
{
122
{
23
110
    mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);
123
    mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);
24
@@ -158,7 +171,22 @@
25
158
            {
171
            {
26
159
                mir::log_debug("Found EGLDeviceEXT with device extensions: %s",
172
                mir::log_debug("Found EGLDeviceEXT with device extensions: %s",
27
160
                               device_extensions);
173
                               device_extensions);
29
161
                return strstr(device_extensions, "EGL_EXT_device_drm") != NULL;
174
                // TODO: This test is not strictly correct (will incorrectly match
30
175
                // EGL_EXT_device_drmish_but_not_drm)
31
176
                if (strstr(device_extensions, "EGL_EXT_device_drm") != NULL)
32
177
                {
33
178
                    // Check if we can acquire DRM master
34
179
                    int const drm_fd = open(drm_node_for_device(device), O_RDWR | O_CLOEXEC);
35
180
                    if (drmSetMaster(drm_fd))
36
181
                    {
37
182
                        mir::log_debug(
38
183
                            "EGL_EXT_device_drm found, but can't acquire DRM master.");
39
184
                        return false;
40
185
                    }
41
186
                    drmDropMaster(drm_fd);
42
187
                    return true;
43
188
                }
44
189
                return false;
45
162
            }
190
            }
46
163
            else
191
            else
47
164
            {
192
            {
48
@@ -167,8 +195,8 @@
49
167
            }
195
            }
50
168
        }))
196
        }))
51
169
    {
197
    {
54
170
        mir::log_debug("EGLDeviceEXTs found, but none support required "
198
        mir::log_debug(
55
171
                       "EGL_EXT_device_drm extension");
199
            "EGLDeviceEXTs found, but none are suitable for Mir");
56
172
        return mg::PlatformPriority::unsupported;
200
        return mg::PlatformPriority::unsupported;
57
173
    }
201
    }
58
174
202
Status:	Merged
Approved by:	Alan Griffiths on 2017-05-25
Approved revision:	no longer in the source branch.
Merged at revision:	4176
Proposed branch:	lp:~raof/mir/better-eglstream-detection
Merge into:	lp:mir
Prerequisite:	lp:~raof/mir/remove-never-used-code
Diff against target:	57 lines (+31/-3) 1 file modified src/platforms/eglstream-kms/server/platform_symbols.cpp (+31/-3)
To merge this branch:	bzr merge lp:~raof/mir/better-eglstream-detection
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2017-05-25	Approve on 2017-05-25
Mir CI Bot	continuous-integration		Approve on 2017-05-25
Review via email: mp+324597@code.launchpad.net
1	=== modified file 'src/platforms/eglstream-kms/server/platform_symbols.cpp'
2	--- src/platforms/eglstream-kms/server/platform_symbols.cpp 2017-05-08 03:04:26 +0000
3	+++ src/platforms/eglstream-kms/server/platform_symbols.cpp 2017-05-25 06:24:14 +0000
4	@@ -105,6 +105,19 @@
5	105	mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);	105	mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);
6	106	}	106	}
7	107		107
8			108	namespace
9			109	{
10			110	char const* drm_node_for_device(EGLDeviceEXT device)
11			111	{
12			112	auto const device_path = eglQueryDeviceStringEXT(device, EGL_DRM_DEVICE_FILE_EXT);
13			113	if (!device_path)
14			114	{
15			115	BOOST_THROW_EXCEPTION(mg::egl_error("Failed to determine DRM device node path from EGLDevice"));
16			116	}
17			117	return device_path;
18			118	}
19			119	}
20			120
21	108	mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /options/)	121	mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /options/)
22	109	{	122	{
23	110	mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);	123	mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);
24	@@ -158,7 +171,22 @@
25	158	{	171	{
26	159	mir::log_debug("Found EGLDeviceEXT with device extensions: %s",	172	mir::log_debug("Found EGLDeviceEXT with device extensions: %s",
27	160	device_extensions);	173	device_extensions);
29	161	return strstr(device_extensions, "EGL_EXT_device_drm") != NULL;	174	// TODO: This test is not strictly correct (will incorrectly match
30			175	// EGL_EXT_device_drmish_but_not_drm)
31			176	if (strstr(device_extensions, "EGL_EXT_device_drm") != NULL)
32			177	{
33			178	// Check if we can acquire DRM master
34			179	int const drm_fd = open(drm_node_for_device(device), O_RDWR \| O_CLOEXEC);
35			180	if (drmSetMaster(drm_fd))
36			181	{
37			182	mir::log_debug(
38			183	"EGL_EXT_device_drm found, but can't acquire DRM master.");
39			184	return false;
40			185	}
41			186	drmDropMaster(drm_fd);
42			187	return true;
43			188	}
44			189	return false;
45	162	}	190	}
46	163	else	191	else
47	164	{	192	{
48	@@ -167,8 +195,8 @@
49	167	}	195	}
50	168	}))	196	}))
51	169	{	197	{
54	170	mir::log_debug("EGLDeviceEXTs found, but none support required "	198	mir::log_debug(
55	171	"EGL_EXT_device_drm extension");	199	"EGLDeviceEXTs found, but none are suitable for Mir");
56	172	return mg::PlatformPriority::unsupported;	200	return mg::PlatformPriority::unsupported;
57	173	}	201	}
58	174		202