Merge lp:~cemil-azizoglu/mir/mir-on-x into lp:mir

[Cemil Azizoglu]

Add X as a platform so Mir server and clients can be run under X11.

Add X as a platform so Mir server and clients can be run under X11.

To run the server-side, use (no need to be root):
bin/mir_demo_server --platform-input-lib lib/server-modules/server-
mesa-x11.so.3

Running a client is exactly the same as Mesa (except you don't need to be root), as mir-on-x is a server-side only notion.

There is still a lot of work to do depending on how far we want to go. Since this platform is mostly intended for developers (as opposed to end-users), we can refine as we go.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2673
http://jenkins.qa.ubuntu.com/job/mir-ci/4193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/502
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2933/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/349
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/349/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2933
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2933/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5752/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21464

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2673
http://jenkins.qa.ubuntu.com/job/mir-ci/4194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/350
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2934
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2934/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5753
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21465

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Some high level first impressions:

~~~~~~~~~

The automatic module detection doesn't work correctly. In case of a priority tie, the first module found (in filesystem order) is selected. If that module is mesa-kms then mesa-x11 can never be loaded unless forced with the platform-graphics-lib option. We need to change mesa-kms and/or mesa-x11 to report different priorities depending on the environment.

~~~~~~~~~

I can't get any output on intel for EGL clients and only the first frame for software clients (I think these are known issues?).

~~~~~~~~~

196 + bool const use_dma_buf_extension)

It's better to use an enum for readability, since true/false values are very uninformative, e.g.:

return std::make_shared<mgm::BufferAllocator>(gbm.device, mgm::BypassOption::prohibited, false);

Compare the existing second (enum) to the new third (bool) option.

~~~~~~~~~

253 + return mir::Fd{IntOwnedFd{fd}};

We should dup() this fd to maintain the interface (i.e., that authenticated_fd() returns a new, independent fd). Ideally we would change the calling code to properly use mir::Fds, but that is beyond the scope of this MP.

~~~~~~~~~

333 + DRMHelper(bool const use_render_node)

Similarly, better to use an enum instead of a bool.

~~~~~~~~~

353 -mgm::IpcOperations::IpcOperations(std::shared_ptr<DRMAuthentication> const& drm_auth) :
355 +mgm::IpcOperations::IpcOperations(std::shared_ptr<DRMAuthentication> const& drm, bool const authenticate) :
...
364 + if (!authenticate)
365 + BOOST_THROW_EXCEPTION(
366 + std::runtime_error("Invalid platform operation"));

We should let the DRMAuthenticator succeed or fail here on its own, no need for changing the IpcOperations code at all. I think the proposed version of DRMHelper will fail in the right way (i.e., throw for auth_magic(), succeed for auth_fd()).

~~~~~~~~~

394 + if (!authenticate)
395 + {
396 + auto package = std::make_shared<mg::PlatformIPCPackage>();
397 + package->ipc_fds.push_back(dup(drm->authenticated_fd()));
398 + return package;
399 + }
400 + return std::make_shared<MesaPlatformIPCPackage>(drm->authenticated_fd());

The two paths are functionally equivalent except 1. the dup() in the first path and 2. the first path leaks fds. As suggested earlier, it's better to dup inside authenticated_fd(), and by doing so we wouldn't need to change the code here at all.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2674
http://jenkins.qa.ubuntu.com/job/mir-ci/4204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/360
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2954
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2954/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5771
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21496

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

> Some high level first impressions:
>
> ~~~~~~~~~
>
> The automatic module detection doesn't work correctly. In case of a priority
> tie, the first module found (in filesystem order) is selected. If that module
> is mesa-kms then mesa-x11 can never be loaded unless forced with the platform-
> graphics-lib option. We need to change mesa-kms and/or mesa-x11 to report
> different priorities depending on the environment.

The obvious thing to do here would be to make mesa-kms try to claim drm master in probe(). That fails when running under X11 (or not running with root), and mesa-kms will fail if it can't claim master anyway.

Apart from what Alexandros has pointed out, I think it's likely that you should be handling md::FdEvent::error in your Dispatchable::dispatch(). I believe Xlib's default behaviour in that case is SIGABRT, which we could do better than :)

[Chris Halse Rogers (raof)]

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

It looks like there is enough useful feedback without me looking any deeper.

review: Abstain

[Cemil Azizoglu (cemil-azizoglu)]

Thanks for the suggestions. Should all be fixed now.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

> Thanks for the suggestions. Should all be fixed now.

- Except for the fd_events::error which I've yet to do.
- Also running "sudo bin/mir_demo_server --vt 3" from an xterm doesn't seem to be working. It errs out saying "unrecognized option 'vt'".

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2678
http://jenkins.qa.ubuntu.com/job/mir-ci/4220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3030
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/549/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2978/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/376/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2978/console

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

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

> > Thanks for the suggestions. Should all be fixed now.
>
> - Except for the fd_events::error which I've yet to do.
> - Also running "sudo bin/mir_demo_server --vt 3" from an xterm doesn't seem to
> be working. It errs out saying "unrecognized option 'vt'".

Yeah. This is because the X server has claimed DRM master, and so the mesa-kms probe detects that it can't claim master and bails.

We've talked before about loading *all* the platform modules, presenting all their options, and then having platform-specific options imply the use of that platform. That would fix this.

As I don't try to run mir from X this doesn't bother me :)

[Chris Halse Rogers (raof)]

Otherwise, apart from handling the md::FdEvent::error case, looks good.

Non-blocking nits:

233 +enum class DMABufExtension
234 +{
235 + use,
236 + do_not_use
237 +};

I think this would be clearer as
enum class BufferImportMethod
{
    gbm_native_pixmap,
    dma_buf
};

Or similar; it's more descriptive of what it selects, and allows us to extend the import method in an obvious way if we need to in future.

