Merge lp:~cemil-azizoglu/mir/split-mesa-into-common-and-kms into lp:mir

[Cemil Azizoglu]

Split Mesa server side into common and KMS.

There are other platforms (like X) using the Mesa driver. Some of the code is common. This MP splits the server side of the Mesa driver into common/ and KMS/ subdirectories.

To see how this new directory structure might be used, you can take a look at :
https://code.launchpad.net/~cemil-azizoglu/mir/mir-on-x/+merge/258793

Subsequent MP(s) will rename relevant build or run time #defines to make things more clear.

Split Mesa server side into common and KMS.

There are other platforms (like X) using the Mesa driver. Some of the code is common. This MP splits the server side of the Mesa driver into common/ and KMS/ subdirectories.

To see how this new directory structure might be used, you can take a look at :
https://code.launchpad.net/~cemil-azizoglu/mir/mir-on-x/+merge/258793

Subsequent MP(s) will rename relevant build or run time #defines to make things more clear.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2603
http://jenkins.qa.ubuntu.com/job/mir-ci/3939/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2571
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5423
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20831

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3939/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Hm. Why is bypass-option in platform_common.h? That's a KMS-specific option.

Otherwise seems to match what we agreed in Dallas, so +1.

review: Needs Information

[Daniel van Vugt (vanvugt)]

(1) SHM is generic and not specific to Mesa. It needs to separated completely for use in any driver...
213 === renamed file 'src/platforms/mesa/server/shm_buffer.cpp' => 'src/platforms/mesa/server/common/shm_buffer.cpp'

(2) Reconsider naming "KMS" vs "DRM" per:
https://code.launchpad.net/~cemil-azizoglu/mir/rename-mesa-to-KMS/+merge/260533

review: Needs Fixing

[Chris Halse Rogers (raof)]

While (1) is correct, in practice we've got no non-mesa drivers using it; android has something better (for them). While it might be nice to separate it out, I don't think it should be a prerequisite for landing this branch.

[Alexandros Frantzis (afrantzis)]

10+ add_subdirectory(KMS/)

Would prefer lowercase for 'kms' directory.

164=== renamed file 'src/platforms/mesa/server/drm_mode_resources.cpp' => 'src/platforms/mesa/server/common/drm_mode_resources.cpp'
165=== renamed file 'src/platforms/mesa/server/drm_mode_resources.h' => 'src/platforms/mesa/server/common/drm_mode_resources.h'

These are KMS specific, does X11 need these? If not, we should place these into kms/ along with the DRMHelper class which needs to split out from src/platforms/mesa/server/common/display_helpers.cpp .

review: Needs Fixing

[Cemil Azizoglu (cemil-azizoglu)]

> Hm. Why is bypass-option in platform_common.h? That's a KMS-specific option.
>
> Otherwise seems to match what we agreed in Dallas, so +1.

Bypass option is used in BufferAllocator which is (99.9%) common code except X doesn't use GBM_BO_USE_SCANOUT.

[Cemil Azizoglu (cemil-azizoglu)]

> 10+ add_subdirectory(KMS/)
>
> Would prefer lowercase for 'kms' directory.

KMS is an acronym, and I'd prefer keeping the name in capitals. I agree changing it to lowercase for the package name though.

>
> 164=== renamed file 'src/platforms/mesa/server/drm_mode_resources.cpp' =>
> 'src/platforms/mesa/server/common/drm_mode_resources.cpp'
> 165=== renamed file 'src/platforms/mesa/server/drm_mode_resources.h' =>
> 'src/platforms/mesa/server/common/drm_mode_resources.h'
>
> These are KMS specific, does X11 need these? If not, we should place these
> into kms/ along with the DRMHelper class which needs to split out from
> src/platforms/mesa/server/common/display_helpers.cpp.

Strictly speaking X11 does not need it. DRMHelper _is_ used in the X version to open a 'render' node to avoid the authentication dance. But this could change and we might end up using authentication for X too in the final version. In the current version of DRMHelper that supports both KMS and X, I chose to introduce a flag indicating whether the DRMHelper object is instantiated for KMS or X and use it to simply bypass some code not needed for X. This allows me to support X with very little change in code and keeps the door open for potential authentication for other Mesa platforms in the future.

[Alexandros Frantzis (afrantzis)]

>> Would prefer lowercase for 'kms' directory.
>
> KMS is an acronym, and I'd prefer keeping the name in capitals.
> I agree changing it to lowercase for the package name though.

We have at least a few other acronyms in the codebase (LTTng, GBM, HWC), for which we use the lowercase version in directory and file names. The reasons are:

1. Our namespaces, which generally follow our directory structure and names, our always lowercase (e.g. mir::mesa::kms for mesa/kms)
2. All files and directories are lowercase, so having a few uppercase names just confuses things and doesn't offer any real benefits

[Cemil Azizoglu (cemil-azizoglu)]

> >> Would prefer lowercase for 'kms' directory.
> >
> > KMS is an acronym, and I'd prefer keeping the name in capitals.
> > I agree changing it to lowercase for the package name though.
>
> We have at least a few other acronyms in the codebase (LTTng, GBM, HWC), for
> which we use the lowercase version in directory and file names. The reasons
> are:
>
> 1. Our namespaces, which generally follow our directory structure and names,
> our always lowercase (e.g. mir::mesa::kms for mesa/kms)
> 2. All files and directories are lowercase, so having a few uppercase names
> just confuses things and doesn't offer any real benefits

Ok. Done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2604
http://jenkins.qa.ubuntu.com/job/mir-ci/3949/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2582
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5432
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20846

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3949/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Hm. I guess BufferAllocator should have a little gentle reworking to not take the BypassOption (and instead use MayScanout, or something similar internally), but I'm happy for that to be done later at our leisure.

Likewise, splitting out some of the display helpers.

review: Approve

[Alan Griffiths (alan-griffiths)]

Nits:

5 +if (MIR_BUILD_PLATFORM_MESA)
6 + add_subdirectory(common/)
7 +endif()
8 +
9 +if (MIR_BUILD_PLATFORM_MESA)
10 + add_subdirectory(kms/)
11 +endif()

The test for MIR_BUILD_PLATFORM_MESA is (and should be) in src/platforms/CMakeLists.txt it is not wanted here.

~~~~

158 + mirsharedmesaservercommon-static

we shouldn't be linking against mirplatformgraphicsmesa but for consistency this ought to be PRIVATE in target_link_libraries(). (To prevent a transitive dependency on a static library.)

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

> Nits:
>
> 5 +if (MIR_BUILD_PLATFORM_MESA)
> 6 + add_subdirectory(common/)
> 7 +endif()
> 8 +
> 9 +if (MIR_BUILD_PLATFORM_MESA)
> 10 + add_subdirectory(kms/)
> 11 +endif()
>
> The test for MIR_BUILD_PLATFORM_MESA is (and should be) in
> src/platforms/CMakeLists.txt it is not wanted here.

You're right the first one is not wanted here. The second one is though (it's more clear why when you consider presence of an X folder at the same level as kms/ and/or if you take a look at the renaming branch). This is now fixed.

>
> ~~~~
>
> 158 + mirsharedmesaservercommon-static
>
> we shouldn't be linking against mirplatformgraphicsmesa but for consistency
> this ought to be PRIVATE in target_link_libraries(). (To prevent a transitive
> dependency on a static library.)

Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2605
http://jenkins.qa.ubuntu.com/job/mir-ci/3964/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2600
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5451
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20879

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3964/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Pre-existing issues, but try not to make them worse...

(3) Pointless enum just makes the code bigger:
94 +enum class BypassOption
95 +{
96 + allowed,
97 + prohibited
98 +};
Should be replaced by "bool bypass_allowed" instead of a new 38-line file.

(4) If you see anything named "Helper" that's a hack which should be replaced with something more concrete, if not simply a better class name.

[Daniel van Vugt (vanvugt)]

(5) If presently:
  "android" == gralloc + hwc
  "mesa" == gbm + drm
and you propose:
  "kms" == gbm + drm
then how do we fit in (soon):
  "nvidia" = eglstreams + kms
? Seems like "kms" then is the wrong name for the open driver because nvidia et all will use KMS too.

review: Needs Information

[Daniel van Vugt (vanvugt)]

Feels like "mesa" is actually the right driver name and we just want to move some stuff into a separate library for other drivers to use.

[Alan Griffiths (alan-griffiths)]

> Pre-existing issues, but try not to make them worse...
>
> (3) Pointless enum just makes the code bigger:
> 94 +enum class BypassOption
> 95 +{
> 96 + allowed,
> 97 + prohibited
> 98 +};
> Should be replaced by "bool bypass_allowed" instead of a new 38-line file.

I've not looked into the reason this is a new file. (Shouldn't it be declared with the interface that uses it?) But I prefer to read code that says:

   foo->bypass(allowed); or foo->bar(Baz::override, BypassOption::allowed, ...);

over code that says:

   foo->bypass(true); or foo->bar(true, true, ...);

[Alan Griffiths (alan-griffiths)]

> > Nits:
> >
> > 5 +if (MIR_BUILD_PLATFORM_MESA)
> > 6 + add_subdirectory(common/)
> > 7 +endif()
> > 8 +
> > 9 +if (MIR_BUILD_PLATFORM_MESA)
> > 10 + add_subdirectory(kms/)
> > 11 +endif()
> >
> > The test for MIR_BUILD_PLATFORM_MESA is (and should be) in
> > src/platforms/CMakeLists.txt it is not wanted here.
>
> You're right the first one is not wanted here. The second one is though (it's
> more clear why when you consider presence of an X folder at the same level as
> kms/ and/or if you take a look at the renaming branch). This is now fixed.