Nit:
941 + if (!eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
942 + BOOST_THROW_EXCEPTION(std::logic_error("Cannot make current"));

It's not really a logic error, is it? I'd expect this to be a runtime_error. For bonus marks, I guess, it could be an EGLError : public std::runtime_error and automatically slurp up the value of eglGetError().

1970 +extern "C" mg::PlatformPriority probe_graphics_platform()
1971 +{
1972 + auto dpy = XOpenDisplay(NULL);
1973 + if (dpy)
1974 + {
1975 + XCloseDisplay(dpy);
1976 +
1977 + auto udev = std::make_shared<mir::udev::Context>();
1978 + auto drm = std::make_shared<mgmh::DRMHelper>(mgmh::DRMNodeToUse::card_node);
1979 +
1980 + try {
1981 + drm->setup(udev);
1982 + drm->set_master();
1983 + }
1984 + catch(...)
1985 + {
1986 + return mg::PlatformPriority::best;
1987 + }
1988 +
1989 + drm->drop_master();
1990 + }
1991 + return mg::PlatformPriority::unsupported;
1992 +}

This is fine. It'd also be correct to return mg::PlatformPriority::supported if you can open the display and find a rendernode, without probing for being able to acquire master. (You might need to change the stub platforms to return PlatformPriority::unsupported+1 to make this work).

2809 +TEST_F(X11DisplayTest, creates_display_successfully)

I don't think this is testing anything useful, and is going to be one of those tests that we update every time we touch the relevant code. I'd prefer it if this test wasn't there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2679
http://jenkins.qa.ubuntu.com/job/mir-ci/4222/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3038
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/558/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2986/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2986/console

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

> 941 + if (!eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
> 942 + BOOST_THROW_EXCEPTION(std::logic_error("Cannot make current"));

> It's not really a logic error, is it? I'd expect this to be a runtime_error.
> For bonus marks, I guess, it could be an EGLError : public std::runtime_error
> and automatically slurp up the value of eglGetError().

+1, but note we already have an egl_error we can use (see src/include/platform/mir/graphics/egl_error.h), that not only gets the eglGetError() value but knows how to print it properly. A few months ago we made an effort to move all EGL related exceptions to egl_error, so we could get more detailed information when something failed in the wild. I think it's worth using it in the X backend too.

2878 +// fake_devices.add_standard_device("standard-drm-devices");

Not needed.

2900 + try
2901 + {
2902 + auto platform = create_platform();
2903 + } catch(...)
2904 + {
2905 + return;
2906 + }
2907 +
2908 + FAIL() << "Expected an exception to be thrown.";

... and elsewhere.

GMock has a construct to express this:

EXPECT_THROW({ create_platform(); }, std::exception); // or use a more specific exception type if applicable

Nit:

635 + EGLint egl_major, egl_minor;
636 + EGLConfig config;
637 + EGLint num_configs;
638 + EGLint vid;
639 + Window root;
640 + XVisualInfo *visInfo, visTemplate;
641 + XSetWindowAttributes attr;
642 + int num_visuals;
643 + unsigned long mask;
644 + char const * const title = "Mir On X";

I guess this is based on some C code. In C++, it has proved easier to read to just declare each variable when it's created.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2683
http://jenkins.qa.ubuntu.com/job/mir-ci/4292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3124
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/646/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/441
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/441/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3072
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3072/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5878
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21763

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2686
http://jenkins.qa.ubuntu.com/job/mir-ci/4294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3126
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/648/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/443
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3074
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3074/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5880
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21765

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2691
http://jenkins.qa.ubuntu.com/job/mir-ci/4298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/447
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3078
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3078/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5883
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21768

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

partial review so far:

needs fixings:
indentation is a bit awry, some places have tabs
http://unity.ubuntu.com/mir/cppguide/index.html?showone=Spaces_vs._Tabs#Spaces_vs._Tabs

185 + int prime_fd;
Handling of this fd isn't exception-safe (eg, if l177 threw), using mir::Fd would help.

611 +mgx::Display::Display(::Display *dpy)
some of the resources in this constructor are also not exception safe. (eg, if eglCreateContext threw some of the resources (like win) might leak)

145-150 c-style casts
http://unity.ubuntu.com/mir/cppguide/index.html?showone=Casting#Casting

126 + if (buffer_import_method == mgm::BufferImportMethod::dma_buf)
Switching on this enum in the buffer type suggests to me that the mgm::Buffer should have two different implementations based on the mapping method, or that there's mgm::BufferImporter interface that mgm::Buffer should take, that abstracts the importation on behalf of the buffer.

needs info:
755 +void mgx::Display::register_configuration_change_handler(
756 + EventHandlerRegister& /* event_handler*/,
757 + DisplayConfigurationChangeHandler const& /*change_handler*/)
758 +{
759 +}
I'm not sure what would happen if the window backing the server changes size. (is this a possible thing for X to do?)

review: Needs Fixing

[Cemil Azizoglu (cemil-azizoglu)]

> 126 + if (buffer_import_method ==
> mgm::BufferImportMethod::dma_buf)
> Switching on this enum in the buffer type suggests to me that the mgm::Buffer
> should have two different implementations based on the mapping method, or that
> there's mgm::BufferImporter interface that mgm::Buffer should take, that
> abstracts the importation on behalf of the buffer.

I'm not sure I understand what needs to be done here. I've fixed the others.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2694
http://jenkins.qa.ubuntu.com/job/mir-ci/4312/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/461
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/461/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3099
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3099/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5904
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21824

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

> > 126 + if (buffer_import_method ==
> > mgm::BufferImportMethod::dma_buf)
> > Switching on this enum in the buffer type suggests to me that the
> mgm::Buffer
> > should have two different implementations based on the mapping method, or
> that
> > there's mgm::BufferImporter interface that mgm::Buffer should take, that
> > abstracts the importation on behalf of the buffer.
>
>
> I'm not sure I understand what needs to be done here. I've fixed the others.

It seems like there's two implementations of mgm::BufferTextureBinder in one class in the MP. i.e., it seems more in accord with the existing design to have:

GBMNativeTextureBinder : public mgm::BufferTextureBinder
and
DMABufTextureBinder : public mgm::BufferTextureBinder

and then have mgm::BufferAllocator::alloc_hardware_buffer() create the mgm::Buffer with the right type of BufferTextureBinder

[Kevin DuBois (kdub)]

Another round:

1977 + auto dpy = XOpenDisplay(NULL);
nullptr?

1907 +::Display *x_display = nullptr;
1908 +
1909 +mgx::Platform::Platform()
IIRC, we guard against opening a platform twice, but we should throw if platform is created twice if this really has to be a singleton. (in the current case, it would leak x_display)

I guess also, x_display should be an RAII type in case either of these throw:
1918 + drm->setup(udev);
1919 + gbm.setup(*drm);

1651 +extern ::Display *x_display;
1400 +extern ::Display *x_display;
These two classes should take this dependency explicitly (as a shared_ptr perhaps), as this guards against ~Platform() being destroyed and destroying the resources that the two classes need.

[Kevin DuBois (kdub)]

931 + return {{0,0}, {width,height}};
could just be:
931 + return {{0,0}, size};

Is calling mgx::Display::configure() or the X window getting resized something that's not supported?

(similar question) should mgx::Display::pause()/resume() be hooked up somewhat like the VT's work, except of course, if the X server pauses.

1058 + mg::DisplayConfigurationOutputId{0},
0 is defined to be invalid (more detail: https://bugs.launchpad.net/mir/+bug/1463873)

1414 + auto ret = true
spacing

365 -struct MesaPlatformIPCPackage : public mg::PlatformIPCPackage
366 +struct DefaultPlatformIPCPackage : public mg::PlatformIPCPackage
"Default" doesn't seem to add much to the name, if it has to be renamed, maybe just PlatformIPCPackage?

[Kevin DuBois (kdub)]

1189 +void mgx::DisplayGroup::post()
1190 +{
1191 +}

There's a bit of a functional difference if we don't do anything here (from mc::MultiThreadedCompositor's perspective). Android and mesa both actually post the content stored up in the DisplayBuffer in the post() function. Is it not possible to separate the swapping from the posting?

[Robert Carr (robertcarr)]

Inclined to agree with kdub on extracting the buand ffer texture binder RAII for ::Display type.

+ win = XCreateWindow(x_dpy, root, 0, 0, 1280, 1024,

Should be the width/height members right?

+ event.key.modifiers = mir_input_event_modifier_none;

Needs impl or a TODO?

1703: unneeded

+ InputDeviceInfo info;

I can't find where this is initialized?

[Cemil Azizoglu (cemil-azizoglu)]

> > > 126 + if (buffer_import_method ==
> > > mgm::BufferImportMethod::dma_buf)
> > > Switching on this enum in the buffer type suggests to me that the
> > mgm::Buffer
> > > should have two different implementations based on the mapping method, or
> > that
> > > there's mgm::BufferImporter interface that mgm::Buffer should take, that
> > > abstracts the importation on behalf of the buffer.
> >
> >
> > I'm not sure I understand what needs to be done here. I've fixed the others.
>
> It seems like there's two implementations of mgm::BufferTextureBinder in one
> class in the MP. i.e., it seems more in accord with the existing design to
> have:
>
> GBMNativeTextureBinder : public mgm::BufferTextureBinder
> and
> DMABufTextureBinder : public mgm::BufferTextureBinder
>
> and then have mgm::BufferAllocator::alloc_hardware_buffer() create the
> mgm::Buffer with the right type of BufferTextureBinder

Done.

[Cemil Azizoglu (cemil-azizoglu)]

> Another round:
>
> 1977 + auto dpy = XOpenDisplay(NULL);
> nullptr?
>
> 1907 +::Display *x_display = nullptr;
> 1908 +
> 1909 +mgx::Platform::Platform()
> IIRC, we guard against opening a platform twice, but we should throw if
> platform is created twice if this really has to be a singleton. (in the
> current case, it would leak x_display)
>
> I guess also, x_display should be an RAII type in case either of these throw:
> 1918 + drm->setup(udev);
> 1919 + gbm.setup(*drm);
>
> 1651 +extern ::Display *x_display;
> 1400 +extern ::Display *x_display;
> These two classes should take this dependency explicitly (as a shared_ptr
> perhaps), as this guards against ~Platform() being destroyed and destroying
> the resources that the two classes need.

Done.

[Cemil Azizoglu (cemil-azizoglu)]

> Is calling mgx::Display::configure() or the X window getting resized something
> that's not supported?

I currently create an Xwindow that is not resizeable. This is a TODO.

>
> (similar question) should mgx::Display::pause()/resume() be hooked up somewhat
> like the VT's work, except of course, if the X server pauses.

I am not sure if there is a need for this. If there is it's another TODO.

Other issues now fixed.

[Cemil Azizoglu (cemil-azizoglu)]

> 1189 +void mgx::DisplayGroup::post()
> 1190 +{
> 1191 +}
>
> There's a bit of a functional difference if we don't do anything here (from
> mc::MultiThreadedCompositor's perspective). Android and mesa both actually
> post the content stored up in the DisplayBuffer in the post() function. Is it
> not possible to separate the swapping from the posting?

I don't see how. X is more like the offscreen or nested in this aspect where this function is null.

[Cemil Azizoglu (cemil-azizoglu)]

> Inclined to agree with kdub on extracting the buand ffer texture binder RAII
> for ::Display type.
>
> + win = XCreateWindow(x_dpy, root, 0, 0, 1280, 1024,
>
> Should be the width/height members right?
>
> + event.key.modifiers = mir_input_event_modifier_none;
>
> Needs impl or a TODO?

This is a TODO.

>
>
> 1703: unneeded
>
> + InputDeviceInfo info;
>
> I can't find where this is initialized?

Ah ok, now fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2698
http://jenkins.qa.ubuntu.com/job/mir-ci/4318/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3160/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/467
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/467/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3108
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5913
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21846

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2699
http://jenkins.qa.ubuntu.com/job/mir-ci/4319/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3161
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/468
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3109
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5914
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21849

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/13/console

^--This is a false positive data race:
https://groups.google.com/forum/#!msg/thread-sanitizer/dZ3QiQE49ns/j7rKGHg08foJ

[Kevin DuBois (kdub)]

> > (similar question) should mgx::Display::pause()/resume() be hooked up
> somewhat
> > like the VT's work, except of course, if the X server pauses.
>
> I am not sure if there is a need for this. If there is it's another TODO.

We should probably throw then with a runtime not-supported exception. If a client of the x-backed server tried to configure via the client api, the request would be silently ignored.

[Kevin DuBois (kdub)]

1414 +mix::XDispatchable::XDispatchable(int raw_fd)

This class has a 2 step initialization; it depends on sink as a dependency of the class, but its not in the constructor. Consider:

mix::XDispatchable dispatch(fd);
dispatch.dispatch(...)

The second call would not fulfill what it should be doing (in the case here, it would segfault; if we checked for sink before calling send(), then we would not accomplish the function)

It would be better to plumb through:
mix::XDispatchable dispatch(fd, sink);
so then dispatch.dispatch(...) would always work. We'd probably also refine the structure of the system, as we (probably) have to plumb the sink dependency a bit differently.

[Kevin DuBois (kdub)]

> It would be better to plumb through:
> mix::XDispatchable dispatch(fd, sink);

actually, looking through again, it probably has to be:

mix::XDispatchable dispatch(fd, sink, x11_connection);

as that's another dependency of the class. Its not immediately obvious that dispatch() wouldn't work if the Platform class had not instantiated it.

[Robert Carr (robertcarr)]

-- DRMNodeToUse::card_node/render_node

Should be

-- DRMNodeToUse::card/render

[Robert Carr (robertcarr)]

--- src/platforms/mesa/server/x11/xserver_connection.h 1970-01-01 00:00:00 +0000

It's better to use an std::unique_ptr with a function deleter. You can use a C function pointer type as opposed to std::function and thus use XCloseDisplay directly and it will be zero overhead.

Otherwise a shared_ptr with a custom deleter is better than a custom type I think.

[Robert Carr (robertcarr)]

Otherwise, as in if std::unique_ptr is somehow unsuitable

[Robert Carr (robertcarr)]

What is the _wrapper for in + MOCK_METHOD10(XCreateWindow_wrapper, Window(Display*, Window, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual*, unsigned long, XSetWindowAttributes*));

[Cemil Azizoglu (cemil-azizoglu)]

> 1414 +mix::XDispatchable::XDispatchable(int raw_fd)
>
> This class has a 2 step initialization; it depends on sink as a dependency of
> the class, but its not in the constructor. Consider:
>
> mix::XDispatchable dispatch(fd);
> dispatch.dispatch(...)
>
> The second call would not fulfill what it should be doing (in the case here,
> it would segfault; if we checked for sink before calling send(), then we would
> not accomplish the function)
>
> It would be better to plumb through:
> mix::XDispatchable dispatch(fd, sink);
> so then dispatch.dispatch(...) would always work. We'd probably also refine
> the structure of the system, as we (probably) have to plumb the sink
> dependency a bit differently.

This is due to mi::InputDevice having two distinct functions :

    std::shared_ptr<dispatch::Dispatchable> dispatchable() override;
    void start(input::InputSink* destination) override;

That is, before the InputDevice is started, dispatchable might be obtained and its dispatch() function might be called when there is no sink. In such a case it makes sense to just consume the event but ignore the dispatch which is what the code is doing. I didn't want to change this semantics (of being able to obtain and dispatch even when there is no sink attached) as I don't know what the repercussions would be. It wouldn't crash as the line "if (sink)" is protecting it.

[Cemil Azizoglu (cemil-azizoglu)]

> > It would be better to plumb through:
> > mix::XDispatchable dispatch(fd, sink);
>
> actually, looking through again, it probably has to be:
>
> mix::XDispatchable dispatch(fd, sink, x11_connection);
>
> as that's another dependency of the class. Its not immediately obvious that
> dispatch() wouldn't work if the Platform class had not instantiated it.

x11_connection is an (external) global. I'm going to have to think of something in the long-term but in the short-term we'll need to live with this ugliness. But at least things would fail miserably way before we'd get to this point.

[Cemil Azizoglu (cemil-azizoglu)]

> We should probably throw then with a runtime not-supported exception. If a
> client of the x-backed server tried to configure via the client api, the
> request would be silently ignored.

Fixed

[Cemil Azizoglu (cemil-azizoglu)]

> --- src/platforms/mesa/server/x11/xserver_connection.h 1970-01-01 00:00:00
> +0000
>
> It's better to use an std::unique_ptr with a function deleter. You can use a C
> function pointer type as opposed to std::function and thus use XCloseDisplay
> directly and it will be zero overhead.
>
> Otherwise a shared_ptr with a custom deleter is better than a custom type I
> think.

I don't think unique_ptr is appropriate as it's being shared between modules. And I'm not worried about the delete overhead - this will only happen when the server goes down, not on every frame or anything like that.

[Cemil Azizoglu (cemil-azizoglu)]

> What is the _wrapper for in + MOCK_METHOD10(XCreateWindow_wrapper,
> Window(Display*, Window, unsigned int, unsigned int, unsigned int, int,
> unsigned int, Visual*, unsigned long, XSetWindowAttributes*));

XCreateWindow takes more than 10 args but gmock accepts up to 10. The way to get around this is to drop some of the uninteresting args and limit the number to 10 with a wrapper. See the response to the original question in : https://code.google.com/p/googlemock/issues/detail?id=117

[Cemil Azizoglu (cemil-azizoglu)]

> -- DRMNodeToUse::card_node/render_node
>
> Should be
>
> -- DRMNodeToUse::card/render

Fixed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2701
http://jenkins.qa.ubuntu.com/job/mir-ci/4327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3175
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/476
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/476/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3123
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5928
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21895

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Reproposed using the new options branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2702
http://jenkins.qa.ubuntu.com/job/mir-ci/4348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3202
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/727
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/497
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/497/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3150
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5954
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21960

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Nonblocking:
180 + std::runtime_error(msg)) << boost::errinfo_errno(errno));

std::system_error does this in a better-consumable way without the boost::enable_errinfo faffery.

234 + dynamic_cast<EGLImageBufferTextureBinder*>(new DMABufTextureBinder{bo, egl_extensions}) :
235 + dynamic_cast<EGLImageBufferTextureBinder*>(new NativePixmapTextureBinder{bo, egl_extensions})

What's the need for dynamic_cast here? Both DMABufTextureBinder and NativePixmapTextureBinder are statically known to be subclasses of EGLImageBufferTextureBinder.

763 + eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
764 + eglDestroyContext(egl_dpy, egl_ctx);
765 + eglDestroySurface(egl_dpy, egl_surf);

Funky indentation.

2880 +TEST_F(X11DisplayTest, creates_display_successfully)

I continue to think that this test doesn't test anything valuable, and should be removed.

Otherwise seems sane.

review: Approve

[Alexandros Frantzis (afrantzis)]

186 +

Not sure this empty line improves readability.

~~~~~~~~~~~~~~~~~~~~~

234 + dynamic_cast<EGLImageBufferTextureBinder*>(new DMABufTextureBinder{bo, egl_extensions}) :

What Chris said, and also we can use make_unique.

~~~~~~~~~~~~~~~~~~~~~

723 + eglTerminate(egl_dpy);
724 + XDestroyWindow(x_dpy, win);

731 + eglDestroyContext(egl_dpy, egl_ctx);
732 + eglTerminate(egl_dpy);
733 + XDestroyWindow(x_dpy, win);

750 + XFree(visInfo);

Using RAII wrappers for these types would help us avoid explicit destruction and potential memory leaks (e.g., as things are now we may leak visInfo).

~~~~~~~~~~~~~~~~~~~~~

1467 + std::chrono::time_point<std::chrono::system_clock> tp;

1549 + ~XDispatchable() = default;
1550 +
1551 + XDispatchable(XDispatchable const&) = delete;
1552 + XDispatchable& operator=(XDispatchable const&) = delete;

No need for explicit default (omitting the destructor creates a default one), or delete (methods are deleted in parent interface class).

~~~~~~~~~~~~~~~~~~~~~

1925 +std::shared_ptr<mx::X11Connection> x11_connection;

It would be better to avoid having static variables hold resources if we can help it. In this case, we could make the x11_connection a member variable of platform, and, if we *really* need to guard against multiple instantiations (which we are not doing in any other platform, btw), we could use a static (atomic) bool variable.

~~~~~~~~~~~~~~~~~~~~~

2469 +// Window XCreateWindow(Display *display, Window parent, int x, int y, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int class, Visual *visual, unsigned long valuemask, XSetWindowAttributes *attributes)

Unnecessary comment.

~~~~~~~~~~~~~~~~~~~~~

2461 + return global_mock->XGetVisualInfo(display, vinfo_mask, vinfo_template, nitems_return);

3088 + X11DispatchableTest()
3089 + {
3090 + }

... and at various other places.

A few instances of tabs instead of spaces. Please grep the diff for tabs and replace them.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

1467 + std::chrono::time_point<std::chrono::system_clock> tp;

Is the system_clock the right clock to use? I would expect a monotonic/steady clock, like our android-based input system uses.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

> 1467 + std::chrono::time_point<std::chrono::system_clock> tp;
>
> Is the system_clock the right clock to use? I would expect a monotonic/steady clock,
> like our android-based input system uses.

A scratch this, we are not measuring time with the clock, just converting units.

[Robert Carr (robertcarr)]

732 + eglTerminate(egl_dpy);
733 + XDestroyWindow(x_dpy, win);

+ other places in this ctor

are strong evidence EGLDisplay and the XWindow should be an RAII type.

[Robert Carr (robertcarr)]

Lots of indentaiton errors but otherwise seems ok to me :D

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2707
http://jenkins.qa.ubuntu.com/job/mir-ci/4372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3233
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/521
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3181
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5983
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22007

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I try running:

$ bin/mir_demo_server --test-client bin/mir_demo_client_egltriangle

And see a window containing a titlebar. But no triangle.

Is this expected?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

Also:

$ bin/mir_demo_standalone_render_surfaces

Gives a blank window.

[Alan Griffiths (alan-griffiths)]

> I try running:
>
> $ bin/mir_demo_server --test-client bin/mir_demo_client_egltriangle
>
> And see a window containing a titlebar. But no triangle.
>
> Is this expected?

Apparently so - I've got an intel GPU and there are driver issues with EGL clients.

[Alan Griffiths (alan-griffiths)]

$ bin/mir_demo_server --platform-input-lib lib/server-modules/server-mesa-x11.so.3 --test-client bin/mir_demo_client_multiwin

This draws OK, but e.g. Shift+F11/Ctrl+F11 do not toggle the surface vertical/horizontal maximize. (And Alt+F4, Ctrl+F4 are intercepted before hitting the server.)

What's the expectation?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

212 +template<typename T,typename V>
213 +T up_cast(V x) {
214 + return x;
215 +}
216 +
...
239 + // To see why up_cast is needed, see
240 + // http://stackoverflow.com/questions/6179314/casting-pointers-and-the-ternary-operator-have-i-reinvented-the-wheel
241 std::unique_ptr<EGLImageBufferTextureBinder> texture_binder{
242 - new EGLImageBufferTextureBinder{bo, egl_extensions}};
243 + buffer_import_method == mgm::BufferImportMethod::dma_buf ?
244 + up_cast<EGLImageBufferTextureBinder*>(new DMABufTextureBinder{bo, egl_extensions}) :
245 + up_cast<EGLImageBufferTextureBinder*>(new NativePixmapTextureBinder{bo, egl_extensions})};

Personally, I wouldn't write an up_cast<> template for this (people will need to look at the definition to follow the code). Instead:

auto make_texture_binder(
    BufferImportMethod const buffer_import_method,
    std::shared_ptr<gbm_bo> const& gbm_bo,
    std::shared_ptr<mg::EGLExtensions> const& egl_extensions)
=> std::unique_ptr<EGLImageBufferTextureBinder>
{
    if (buffer_import_method == mgm::BufferImportMethod::dma_buf)
        return std::make_unique<DMABufTextureBinder>(bo, egl_extensions);
    else
        return std::make_unique<NativePixmapTextureBinder>(bo, egl_extensions);
}

...

    auto const buffer =
        std::make_shared<GBMBuffer>(bo, bo_flags, make_texture_binder(buffer_import_method, gbm_bo, egl_extensions));

[Alan Griffiths (alan-griffiths)]

Just nits so far. (May well be more if I re-read the code later.)

127 +

Neededless whitespace

~~~~

485 +namespace mgmh = mgm::helpers;

unused.

~~~~

511 -

Helpful whitespace

review: Needs Fixing

[Cemil Azizoglu (cemil-azizoglu)]

> $ bin/mir_demo_server --platform-input-lib lib/server-modules/server-
> mesa-x11.so.3 --test-client bin/mir_demo_client_multiwin
>
> This draws OK, but e.g. Shift+F11/Ctrl+F11 do not toggle the surface
> vertical/horizontal maximize. (And Alt+F4, Ctrl+F4 are intercepted before
> hitting the server.)
>
> What's the expectation?

Meta keys are not handled yet.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2709
http://jenkins.qa.ubuntu.com/job/mir-ci/4385/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3251
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/534
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3199
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6001
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22035

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2710
http://jenkins.qa.ubuntu.com/job/mir-ci/4388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3256
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/537
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/537/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3204
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3204/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6004
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22040

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

I have addressed all the reviews so far with the exception of the following :

alf - static variables hold resources
1925 +std::shared_ptr<mx::X11Connection> x11_connection;

The problem here is that our graphics and input platforms do not share any context and this is a TODO. I'd rather not spend any more time on what amounts to a bandaid solution.
-----------------------------------------------------------------------------------

chris - this test doesn't test anything valuable, and should be removed.
2880 +TEST_F(X11DisplayTest, creates_display_successfully)

This test is pretty similar on other platforms. I'd like to keep it so I can refine it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2713
http://jenkins.qa.ubuntu.com/job/mir-ci/4389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3258
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/111/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/538
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3206
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6006
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22042

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Alan Griffiths (alan-griffiths)]

I'd rather have this code on trunk than wait for known gaps to be filled (EGL clients, missing meta key input and mouse input).

review: Approve

[Kevin DuBois (kdub)]

> I have addressed all the reviews so far with the exception of the following :
>
> alf - static variables hold resources
> 1925 +std::shared_ptr<mx::X11Connection> x11_connection;
>
> The problem here is that our graphics and input platforms do not share any
> context and this is a TODO. I'd rather not spend any more time on what amounts
> to a bandaid solution.

The issue though is that its a non-explicit (ie, not in the destructor) dependency of the classes that use it, which makes the classes that use it a bit trickier. +1 in the name of not spending more time, but would be better with a TODO comment, I think.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2713
http://jenkins.qa.ubuntu.com/job/mir-ci/4396/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3270
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/795
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3218/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/545
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3218
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3218/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6017/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22061

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for this work, I'm waiting for this since some time, as it will help a lot the development.

As per inline comment, I guess symbols should be updated to platform 4.

Also, I think that a new mir-platform-graphics-mesa-x114 package should be generated.

[Cemil Azizoglu (cemil-azizoglu)]

> Thanks for this work, I'm waiting for this since some time, as it will help a
> lot the development.
>
> As per inline comment, I guess symbols should be updated to platform 4.
>
> Also, I think that a new mir-platform-graphics-mesa-x114 package should be
> generated.

Thanks for noticing this. Fixed now.

We don't yet have a package for this. X11 support is still pretty raw. Getting the minimally acceptable code to the trunk is the first priority, which is not necessarily equivalent to having a minimally functional x11 platform support.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2715
http://jenkins.qa.ubuntu.com/job/mir-ci/4398/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3273
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/547
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3221
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6020
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22066

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

> We don't yet have a package for this. X11 support is still pretty raw.

Ok, thanks, fair enough.

Probably, one thing to add is to grab the mouse input (and hide the X cursor) when the Mir on X window is focused, or it will be hard to interact without disturbing the environment :), but things seem to start working pretty well (also launching it in a wily LXC container on a trusty host with 3.19 [vivid lts] kernel).

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-16 07:03:19 +0000
+++ CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -144,10 +144,10 @@
 # Default to KMS backend, but build all of them
 set(
   MIR_PLATFORM
-  mesa-kms;android
+  mesa-kms;android;mesa-x11
   CACHE
   STRING
-  "a list of graphics backends to build (options are 'mesa-kms' or 'android')"
+  "a list of graphics backends to build (options are 'mesa-kms', 'android' or 'mesa-x11')"
 )
 
 list(GET MIR_PLATFORM 0 MIR_TEST_PLATFORM)
@@ -159,6 +159,9 @@
   if (platform STREQUAL "android")
      set(MIR_BUILD_PLATFORM_ANDROID TRUE)
   endif()
+  if (platform STREQUAL "mesa-x11")
+     set(MIR_BUILD_PLATFORM_MESA_X11 TRUE)
+  endif()
 endforeach(platform)
 
 find_package(EGL REQUIRED)
@@ -182,7 +185,7 @@
   find_package(LibHardware REQUIRED)
 endif()
 
-if (MIR_BUILD_PLATFORM_MESA_KMS)
+if (MIR_BUILD_PLATFORM_MESA_KMS OR MIR_BUILD_PLATFORM_MESA_X11)
   find_package( PkgConfig )
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )

=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2015-07-21 07:09:45 +0000
+++ src/platforms/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -52,8 +52,8 @@
 
 add_subdirectory(common/)
 
-if (MIR_BUILD_PLATFORM_MESA_KMS)
-  add_subdirectory(mesa/)
+if (MIR_BUILD_PLATFORM_MESA_KMS OR MIR_BUILD_PLATFORM_MESA_X11)
+    add_subdirectory(mesa/)
 endif()
 
 if (MIR_BUILD_PLATFORM_ANDROID)

=== modified file 'src/platforms/mesa/server/CMakeLists.txt'
--- src/platforms/mesa/server/CMakeLists.txt	2015-06-05 06:28:36 +0000
+++ src/platforms/mesa/server/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -3,3 +3,6 @@
 if (MIR_BUILD_PLATFORM_MESA_KMS)
   add_subdirectory(kms/)
 endif()
+if (MIR_BUILD_PLATFORM_MESA_X11)
+  add_subdirectory(x11/)
+endif()

=== modified file 'src/platforms/mesa/server/common/buffer_allocator.cpp'
--- src/platforms/mesa/server/common/buffer_allocator.cpp	2015-07-17 22:51:35 +0000
+++ src/platforms/mesa/server/common/buffer_allocator.cpp	2015-07-22 20:26:39 +0000
@@ -22,10 +22,12 @@
 #include "buffer_texture_binder.h"
 #include "anonymous_shm_file.h"
 #include "shm_buffer.h"
+#include "display_helpers.h"
 #include "mir/graphics/egl_extensions.h"
 #include "mir/graphics/egl_error.h"
 #include "mir/graphics/buffer_properties.h"
 #include <boost/throw_exception.hpp>
+#include <boost/exception/errinfo_errno.hpp>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -37,6 +39,7 @@
 #include <system_error>
 #include <gbm.h>
 #include <cassert>
+#include <fcntl.h>
 
 namespace mg  = mir::graphics;
 namespace mgm = mg::mesa;
@@ -50,7 +53,9 @@
 public:
     EGLImageBufferTextureBinder(std::shared_ptr<gbm_bo> const& gbm_bo,
                                 std::shared_ptr<mg::EGLExtensions> const& egl_extensions)
-        : bo{gbm_bo}, egl_extensions{egl_extensions}, egl_image{EGL_NO_IMAGE_KHR}
+        : bo{gbm_bo},
+          egl_extensions{egl_extensions},
+          egl_image{EGL_NO_IMAGE_KHR}
     {
     }
 
@@ -68,6 +73,24 @@
         egl_extensions->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, egl_image);
     }
 
+protected:
+    virtual void ensure_egl_image() = 0;
+
+    std::shared_ptr<gbm_bo> const bo;
+    std::shared_ptr<mg::EGLExtensions> const egl_extensions;
+    EGLDisplay egl_display;
+    EGLImageKHR egl_image;
+};
+
+class NativePixmapTextureBinder : public EGLImageBufferTextureBinder
+{
+public:
+    NativePixmapTextureBinder(std::shared_ptr<gbm_bo> const& gbm_bo,
+                              std::shared_ptr<mg::EGLExtensions> const& egl_extensions)
+        : EGLImageBufferTextureBinder(gbm_bo, egl_extensions)
+    {
+    }
+
 private:
     void ensure_egl_image()
     {
@@ -82,19 +105,71 @@
                 EGL_NONE
             };
 
-            egl_image = egl_extensions->eglCreateImageKHR(egl_display, EGL_NO_CONTEXT,
+            egl_image = egl_extensions->eglCreateImageKHR(egl_display,
+                                                          EGL_NO_CONTEXT,
                                                           EGL_NATIVE_PIXMAP_KHR,
                                                           reinterpret_cast<void*>(bo_raw),
                                                           image_attrs);
             if (egl_image == EGL_NO_IMAGE_KHR)
-                BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGLImage from GBM bo"));
-        }
-    }
-
-    std::shared_ptr<gbm_bo> const bo;
-    std::shared_ptr<mg::EGLExtensions> const egl_extensions;
-    EGLDisplay egl_display;
-    EGLImageKHR egl_image;
+                BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGLImage"));
+        }
+    }
+};
+
+class DMABufTextureBinder : public EGLImageBufferTextureBinder
+{
+public:
+    DMABufTextureBinder(std::shared_ptr<gbm_bo> const& gbm_bo,
+                        std::shared_ptr<mg::EGLExtensions> const& egl_extensions)
+        : EGLImageBufferTextureBinder(gbm_bo, egl_extensions)
+    {
+    }
+
+private:
+    void ensure_egl_image()
+    {
+        if (egl_image == EGL_NO_IMAGE_KHR)
+        {
+            egl_display = eglGetCurrentDisplay();
+            gbm_bo* bo_raw{bo.get()};
+
+            auto device = gbm_bo_get_device(bo_raw);
+            auto gem_handle = gbm_bo_get_handle(bo_raw).u32;
+            auto drm_fd = gbm_device_get_fd(device);
+            int raw_fd = -1;
+
+            auto ret = drmPrimeHandleToFD(drm_fd, gem_handle, DRM_CLOEXEC, &raw_fd);
+            prime_fd = mir::Fd{raw_fd};
+            if (ret)
+            {
+                std::string const msg("Failed to get PRIME fd from gbm bo");
+                BOOST_THROW_EXCEPTION(
+                    std::system_error(errno, std::system_category(), "Failed to get PRIME fd from gbm bo"));
+            }
+
+            const EGLint image_attrs_X[] =
+            {
+                EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
+                EGL_WIDTH, static_cast<const EGLint>(gbm_bo_get_width(bo_raw)),
+                EGL_HEIGHT, static_cast<const EGLint>(gbm_bo_get_height(bo_raw)),
+                EGL_LINUX_DRM_FOURCC_EXT, static_cast<const EGLint>(gbm_bo_get_format(bo_raw)),
+                EGL_DMA_BUF_PLANE0_FD_EXT, prime_fd,
+                EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,
+                EGL_DMA_BUF_PLANE0_PITCH_EXT, static_cast<const EGLint>(gbm_bo_get_stride(bo_raw)),
+                EGL_NONE
+            };
+
+            egl_image = egl_extensions->eglCreateImageKHR(egl_display,
+                                                          EGL_NO_CONTEXT,
+                                                          EGL_LINUX_DMA_BUF_EXT,
+                                                          static_cast<EGLClientBuffer>(nullptr),
+                                                          image_attrs_X);
+            if (egl_image == EGL_NO_IMAGE_KHR)
+                BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGLImage"));
+        }
+    }
+
+    mir::Fd prime_fd;
 };
 
 struct GBMBODeleter
@@ -106,15 +181,30 @@
     }
 };
 
+auto make_texture_binder(
+    mgm::BufferImportMethod const buffer_import_method,
+    std::shared_ptr<gbm_bo> const& bo,
+    std::shared_ptr<mg::EGLExtensions> const& egl_extensions)
+-> std::unique_ptr<EGLImageBufferTextureBinder>
+{
+    if (buffer_import_method == mgm::BufferImportMethod::dma_buf)
+        return std::make_unique<DMABufTextureBinder>(bo, egl_extensions);
+    else
+        return std::make_unique<NativePixmapTextureBinder>(bo, egl_extensions);
+}
+
 }
 
 mgm::BufferAllocator::BufferAllocator(
     gbm_device* device,
-    BypassOption bypass_option)
+    BypassOption bypass_option,
+    mgm::BufferImportMethod const buffer_import_method)
     : device(device),
       egl_extensions(std::make_shared<mg::EGLExtensions>()),
-      bypass_option(bypass_option)
-
+      bypass_option(buffer_import_method == mgm::BufferImportMethod::dma_buf ?
+                        mgm::BypassOption::prohibited :
+                        bypass_option),
+      buffer_import_method(buffer_import_method)
 {
 }
 
@@ -169,12 +259,9 @@
 
     std::shared_ptr<gbm_bo> bo{bo_raw, GBMBODeleter()};
 
-    std::unique_ptr<EGLImageBufferTextureBinder> texture_binder{
-        new EGLImageBufferTextureBinder{bo, egl_extensions}};
-
     /* Create the GBMBuffer */
     auto const buffer =
-        std::make_shared<GBMBuffer>(bo, bo_flags, std::move(texture_binder));
+        std::make_shared<GBMBuffer>(bo, bo_flags, make_texture_binder(buffer_import_method, bo, egl_extensions));
 
     return buffer;
 }
@@ -257,5 +344,5 @@
     return std::make_unique<mgm::GBMBuffer>(
         bo,
         package->flags,
-        std::make_unique<EGLImageBufferTextureBinder>(bo, egl_extensions));
+        std::make_unique<NativePixmapTextureBinder>(bo, egl_extensions));
 }

=== modified file 'src/platforms/mesa/server/common/buffer_allocator.h'
--- src/platforms/mesa/server/common/buffer_allocator.h	2015-07-16 07:03:19 +0000
+++ src/platforms/mesa/server/common/buffer_allocator.h	2015-07-22 20:26:39 +0000
@@ -38,10 +38,17 @@
 
 namespace mesa
 {
+
+enum class BufferImportMethod
+{
+    gbm_native_pixmap,
+    dma_buf
+};
+
 class BufferAllocator: public graphics::GraphicBufferAllocator
 {
 public:
-    BufferAllocator(gbm_device* device, BypassOption bypass_option);
+    BufferAllocator(gbm_device* device, BypassOption bypass_option, BufferImportMethod const buffer_import_method);
 
     virtual std::shared_ptr<Buffer> alloc_buffer(
         graphics::BufferProperties const& buffer_properties);
@@ -60,6 +67,7 @@
     std::shared_ptr<EGLExtensions> const egl_extensions;
 
     BypassOption const bypass_option;
+    BufferImportMethod const buffer_import_method;
 };
 
 }

=== modified file 'src/platforms/mesa/server/common/display_helpers.cpp'
--- src/platforms/mesa/server/common/display_helpers.cpp	2015-06-17 05:20:42 +0000
+++ src/platforms/mesa/server/common/display_helpers.cpp	2015-07-22 20:26:39 +0000
@@ -56,6 +56,9 @@
             std::runtime_error(
                 "Tried to get authenticated DRM fd before setting up the DRM master"));
 