The second one might be wanted after moving to src/platforms/CMakeLists.txt is isn't wanted *here*. (But I'm not blocking on a redundant conditional in an intermediate form.)

[Alexandros Frantzis (afrantzis)]

OK for now. We will get a better idea of how to split/refactor further when we have the X platform code.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

> Feels like "mesa" is actually the right driver name and we just want to move
> some stuff into a separate library for other drivers to use.

Mesa is the name of the driver and X driver uses it also, so I don't think that's the right name.

[Daniel van Vugt (vanvugt)]

X does use Mesa. That's always been true and I don't see any issue with that.

I'm mostly concerned about proprietary drivers that use KMS and their own buffer sharing. In that case to say "kms" is a mutually exclusive driver to "nvidia" is very confusing.

[Daniel van Vugt (vanvugt)]

BTW, I'm not talking about "foo->bypass(true)" but the more flexible and expressive form:
   foo->allow_bypass(some_bool_expression)

Hence no bespoke non-bool-boolean enum and no 38-line file to contain it is required.

[Daniel van Vugt (vanvugt)]

"Suggest fixing", but otherwise abstain.

I'm more concerned with this code stabilizing (to avoid conflicts in the near term) than the syntax itself.

review: Abstain

[Alan Griffiths (alan-griffiths)]

> BTW, I'm not talking about "foo->bypass(true)" but the more flexible and
> expressive form:
> foo->allow_bypass(some_bool_expression)

let's look at the real code:

std::shared_ptr<mg::GraphicBufferAllocator> mgm::GuestPlatform::create_buffer_allocator()
{
    return std::make_shared<mgm::BufferAllocator>(gbm.device, mgm::BypassOption::prohibited);
}

vs

std::shared_ptr<mg::GraphicBufferAllocator> mgm::GuestPlatform::create_buffer_allocator()
{
    return std::make_shared<mgm::BufferAllocator>(gbm.device, false);
}

...

    auto bypass_option = mgm::BypassOption::allowed;
    if (!options->get<bool>(bypass_option_name))
        bypass_option = mgm::BypassOption::prohibited;

vs

    auto bypass_option = true;
    if (!options->get<bool>(bypass_option_name))
        bypass_option = false;

(I do realize that neither of us would actually write something as verbose as either of those last options.)

> Hence no bespoke non-bool-boolean enum and no 38-line file to contain it is
> required.