+    if (node_to_use == DRMNodeToUse::render)
+        return mir::Fd{IntOwnedFd{dup(fd)}};
+
     char* busid = drmGetBusid(fd);
     if (!busid)
         BOOST_THROW_EXCEPTION(
@@ -199,13 +202,16 @@
 
     mir::udev::Enumerator devices(udev);
     devices.match_subsystem("drm");
-    devices.match_sysname("card[0-9]*");
+    if (node_to_use == DRMNodeToUse::render)
+        devices.match_sysname("renderD[0-9]*");
+    else
+        devices.match_sysname("card[0-9]*");
 
     devices.scan_devices();
 
     for(auto& device : devices)
     {
-        if ((error = is_appropriate_device(udev, device)))
+        if ((node_to_use == DRMNodeToUse::card) && (error = is_appropriate_device(udev, device)))
             continue;
 
         // If directly opening the DRM device is good enough for X it's good enough for us!
@@ -216,26 +222,31 @@
             continue;
         }
 
-        // Check that the drm device is usable by setting the interface version we use (1.4)
-        drmSetVersion sv;
-        sv.drm_di_major = 1;
-        sv.drm_di_minor = 4;
-        sv.drm_dd_major = -1;     /* Don't care */
-        sv.drm_dd_minor = -1;     /* Don't care */
-
-        if ((error = -drmSetInterfaceVersion(tmp_fd, &sv)))
+        if (node_to_use == DRMNodeToUse::card)
         {
+            // Check that the drm device is usable by setting the interface version we use (1.4)
+            drmSetVersion sv;
+            sv.drm_di_major = 1;
+            sv.drm_di_minor = 4;
+            sv.drm_dd_major = -1;     /* Don't care */
+            sv.drm_dd_minor = -1;     /* Don't care */
+
+            if ((error = -drmSetInterfaceVersion(tmp_fd, &sv)))
+            {
+                close(tmp_fd);
+                tmp_fd = -1;
+                continue;
+            }
+
+            // Stop if this device has connections to display on
+            if (count_connections(tmp_fd) > 0)
+                break;
+
             close(tmp_fd);
             tmp_fd = -1;
-            continue;
         }
-
-        // Stop if this device has connections to display on
-        if (count_connections(tmp_fd) > 0)
+        else
             break;
-
-        close(tmp_fd);
-        tmp_fd = -1;
     }
 
     if (tmp_fd < 0)

=== modified file 'src/platforms/mesa/server/common/display_helpers.h'
--- src/platforms/mesa/server/common/display_helpers.h	2015-06-17 05:20:42 +0000
+++ src/platforms/mesa/server/common/display_helpers.h	2015-07-22 20:26:39 +0000
@@ -48,10 +48,16 @@
 namespace helpers
 {
 
+enum class DRMNodeToUse
+{
+    render,
+    card
+};
+
 class DRMHelper : public DRMAuthentication
 {
 public:
-    DRMHelper() : fd{-1} {}
+    DRMHelper(DRMNodeToUse const node_to_use) : fd{-1}, node_to_use{node_to_use} {}
     ~DRMHelper();
 
     DRMHelper(const DRMHelper &) = delete;
@@ -65,6 +71,7 @@
     void set_master() const;
 
     int fd;
+    DRMNodeToUse const node_to_use;
 
 private:
     // TODO: This herustic is temporary; should be replaced with

=== modified file 'src/platforms/mesa/server/common/ipc_operations.cpp'
--- src/platforms/mesa/server/common/ipc_operations.cpp	2015-06-17 05:20:42 +0000
+++ src/platforms/mesa/server/common/ipc_operations.cpp	2015-07-22 20:26:39 +0000
@@ -53,8 +53,7 @@
 };
 }
 
-mgm::IpcOperations::IpcOperations(std::shared_ptr<DRMAuthentication> const& drm_auth) :
-    drm_auth{drm_auth}
+mgm::IpcOperations::IpcOperations(std::shared_ptr<DRMAuthentication> const& drm) : drm{drm}
 {
 }
 
@@ -103,7 +102,7 @@
 
         try
         {
-            drm_auth->auth_magic(auth_magic_request.magic);
+            drm->auth_magic(auth_magic_request.magic);
             auth_magic_response.status = 0;
         }
         catch (std::exception const& e)
@@ -129,7 +128,7 @@
                 std::runtime_error("Invalid request message for auth_fd platform operation"));
         }
 
-        return mg::PlatformOperationMessage{{},{drm_auth->authenticated_fd()}};
+        return mg::PlatformOperationMessage{{},{drm->authenticated_fd()}};
     }
     else
     {
@@ -140,5 +139,5 @@
 
 std::shared_ptr<mg::PlatformIPCPackage> mgm::IpcOperations::connection_ipc_package()
 {
-    return std::make_shared<MesaPlatformIPCPackage>(drm_auth->authenticated_fd());
+    return std::make_shared<MesaPlatformIPCPackage>(drm->authenticated_fd());
 }

=== modified file 'src/platforms/mesa/server/common/ipc_operations.h'
--- src/platforms/mesa/server/common/ipc_operations.h	2015-06-17 05:20:42 +0000
+++ src/platforms/mesa/server/common/ipc_operations.h	2015-07-22 20:26:39 +0000
@@ -31,7 +31,7 @@
 class IpcOperations : public PlatformIpcOperations
 {
 public:
-    IpcOperations(std::shared_ptr<DRMAuthentication> const&);
+    IpcOperations(std::shared_ptr<DRMAuthentication> const& drm);
 
     void pack_buffer(BufferIpcMessage& message, Buffer const& buffer, BufferIpcMsgType msg_type) const override;
     void unpack_buffer(BufferIpcMessage& message, Buffer const& buffer) const override;
@@ -40,7 +40,7 @@
         unsigned int const opcode,
         PlatformOperationMessage const& message) override;
 private:
-    std::shared_ptr<DRMAuthentication> const drm_auth;
+    std::shared_ptr<DRMAuthentication> const drm;
 };
 
 }

=== modified file 'src/platforms/mesa/server/kms/guest_platform.cpp'
--- src/platforms/mesa/server/kms/guest_platform.cpp	2015-07-16 07:03:19 +0000
+++ src/platforms/mesa/server/kms/guest_platform.cpp	2015-07-22 20:26:39 +0000
@@ -80,12 +80,12 @@
     gbm.setup(fds.at(0));
     set_guest_gbm_device(*nested_context, gbm.device);
     ipc_ops = std::make_shared<mgm::IpcOperations>(
-        std::make_shared<mgm::NestedAuthentication>(nested_context)); 
+        std::make_shared<mgm::NestedAuthentication>(nested_context));
 }
 
 std::shared_ptr<mg::GraphicBufferAllocator> mgm::GuestPlatform::create_buffer_allocator()
 {
-    return std::make_shared<mgm::BufferAllocator>(gbm.device, mgm::BypassOption::prohibited);
+    return std::make_shared<mgm::BufferAllocator>(gbm.device, mgm::BypassOption::prohibited, mgm::BufferImportMethod::gbm_native_pixmap);
 }
 
 std::shared_ptr<mg::Platform> create_guest_platform(

=== modified file 'src/platforms/mesa/server/kms/platform.cpp'
--- src/platforms/mesa/server/kms/platform.cpp	2015-07-17 17:23:11 +0000
+++ src/platforms/mesa/server/kms/platform.cpp	2015-07-22 20:26:39 +0000
@@ -39,6 +39,7 @@
 
 namespace mg = mir::graphics;
 namespace mgm = mg::mesa;
+namespace mgmh = mgm::helpers;
 namespace mo = mir::options;
 
 namespace
@@ -128,7 +129,7 @@
                         EmergencyCleanupRegistry& emergency_cleanup_registry,
                         BypassOption bypass_option)
     : udev{std::make_shared<mir::udev::Context>()},
-      drm{std::make_shared<helpers::DRMHelper>()},
+      drm{std::make_shared<mgmh::DRMHelper>(mgmh::DRMNodeToUse::card)},
       listener{listener},
       vt{vt},
       bypass_option_{bypass_option}
@@ -137,7 +138,7 @@
     gbm.setup(*drm);
 
     std::weak_ptr<VirtualTerminal> weak_vt = vt;
-    std::weak_ptr<helpers::DRMHelper> weak_drm = drm;
+    std::weak_ptr<mgmh::DRMHelper> weak_drm = drm;
     emergency_cleanup_registry.add(
         [weak_vt,weak_drm]
         {
@@ -151,7 +152,7 @@
 
 std::shared_ptr<mg::GraphicBufferAllocator> mgm::Platform::create_buffer_allocator()
 {
-    return std::make_shared<mgm::BufferAllocator>(gbm.device, bypass_option_);
+    return std::make_shared<mgm::BufferAllocator>(gbm.device, bypass_option_, mgm::BufferImportMethod::gbm_native_pixmap);
 }
 
 std::shared_ptr<mg::Display> mgm::Platform::create_display(
@@ -184,7 +185,7 @@
 std::shared_ptr<mg::Platform> create_host_platform(
     std::shared_ptr<mo::Option> const& options,
     std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
-    std::shared_ptr<mir::graphics::DisplayReport> const& report)
+    std::shared_ptr<mg::DisplayReport> const& report)
 {
     auto real_fops = std::make_shared<RealVTFileOperations>();
     auto real_pops = std::unique_ptr<RealPosixProcessOperations>(new RealPosixProcessOperations{});

=== added directory 'src/platforms/mesa/server/x11'
=== added file 'src/platforms/mesa/server/x11/CMakeLists.txt'
--- src/platforms/mesa/server/x11/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -0,0 +1,61 @@
+include_directories(
+  ${server_common_include_dirs}
+  ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/include/client
+  ${PROJECT_SOURCE_DIR}/src/platforms/mesa/server/common
+)
+
+include_directories(
+    ${DRM_INCLUDE_DIRS}
+    ${GBM_INCLUDE_DIRS}
+    ${EGL_INCLUDE_DIRS}
+    ${GLESv2_INCLUDE_DIRS}
+    ${UDEV_INCLUDE_DIRS}
+)
+
+add_library(
+  mirplatformservermesax11objects OBJECT
+
+  platform.cpp
+  display.cpp
+  display_configuration.cpp
+  gl_context.cpp
+  display_group.cpp
+  display_buffer.cpp
+  input/input.cpp
+  input/input_platform.cpp
+  input/input_device.cpp
+  input/dispatchable.cpp
+)
+
+add_library(
+  mirplatformservermesax11 MODULE
+
+  $<TARGET_OBJECTS:mirplatformservermesax11objects>
+)
+
+target_link_libraries(
+  mirplatformservermesax11
+  PRIVATE
+  mirplatform
+  EGL
+  GLESv2
+  X11
+  mirsharedmesaservercommon-static
+  ${Boost_PROGRAM_OPTIONS_LIBRARY}
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+)
+
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
+
+set_target_properties(
+  mirplatformservermesax11 PROPERTIES
+  OUTPUT_NAME server-mesa-x11
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
+  PREFIX ""
+  SUFFIX ".so.${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+)
+
+install(TARGETS mirplatformservermesax11 LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})

=== added file 'src/platforms/mesa/server/x11/display.cpp'
--- src/platforms/mesa/server/x11/display.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,274 @@
+/*
+ * 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]>
+ */
+
+#include "mir/graphics/platform.h"
+#include "mir/graphics/display_report.h"
+#include "mir/graphics/egl_resources.h"
+#include "mir/graphics/egl_error.h"
+#include "display_configuration.h"
+#include "display.h"
+#include "display_buffer.h"
+#include "gl_context.h"
+
+#include <boost/throw_exception.hpp>
+#include <fcntl.h>
+#include <mutex>
+
+#define MIR_LOG_COMPONENT "x11-display"
+#include "mir/log.h"
+
+namespace mg=mir::graphics;
+namespace mgx=mg::X;
+namespace geom=mir::geometry;
+
+mgx::X11EGLDisplay::X11EGLDisplay(::Display *x_dpy)
+    : egl_dpy{eglGetDisplay(x_dpy)}
+{
+    if (!egl_dpy)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get an egl display"));
+
+    EGLint egl_major, egl_minor;
+    if (!eglInitialize(egl_dpy, &egl_major, &egl_minor))
+        BOOST_THROW_EXCEPTION(mg::egl_error("eglInitialize failed"));
+
+    mir::log_info("EGL Version %d.%d", egl_major, egl_minor);
+}
+
+mgx::X11EGLDisplay::~X11EGLDisplay()
+{
+    eglTerminate(egl_dpy);
+}
+
+mgx::X11EGLDisplay::operator EGLDisplay() const
+{
+    return egl_dpy;
+}
+
+mgx::X11Window::X11Window(::Display *x_dpy, EGLDisplay egl_dpy, int width, int height)
+    : x_dpy{x_dpy}
+{
+    EGLint const att[] = {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RED_SIZE, 5,
+        EGL_GREEN_SIZE, 5,
+        EGL_BLUE_SIZE, 5,
+        EGL_ALPHA_SIZE, 0,
+        EGL_DEPTH_SIZE, 0,
+        EGL_STENCIL_SIZE, 0,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_NONE
+    };
+
+    auto root = XDefaultRootWindow(x_dpy);
+
+    EGLint num_configs;
+    if (!eglChooseConfig(egl_dpy, att, &config, 1, &num_configs))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get an EGL config"));
+
+    assert(config);
+    assert(num_configs > 0);
+
+    EGLint vid;
+    if (!eglGetConfigAttrib(egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get config attrib"));
+
+    XVisualInfo visTemplate;
+    int num_visuals;
+    visTemplate.visualid = vid;
+    auto visInfo = XGetVisualInfo(x_dpy, VisualIDMask, &visTemplate, &num_visuals);
+    if (!visInfo)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get visual info"));
+
+    XSetWindowAttributes attr;
+    attr.background_pixel = 0;
+    attr.border_pixel = 0;
+    attr.colormap = XCreateColormap(x_dpy, root, visInfo->visual, AllocNone);
+    attr.event_mask = StructureNotifyMask |
+                      ExposureMask        |
+                      KeyPressMask        |
+                      KeyReleaseMask      |
+                      ButtonPressMask     |
+                      ButtonReleaseMask;
+
+    auto mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+
+    win = XCreateWindow(x_dpy, root, 0, 0, width, height,
+                        0, visInfo->depth, InputOutput,
+                        visInfo->visual, mask, &attr);
+
+    mir::log_info("Pixel depth = %d", visInfo->depth);
+
+    //TODO: handle others
+    assert(visInfo->depth==24);
+
+    XFree(visInfo);
+
+    XMapWindow(x_dpy, win);
+}
+
+mgx::X11Window::~X11Window()
+{
+    XDestroyWindow(x_dpy, win);
+}
+
+mgx::X11Window::operator Window() const
+{
+    return win;
+}
+
+EGLConfig mgx::X11Window::egl_config() const
+{
+    return config;
+}
+
+mgx::X11EGLContext::X11EGLContext(EGLDisplay egl_dpy, EGLConfig config)
+    : egl_dpy{egl_dpy}
+{
+    static const EGLint ctx_attribs[] = {
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+        EGL_NONE };
+
+    egl_ctx = eglCreateContext(egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs);
+    if (!egl_ctx)
+        BOOST_THROW_EXCEPTION(mg::egl_error("eglCreateContext failed"));
+}
+
+mgx::X11EGLContext::~X11EGLContext()
+{
+    eglDestroyContext(egl_dpy, egl_ctx);
+}
+
+mgx::X11EGLContext::operator EGLContext() const
+{
+    return egl_ctx;
+}
+
+mgx::X11EGLSurface::X11EGLSurface(EGLDisplay egl_dpy, EGLConfig config, Window win)
+    : egl_dpy{egl_dpy}, egl_surf{eglCreateWindowSurface(egl_dpy, config, win, NULL)}
+{
+    if (!egl_surf)
+        BOOST_THROW_EXCEPTION(mg::egl_error("eglCreateWindowSurface failed"));
+}
+
+mgx::X11EGLSurface::~X11EGLSurface()
+{
+    eglDestroySurface(egl_dpy, egl_surf);
+}
+
+mgx::X11EGLSurface::operator EGLSurface() const
+{
+    return egl_surf;
+}
+
+mgx::Display::Display(::Display *dpy)
+    : x_dpy{dpy},
+      egl_display{X11EGLDisplay(dpy)},
+      display_width{1280},
+      display_height{1024},
+      win{X11Window(dpy,
+                    egl_display,
+                    display_width,
+                    display_height)},
+      egl_context{X11EGLContext(egl_display,
+                                win.egl_config())},
+      egl_surface{X11EGLSurface(egl_display,
+                                win.egl_config(),
+                                win)}
+{
+    // TODO: read from the chosen config
+    pf = mir_pixel_format_bgr_888;
+
+    // Make window nonresizeable
+    // TODO: Make sizing possible
+    {
+        char const * const title = "Mir On X";
+        XSizeHints sizehints;
+
+        sizehints.x = 0;
+        sizehints.y = 0;
+        sizehints.base_width = display_width;
+        sizehints.base_height = display_height;
+        sizehints.min_width  = display_width;
+        sizehints.min_height = display_height;
+        sizehints.max_width = display_width;
+        sizehints.max_height = display_height;
+        sizehints.flags = USSize | USPosition | PMinSize | PMaxSize;
+
+        XSetNormalHints(x_dpy, win, &sizehints);
+        XSetStandardProperties(x_dpy, win, title, title, None, (char **)NULL, 0, &sizehints);
+    }
+
+    display_group = std::make_unique<mgx::DisplayGroup>(
+        std::make_unique<mgx::DisplayBuffer>(geom::Size{display_width, display_height},
+                                             egl_display,
+                                             egl_surface,
+                                             egl_context));
+}
+
+mgx::Display::~Display() noexcept
+{
+    eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+}
+
+void mgx::Display::for_each_display_sync_group(std::function<void(mg::DisplaySyncGroup&)> const& f)
+{
+    f(*display_group);
+}
+
+std::unique_ptr<mg::DisplayConfiguration> mgx::Display::configuration() const
+{
+    return std::make_unique<mgx::DisplayConfiguration>(pf, display_width, display_height);
+}
+
+void mgx::Display::configure(mg::DisplayConfiguration const& /*new_configuration*/)
+{
+    BOOST_THROW_EXCEPTION(std::runtime_error("'Display::configure()' not yet supported on x11 platform"));
+}
+
+void mgx::Display::register_configuration_change_handler(
+    EventHandlerRegister& /* event_handler*/,
+    DisplayConfigurationChangeHandler const& /*change_handler*/)
+{
+}
+
+void mgx::Display::register_pause_resume_handlers(
+    EventHandlerRegister& /*handlers*/,
+    DisplayPauseHandler const& /*pause_handler*/,
+    DisplayResumeHandler const& /*resume_handler*/)
+{
+}
+
+void mgx::Display::pause()
+{
+    BOOST_THROW_EXCEPTION(std::runtime_error("'Display::pause()' not yet supported on x11 platform"));
+}
+
+void mgx::Display::resume()
+{
+    BOOST_THROW_EXCEPTION(std::runtime_error("'Display::resume()' not yet supported on x11 platform"));
+}
+
+auto mgx::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */) -> std::shared_ptr<Cursor>
+{
+    return nullptr;
+}
+
+std::unique_ptr<mg::GLContext> mgx::Display::create_gl_context()
+{
+    return std::make_unique<mgx::XGLContext>(egl_display, egl_surface, egl_context);
+}

=== added file 'src/platforms/mesa/server/x11/display.h'
--- src/platforms/mesa/server/x11/display.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,131 @@
+/*
+ * 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_X_DISPLAY_H_
+#define MIR_GRAPHICS_X_DISPLAY_H_
+
+#include "mir/graphics/display.h"
+#include "mir_toolkit/common.h"
+#include "display_group.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <EGL/egl.h>
+
+namespace mir
+{
+namespace graphics
+{
+namespace X
+{
+
+class X11EGLDisplay
+{
+public:
+    X11EGLDisplay(::Display *x_dpy);
+    ~X11EGLDisplay();
+
+    operator EGLDisplay() const;
+
+private:
+    EGLDisplay const egl_dpy;
+};
+
+class X11Window
+{
+public:
+    X11Window(::Display* const x_dpy, EGLDisplay egl_dpy, int width, int height);
+    ~X11Window();
+
+    operator Window() const;
+    EGLConfig egl_config() const;
+
+private:
+    ::Display* const x_dpy;
+    Window win;
+    EGLConfig config;
+};
+
+class X11EGLContext
+{
+public:
+    X11EGLContext(EGLDisplay egl_dpy, EGLConfig config);
+    ~X11EGLContext();
+
+    operator EGLContext() const;
+
+private:
+    EGLContext egl_ctx;
+    EGLDisplay const egl_dpy;
+};
+
+class X11EGLSurface
+{
+public:
+    X11EGLSurface(EGLDisplay egl_dpy, EGLConfig config, Window win);
+    ~X11EGLSurface();
+
+    operator EGLSurface() const;
+
+private:
+    EGLDisplay const egl_dpy;
+    EGLSurface const egl_surf;
+};
+
+class Display : public graphics::Display
+{
+public:
+    explicit Display(::Display *dpy);
+    ~Display() noexcept;
+
+    void for_each_display_sync_group(std::function<void(graphics::DisplaySyncGroup&)> const& f) override;
+
+    std::unique_ptr<graphics::DisplayConfiguration> configuration() const override;
+    void configure(graphics::DisplayConfiguration const&) override;
+
+    void register_configuration_change_handler(
+        EventHandlerRegister& handlers,
+        DisplayConfigurationChangeHandler const& conf_change_handler) override;
+
+    void register_pause_resume_handlers(
+        EventHandlerRegister& handlers,
+        DisplayPauseHandler const& pause_handler,
+        DisplayResumeHandler const& resume_handler) override;
+
+    void pause() override;
+    void resume() override;
+
+    std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image) override;
+    std::unique_ptr<graphics::GLContext> create_gl_context() override;
+
+private:
+    ::Display *x_dpy;
+    X11EGLDisplay const egl_display;
+    int const display_width;
+    int const display_height;
+    X11Window const win;
+    X11EGLContext egl_context;
+    X11EGLSurface egl_surface;
+    MirPixelFormat pf;
+    std::unique_ptr<DisplayGroup> display_group;
+};
+
+}
+}
+}
+#endif /* MIR_GRAPHICS_X_DISPLAY_H_ */

=== added file 'src/platforms/mesa/server/x11/display_buffer.cpp'
--- src/platforms/mesa/server/x11/display_buffer.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display_buffer.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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]>
+ *
+ */
+
+#include "mir/graphics/egl_error.h"
+#include "display_buffer.h"
+
+#include <boost/throw_exception.hpp>
+
+namespace mg=mir::graphics;
+namespace mgx=mg::X;
+namespace geom=mir::geometry;
+
+mgx::DisplayBuffer::DisplayBuffer(geom::Size const sz,
+                                  EGLDisplay const d,
+                                  EGLSurface const s,
+                                  EGLContext const c)
+                                  : size{sz}, egl_dpy{d}, egl_surf{s}, egl_ctx{c}
+{
+}
+
+geom::Rectangle mgx::DisplayBuffer::view_area() const
+{
+    return {{0,0}, size};
+}
+
+void mgx::DisplayBuffer::make_current()
+{
+    if (!eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make current"));
+}
+
+void mgx::DisplayBuffer::release_current()
+{
+    if (!eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make uncurrent"));
+}
+
+bool mgx::DisplayBuffer::post_renderables_if_optimizable(RenderableList const& /*renderlist*/)
+{
+    return false;
+}
+
+void mgx::DisplayBuffer::gl_swap_buffers()
+{
+    if (!eglSwapBuffers(egl_dpy, egl_surf))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot swap"));
+}
+
+MirOrientation mgx::DisplayBuffer::orientation() const
+{
+    return mir_orientation_normal;
+}

=== added file 'src/platforms/mesa/server/x11/display_buffer.h'
--- src/platforms/mesa/server/x11/display_buffer.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display_buffer.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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_X_DISPLAY_BUFFER_H_
+#define MIR_GRAPHICS_X_DISPLAY_BUFFER_H_
+
+#include "mir/graphics/display_buffer.h"
+#include "gl_context.h"
+
+#include <EGL/egl.h>
+
+namespace mir
+{
+namespace graphics
+{
+namespace X
+{
+
+class DisplayBuffer : public graphics::DisplayBuffer
+{
+public:
+    DisplayBuffer(geometry::Size const sz, EGLDisplay const d, EGLSurface const s, EGLContext const c);
+
+    geometry::Rectangle view_area() const override;
+    void make_current() override;
+    void release_current() override;
+    void gl_swap_buffers() override;
+    bool post_renderables_if_optimizable(RenderableList const& renderlist) override;
+
+    MirOrientation orientation() const override;
+
+private:
+    geometry::Size const size;
+    EGLDisplay const egl_dpy;
+    EGLSurface const egl_surf;
+    EGLContext const egl_ctx;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_X_DISPLAY_BUFFER_H_ */

=== added file 'src/platforms/mesa/server/x11/display_configuration.cpp'
--- src/platforms/mesa/server/x11/display_configuration.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display_configuration.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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]>
+ *
+ */
+
+#include "display_configuration.h"
+#include <boost/throw_exception.hpp>
+
+namespace mg = mir::graphics;
+namespace mgx = mg::X;
+namespace geom = mir::geometry;
+
+mgx::DisplayConfiguration::DisplayConfiguration(MirPixelFormat pf, int width, int height) :
+    configuration{
+            mg::DisplayConfigurationOutputId{1},
+            mg::DisplayConfigurationCardId{0},
+            mg::DisplayConfigurationOutputType::unknown,
+            {pf},
+            //TODO: query fps
+            {mg::DisplayConfigurationMode{geom::Size{width, height}, 60.0}},
+            0,
+            //TODO: query mm-size
+            geom::Size{width, height},
+            true,
+            true,
+            geom::Point{0, 0},
+            0,
+            pf,
+            mir_power_mode_on,
+            mir_orientation_normal},
+    card{mg::DisplayConfigurationCardId{0}, 1}
+{
+}
+
+void mgx::DisplayConfiguration::for_each_card(std::function<void(mg::DisplayConfigurationCard const&)> f) const
+{
+    f(card);
+}
+
+void mgx::DisplayConfiguration::for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)> f) const
+{
+    f(configuration);
+}
+
+void mgx::DisplayConfiguration::for_each_output(std::function<void(mg::UserDisplayConfigurationOutput&)> f)
+{
+    mg::UserDisplayConfigurationOutput user(configuration);
+    f(user);
+}

=== added file 'src/platforms/mesa/server/x11/display_configuration.h'
--- src/platforms/mesa/server/x11/display_configuration.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display_configuration.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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_X_DISPLAY_CONFIGURATION_H_
+#define MIR_GRAPHICS_X_DISPLAY_CONFIGURATION_H_
+
+#include "mir/graphics/display_configuration.h"
+
+namespace mir
+{
+namespace graphics
+{
+namespace X
+{
+
+class DisplayConfiguration : public graphics::DisplayConfiguration
+{
+public:
+    DisplayConfiguration(MirPixelFormat pf, int width, int height);
+
+    virtual ~DisplayConfiguration() = default;
+
+    void for_each_card(std::function<void(DisplayConfigurationCard const&)> f) const override;
+    void for_each_output(std::function<void(DisplayConfigurationOutput const&)> f) const override;
+    void for_each_output(std::function<void(UserDisplayConfigurationOutput&)> f) override;
+
+private:
+    DisplayConfigurationOutput configuration;
+    DisplayConfigurationCard card;
+};
+
+
+}
+}
+}
+#endif /* MIR_GRAPHICS_X_DISPLAY_CONFIGURATION_H_ */

=== added file 'src/platforms/mesa/server/x11/display_group.cpp'
--- src/platforms/mesa/server/x11/display_group.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display_group.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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]>
+ *
+ */
+
+#include "display_group.h"
+
+namespace mg = mir::graphics;
+namespace mgx = mg::X;
+
+mgx::DisplayGroup::DisplayGroup(std::unique_ptr<mgx::DisplayBuffer> primary_buffer)
+{
+    display_buffer = std::move(primary_buffer);
+}
+
+void mgx::DisplayGroup::for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f)
+{
+    f(*display_buffer);
+}
+
+void mgx::DisplayGroup::post()
+{
+}
+
+std::chrono::milliseconds mgx::DisplayGroup::recommended_sleep() const
+{
+    return std::chrono::milliseconds::zero();
+}

=== added file 'src/platforms/mesa/server/x11/display_group.h'
--- src/platforms/mesa/server/x11/display_group.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/display_group.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,51 @@
+/*
+ * 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_X_DISPLAY_GROUP_H_
+#define MIR_GRAPHICS_X_DISPLAY_GROUP_H_
+
+#include "mir_toolkit/common.h"
+#include "mir/graphics/display.h"
+#include "display_buffer.h"
+
+namespace mir
+{
+namespace graphics
+{
+namespace X
+{
+
+class DisplayGroup : public graphics::DisplaySyncGroup
+{
+public:
+    DisplayGroup(std::unique_ptr<DisplayBuffer> primary_buffer);
+
+    void for_each_display_buffer(std::function<void(graphics::DisplayBuffer&)> const& f) override;
+    void post() override;
+    std::chrono::milliseconds recommended_sleep() const override;
+
+private:
+    std::unique_ptr<DisplayBuffer> display_buffer;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_X_DISPLAY_GROUP_H_ */

=== added file 'src/platforms/mesa/server/x11/gl_context.cpp'
--- src/platforms/mesa/server/x11/gl_context.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/gl_context.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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]>
+ *
+ */
+
+#include "mir/graphics/egl_error.h"
+#include "gl_context.h"
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+namespace mg=mir::graphics;
+namespace mgx=mg::X;
+
+mgx::XGLContext::XGLContext(EGLDisplay const d, EGLSurface const s, EGLContext const c)
+    : egl_dpy{d},
+      egl_surf{s},
+      egl_ctx{c}
+{
+}
+
+void mgx::XGLContext::make_current() const
+{
+    if (!eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make current"));
+}
+
+void mgx::XGLContext::release_current() const
+{
+    if (!eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
+        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make uncurrent"));
+}

=== added file 'src/platforms/mesa/server/x11/gl_context.h'
--- src/platforms/mesa/server/x11/gl_context.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/gl_context.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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_X_GL_CONTEXT_H_
+#define MIR_GRAPHICS_X_GL_CONTEXT_H_
+
+#include "mir/graphics/gl_context.h"
+
+#include <EGL/egl.h>
+
+namespace mir
+{
+namespace graphics
+{
+namespace X
+{
+
+class XGLContext : public graphics::GLContext
+{
+public:
+    XGLContext(EGLDisplay const d, EGLSurface const s, EGLContext const c);
+    ~XGLContext() = default;
+    void make_current() const override;
+    void release_current() const override;
+
+private:
+    EGLDisplay const egl_dpy;
+    EGLSurface const egl_surf;
+    EGLContext const egl_ctx;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_X_GL_CONTEXT_H_ */

=== added directory 'src/platforms/mesa/server/x11/input'
=== added file 'src/platforms/mesa/server/x11/input/dispatchable.cpp'
--- src/platforms/mesa/server/x11/input/dispatchable.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/dispatchable.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "dispatchable.h"
+#include "../xserver_connection.h"
+#include "mir/events/event_private.h"
+
+#include <boost/throw_exception.hpp>
+#include <chrono>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <linux/input.h>
+#include <inttypes.h>
+
+#define MIR_LOG_COMPONENT "x11-dispatchable"
+#include "mir/log.h"
+
+namespace mi = mir::input;
+namespace mix = mi::X;
+namespace md = mir::dispatch;
+namespace mx = mir::X;
+
+extern std::shared_ptr<mx::X11Connection> x11_connection;
+
+mix::XDispatchable::XDispatchable(int raw_fd)
+    : fd(raw_fd), sink(nullptr)
+{
+}
+
+mir::Fd mix::XDispatchable::watch_fd() const
+{
+    return fd;
+}
+
+bool mix::XDispatchable::dispatch(md::FdEvents events)
+{
+    auto ret = true;
+
+    if (events & (md::FdEvent::remote_closed | md::FdEvent::error))
+        ret = false;
+
+    if (events & md::FdEvent::readable)
+    {
+        XEvent xev;
+
+        XNextEvent(x11_connection->dpy, &xev);
+
+        if (sink)
+        {
+            switch (xev.type)
+            {
+            case KeyPress:
+            case KeyRelease:
+            {
+                MirEvent event;
+                XKeyEvent &xkev = (XKeyEvent &)xev;
+                static const int STRMAX = 32;
+                char str[STRMAX];
+                KeySym keysym;
+
+                auto count = XLookupString(&xkev, str, STRMAX, &keysym, NULL);
+
+                mir::log_info("Key event : type=%d, serial=%u, send_event=%d, display=%p, window=%p, root=%p, subwindow=%p, time=%d, x=%d, y=%d, x_root=%d, y_root=%d, state=%0X, keycode=%d, same_screen=%d",
+                    xkev.type, xkev.serial, xkev.send_event, xkev.display, xkev.window, xkev.root, xkev.subwindow, xkev.time, xkev.x, xkev.y, xkev.x_root, xkev.y_root, xkev.state, xkev.keycode, xkev.same_screen);
+
+                event.key.type = mir_event_type_key;
+                event.key.device_id = 0;
+                event.key.source_id = 0;
+                event.key.action = xev.type == KeyPress ?
+                                       mir_keyboard_action_down : mir_keyboard_action_up;
+                event.key.modifiers = mir_input_event_modifier_none;
+                event.key.key_code = keysym;
+                event.key.scan_code = xkev.keycode-8;
+
+                std::chrono::time_point<std::chrono::system_clock> tp;
+                std::chrono::milliseconds msec(xkev.time);
+                tp += msec;
+                event.key.event_time = std::chrono::duration_cast<std::chrono::nanoseconds>(tp.time_since_epoch());
+
+                for (int i=0; i<count; i++)
+                    mir::log_info("buffer[%d]='%c', key_code=%d, scan_code=%d, event_time=%" PRId64, i, str[i], keysym, xkev.keycode-8, event.key.event_time);
+
+                sink->handle_input(event);
+                break;
+            }
+
+            case MappingNotify:
+                mir::log_info("Mapping changed at server. Refreshing the cache.");
+                XRefreshKeyboardMapping((XMappingEvent*)&xev);
+                break;
+
+            default:
+                mir::log_info("Uninteresting event");
+                break;
+            }
+        }
+        else
+            mir::log_info("input event detected with no sink to handle it");
+    }
+
+    return ret;
+}
+
+md::FdEvents mix::XDispatchable::relevant_events() const
+{
+    return md::FdEvent::readable | md::FdEvent::error | md::FdEvent::remote_closed;
+}
+
+void mix::XDispatchable::set_input_sink(mi::InputSink *input_sink)
+{
+    sink = input_sink;
+}
+
+void mix::XDispatchable::unset_input_sink()
+{
+    sink = nullptr;
+}

=== added file 'src/platforms/mesa/server/x11/input/dispatchable.h'
--- src/platforms/mesa/server/x11/input/dispatchable.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/dispatchable.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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_INPUT_X_DISPATCHABLE_H_
+#define MIR_INPUT_X_DISPATCHABLE_H_
+
+#include "mir/dispatch/dispatchable.h"
+#include "mir/input/input_sink.h"
+
+namespace mir
+{
+namespace input
+{
+namespace X
+{
+struct XDispatchable : public dispatch::Dispatchable
+{
+public:
+    XDispatchable(int raw_fd);
+
+    mir::Fd watch_fd() const override;
+    bool dispatch(dispatch::FdEvents events) override;
+    dispatch::FdEvents relevant_events() const override;
+
+    void set_input_sink(InputSink *input_sink);
+    void unset_input_sink();
+
+private:
+    mir::Fd fd;
+    InputSink *sink;
+};
+
+}
+}
+}
+
+#endif // MIR_INPUT_X_DISPATCHABLE_H_

=== added file 'src/platforms/mesa/server/x11/input/input.cpp'
--- src/platforms/mesa/server/x11/input/input.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/input.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "input_platform.h"
+#include "mir/module_properties.h"
+#include "mir/input/platform.h"
+
+namespace mo = mir::options;
+namespace mi = mir::input;
+namespace mix = mi::X;
+
+extern "C" mir::UniqueModulePtr<mi::Platform> create_input_platform(
+    std::shared_ptr<mo::Option> const& /*options*/,
+    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
+    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
+    std::shared_ptr<mi::InputReport> const& /*report*/)
+{
+    return mir::make_module_ptr<mix::XInputPlatform>(input_device_registry);
+}
+
+extern "C" void add_input_platform_options(
+    boost::program_options::options_description& /*config*/)
+{
+}
+
+extern "C" mi::PlatformPriority probe_input_platform(
+    mo::Option const& /*options*/)
+{
+    return mi::PlatformPriority::best;
+}
+
+namespace
+{
+mir::ModuleProperties const description = {
+    "x11-input",
+    MIR_VERSION_MAJOR,
+    MIR_VERSION_MINOR,
+    MIR_VERSION_MICRO
+};
+}
+
+extern "C" mir::ModuleProperties const* describe_input_module()
+{
+    return &description;
+}

=== added file 'src/platforms/mesa/server/x11/input/input_device.cpp'
--- src/platforms/mesa/server/x11/input/input_device.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/input_device.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "mir/input/input_device_info.h"
+#include "input_device.h"
+#include "dispatchable.h"
+#include "../xserver_connection.h"
+
+namespace mi = mir::input;
+namespace mix = mi::X;
+namespace md = mir::dispatch;
+namespace mx = mir::X;
+
+extern std::shared_ptr<mx::X11Connection> x11_connection;
+
+mix::XInputDevice::XInputDevice()
+    : fd(XConnectionNumber(x11_connection->dpy)), x_dispatchable(std::make_shared<mix::XDispatchable>(fd))
+{
+}
+
+std::shared_ptr<md::Dispatchable> mix::XInputDevice::dispatchable()
+{
+    return x_dispatchable;
+}
+
+void mix::XInputDevice::start(mi::InputSink* destination)
+{
+    x_dispatchable->set_input_sink(destination);
+}
+
+void mix::XInputDevice::stop()
+{
+    x_dispatchable->unset_input_sink();
+}
+
+mi::InputDeviceInfo mix::XInputDevice::get_device_info()
+{
+    return mi::InputDeviceInfo{0,"x11-keyboard-device","x11-key-dev-1", mi::DeviceCapability::keyboard};
+}

=== added file 'src/platforms/mesa/server/x11/input/input_device.h'
--- src/platforms/mesa/server/x11/input/input_device.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/input_device.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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_INPUT_X_INPUT_DEVICE_H_
+#define MIR_INPUT_X_INPUT_DEVICE_H_
+
+#include "mir/input/input_device.h"
+
+#include <X11/Xlib.h>
+
+namespace mir
+{
+
+namespace dispatch
+{
+class Dispatchable;
+}
+
+namespace input
+{
+
+namespace X
+{
+class XDispatchable;
+
+class XInputDevice : public input::InputDevice
+{
+public:
+    XInputDevice();
+    ~XInputDevice() = default;
+
+    std::shared_ptr<dispatch::Dispatchable> dispatchable() override;
+    void start(input::InputSink* destination) override;
+    void stop() override;
+    InputDeviceInfo get_device_info() override;
+
+protected:
+    XInputDevice(XInputDevice const&) = delete;
+    XInputDevice& operator=(XInputDevice const&) = delete;
+
+private:
+    int fd;
+    std::shared_ptr<XDispatchable> x_dispatchable;
+};
+
+}
+
+}
+}
+
+#endif // MIR_INPUT_X_INPUT_DEVICE_H_

=== added file 'src/platforms/mesa/server/x11/input/input_platform.cpp'
--- src/platforms/mesa/server/x11/input/input_platform.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/input_platform.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "input_platform.h"
+#include "input_device.h"
+
+#include "mir/input/input_device_registry.h"
+#include "mir/dispatch/action_queue.h"
+#include "mir/module_deleter.h"
+
+namespace mi = mir::input;
+namespace md = mir::dispatch;
+namespace mix = mi::X;
+
+mix::XInputPlatform::XInputPlatform(
+    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry)
+    : platform_queue(mir::make_module_ptr<md::ActionQueue>()),
+      registry(input_device_registry),
+      device(std::make_shared<mix::XInputDevice>())
+{
+}
+
+void mix::XInputPlatform::start()
+{
+    registry->add_device(device);
+}
+
+std::shared_ptr<md::Dispatchable> mix::XInputPlatform::dispatchable()
+{
+    return platform_queue;
+}
+
+void mix::XInputPlatform::stop()
+{
+    registry->remove_device(device);
+}

=== added file 'src/platforms/mesa/server/x11/input/input_platform.h'
--- src/platforms/mesa/server/x11/input/input_platform.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/input/input_platform.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+#ifndef MIR_INPUT_X_INPUT_PLATFORM_H_
+#define MIR_INPUT_X_INPUT_PLATFORM_H_
+
+#include "mir/input/platform.h"
+#include <memory>
+
+namespace mir
+{
+
+namespace dispatch
+{
+class ActionQueue;
+}
+
+namespace input
+{
+class InputDevice;
+
+namespace X
+{
+class XInputDevice;
+
+class XInputPlatform : public input::Platform
+{
+public:
+    explicit XInputPlatform(std::shared_ptr<input::InputDeviceRegistry> const& input_device_registry);
+    ~XInputPlatform() = default;
+
+    std::shared_ptr<dispatch::Dispatchable> dispatchable() override;
+    void start() override;
+    void stop() override;
+
+private:
+    std::shared_ptr<dispatch::ActionQueue> const platform_queue;
+    std::shared_ptr<input::InputDeviceRegistry> const registry;
+    std::shared_ptr<XInputDevice> const device;
+};
+
+}
+}
+}
+
+#endif // MIR_INPUT_X_INPUT_PLATFORM_H_

=== added file 'src/platforms/mesa/server/x11/platform.cpp'
--- src/platforms/mesa/server/x11/platform.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/platform.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,135 @@
+/*
+ * 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]>
+ */
+
+#include "platform.h"
+#include "display.h"
+#include "buffer_allocator.h"
+#include "ipc_operations.h"
+#include "xserver_connection.h"
+#include "mir/udev/wrapper.h"
+
+#include <boost/throw_exception.hpp>
+
+namespace mg = mir::graphics;
+namespace mgm = mg::mesa;
+namespace mgx = mg::X;
+namespace mo = mir::options;
+namespace mx = mir::X;
+
+//TODO: Remove this global by allowing input and graphics drivers to share
+//     some context like the x11 display handle.
+std::shared_ptr<mx::X11Connection> x11_connection;
+
+mgx::Platform::Platform()
+    : udev{std::make_shared<mir::udev::Context>()},
+       drm{std::make_shared<mesa::helpers::DRMHelper>(mesa::helpers::DRMNodeToUse::render)}
+{
+    if (x11_connection)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Cannot create x11 platform more than once"));
+
+    x11_connection.reset(new mx::X11Connection());
+
+    if (!x11_connection->dpy)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Cannot open x11 display"));
+
+    drm->setup(udev);
+    gbm.setup(*drm);
+}
+
+std::shared_ptr<mg::GraphicBufferAllocator> mgx::Platform::create_buffer_allocator()
+{
+    return std::make_shared<mgm::BufferAllocator>(gbm.device, mgm::BypassOption::prohibited, mgm::BufferImportMethod::dma_buf);
+}
+
+std::shared_ptr<mg::Display> mgx::Platform::create_display(
+    std::shared_ptr<DisplayConfigurationPolicy> const& /*initial_conf_policy*/,
+    std::shared_ptr<GLProgramFactory> const&,
+    std::shared_ptr<GLConfig> const& /*gl_config*/)
+{
+    return std::make_shared<mgx::Display>(x11_connection->dpy);
+}
+
+std::shared_ptr<mg::PlatformIpcOperations> mgx::Platform::make_ipc_operations() const
+{
+    return std::make_shared<mg::mesa::IpcOperations>(drm);
+}
+
+EGLNativeDisplayType mgx::Platform::egl_native_display() const
+{
+    return eglGetDisplay(x11_connection->dpy);
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+// Platform module entry points below
+////////////////////////////////////////////////////////////////////////////////////
+
+std::shared_ptr<mg::Platform> create_host_platform(
+    std::shared_ptr<mo::Option> const& /*options*/,
+    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
+    std::shared_ptr<mg::DisplayReport> const& /*report*/)
+{
+    return std::make_shared<mgx::Platform>();
+}
+
+std::shared_ptr<mg::Platform> create_guest_platform(
+    std::shared_ptr<mg::DisplayReport> const& /*report*/,
+    std::shared_ptr<mg::NestedContext> const&)
+{
+    BOOST_THROW_EXCEPTION(std::runtime_error("Guest platform isn't supported under X"));
+    return nullptr;
+}
+
+void add_graphics_platform_options(boost::program_options::options_description& /*config*/)
+{
+}
+
+mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /*options*/)
+{
+    auto dpy = XOpenDisplay(nullptr);
+    if (dpy)
+    {
+        XCloseDisplay(dpy);
+
+        auto udev = std::make_shared<mir::udev::Context>();
+
+        mir::udev::Enumerator drm_devices{udev};
+        drm_devices.match_subsystem("drm");
+        drm_devices.match_sysname("renderD[0-9]*");
+        drm_devices.scan_devices();
+
+        for (auto& device : drm_devices)
+        {
+            static_cast<void>(device);
+
+            return mg::PlatformPriority::best;
+        }
+    }
+    return mg::PlatformPriority::unsupported;
+}
+
+mir::ModuleProperties const description = {
+    "mesa-x11",
+    MIR_VERSION_MAJOR,
+    MIR_VERSION_MINOR,
+    MIR_VERSION_MICRO
+};
+
+mir::ModuleProperties const* describe_graphics_module()
+{
+    return &description;
+}

=== added file 'src/platforms/mesa/server/x11/platform.h'
--- src/platforms/mesa/server/x11/platform.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/platform.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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_X_PLATFORM_H_
+#define MIR_GRAPHICS_X_PLATFORM_H_
+
+#include "mir/graphics/platform.h"
+#include "display_helpers.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+namespace mir
+{
+namespace graphics
+{
+namespace X
+{
+
+class Platform : public graphics::Platform
+{
+public:
+    explicit Platform();
+    ~Platform() = default;
+
+    /* From Platform */
+    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator() override;
+
+    std::shared_ptr<graphics::Display> create_display(
+        std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
+        std::shared_ptr<GLProgramFactory> const& program_factory,
+        std::shared_ptr<GLConfig> const& gl_config) override;
+
+    std::shared_ptr<PlatformIpcOperations> make_ipc_operations() const override;
+
+    EGLNativeDisplayType egl_native_display() const override;
+private:
+    std::shared_ptr<mir::udev::Context> udev;
+    std::shared_ptr<mesa::helpers::DRMHelper> const drm;
+    mesa::helpers::GBMHelper gbm;
+};
+
+}
+}
+}
+#endif /* MIR_GRAPHICS_X_PLATFORM_H_ */

=== added file 'src/platforms/mesa/server/x11/symbols.map'
--- src/platforms/mesa/server/x11/symbols.map	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/symbols.map	2015-07-22 20:26:39 +0000
@@ -0,0 +1,18 @@
+MIR_GRAPHICS_PLATFORM_4 {
+  global: 
+   add_graphics_platform_options;
+   probe_graphics_platform;
+   create_host_platform;
+   create_guest_platform;
+   describe_graphics_module;
+  local: *;
+};
+
+MIR_INPUT_PLATFORM_1 {
+  global: 
+   add_input_platform_options;
+   create_input_platform;
+   probe_input_platform;
+   describe_input_module;
+  local: *;
+};

=== added file 'src/platforms/mesa/server/x11/xserver_connection.h'
--- src/platforms/mesa/server/x11/xserver_connection.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/xserver_connection.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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_X_XSERVER_CONNECTION_H_
+#define MIR_X_XSERVER_CONNECTION_H_
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+namespace mir
+{
+namespace X
+{
+
+struct X11Connection
+{
+    X11Connection()
+    {
+        dpy = XOpenDisplay(nullptr);
+    }
+
+    ~X11Connection()
+    {
+        XCloseDisplay(dpy);
+    }
+
+    ::Display *dpy;
+};
+
+}
+}
+#endif /* MIR_X_XSERVER_CONNECTION_H_ */

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-06-29 03:29:31 +0000
+++ tests/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -33,6 +33,10 @@
   add_definitions(-DMESA_KMS)
 endif()
 
+if (MIR_TEST_PLATFORM STREQUAL "mesa-x11")
+  add_definitions(-DMESA_X11)
+endif()
+
 if (MIR_BUILD_PLATFORM_ANDROID)
   #avoid complaints about poor quality android headers
   include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2015-07-16 07:03:19 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2015-07-22 20:26:39 +0000
@@ -421,7 +421,7 @@
 }
 #endif
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(MESA_X11)
 // Mir's Android test infrastructure isn't quite ready for this yet.
 TEST_F(ClientLibrary, DISABLED_gets_buffer_dimensions)
 #else
@@ -646,10 +646,10 @@
  * trying to marshall stub buffers causes crashes.
  */
 
-#ifndef ANDROID
+#if defined(ANDROID) || defined(MESA_X11)
+TEST_F(ClientLibrary, DISABLED_create_simple_normal_surface_from_spec)
+#else
 TEST_F(ClientLibrary, create_simple_normal_surface_from_spec)
-#else
-TEST_F(ClientLibrary, DISABLED_create_simple_normal_surface_from_spec)
 #endif
 {
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
@@ -677,10 +677,10 @@
     mir_connection_release(connection);
 }
 
-#ifndef ANDROID
+#if defined(ANDROID) || defined(MESA_X11)
+TEST_F(ClientLibrary, DISABLED_create_simple_normal_surface_from_spec_async)
+#else
 TEST_F(ClientLibrary, create_simple_normal_surface_from_spec_async)
-#else
-TEST_F(ClientLibrary, DISABLED_create_simple_normal_surface_from_spec_async)
 #endif
 {
     auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
@@ -744,10 +744,10 @@
     mir_connection_release(connection);
 }
 
-#ifndef ANDROID
+#if defined(ANDROID) || defined(MESA_X11)
+TEST_F(ClientLibrary, DISABLED_set_fullscreen_on_output_makes_fullscreen_surface)
+#else
 TEST_F(ClientLibrary, set_fullscreen_on_output_makes_fullscreen_surface)
-#else
-TEST_F(ClientLibrary, DISABLED_set_fullscreen_on_output_makes_fullscreen_surface)
 #endif
 {
     using namespace testing;

=== added file 'tests/include/mir/test/doubles/mock_input_sink.h'
--- tests/include/mir/test/doubles/mock_input_sink.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir/test/doubles/mock_input_sink.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_MOCK_INPUT_SINK_H_
+#define MIR_TEST_DOUBLES_MOCK_INPUT_SINK_H_
+
+#include "mir/input/input_sink.h"
+
+#include <gmock/gmock.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+struct MockInputSink : mir::input::InputSink
+{
+    MOCK_METHOD1(handle_input, void(MirEvent&));
+    MOCK_METHOD1(confine_pointer, void(mir::geometry::Point&));
+    MOCK_CONST_METHOD0(bounding_rectangle, mir::geometry::Rectangle());
+};
+
+}
+}
+}
+
+#endif // MIR_TEST_DOUBLES_MOCK_INPUT_SINK_H_

=== added file 'tests/include/mir/test/doubles/mock_x11.h'
--- tests/include/mir/test/doubles/mock_x11.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir/test/doubles/mock_x11.h	2015-07-22 20:26:39 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_MOCK_X11_H_
+#define MIR_TEST_DOUBLES_MOCK_X11_H_
+
+#include <gmock/gmock.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+class FakeX11Resources
+{
+public:
+    FakeX11Resources();
+    ~FakeX11Resources() = default;
+
+    Display *display;
+    Window window;
+    XVisualInfo visual_info;
+    XEvent event_return;
+};
+
+class MockX11
+{
+public:
+    MockX11();
+    ~MockX11();
+
+    MOCK_METHOD1(XOpenDisplay, Display*(const char*));
+    MOCK_METHOD1(XCloseDisplay, int(Display*));
+    MOCK_METHOD4(XGetVisualInfo, XVisualInfo*(Display*, long, XVisualInfo*, int*));
+    MOCK_METHOD4(XCreateColormap, Colormap(Display*, Window, Visual*, int));
+    /* Too long to mock, use wrapper instead.
+    MOCK_METHOD12(XCreateWindow, Window(Display*, Window, int, int, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual*, unsigned long, XSetWindowAttributes*));
+    */
+    MOCK_METHOD10(XCreateWindow_wrapper, Window(Display*, Window, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual*, unsigned long, XSetWindowAttributes*));
+    MOCK_METHOD3(XSetNormalHints, int(Display*, Window, XSizeHints*));
+    MOCK_METHOD8(XSetStandardProperties, int(Display*, Window, const char*, const char*, Pixmap, char **, int, XSizeHints*));
+    MOCK_METHOD1(XFree, int(void*));
+    MOCK_METHOD2(XMapWindow, int(Display*, Window));
+    MOCK_METHOD2(XDestroyWindow, int(Display*, Window));
+    MOCK_METHOD1(XConnectionNumber, int(Display*));
+    MOCK_METHOD2(XNextEvent, int(Display*, XEvent*));
+    MOCK_METHOD5(XLookupString, int(XKeyEvent*, char*, int, KeySym*, XComposeStatus*));
+    MOCK_METHOD1(XRefreshKeyboardMapping, int(XMappingEvent*));
+    MOCK_METHOD1(XDefaultRootWindow, Window(Display*));
+
+    FakeX11Resources fake_x11;
+};
+
+}
+}
+}
+
+#endif /* MIR_TEST_DOUBLES_MOCK_X11_H_ */

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2015-06-26 08:00:59 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -28,6 +28,12 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp
 )
 
+if (MIR_BUILD_PLATFORM_MESA_X11)
+  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_x11.cpp
+  )
+endif()
+
 if (MIR_BUILD_PLATFORM_MESA_KMS)
   include_directories(
     ${PROJECT_SOURCE_DIR}/src/platforms/mesa/server/common

=== added file 'tests/mir_test_doubles/mock_x11.cpp'
--- tests/mir_test_doubles/mock_x11.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_doubles/mock_x11.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by:
+ * Cemil Azizoglu <[e-mail]>
+ */
+
+#include "mir/test/doubles/mock_x11.h"
+#include <gtest/gtest.h>
+
+namespace mtd=mir::test::doubles;
+
+namespace
+{
+mtd::MockX11* global_mock = nullptr;
+}
+
+mtd::FakeX11Resources::FakeX11Resources()
+    : display{reinterpret_cast<Display*>(0x12345678)},
+      window{reinterpret_cast<Window>((long unsigned int)9876543210)}
+{
+    visual_info.depth=24;
+    event_return.type = KeyPress;
+}
+
+mtd::MockX11::MockX11()
+{
+    using namespace testing;
+    assert(global_mock == nullptr && "Only one mock object per process is allowed");
+
+    global_mock = this;
+
+    ON_CALL(*this, XOpenDisplay(_))
+    .WillByDefault(Return(fake_x11.display));
+
+    ON_CALL(*this, XGetVisualInfo(fake_x11.display,_,_,_))
+    .WillByDefault(Return(&fake_x11.visual_info));
+
+    ON_CALL(*this, XCreateWindow_wrapper(fake_x11.display,_,_,_,_,_,_,_,_,_))
+    .WillByDefault(Return(fake_x11.window));
+}
+
+mtd::MockX11::~MockX11()
+{
+    global_mock = nullptr;
+}
+
+Display *XOpenDisplay(const char *display_name)
+{
+    return global_mock->XOpenDisplay(display_name);
+}
+
+int XCloseDisplay(Display *display)
+{
+    return global_mock->XCloseDisplay(display);
+}
+
+XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)
+{
+    return global_mock->XGetVisualInfo(display, vinfo_mask, vinfo_template, nitems_return);
+}
+
+Colormap XCreateColormap(Display *display, Window w, Visual *visual, int alloc)
+{
+    return global_mock->XCreateColormap(display, w, visual, alloc);
+}
+
+Window XCreateWindow(Display * display, Window parent, int /*x*/, int /*y*/, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int clss, Visual *visual, unsigned long valuemask, XSetWindowAttributes *attributes)
+{
+    return global_mock->XCreateWindow_wrapper(display, parent, width, height, border_width, depth, clss, visual, valuemask, attributes);
+}
+
+int XSetNormalHints(Display *display, Window w, XSizeHints *hints)
+{
+    return global_mock->XSetNormalHints(display, w, hints);
+}
+
+int XSetStandardProperties(Display *display, Window w, const char *window_name, const char *icon_name, Pixmap icon_pixmap, char **argv, int argc, XSizeHints *hints)
+{
+    return global_mock->XSetStandardProperties(display, w, window_name, icon_name, icon_pixmap, argv, argc, hints);
+}
+
+int XFree(void *data)
+{
+    return global_mock->XFree(data);
+}
+
+int XMapWindow(Display *display, Window w)
+{
+    return global_mock->XMapWindow(display, w);
+}
+
+int XDestroyWindow(Display *display, Window w)
+{
+    return global_mock->XDestroyWindow(display, w);
+}
+
+int XConnectionNumber(Display *display)
+{
+    return global_mock->XConnectionNumber(display);
+}
+
+int XNextEvent(Display *display, XEvent *event_return)
+{
+    return global_mock->XNextEvent(display, event_return);
+}
+
+int XLookupString(XKeyEvent *event_struct, char *buffer_return, int bytes_buffer, KeySym *keysym_return, XComposeStatus *status_in_out)
+{
+    return global_mock->XLookupString(event_struct, buffer_return, bytes_buffer, keysym_return, status_in_out);
+}
+
+int XRefreshKeyboardMapping(XMappingEvent *event_map)
+{
+    return global_mock->XRefreshKeyboardMapping(event_map);
+}
+
+Window XDefaultRootWindow(Display *display)
+{
+    return global_mock->XDefaultRootWindow(display);
+}

=== modified file 'tests/mir_test_doubles/platform_factory.cpp'
--- tests/mir_test_doubles/platform_factory.cpp	2015-06-25 21:34:27 +0000
+++ tests/mir_test_doubles/platform_factory.cpp	2015-07-22 20:26:39 +0000
@@ -22,6 +22,8 @@
 
 #ifdef MESA_KMS
 #include "src/platforms/mesa/server/kms/platform.h"
+#elif MESA_X11
+#include "src/platforms/mesa/server/x11/platform.h"
 #endif
 
 #include "src/server/report/null_report_factory.h"
@@ -41,7 +43,7 @@
         report::null_display_report());
 }
 