I still see no reason for platform_common.h to be a separate file in this MP. (If fact I don't see how it is meaningful without the mgm::Platform interface.)

=== added file 'src/platforms/mesa/server/CMakeLists.txt'
--- src/platforms/mesa/server/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/CMakeLists.txt	2015-06-01 18:31:25 +0000
@@ -0,0 +1,5 @@
+add_subdirectory(common/)
+
+if (MIR_BUILD_PLATFORM_MESA)
+  add_subdirectory(kms/)
+endif()

=== added directory 'src/platforms/mesa/server/common'
=== added file 'src/platforms/mesa/server/common/CMakeLists.txt'
--- src/platforms/mesa/server/common/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/common/CMakeLists.txt	2015-06-01 18:31:25 +0000
@@ -0,0 +1,17 @@
+include_directories(
+    ${server_common_include_dirs}
+    ${DRM_INCLUDE_DIRS}
+)
+
+add_library(
+  mirsharedmesaservercommon-static STATIC
+
+  anonymous_shm_file.cpp
+  buffer_allocator.cpp
+  display_helpers.cpp
+  drm_close_threadsafe.cpp
+  drm_mode_resources.cpp
+  gbm_buffer.cpp
+  ipc_operations.cpp
+  shm_buffer.cpp
+)

=== renamed file 'src/platforms/mesa/server/anonymous_shm_file.cpp' => 'src/platforms/mesa/server/common/anonymous_shm_file.cpp'
=== renamed file 'src/platforms/mesa/server/anonymous_shm_file.h' => 'src/platforms/mesa/server/common/anonymous_shm_file.h'
=== renamed file 'src/platforms/mesa/server/buffer_allocator.cpp' => 'src/platforms/mesa/server/common/buffer_allocator.cpp'
=== renamed file 'src/platforms/mesa/server/buffer_allocator.h' => 'src/platforms/mesa/server/common/buffer_allocator.h'
--- src/platforms/mesa/server/buffer_allocator.h	2015-05-07 09:06:20 +0000
+++ src/platforms/mesa/server/common/buffer_allocator.h	2015-06-01 18:31:25 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GRAPHICS_MESA_BUFFER_ALLOCATOR_H_
 #define MIR_GRAPHICS_MESA_BUFFER_ALLOCATOR_H_
 
-#include "platform.h"
+#include "platform_common.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
 #include "mir/graphics/buffer_id.h"
 

=== renamed file 'src/platforms/mesa/server/buffer_texture_binder.h' => 'src/platforms/mesa/server/common/buffer_texture_binder.h'
=== renamed file 'src/platforms/mesa/server/display_helpers.cpp' => 'src/platforms/mesa/server/common/display_helpers.cpp'
=== renamed file 'src/platforms/mesa/server/display_helpers.h' => 'src/platforms/mesa/server/common/display_helpers.h'
=== renamed file 'src/platforms/mesa/server/drm_authentication.h' => 'src/platforms/mesa/server/common/drm_authentication.h'
=== renamed file 'src/platforms/mesa/server/drm_close_threadsafe.cpp' => 'src/platforms/mesa/server/common/drm_close_threadsafe.cpp'
=== renamed file 'src/platforms/mesa/server/drm_close_threadsafe.h' => 'src/platforms/mesa/server/common/drm_close_threadsafe.h'
=== renamed file 'src/platforms/mesa/server/drm_mode_resources.cpp' => 'src/platforms/mesa/server/common/drm_mode_resources.cpp'
=== renamed file 'src/platforms/mesa/server/drm_mode_resources.h' => 'src/platforms/mesa/server/common/drm_mode_resources.h'
=== renamed file 'src/platforms/mesa/server/gbm_buffer.cpp' => 'src/platforms/mesa/server/common/gbm_buffer.cpp'
=== renamed file 'src/platforms/mesa/server/gbm_buffer.h' => 'src/platforms/mesa/server/common/gbm_buffer.h'
=== renamed file 'src/platforms/mesa/server/ipc_operations.cpp' => 'src/platforms/mesa/server/common/ipc_operations.cpp'
=== renamed file 'src/platforms/mesa/server/ipc_operations.h' => 'src/platforms/mesa/server/common/ipc_operations.h'
=== added file 'src/platforms/mesa/server/common/platform_common.h'
--- src/platforms/mesa/server/common/platform_common.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/common/platform_common.h	2015-06-01 18:31:25 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_MESA_PLATFORM_COMMON_H_
+#define MIR_GRAPHICS_MESA_PLATFORM_COMMON_H_
+
+namespace mir
+{
+namespace graphics
+{
+namespace mesa
+{
+
+enum class BypassOption
+{
+    allowed,
+    prohibited
+};
+
+}
+}
+}
+#endif /* MIR_GRAPHICS_MESA_PLATFORM_COMMON_H_ */

=== renamed file 'src/platforms/mesa/server/shm_buffer.cpp' => 'src/platforms/mesa/server/common/shm_buffer.cpp'
=== renamed file 'src/platforms/mesa/server/shm_buffer.h' => 'src/platforms/mesa/server/common/shm_buffer.h'
=== renamed file 'src/platforms/mesa/server/shm_file.h' => 'src/platforms/mesa/server/common/shm_file.h'
=== added directory 'src/platforms/mesa/server/kms'
=== renamed file 'src/platforms/mesa/server/CMakeLists.txt' => 'src/platforms/mesa/server/kms/CMakeLists.txt'
--- src/platforms/mesa/server/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ src/platforms/mesa/server/kms/CMakeLists.txt	2015-06-01 18:31:25 +0000
@@ -1,5 +1,6 @@
 include_directories(
     ${server_common_include_dirs}
+    ${PROJECT_SOURCE_DIR}/src/platforms/mesa/server/common
 )
 
 include_directories(
@@ -18,26 +19,18 @@
 add_library(
   mirplatformgraphicsmesaobjects OBJECT
 
-  platform.cpp
-  buffer_allocator.cpp
-  gbm_buffer.cpp
+  bypass.cpp
   cursor.cpp
-  display_helpers.cpp
   display.cpp
-  real_kms_display_configuration.cpp
-  drm_mode_resources.cpp
   display_buffer.cpp
-  real_kms_output.cpp
-  real_kms_output_container.cpp
+  guest_platform.cpp
   kms_page_flipper.cpp
   linux_virtual_terminal.cpp
-  drm_close_threadsafe.cpp
-  guest_platform.cpp
-  anonymous_shm_file.cpp
-  shm_buffer.cpp
-  bypass.cpp
-  ipc_operations.cpp
   nested_authentication.cpp
+  platform.cpp
+  real_kms_display_configuration.cpp
+  real_kms_output.cpp
+  real_kms_output_container.cpp
 )
 
 add_library(
@@ -48,8 +41,9 @@
 
 target_link_libraries(
   mirplatformgraphicsmesa
-
+  PRIVATE
   mirplatform
+  mirsharedmesaservercommon-static
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
   ${GBM_LDFLAGS} ${GBM_LIBRARIES}

=== renamed file 'src/platforms/mesa/server/bypass.cpp' => 'src/platforms/mesa/server/kms/bypass.cpp'
=== renamed file 'src/platforms/mesa/server/bypass.h' => 'src/platforms/mesa/server/kms/bypass.h'
=== renamed file 'src/platforms/mesa/server/cursor.cpp' => 'src/platforms/mesa/server/kms/cursor.cpp'
=== renamed file 'src/platforms/mesa/server/cursor.h' => 'src/platforms/mesa/server/kms/cursor.h'
=== renamed file 'src/platforms/mesa/server/display.cpp' => 'src/platforms/mesa/server/kms/display.cpp'
=== renamed file 'src/platforms/mesa/server/display.h' => 'src/platforms/mesa/server/kms/display.h'
=== renamed file 'src/platforms/mesa/server/display_buffer.cpp' => 'src/platforms/mesa/server/kms/display_buffer.cpp'
=== renamed file 'src/platforms/mesa/server/display_buffer.h' => 'src/platforms/mesa/server/kms/display_buffer.h'
=== renamed file 'src/platforms/mesa/server/guest_platform.cpp' => 'src/platforms/mesa/server/kms/guest_platform.cpp'
=== renamed file 'src/platforms/mesa/server/guest_platform.h' => 'src/platforms/mesa/server/kms/guest_platform.h'
=== renamed file 'src/platforms/mesa/server/kms_display_configuration.h' => 'src/platforms/mesa/server/kms/kms_display_configuration.h'
=== renamed file 'src/platforms/mesa/server/kms_output.h' => 'src/platforms/mesa/server/kms/kms_output.h'
=== renamed file 'src/platforms/mesa/server/kms_output_container.h' => 'src/platforms/mesa/server/kms/kms_output_container.h'
=== renamed file 'src/platforms/mesa/server/kms_page_flipper.cpp' => 'src/platforms/mesa/server/kms/kms_page_flipper.cpp'
=== renamed file 'src/platforms/mesa/server/kms_page_flipper.h' => 'src/platforms/mesa/server/kms/kms_page_flipper.h'
=== renamed file 'src/platforms/mesa/server/linux_virtual_terminal.cpp' => 'src/platforms/mesa/server/kms/linux_virtual_terminal.cpp'
=== renamed file 'src/platforms/mesa/server/linux_virtual_terminal.h' => 'src/platforms/mesa/server/kms/linux_virtual_terminal.h'
=== renamed file 'src/platforms/mesa/server/nested_authentication.cpp' => 'src/platforms/mesa/server/kms/nested_authentication.cpp'
=== renamed file 'src/platforms/mesa/server/nested_authentication.h' => 'src/platforms/mesa/server/kms/nested_authentication.h'
=== renamed file 'src/platforms/mesa/server/page_flipper.h' => 'src/platforms/mesa/server/kms/page_flipper.h'
=== renamed file 'src/platforms/mesa/server/platform.cpp' => 'src/platforms/mesa/server/kms/platform.cpp'
=== renamed file 'src/platforms/mesa/server/platform.h' => 'src/platforms/mesa/server/kms/platform.h'
--- src/platforms/mesa/server/platform.h	2015-03-31 02:35:42 +0000
+++ src/platforms/mesa/server/kms/platform.h	2015-06-01 18:31:25 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_MESA_PLATFORM_H_
 
 #include "mir/graphics/platform.h"
+#include "platform_common.h"
 #include "display_helpers.h"
 
 namespace mir
@@ -29,11 +30,6 @@
 {
 namespace mesa
 {
-enum class BypassOption
-{
-    allowed,
-    prohibited
-};
 
 class VirtualTerminal;
 class InternalNativeDisplay;

=== renamed file 'src/platforms/mesa/server/real_kms_display_configuration.cpp' => 'src/platforms/mesa/server/kms/real_kms_display_configuration.cpp'
=== renamed file 'src/platforms/mesa/server/real_kms_display_configuration.h' => 'src/platforms/mesa/server/kms/real_kms_display_configuration.h'
=== renamed file 'src/platforms/mesa/server/real_kms_output.cpp' => 'src/platforms/mesa/server/kms/real_kms_output.cpp'
=== renamed file 'src/platforms/mesa/server/real_kms_output.h' => 'src/platforms/mesa/server/kms/real_kms_output.h'
=== renamed file 'src/platforms/mesa/server/real_kms_output_container.cpp' => 'src/platforms/mesa/server/kms/real_kms_output_container.cpp'
=== renamed file 'src/platforms/mesa/server/real_kms_output_container.h' => 'src/platforms/mesa/server/kms/real_kms_output_container.h'
=== renamed file 'src/platforms/mesa/server/symbols.map' => 'src/platforms/mesa/server/kms/symbols.map'
=== renamed file 'src/platforms/mesa/server/virtual_terminal.h' => 'src/platforms/mesa/server/kms/virtual_terminal.h'
=== modified file 'tests/include/mir_test_doubles/mock_virtual_terminal.h'
--- tests/include/mir_test_doubles/mock_virtual_terminal.h	2015-01-22 09:00:14 +0000
+++ tests/include/mir_test_doubles/mock_virtual_terminal.h	2015-06-01 18:31:25 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_VIRTUAL_TERMINAL_H_
 #define MIR_TEST_DOUBLES_MOCK_VIRTUAL_TERMINAL_H_
 
-#include "src/platforms/mesa/server/virtual_terminal.h"
+#include "src/platforms/mesa/server/kms/virtual_terminal.h"
 
 #include <gmock/gmock.h>
 

=== modified file 'tests/include/mir_test_doubles/null_virtual_terminal.h'
--- tests/include/mir_test_doubles/null_virtual_terminal.h	2015-01-22 09:00:14 +0000
+++ tests/include/mir_test_doubles/null_virtual_terminal.h	2015-06-01 18:31:25 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_NULL_VIRTUAL_TERMINAL_H_
 #define MIR_TEST_DOUBLES_NULL_VIRTUAL_TERMINAL_H_
 
-#include "src/platforms/mesa/server/virtual_terminal.h"
+#include "src/platforms/mesa/server/kms/virtual_terminal.h"
 
 namespace mir
 {

=== modified file 'tests/include/mir_test_doubles/stub_gbm_native_buffer.h'
--- tests/include/mir_test_doubles/stub_gbm_native_buffer.h	2015-03-31 02:35:42 +0000
+++ tests/include/mir_test_doubles/stub_gbm_native_buffer.h	2015-06-01 18:31:25 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_STUB_GBM_NATIVE_BUFFER_H_
 #define MIR_TEST_DOUBLES_STUB_GBM_NATIVE_BUFFER_H_
 
-#include "src/platforms/mesa/server/gbm_buffer.h"
+#include "src/platforms/mesa/server/common/gbm_buffer.h"
 #include "mir/geometry/size.h"
 #include <unistd.h>
 #include <fcntl.h>

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ tests/integration-tests/CMakeLists.txt	2015-06-01 18:31:25 +0000
@@ -117,6 +117,12 @@
   ${MIR_SERVER_REFERENCES}
 )
 
+if (MIR_BUILD_PLATFORM_MESA)
+target_link_libraries(mir_integration_tests
+  mirsharedmesaservercommon-static
+)
+endif()
+
 if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_integration_tests
   mirsharedandroid-static

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2015-06-01 18:31:25 +0000
@@ -33,7 +33,12 @@
 )
 
 if (MIR_BUILD_PLATFORM_MESA)
-  include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
+  include_directories(
+    ${PROJECT_SOURCE_DIR}/src/platforms/mesa/server/common
+    ${DRM_INCLUDE_DIRS}
+    ${GBM_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}
+  )
   list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp

=== modified file 'tests/mir_test_doubles/platform_factory.cpp'
--- tests/mir_test_doubles/platform_factory.cpp	2015-04-09 08:57:24 +0000
+++ tests/mir_test_doubles/platform_factory.cpp	2015-06-01 18:31:25 +0000
@@ -21,7 +21,7 @@
 #include "mir/graphics/platform.h"
 
 #ifndef ANDROID
-#include "src/platforms/mesa/server/platform.h"
+#include "src/platforms/mesa/server/kms/platform.h"
 #endif
 
 #include "src/server/report/null_report_factory.h"

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-05-19 21:34:34 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-06-01 18:31:25 +0000
@@ -23,6 +23,7 @@
   ${PROJECT_SOURCE_DIR}/src/include/client
   ${PROJECT_SOURCE_DIR}/src/include/common
   ${PROJECT_SOURCE_DIR}/src/platforms/common/client
+  ${PROJECT_SOURCE_DIR}/src/platforms/mesa/server/common
   ${GLIB_INCLUDE_DIRS}
 )
 
@@ -134,6 +135,12 @@
   ${XKBCOMMON_LIBRARIES}
 )
 
+if (MIR_BUILD_PLATFORM_MESA)
+target_link_libraries(mir_unit_tests
+  mirsharedmesaservercommon-static
+)
+endif()
+
 if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_unit_tests 
   mirsharedandroid-static

=== modified file 'tests/unit-tests/graphics/mesa/mock_kms_output.h'
--- tests/unit-tests/graphics/mesa/mock_kms_output.h	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/mesa/mock_kms_output.h	2015-06-01 18:31:25 +0000
@@ -19,7 +19,7 @@
 #ifndef MOCK_KMS_OUTPUT_H_
 #define MOCK_KMS_OUTPUT_H_
 
-#include "src/platforms/mesa/server/kms_output.h"
+#include "src/platforms/mesa/server/kms/kms_output.h"
 #include <gmock/gmock.h>
 
 namespace mir

=== modified file 'tests/unit-tests/graphics/mesa/test_anonymous_shm_file.cpp'
--- tests/unit-tests/graphics/mesa/test_anonymous_shm_file.cpp	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/mesa/test_anonymous_shm_file.cpp	2015-06-01 18:31:25 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/anonymous_shm_file.h"
+#include "src/platforms/mesa/server/common/anonymous_shm_file.h"
 #include <gtest/gtest.h>
 
 namespace mgm = mir::graphics::mesa;

=== modified file 'tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp'
--- tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp	2015-05-07 09:06:20 +0000
+++ tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp	2015-06-01 18:31:25 +0000
@@ -16,9 +16,9 @@
  * Authored by: Christopher James Halse Rogers <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/platform.h"
+#include "src/platforms/mesa/server/kms/platform.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
-#include "src/platforms/mesa/server/buffer_allocator.h"
+#include "src/platforms/mesa/server/common/buffer_allocator.h"
 #include "mir/graphics/buffer_properties.h"
 
 #include "mir_test_doubles/mock_drm.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_bypass.cpp'
--- tests/unit-tests/graphics/mesa/test_bypass.cpp	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/mesa/test_bypass.cpp	2015-06-01 18:31:25 +0000
@@ -16,7 +16,7 @@
  * Authored by: Daniel van Vugt <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/bypass.h"
+#include "src/platforms/mesa/server/kms/bypass.h"
 #include "mir_test_doubles/mock_display_buffer.h"
 #include "mir_test_doubles/fake_renderable.h"
 

=== modified file 'tests/unit-tests/graphics/mesa/test_cursor.cpp'
--- tests/unit-tests/graphics/mesa/test_cursor.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_cursor.cpp	2015-06-01 18:31:25 +0000
@@ -16,10 +16,10 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/cursor.h"
-#include "src/platforms/mesa/server/kms_output.h"
-#include "src/platforms/mesa/server/kms_output_container.h"
-#include "src/platforms/mesa/server/kms_display_configuration.h"
+#include "src/platforms/mesa/server/kms/cursor.h"
+#include "src/platforms/mesa/server/kms/kms_output.h"
+#include "src/platforms/mesa/server/kms/kms_output_container.h"
+#include "src/platforms/mesa/server/kms/kms_display_configuration.h"
 
 #include "mir/graphics/cursor_image.h"
 

=== modified file 'tests/unit-tests/graphics/mesa/test_display.cpp'
--- tests/unit-tests/graphics/mesa/test_display.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_display.cpp	2015-06-01 18:31:25 +0000
@@ -16,9 +16,9 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 #include <boost/throw_exception.hpp>
-#include "src/platforms/mesa/server/platform.h"
-#include "src/platforms/mesa/server/display.h"
-#include "src/platforms/mesa/server/virtual_terminal.h"
+#include "src/platforms/mesa/server/kms/platform.h"
+#include "src/platforms/mesa/server/kms/display.h"
+#include "src/platforms/mesa/server/kms/virtual_terminal.h"
 #include "src/server/report/logging/display_report.h"
 #include "mir/logging/logger.h"
 #include "mir/graphics/display_buffer.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_display_buffer.cpp'
--- tests/unit-tests/graphics/mesa/test_display_buffer.cpp	2015-05-28 10:01:07 +0000
+++ tests/unit-tests/graphics/mesa/test_display_buffer.cpp	2015-06-01 18:31:25 +0000
@@ -15,8 +15,8 @@
  *
  * Authored by: Daniel van Vugt <[e-mail]>
  */
-#include "src/platforms/mesa/server/platform.h"
-#include "src/platforms/mesa/server/display_buffer.h"
+#include "src/platforms/mesa/server/kms/platform.h"
+#include "src/platforms/mesa/server/kms/display_buffer.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir_test_doubles/mock_egl.h"
 #include "mir_test_doubles/mock_gl.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_display_configuration.cpp'
--- tests/unit-tests/graphics/mesa/test_display_configuration.cpp	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/mesa/test_display_configuration.cpp	2015-06-01 18:31:25 +0000
@@ -20,8 +20,8 @@
 #include "mir/graphics/display_configuration.h"
 #include "mir/graphics/display.h"
 #include "src/server/graphics/default_display_configuration_policy.h"
-#include "src/platforms/mesa/server/platform.h"
-#include "src/platforms/mesa/server/kms_display_configuration.h"
+#include "src/platforms/mesa/server/kms/platform.h"
+#include "src/platforms/mesa/server/kms/kms_display_configuration.h"
 
 #include "mir_test_doubles/mock_egl.h"
 #include "mir_test_doubles/mock_gl.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_drm_helper.cpp'
--- tests/unit-tests/graphics/mesa/test_drm_helper.cpp	2015-02-02 12:18:18 +0000
+++ tests/unit-tests/graphics/mesa/test_drm_helper.cpp	2015-06-01 18:31:25 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/display_helpers.h"
+#include "src/platforms/mesa/server/common/display_helpers.h"
 #include "mir/udev/wrapper.h"
 
 #include "mir_test_framework/udev_environment.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp'
--- tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp	2015-06-01 18:31:25 +0000
@@ -23,8 +23,9 @@
 
 #include "mir_test_framework/udev_environment.h"
 
-#include "src/platforms/mesa/server/gbm_buffer.h"
-#include "src/platforms/mesa/server/buffer_allocator.h"
+#include "src/platforms/mesa/server/kms/platform.h"
+#include "src/platforms/mesa/server/common/gbm_buffer.h"
+#include "src/platforms/mesa/server/common/buffer_allocator.h"
 #include "mir/graphics/buffer_properties.h"
 #include "mir_test_doubles/platform_factory.h"
 

=== modified file 'tests/unit-tests/graphics/mesa/test_guest_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_guest_platform.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_guest_platform.cpp	2015-06-01 18:31:25 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir/graphics/nested_context.h"
-#include "src/platforms/mesa/server/guest_platform.h"
+#include "src/platforms/mesa/server/kms/guest_platform.h"
 #include "mir/graphics/buffer_properties.h"
 #include "mir/graphics/platform_ipc_operations.h"
 #include "mir_toolkit/mesa/platform_operation.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_ipc_operations.cpp'
--- tests/unit-tests/graphics/mesa/test_ipc_operations.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_ipc_operations.cpp	2015-06-01 18:31:25 +0000
@@ -16,8 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/ipc_operations.h"
-#include "src/platforms/mesa/server/drm_authentication.h"
+#include "src/platforms/mesa/server/common/ipc_operations.h"
+#include "src/platforms/mesa/server/common/drm_authentication.h"
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/graphics/platform_operation_message.h"
 #include "mir_toolkit/mesa/platform_operation.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp'
--- tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp	2015-06-01 18:31:25 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/kms_page_flipper.h"
+#include "src/platforms/mesa/server/kms/kms_page_flipper.h"
 
 #include "mir_test_doubles/mock_drm.h"
 #include "mir_test_doubles/mock_display_report.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp'
--- tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp	2015-06-01 18:31:25 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/linux_virtual_terminal.h"
+#include "src/platforms/mesa/server/kms/linux_virtual_terminal.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/graphics/event_handler_register.h"
 

=== modified file 'tests/unit-tests/graphics/mesa/test_nested_authentication.cpp'
--- tests/unit-tests/graphics/mesa/test_nested_authentication.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_nested_authentication.cpp	2015-06-01 18:31:25 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/graphics/nested_context.h"
 #include "mir/graphics/platform_operation_message.h"
-#include "src/platforms/mesa/server/nested_authentication.h"
+#include "src/platforms/mesa/server/kms/nested_authentication.h"
 #include "mir_toolkit/mesa/platform_operation.h"
 #include "mir_test_doubles/mock_drm.h"
 #include "mir_test_doubles/mock_nested_context.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2015-05-07 09:06:20 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2015-06-01 18:31:25 +0000
@@ -20,7 +20,7 @@
 #include "mir/graphics/event_handler_register.h"
 #include "mir/graphics/platform_ipc_operations.h"
 #include "mir/graphics/platform_operation_message.h"
-#include "src/platforms/mesa/server/platform.h"
+#include "src/platforms/mesa/server/kms/platform.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/emergency_cleanup_registry.h"
 #include "mir/shared_library.h"

=== modified file 'tests/unit-tests/graphics/mesa/test_real_kms_output.cpp'
--- tests/unit-tests/graphics/mesa/test_real_kms_output.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_real_kms_output.cpp	2015-06-01 18:31:25 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/real_kms_output.h"
-#include "src/platforms/mesa/server/page_flipper.h"
+#include "src/platforms/mesa/server/kms/real_kms_output.h"
+#include "src/platforms/mesa/server/kms/page_flipper.h"
 
 #include "mir_test/fake_shared.h"
 

=== modified file 'tests/unit-tests/graphics/mesa/test_shm_buffer.cpp'
--- tests/unit-tests/graphics/mesa/test_shm_buffer.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/graphics/mesa/test_shm_buffer.cpp	2015-06-01 18:31:25 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/platforms/mesa/server/shm_buffer.h"
-#include "src/platforms/mesa/server/shm_file.h"
+#include "src/platforms/mesa/server/common/shm_buffer.h"
+#include "src/platforms/mesa/server/common/shm_file.h"
 
 #include "mir_test_doubles/mock_gl.h"