-#else
+#elif MESA_KMS
 auto mtd::create_platform_with_null_dependencies()
     -> std::shared_ptr<graphics::Platform>
 {
@@ -57,4 +59,10 @@
         *std::make_shared<NullEmergencyCleanup>(),
         graphics::mesa::BypassOption::allowed);
 }
+#elif MESA_X11
+auto mtd::create_platform_with_null_dependencies()
+    -> std::shared_ptr<graphics::Platform>
+{
+    return std::make_shared<graphics::X::Platform>();
+}
 #endif

=== modified file 'tests/mir_test_doubles/stub_buffer.cpp'
--- tests/mir_test_doubles/stub_buffer.cpp	2015-06-25 21:34:27 +0000
+++ tests/mir_test_doubles/stub_buffer.cpp	2015-07-22 20:26:39 +0000
@@ -20,7 +20,7 @@
 
 #ifdef ANDROID
 #include "mir/test/doubles/stub_android_native_buffer.h"
-#else
+#elif defined(MESA_KMS) || defined(MESA_X11)
 #include "mir/test/doubles/stub_gbm_native_buffer.h"
 #endif
 
@@ -29,9 +29,9 @@
 auto mtd::StubBuffer::create_native_buffer()
 -> std::shared_ptr<graphics::NativeBuffer>
 {
-#ifdef MESA_KMS
+#if defined(MESA_KMS) || defined(MESA_X11)
     return std::make_shared<StubGBMNativeBuffer>(geometry::Size{0,0});
-#else
+#elif ANDROID
     return std::make_shared<StubAndroidNativeBuffer>();
 #endif
 }

=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2015-07-16 07:03:19 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2015-07-22 20:26:39 +0000
@@ -65,7 +65,7 @@
 
     std::shared_ptr<mg::NativeBuffer> native_buffer_handle() const override
     {
-#ifdef MESA_KMS
+#if defined(MESA_KMS) || defined(MESA_X11)
         auto native_buffer = std::make_shared<mg::NativeBuffer>();
         native_buffer->data_items = 1;
         native_buffer->data[0] = 0xDEADBEEF;
@@ -124,7 +124,7 @@
     {
         if (msg_type == mg::BufferIpcMsgType::full_msg)
         {
-#ifdef MESA_KMS
+#if defined(MESA_KMS) || defined(MESA_X11)
             auto native_handle = buffer.native_buffer_handle();
             for(auto i=0; i<native_handle->data_items; i++)
             {

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-07-14 07:28:55 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-07-22 20:26:39 +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}
 )
 
@@ -61,6 +62,12 @@
   test_module_deleter.cpp
 )
 
+if (MIR_TEST_PLATFORM STREQUAL "mesa-x11")
+list(APPEND UNIT_TEST_SOURCES
+  $<TARGET_OBJECTS:mirplatformservermesax11objects>
+)
+endif()
+
 add_subdirectory(options/)
 add_subdirectory(client/)
 add_subdirectory(compositor/)
@@ -133,11 +140,10 @@
   ${XKBCOMMON_LIBRARIES}
 )
 
-if (MIR_BUILD_PLATFORM_MESA_KMS)
 target_link_libraries(mir_unit_tests
   mirsharedmesaservercommon-static
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
-endif()
 
 if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_unit_tests 

=== modified file 'tests/unit-tests/client/CMakeLists.txt'
--- tests/unit-tests/client/CMakeLists.txt	2015-07-16 07:03:19 +0000
+++ tests/unit-tests/client/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -23,7 +23,7 @@
   add_subdirectory("android")
 endif()
 
-if(MIR_TEST_PLATFORM STREQUAL "mesa-kms")
+if(MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11" )
   add_subdirectory("mesa")
 endif()
 

=== modified file 'tests/unit-tests/graphics/CMakeLists.txt'
--- tests/unit-tests/graphics/CMakeLists.txt	2015-06-18 02:46:16 +0000
+++ tests/unit-tests/graphics/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -1,9 +1,7 @@
 list(APPEND UNIT_TEST_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_graphics_platform.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_display_configuration.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_egl_extensions.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_egl_error.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_display.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_default_display_configuration_policy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_id.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_properties.cpp
@@ -15,16 +13,23 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/test_software_cursor.cpp
 )
 
+if (MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "android")
+  list(APPEND UNIT_TEST_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_graphics_platform.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_display.cpp
+  )
+endif()
+
 add_subdirectory(nested/)
 add_subdirectory(offscreen/)
 
 add_subdirectory(egl_mock/)
 if (MIR_TEST_PLATFORM STREQUAL "android")
-add_subdirectory(android/)
+  add_subdirectory(android/)
 endif()
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa-kms")
-add_subdirectory(mesa/)
+if (MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11")
+  add_subdirectory(mesa/)
 endif()
 
 set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)

=== modified file 'tests/unit-tests/graphics/mesa/CMakeLists.txt'
--- tests/unit-tests/graphics/mesa/CMakeLists.txt	2015-06-19 01:35:28 +0000
+++ tests/unit-tests/graphics/mesa/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -9,4 +9,8 @@
   add_subdirectory(kms/)
 endif()
 
+if (MIR_TEST_PLATFORM STREQUAL "mesa-x11")
+  add_subdirectory(x11/)
+endif()
+
 set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)

=== modified file 'tests/unit-tests/graphics/mesa/common/CMakeLists.txt'
--- tests/unit-tests/graphics/mesa/common/CMakeLists.txt	2015-06-18 10:00:46 +0000
+++ tests/unit-tests/graphics/mesa/common/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -1,6 +1,4 @@
 add_library(unit_test_graphics_mesa_common OBJECT
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_gbm_buffer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_allocator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_anonymous_shm_file.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_shm_buffer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_drm_helper.cpp

=== modified file 'tests/unit-tests/graphics/mesa/common/test_drm_helper.cpp'
--- tests/unit-tests/graphics/mesa/common/test_drm_helper.cpp	2015-06-26 08:00:59 +0000
+++ tests/unit-tests/graphics/mesa/common/test_drm_helper.cpp	2015-07-22 20:26:39 +0000
@@ -50,7 +50,7 @@
 protected:       
     ::testing::NiceMock<mtd::MockDRM> mock_drm;
     mtf::UdevEnvironment fake_devices;
-    mgm::helpers::DRMHelper drm_helper;
+    mgm::helpers::DRMHelper drm_helper{mgm::helpers::DRMNodeToUse::card};
 };
 
 }

=== modified file 'tests/unit-tests/graphics/mesa/kms/CMakeLists.txt'
--- tests/unit-tests/graphics/mesa/kms/CMakeLists.txt	2015-06-18 10:00:46 +0000
+++ tests/unit-tests/graphics/mesa/kms/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -1,4 +1,6 @@
 add_library(unit_test_graphics_mesa_kms OBJECT
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_gbm_buffer.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_allocator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_platform.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_display.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_display_buffer.cpp

=== renamed file 'tests/unit-tests/graphics/mesa/common/test_buffer_allocator.cpp' => 'tests/unit-tests/graphics/mesa/kms/test_buffer_allocator.cpp'
--- tests/unit-tests/graphics/mesa/common/test_buffer_allocator.cpp	2015-07-21 04:11:10 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_buffer_allocator.cpp	2015-07-22 20:26:39 +0000
@@ -63,7 +63,7 @@
 
         platform = mtd::create_mesa_platform_with_null_dependencies();
         allocator.reset(new mgm::BufferAllocator(
-            platform->gbm.device, mgm::BypassOption::allowed));
+            platform->gbm.device, mgm::BypassOption::allowed, mgm::BufferImportMethod::gbm_native_pixmap));
     }
 
     // Defaults
@@ -145,7 +145,8 @@
 
     mgm::BufferAllocator alloc(
         platform->gbm.device,
-        mgm::BypassOption::prohibited);
+        mgm::BypassOption::prohibited,
+        mgm::BufferImportMethod::gbm_native_pixmap);
     auto buf = alloc.alloc_buffer(properties);
     ASSERT_TRUE(buf.get() != NULL);
     EXPECT_FALSE(buf->native_buffer_handle()->flags & mir_buffer_flag_can_scanout);

=== renamed file 'tests/unit-tests/graphics/mesa/common/test_gbm_buffer.cpp' => 'tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp'
--- tests/unit-tests/graphics/mesa/common/test_gbm_buffer.cpp	2015-06-26 08:00:59 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp	2015-07-22 20:26:39 +0000
@@ -72,7 +72,7 @@
 
         platform = mtd::create_mesa_platform_with_null_dependencies();
 
-        allocator.reset(new mgm::BufferAllocator(platform->gbm.device, mgm::BypassOption::allowed));
+        allocator.reset(new mgm::BufferAllocator(platform->gbm.device, mgm::BypassOption::allowed, mgm::BufferImportMethod::gbm_native_pixmap));
     }
 
     ::testing::NiceMock<mtd::MockDRM> mock_drm;

=== added directory 'tests/unit-tests/graphics/mesa/x11'
=== added file 'tests/unit-tests/graphics/mesa/x11/CMakeLists.txt'
--- tests/unit-tests/graphics/mesa/x11/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/graphics/mesa/x11/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -0,0 +1,6 @@
+list(APPEND UNIT_TEST_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_platform.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_display.cpp
+)
+
+set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)

=== added file 'tests/unit-tests/graphics/mesa/x11/test_display.cpp'
--- tests/unit-tests/graphics/mesa/x11/test_display.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/graphics/mesa/x11/test_display.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+#include "src/platforms/mesa/server/x11/display.h"
+#include "mir/test/doubles/mock_egl.h"
+#include "mir/test/doubles/mock_x11.h"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace mg=mir::graphics;
+namespace mgx=mg::X;
+namespace mtd=mir::test::doubles;
+
+namespace
+{
+
+EGLint const window_width = 1280;
+EGLint const window_height = 1024;
+
+class X11DisplayTest : public ::testing::Test
+{
+public:
+
+    X11DisplayTest()
+    {
+        using namespace testing;
+        EGLint const client_version = 2;
+
+        ON_CALL(mock_egl, eglQueryContext(mock_egl.fake_egl_display,
+                                          mock_egl.fake_egl_context,
+                                          EGL_CONTEXT_CLIENT_VERSION,
+                                          _))
+            .WillByDefault(DoAll(SetArgPointee<3>(client_version),
+                            Return(EGL_TRUE)));
+
+        ON_CALL(mock_egl, eglQuerySurface(mock_egl.fake_egl_display,
+                                          mock_egl.fake_egl_surface,
+                                          EGL_WIDTH,
+                                          _))
+            .WillByDefault(DoAll(SetArgPointee<3>(window_width),
+                            Return(EGL_TRUE)));
+
+        ON_CALL(mock_egl, eglQuerySurface(mock_egl.fake_egl_display,
+                                          mock_egl.fake_egl_surface,
+                                          EGL_HEIGHT,
+                                          _))
+            .WillByDefault(DoAll(SetArgPointee<3>(window_height),
+                            Return(EGL_TRUE)));
+
+        ON_CALL(mock_egl, eglGetConfigAttrib(mock_egl.fake_egl_display,
+                                             _,
+                                             _,
+                                             _))
+            .WillByDefault(DoAll(SetArgPointee<3>(EGL_WINDOW_BIT),
+                            Return(EGL_TRUE)));
+    }
+
+    std::shared_ptr<mgx::Display> create_display()
+    {
+        return std::make_shared<mgx::Display>(mock_x11.fake_x11.display);
+    }
+
+    ::testing::NiceMock<mtd::MockEGL> mock_egl;
+    ::testing::NiceMock<mtd::MockX11> mock_x11;
+};
+
+}
+
+TEST_F(X11DisplayTest, creates_display_successfully)
+{
+    using namespace testing;
+
+    EXPECT_CALL(mock_egl, eglGetDisplay(mock_x11.fake_x11.display))
+        .Times(Exactly(1));
+
+    EXPECT_CALL(mock_x11, XCreateWindow_wrapper(mock_x11.fake_x11.display,_, window_width, window_height,_,_,_,_,_,_))
+        .Times(Exactly(1));
+
+    EXPECT_CALL(mock_egl, eglCreateContext(mock_egl.fake_egl_display,_, EGL_NO_CONTEXT,_))
+        .Times(Exactly(1));
+
+    EXPECT_CALL(mock_egl, eglCreateWindowSurface(mock_egl.fake_egl_display,_, mock_x11.fake_x11.window, nullptr))
+        .Times(Exactly(1));
+
+    auto display = create_display();
+}

=== added file 'tests/unit-tests/graphics/mesa/x11/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/x11/test_platform.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/graphics/mesa/x11/test_platform.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "mir/options/program_option.h"
+#include "src/platforms/mesa/server/x11/platform.h"
+
+#include "mir/test/doubles/platform_factory.h"
+#include "mir/test/doubles/mock_drm.h"
+#include "mir/test/doubles/mock_gbm.h"
+#include "mir/test/doubles/mock_x11.h"
+#include "mir/shared_library.h"
+#include "mir_test_framework/executable_path.h"
+#include "mir_test_framework/udev_environment.h"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace mg = mir::graphics;
+namespace mtd = mir::test::doubles;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+const char probe_platform[] = "probe_graphics_platform";
+
+class X11GraphicsPlatformTest : public ::testing::Test
+{
+public:
+    void SetUp()
+    {
+        ::testing::Mock::VerifyAndClearExpectations(&mock_drm);
+        ::testing::Mock::VerifyAndClearExpectations(&mock_gbm);
+    }
+
+    std::shared_ptr<mg::Platform> create_platform()
+    {
+        return mtd::create_platform_with_null_dependencies();
+    }
+
+    ::testing::NiceMock<mtd::MockDRM> mock_drm;
+    ::testing::NiceMock<mtd::MockGBM> mock_gbm;
+    ::testing::NiceMock<mtd::MockX11> mock_x11;
+};
+}
+
+TEST_F(X11GraphicsPlatformTest, failure_to_open_x11_display_results_in_an_error)
+{
+    using namespace ::testing;
+
+    EXPECT_CALL(mock_x11, XOpenDisplay(_))
+        .WillRepeatedly(Return(nullptr));
+
+    EXPECT_THROW({ create_platform(); }, std::exception);
+}
+
+TEST_F(X11GraphicsPlatformTest, failure_to_open_drm_results_in_an_error)
+{
+    using namespace ::testing;
+
+    EXPECT_CALL(mock_drm, open(_,_,_))
+        .WillRepeatedly(Return(-1));
+
+    EXPECT_THROW({ create_platform(); }, std::exception);
+}
+
+TEST_F(X11GraphicsPlatformTest, failure_to_create_gbm_device_results_in_an_error)
+{
+    using namespace ::testing;
+
+    EXPECT_CALL(mock_gbm, gbm_create_device(mock_drm.fake_drm.fd()))
+        .WillRepeatedly(Return(nullptr));
+
+    EXPECT_THROW({ create_platform(); }, std::exception);
+}
+
+TEST_F(X11GraphicsPlatformTest, probe_returns_unsupported_when_no_drm_udev_devices)
+{
+    mtf::UdevEnvironment udev_environment;
+    mir::options::ProgramOption options;
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("server-mesa-x11")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe(options));
+}
+
+TEST_F(X11GraphicsPlatformTest, probe_returns_unsupported_when_x_cannot_open_display)
+{
+    using namespace ::testing;
+
+    mir::options::ProgramOption options;
+
+    EXPECT_CALL(mock_x11, XOpenDisplay(_))
+        .WillRepeatedly(Return(nullptr));
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("server-mesa-x11")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe(options));
+}
+
+TEST_F(X11GraphicsPlatformTest, probe_returns_best_when_drm_render_nodes_exist)
+{
+    mtf::UdevEnvironment udev_environment;
+    mir::options::ProgramOption options;
+
+    udev_environment.add_standard_device("standard-drm-render-nodes");
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("server-mesa-x11")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    EXPECT_EQ(mg::PlatformPriority::best, probe(options));
+}

=== modified file 'tests/unit-tests/input/CMakeLists.txt'
--- tests/unit-tests/input/CMakeLists.txt	2015-06-30 23:23:17 +0000
+++ tests/unit-tests/input/CMakeLists.txt	2015-07-22 20:26:39 +0000
@@ -15,6 +15,12 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_validator.cpp
 )
 
+if (MIR_TEST_PLATFORM STREQUAL "mesa-x11")
+  list(APPEND UNIT_TEST_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_dispatchable.cpp
+  )
+endif()
+
 set(
   UNIT_TEST_SOURCES
   ${UNIT_TEST_SOURCES}

=== added file 'tests/unit-tests/input/test_x11_dispatchable.cpp'
--- tests/unit-tests/input/test_x11_dispatchable.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/test_x11_dispatchable.cpp	2015-07-22 20:26:39 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "mir/events/event_private.h"
+#include "mir_toolkit/event.h"
+#include "src/platforms/mesa/server/x11/input/dispatchable.h"
+#include "src/platforms/mesa/server/x11/xserver_connection.h"
+#include "mir/test/doubles/mock_input_sink.h"
+#include "mir/test/doubles/mock_x11.h"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace mtd = mir::test::doubles;
+
+using namespace ::testing;
+
+extern std::shared_ptr<mir::X::X11Connection> x11_connection;
+
+namespace
+{
+
+struct X11DispatchableTest : ::testing::Test
+{
+    X11DispatchableTest()
+    {
+        // X11Connection freed in the (external) shared_ptr destruction.
+        x11_connection.reset(new mir::X::X11Connection());
+    }
+
+    ~X11DispatchableTest()
+    {
+        x11_connection.reset();
+    }
+
+    mir::input::X::XDispatchable x11_dispatchable{0};
+    NiceMock<mtd::MockInputSink> mock_input_sink;
+    NiceMock<mtd::MockX11> mock_x11;
+};
+
+}
+
+TEST_F(X11DispatchableTest, dispatches_input_events_to_sink)
+{
+    ON_CALL(mock_x11, XNextEvent(_,_))
+    .WillByDefault(DoAll(SetArgPointee<1>(mock_x11.fake_x11.event_return),
+                   Return(1)));
+
+    EXPECT_CALL(mock_input_sink, handle_input(_));
+
+    x11_dispatchable.set_input_sink(&mock_input_sink);
+    x11_dispatchable.dispatch(mir::dispatch::FdEvent::readable);
+}