Merge lp:~kdub/mir/platform-operations into lp:mir

[Kevin DuBois]

platform: Allow for use of platform operations in the platform interfaces. This currently abstracts the drm auth magic request for the mesa platform. (the protocol still needs the drm magic stuff weeded out)

platform: Allow for use of platform operations in the platform interfaces. This currently abstracts the drm auth magic request for the mesa platform. (the protocol still needs the drm magic stuff weeded out)

This is a branch that sprung from the discussion started here:
https://lists.ubuntu.com/archives/mir-devel/2014-October/000923.html

I opted to put an opcode in the signature (Alan suggested on the chain that an opcode/type of operation is not necessary, it could just be part of the "DataAndFds"), mostly because all platform requests will need an opcode to distinguish what is to be done.

This benefits SessionMediator in that we don't have to cast to figure out whether we're dealing with the mesa platform or not. We also no longer need mg::Platform in SessionMediator, just mg::PlatformIpcOperations (which is defined by what SessionMediator has to do)

note: This branch has been rattling around my computer for a bit, now that I'm attempting to clean up the platform a bit and split out the nested/offscreen into actual platforms, seemed like a good time to propose.

note2: There's another cleanup coming that should also have a negative diff... but I figured ~1100 was a good review size.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2026
http://jenkins.qa.ubuntu.com/job/mir-ci/2084/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/95
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/95/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/75
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3367
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15771

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

doesnt look related retriggered.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2026
http://jenkins.qa.ubuntu.com/job/mir-ci/2088/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/80
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3371
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15777

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Looks sensible to me. A bunch of spurious frontend:: → mf:: diff, but that's managable :)

review: Approve

[Alan Griffiths (alan-griffiths)]

> doesnt look related retriggered.

filed as lp:1392256

[Alan Griffiths (alan-griffiths)]

Nit I suspect that this:

    170 + the_graphics_platform()->make_ipc_operations(),

should be:

    170 + the_ipc_operations(),

With the_ipc_operations() having the obvious definition (but not belonging in frontend).

LGTM

review: Approve

[Alexandros Frantzis (afrantzis)]

> virtual void platform_operation(
> PlatformIPCPackage& response, unsigned int const opcode, PlatformIPCPackage const& package) = 0;

The other option is:

virtual PlatformIPCPackage platform_operation(unsigned int opcode, PlatformIPCPackage const& package) = 0

PlatformIPCPackage is movable so even if (N)RVO doesn't kick in, returning the package should be cheap.

Weak "Needs Fixing", I prefer it with the return value, but I am not fussed.

review: Needs Fixing

[Kevin DuBois (kdub)]

I think my [weak] reason for having an out parameter was that I could forward-declare the PlatformIPCPackage type in the platform_ipc.h header... but I do like returning the response package a bit better.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2028
http://jenkins.qa.ubuntu.com/job/mir-ci/2097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/95
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3384
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15807

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

This makes the arch a whole lot cleaner. Looking forward to the IPC part of the cleanup.

review: Approve

[Alexandros Frantzis (afrantzis)]

> I think my [weak] reason for having an out parameter was that I could forward-declare the PlatformIPCPackage type in the platform_ipc.h header...

It's allowed to declare functions that return (or accept) incomplete types, so we can still forward-declare PlatformIPCPackage in this case if we want.

review: Approve

[Alan Griffiths (alan-griffiths)]

24 +#include "platform_ipc_package.h"
...
32 -struct PlatformIPCPackage;

Not needed - the declaration was enough.

review: Approve

=== modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp'
--- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2014-10-26 00:41:36 +0000
+++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2014-11-13 16:42:20 +0000
@@ -61,6 +61,11 @@
     {
         return std::make_shared<mg::PlatformIPCPackage>();
     }
+
+    mg::PlatformIPCPackage platform_operation(unsigned int const, mg::PlatformIPCPackage const&) override
+    {
+        return mg::PlatformIPCPackage();
+    }
 };
 
 struct StubDisplayBuffer : mtd::StubDisplayBuffer
 
=== modified file 'include/platform/mir/graphics/platform_ipc_operations.h'
--- include/platform/mir/graphics/platform_ipc_operations.h	2014-10-06 03:02:44 +0000
+++ include/platform/mir/graphics/platform_ipc_operations.h	2014-11-13 16:42:20 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_PLATFORM_IPC_OPERATIONS_H_
 #define MIR_GRAPHICS_PLATFORM_IPC_OPERATIONS_H_
 
+#include "platform_ipc_package.h"
 #include <memory>
 
 namespace mir
@@ -32,7 +33,6 @@
 };
 class Buffer;
 class BufferIpcMessage;
-struct PlatformIPCPackage;
 
 class PlatformIpcOperations
 {
@@ -68,6 +68,15 @@
      */
     virtual std::shared_ptr<PlatformIPCPackage> connection_ipc_package() = 0;
 
+    
+    /**
+     * Arranges a platform specific operation triggered by an IPC call
+     * \returns              the response that will be sent to the client
+     * \param [in]  opcode   the opcode that indicates the action to be performed 
+     * \param [in]  request  the message that was sent to the server
+     */
+    virtual PlatformIPCPackage platform_operation(unsigned int const opcode, PlatformIPCPackage const& package) = 0; 
+
 protected:
     PlatformIpcOperations() = default;
     PlatformIpcOperations(PlatformIpcOperations const&) = delete;
 
=== modified file 'include/platform/mir/graphics/platform_ipc_package.h'
--- include/platform/mir/graphics/platform_ipc_package.h	2014-10-21 16:21:14 +0000
+++ include/platform/mir/graphics/platform_ipc_package.h	2014-11-13 16:42:20 +0000
@@ -32,7 +32,6 @@
  */
 struct PlatformIPCPackage
 {
-    virtual ~PlatformIPCPackage() {}
     std::vector<int32_t> ipc_data;
     std::vector<int32_t> ipc_fds;
 };
 
=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2014-11-11 07:34:31 +0000
+++ platform-ABI-sha1sums	2014-11-13 16:42:20 +0000
@@ -37,8 +37,8 @@
 c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
 d4ab0ef9544345fcc85740f6ed6d8118728a5c59  include/platform/mir/graphics/native_platform.h
 109d2c82d245a512e7c1790a3b853c9c275ebd4d  include/platform/mir/graphics/platform.h
-1fbe488b4581486fd01e2f03e504f31b72c09040  include/platform/mir/graphics/platform_ipc_operations.h
-9c7712af84b6fde1970ff802ad2ea78f892c7b7e  include/platform/mir/graphics/platform_ipc_package.h
+3b3463d2513f4c3985f2400496dab333518f9a13  include/platform/mir/graphics/platform_ipc_operations.h
+1b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
 84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
 b19329d35a55f640edd72c0a953908995211d97e  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-11-13 15:24:33 +0000
+++ server-ABI-sha1sums	2014-11-13 16:42:20 +0000
@@ -37,8 +37,8 @@
 c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
 d4ab0ef9544345fcc85740f6ed6d8118728a5c59  include/platform/mir/graphics/native_platform.h
 109d2c82d245a512e7c1790a3b853c9c275ebd4d  include/platform/mir/graphics/platform.h
-1fbe488b4581486fd01e2f03e504f31b72c09040  include/platform/mir/graphics/platform_ipc_operations.h
-9c7712af84b6fde1970ff802ad2ea78f892c7b7e  include/platform/mir/graphics/platform_ipc_package.h
+3b3463d2513f4c3985f2400496dab333518f9a13  include/platform/mir/graphics/platform_ipc_operations.h
+1b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
 84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
 b19329d35a55f640edd72c0a953908995211d97e  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 
=== modified file 'src/platform/graphics/android/ipc_operations.cpp'
--- src/platform/graphics/android/ipc_operations.cpp	2014-10-16 19:07:47 +0000
+++ src/platform/graphics/android/ipc_operations.cpp	2014-11-13 16:42:20 +0000
@@ -21,6 +21,8 @@
 #include "mir/graphics/buffer_ipc_message.h"
 #include "mir/graphics/android/android_native_buffer.h"
 #include "ipc_operations.h"
+#include <stdexcept>
+#include <boost/throw_exception.hpp>
 
 namespace mg = mir::graphics;
 namespace mga = mir::graphics::android;
@@ -67,3 +69,9 @@
 {
     return std::make_shared<mg::PlatformIPCPackage>();
 }
+
+mg::PlatformIPCPackage mga::IpcOperations::platform_operation(
+    unsigned int const, mg::PlatformIPCPackage const&)
+{
+    BOOST_THROW_EXCEPTION(std::invalid_argument("android platform does not support any platform operations"));
+}
 
=== modified file 'src/platform/graphics/android/ipc_operations.h'
--- src/platform/graphics/android/ipc_operations.h	2014-09-03 12:24:33 +0000
+++ src/platform/graphics/android/ipc_operations.h	2014-11-13 16:42:20 +0000
@@ -33,6 +33,8 @@
     void pack_buffer(BufferIpcMessage&, Buffer const&, BufferIpcMsgType) const override;
     void unpack_buffer(BufferIpcMessage&, Buffer const&) const override;
     std::shared_ptr<PlatformIPCPackage> connection_ipc_package() override;
+    PlatformIPCPackage platform_operation(
+        unsigned int const opcode, PlatformIPCPackage const& package) override; 
 };
 }
 }
 
=== modified file 'src/platform/graphics/mesa/ipc_operations.cpp'
--- src/platform/graphics/mesa/ipc_operations.cpp	2014-09-03 12:24:33 +0000
+++ src/platform/graphics/mesa/ipc_operations.cpp	2014-11-13 16:42:20 +0000
@@ -77,3 +77,15 @@
 void mgm::IpcOperations::unpack_buffer(BufferIpcMessage&, Buffer const&) const
 {
 }
+
+mg::PlatformIPCPackage mgm::IpcOperations::platform_operation(
+    unsigned int const, mg::PlatformIPCPackage const& request)
+{
+    int magic{0};
+    if (request.ipc_data.size() > 0)
+        magic = request.ipc_data[0];
+
+    drm->auth_magic(magic);
+
+    return mg::PlatformIPCPackage{{0},{}};
+}
 
=== modified file 'src/platform/graphics/mesa/ipc_operations.h'
--- src/platform/graphics/mesa/ipc_operations.h	2014-09-03 12:24:33 +0000
+++ src/platform/graphics/mesa/ipc_operations.h	2014-11-13 16:42:20 +0000
@@ -37,6 +37,9 @@
     void pack_buffer(BufferIpcMessage& message, Buffer const& buffer, BufferIpcMsgType msg_type) const override;
     void unpack_buffer(BufferIpcMessage& message, Buffer const& buffer) const override;
     std::shared_ptr<PlatformIPCPackage> connection_ipc_package() override;
+    PlatformIPCPackage platform_operation(
+        unsigned int const opcode,
+        PlatformIPCPackage const& package) override; 
 private:
     std::shared_ptr<helpers::DRMHelper> const drm;
 };
 
=== modified file 'src/server/frontend/default_configuration.cpp'
--- src/server/frontend/default_configuration.cpp	2014-10-27 22:31:16 +0000
+++ src/server/frontend/default_configuration.cpp	2014-11-13 16:42:20 +0000
@@ -24,6 +24,7 @@
 
 #include "unsupported_coordinate_translator.h"
 
+#include "mir/graphics/platform.h"
 #include "mir/frontend/protobuf_connection_creator.h"
 #include "mir/frontend/session_authorizer.h"
 #include "mir/options/configuration.h"
@@ -152,7 +153,7 @@
     return std::make_shared<mf::DefaultIpcFactory>(
                 the_frontend_shell(),
                 the_session_mediator_report(),
-                the_graphics_platform(),
+                the_graphics_platform()->make_ipc_operations(),
                 the_frontend_display_changer(),
                 the_buffer_allocator(),
                 the_screencast(),
 
=== modified file 'src/server/frontend/default_ipc_factory.cpp'
--- src/server/frontend/default_ipc_factory.cpp	2014-10-27 22:31:16 +0000
+++ src/server/frontend/default_ipc_factory.cpp	2014-11-13 16:42:20 +0000
@@ -33,7 +33,7 @@
 mf::DefaultIpcFactory::DefaultIpcFactory(
     std::shared_ptr<Shell> const& shell,
     std::shared_ptr<SessionMediatorReport> const& sm_report,
-    std::shared_ptr<mg::Platform> const& graphics_platform,
+    std::shared_ptr<mg::PlatformIpcOperations> const& platform_ipc_operations,
     std::shared_ptr<DisplayChanger> const& display_changer,
     std::shared_ptr<mg::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<Screencast> const& screencast,
@@ -44,7 +44,7 @@
     no_prompt_shell(std::make_shared<NoPromptShell>(shell)),
     sm_report(sm_report),
     cache(std::make_shared<ResourceCache>()),
-    graphics_platform(graphics_platform),
+    platform_ipc_operations(platform_ipc_operations),
     display_changer(display_changer),
     buffer_allocator(buffer_allocator),
     screencast(screencast),
@@ -87,7 +87,7 @@
 
     return make_mediator(
         effective_shell,
-        graphics_platform,
+        platform_ipc_operations,
         changer,
         buffer_allocator,
         sm_report,
@@ -103,7 +103,7 @@
 
 std::shared_ptr<mf::detail::DisplayServer> mf::DefaultIpcFactory::make_mediator(
     std::shared_ptr<Shell> const& shell,
-    std::shared_ptr<mg::Platform> const& graphics_platform,
+    std::shared_ptr<mg::PlatformIpcOperations> const& platform_ipc_operations,
     std::shared_ptr<DisplayChanger> const& changer,
     std::shared_ptr<mg::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<SessionMediatorReport> const& sm_report,
@@ -114,7 +114,7 @@
 {
     return std::make_shared<SessionMediator>(
         shell,
-        graphics_platform,
+        platform_ipc_operations,
         changer,
         buffer_allocator->supported_pixel_formats(),
         sm_report,
 
=== modified file 'src/server/frontend/default_ipc_factory.h'
--- src/server/frontend/default_ipc_factory.h	2014-10-27 22:31:16 +0000
+++ src/server/frontend/default_ipc_factory.h	2014-11-13 16:42:20 +0000
@@ -25,7 +25,7 @@
 {
 namespace graphics
 {
-class Platform;
+class PlatformIpcOperations;
 class GraphicBufferAllocator;
 }
 namespace input
@@ -52,7 +52,7 @@
     explicit DefaultIpcFactory(
         std::shared_ptr<Shell> const& shell,
         std::shared_ptr<SessionMediatorReport> const& sm_report,
-        std::shared_ptr<graphics::Platform> const& graphics_platform,
+        std::shared_ptr<graphics::PlatformIpcOperations> const& platform_ipc_operations,
         std::shared_ptr<DisplayChanger> const& display_changer,
         std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
         std::shared_ptr<Screencast> const& screencast,
@@ -69,7 +69,7 @@
 
     virtual std::shared_ptr<detail::DisplayServer> make_mediator(
         std::shared_ptr<Shell> const& shell,
-        std::shared_ptr<graphics::Platform> const& graphics_platform,
+        std::shared_ptr<graphics::PlatformIpcOperations> const& platform_ipc_operations,
         std::shared_ptr<DisplayChanger> const& changer,
         std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
         std::shared_ptr<SessionMediatorReport> const& sm_report,
@@ -83,7 +83,7 @@
     std::shared_ptr<Shell> const no_prompt_shell;
     std::shared_ptr<SessionMediatorReport> const sm_report;
     std::shared_ptr<ResourceCache> const cache;
-    std::shared_ptr<graphics::Platform> const graphics_platform;
+    std::shared_ptr<graphics::PlatformIpcOperations> const platform_ipc_operations;
     std::shared_ptr<DisplayChanger> const display_changer;
     std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator;
     std::shared_ptr<Screencast> const screencast;
 
=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2014-10-30 18:37:11 +0000
+++ src/server/frontend/session_mediator.cpp	2014-11-13 16:42:20 +0000
@@ -35,6 +35,7 @@
 #include "mir/frontend/display_changer.h"
 #include "mir/graphics/display_configuration.h"
 #include "mir/graphics/pixel_format_utils.h"
+#include "mir/graphics/platform_ipc_operations.h"
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/graphics/drm_authenticator.h"
 #include "mir/frontend/client_constants.h"
@@ -64,8 +65,8 @@
 namespace geom = mir::geometry;
 
 mf::SessionMediator::SessionMediator(
-    std::shared_ptr<frontend::Shell> const& shell,
-    std::shared_ptr<graphics::Platform> const & graphics_platform,
+    std::shared_ptr<mf::Shell> const& shell,
+    std::shared_ptr<mg::PlatformIpcOperations> const& ipc_operations,
     std::shared_ptr<mf::DisplayChanger> const& display_changer,
     std::vector<MirPixelFormat> const& surface_pixel_formats,
     std::shared_ptr<SessionMediatorReport> const& report,
@@ -77,8 +78,7 @@
     std::shared_ptr<scene::CoordinateTranslator> const& translator) :
     client_pid_(0),
     shell(shell),
-    graphics_platform(graphics_platform),
-    ipc_operations(graphics_platform->make_ipc_operations()),
+    ipc_operations(ipc_operations),
     surface_pixel_formats(surface_pixel_formats),
     display_changer(display_changer),
     report(report),
@@ -357,7 +357,7 @@
 
         report->session_configure_surface_called(session->name());
 
-        auto const id = frontend::SurfaceId(request->surfaceid().value());
+        auto const id = mf::SurfaceId(request->surfaceid().value());
         int value = request->ivalue();
         auto const surface = session->get_surface(id);
         int newvalue = surface->configure(attrib, value);
@@ -474,7 +474,7 @@
 
 std::function<void(std::shared_ptr<mf::Session> const&)> mf::SessionMediator::prompt_session_connect_handler() const
 {
-    return [this](std::shared_ptr<frontend::Session> const& session)
+    return [this](std::shared_ptr<mf::Session> const& session)
     {
         auto prompt_session = weak_prompt_session.lock();
         if (prompt_session.get() == nullptr)
@@ -500,7 +500,7 @@
 
         report->session_configure_surface_cursor_called(session->name());
 
-        auto const id = frontend::SurfaceId(cursor_request->surfaceid().value());
+        auto const id = mf::SurfaceId(cursor_request->surfaceid().value());
         auto const surface = session->get_surface(id);
 
         if (cursor_request->has_name())
@@ -548,7 +548,7 @@
     done->Run();
 }
 
-void mir::frontend::SessionMediator::translate_surface_to_screen(
+void mf::SessionMediator::translate_surface_to_screen(
     ::google::protobuf::RpcController* ,
     ::mir::protobuf::CoordinateTranslationRequest const* request,
     ::mir::protobuf::CoordinateTranslationResponse* response,
@@ -562,7 +562,7 @@
         if (session.get() == nullptr)
             BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-        auto const id = frontend::SurfaceId(request->surfaceid().value());
+        auto const id = mf::SurfaceId(request->surfaceid().value());
 
         auto const coords = translator->surface_to_screen(session->get_surface(id),
                                                           request->x(),
@@ -590,16 +590,14 @@
         report->session_drm_auth_magic_called(session->name());
     }
 
-    auto const magic = static_cast<unsigned int>(request->magic());
-    //FIXME: don't dynamic cast like this drm_auth_magic should be a part of PlatformIpcOperations 
-    auto authenticator = std::dynamic_pointer_cast<mg::DRMAuthenticator>(graphics_platform);
-    if (!authenticator)
-        BOOST_THROW_EXCEPTION(std::logic_error("drm_auth_magic request not supported by the active platform"));
-
+    //TODO: the opcode should be provided as part of the request, and should be opaque to the server code.
+    unsigned int const made_up_opcode{0};
+    mg::PlatformIPCPackage platform_request{{static_cast<int32_t>(request->magic())},{}};
     try
     {
-        authenticator->drm_auth_magic(magic);
-        response->set_status_code(0);
+        auto platform_response = ipc_operations->platform_operation(made_up_opcode, platform_request);
+        if (platform_response.ipc_data.size() > 0)
+            response->set_status_code(platform_response.ipc_data[0]);
     }
     catch (std::exception const& e)
     {
 
=== modified file 'src/server/frontend/session_mediator.h'
--- src/server/frontend/session_mediator.h	2014-11-03 06:51:26 +0000
+++ src/server/frontend/session_mediator.h	2014-11-13 16:42:20 +0000
@@ -22,7 +22,6 @@
 #include "display_server.h"
 #include "mir/frontend/connection_context.h"
 #include "mir/frontend/surface_id.h"
-#include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_operations.h"
 #include "mir_toolkit/common.h"
 #include "surface_tracker.h"
@@ -37,7 +36,6 @@
 namespace graphics
 {
 class Buffer;
-class Platform;
 class Display;
 class GraphicBufferAllocator;
 }
@@ -73,7 +71,7 @@
 
     SessionMediator(
         std::shared_ptr<Shell> const& shell,
-        std::shared_ptr<graphics::Platform> const& graphics_platform,
+        std::shared_ptr<graphics::PlatformIpcOperations> const& ipc_operations,
         std::shared_ptr<frontend::DisplayChanger> const& display_changer,
         std::vector<MirPixelFormat> const& surface_pixel_formats,
         std::shared_ptr<SessionMediatorReport> const& report,
@@ -194,7 +192,6 @@
 
     pid_t client_pid_;
     std::shared_ptr<Shell> const shell;
-    std::shared_ptr<graphics::Platform> const graphics_platform;
     std::shared_ptr<graphics::PlatformIpcOperations> const ipc_operations;
 
     std::vector<MirPixelFormat> const surface_pixel_formats;
 
=== modified file 'src/server/graphics/nested/nested_platform.cpp'
--- src/server/graphics/nested/nested_platform.cpp	2014-10-27 13:06:48 +0000
+++ src/server/graphics/nested/nested_platform.cpp	2014-11-13 16:42:20 +0000
@@ -111,12 +111,19 @@
     {
         native_platform->fill_buffer_package(&message, &buffer, msg_type);
     }
+
     void unpack_buffer(mg::BufferIpcMessage&, mg::Buffer const&) const {}
 
     std::shared_ptr<mg::PlatformIPCPackage> connection_ipc_package()
     {
         return native_platform->connection_ipc_package();
     }
+
+    mg::PlatformIPCPackage platform_operation(unsigned int const, mg::PlatformIPCPackage const&) override
+    {
+        return mg::PlatformIPCPackage();
+    }
+
 private:
     std::shared_ptr<mg::NativePlatform> const native_platform;
 };
 
=== modified file 'tests/include/mir_test_doubles/null_platform_ipc_operations.h'
--- tests/include/mir_test_doubles/null_platform_ipc_operations.h	2014-09-03 12:24:33 +0000
+++ tests/include/mir_test_doubles/null_platform_ipc_operations.h	2014-11-13 16:42:20 +0000
@@ -40,6 +40,11 @@
     {
         return std::make_shared<graphics::PlatformIPCPackage>();
     }
+    graphics::PlatformIPCPackage platform_operation(
+        unsigned int const, graphics::PlatformIPCPackage const&) override
+    {
+        return graphics::PlatformIPCPackage();
+    }
 };
 }
 }
 
=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2014-10-16 11:53:01 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2014-11-13 16:42:20 +0000
@@ -19,6 +19,7 @@
 #include "mir/graphics/display.h"
 #include "mir/graphics/drm_authenticator.h"
 #include "mir/graphics/platform_ipc_package.h"
+#include "mir/graphics/buffer_ipc_message.h"
 #include "mir/graphics/buffer_basic.h"
 
 #include <boost/exception/errinfo_errno.hpp>
@@ -44,15 +45,34 @@
 
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
 
-class MockAuthenticatingPlatform : public mtd::NullPlatform, public mg::DRMAuthenticator
+struct MockAuthenticatingIpcOps : public mg::PlatformIpcOperations
+{
+    MOCK_CONST_METHOD3(pack_buffer, void(mg::BufferIpcMessage&, mg::Buffer const&, mg::BufferIpcMsgType));
+    MOCK_CONST_METHOD2(unpack_buffer, void(mg::BufferIpcMessage&, mg::Buffer const&));
+    MOCK_METHOD0(connection_ipc_package, std::shared_ptr<mg::PlatformIPCPackage>());
+    MOCK_METHOD2(platform_operation, mg::PlatformIPCPackage(
+        unsigned int const, mg::PlatformIPCPackage const&));
+};
+
+class StubAuthenticatingPlatform : public mtd::NullPlatform
 {
 public:
+    StubAuthenticatingPlatform(std::shared_ptr<mg::PlatformIpcOperations> const& ops) :
+        ops{ops}
+    {
+    }
+
     std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return std::make_shared<mtd::StubBufferAllocator>();
     }
+    std::shared_ptr<mg::PlatformIpcOperations> make_ipc_operations() const override
+    {
+        return ops;
+    }
 
-    MOCK_METHOD1(drm_auth_magic, void(unsigned int));
+private:
+    std::shared_ptr<mg::PlatformIpcOperations> const ops;
 };
 
 void connection_callback(MirConnection* connection, void* context)
@@ -80,15 +100,20 @@
             using namespace testing;
             if (!platform)
             {
-                platform = std::make_shared<MockAuthenticatingPlatform>();
-                EXPECT_CALL(*platform, drm_auth_magic(magic))
-                    .Times(1);
+                mg::PlatformIPCPackage pkg{{0},{}};
+                auto ipc_ops = std::make_shared<NiceMock<MockAuthenticatingIpcOps>>();
+                EXPECT_CALL(*ipc_ops, platform_operation(_,_))
+                    .Times(1)
+                    .WillRepeatedly(Return(pkg));
+                ON_CALL(*ipc_ops, connection_ipc_package())
+                    .WillByDefault(Return(std::make_shared<mg::PlatformIPCPackage>()));
+                platform = std::make_shared<StubAuthenticatingPlatform>(ipc_ops);
             }
 
             return platform;
         }
 
-        std::shared_ptr<MockAuthenticatingPlatform> platform;
+        std::shared_ptr<StubAuthenticatingPlatform> platform;
     } server_config;
 
     launch_server_process(server_config);
@@ -130,16 +155,17 @@
             using namespace testing;
             if (!platform)
             {
-                platform = std::make_shared<MockAuthenticatingPlatform>();
-                EXPECT_CALL(*platform, drm_auth_magic(magic))
+                auto ipc_ops = std::make_shared<NiceMock<MockAuthenticatingIpcOps>>();
+                EXPECT_CALL(*ipc_ops, platform_operation(_,_))
                     .WillOnce(Throw(::boost::enable_error_info(std::exception())
                         << boost::errinfo_errno(auth_magic_error)));
+                platform = std::make_shared<StubAuthenticatingPlatform>(ipc_ops);
             }
 
             return platform;
         }
 
-        std::shared_ptr<MockAuthenticatingPlatform> platform;
+        std::shared_ptr<StubAuthenticatingPlatform> platform;
     } server_config;
 
     launch_server_process(server_config);
 
=== modified file 'tests/integration-tests/test_exchange_buffer.cpp'
--- tests/integration-tests/test_exchange_buffer.cpp	2014-10-27 20:15:54 +0000
+++ tests/integration-tests/test_exchange_buffer.cpp	2014-11-13 16:42:20 +0000
@@ -130,6 +130,12 @@
     {
         return last_fd;
     }
+
+    mg::PlatformIPCPackage platform_operation(
+        unsigned int const, mg::PlatformIPCPackage const&) override
+    {
+        return mg::PlatformIPCPackage();
+    }
 private:
     mir::Fd mutable last_fd;
 };
 
=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2014-10-22 12:46:08 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2014-11-13 16:42:20 +0000
@@ -147,6 +147,12 @@
     {
         return std::make_shared<mg::PlatformIPCPackage>();
     }
+
+    mg::PlatformIPCPackage platform_operation(
+         unsigned int const, mg::PlatformIPCPackage const&) override
+    {
+        return mg::PlatformIPCPackage();
+    }
 };
 }
 
 
=== modified file 'tests/unit-tests/frontend/CMakeLists.txt'
--- tests/unit-tests/frontend/CMakeLists.txt	2014-10-27 22:31:16 +0000
+++ tests/unit-tests/frontend/CMakeLists.txt	2014-11-13 16:42:20 +0000
@@ -14,16 +14,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_message_processor.cpp
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "android")
-  list(APPEND UNIT_TEST_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator_android.cpp
-  )
-elseif (MIR_TEST_PLATFORM STREQUAL "mesa")
-  list(APPEND UNIT_TEST_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator_mesa.cpp
-  )
-endif()
-
 set(
   UNIT_TEST_SOURCES
   ${UNIT_TEST_SOURCES}
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2014-10-30 18:37:11 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2014-11-13 16:42:20 +0000
@@ -50,6 +50,8 @@
 #include "mir/frontend/event_sink.h"
 
 #include "gmock_set_arg.h"
+#include <boost/exception/errinfo_errno.hpp>
+#include <boost/throw_exception.hpp>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -124,6 +126,7 @@
     MOCK_CONST_METHOD2(unpack_buffer,
         void(mg::BufferIpcMessage&, mg::Buffer const&));
     MOCK_METHOD0(connection_ipc_package, std::shared_ptr<mg::PlatformIPCPackage>());
+    MOCK_METHOD2(platform_operation, mg::PlatformIPCPackage(unsigned int const, mg::PlatformIPCPackage const&));
 };
 
 class StubbedSession : public mtd::StubSession
@@ -202,36 +205,6 @@
     MOCK_METHOD0(supported_pixel_formats, std::vector<MirPixelFormat>());
 };
 
-
-class MockPlatform : public mg::Platform
-{
- public:
-    MockPlatform(std::shared_ptr<mg::PlatformIpcOperations> const& ipc_ops)
-    {
-        using namespace testing;
-        ON_CALL(*this, create_buffer_allocator())
-            .WillByDefault(Return(std::shared_ptr<mg::GraphicBufferAllocator>()));
-        ON_CALL(*this, create_display(_,_,_))
-            .WillByDefault(Return(std::make_shared<mtd::NullDisplay>()));
-        ON_CALL(*this, connection_ipc_package())
-            .WillByDefault(Return(std::make_shared<mg::PlatformIPCPackage>()));
-        ON_CALL(*this, make_ipc_operations())
-            .WillByDefault(Return(ipc_ops));
-    }
-
-    MOCK_METHOD0(create_buffer_allocator, std::shared_ptr<mg::GraphicBufferAllocator>());
-    MOCK_METHOD3(create_display,
-                 std::shared_ptr<mg::Display>(
-                     std::shared_ptr<mg::DisplayConfigurationPolicy> const&,
-                     std::shared_ptr<mg::GLProgramFactory> const&,
-                     std::shared_ptr<mg::GLConfig> const&));
-    MOCK_METHOD0(connection_ipc_package, std::shared_ptr<mg::PlatformIPCPackage>());
-    MOCK_METHOD0(create_internal_client, std::shared_ptr<mg::InternalClient>());
-    MOCK_CONST_METHOD0(make_ipc_operations, std::shared_ptr<mg::PlatformIpcOperations>());
-    MOCK_CONST_METHOD0(egl_native_display, EGLNativeDisplayType());
-    MOCK_METHOD0(make_buffer_writer, std::shared_ptr<mg::BufferWriter>());
-};
-
 struct StubScreencast : mtd::NullScreencast
 {
     std::shared_ptr<mg::Buffer> capture(mf::ScreencastSessionId)
@@ -246,8 +219,6 @@
 {
     SessionMediator()
         : shell{std::make_shared<testing::NiceMock<mtd::MockShell>>()},
-          graphics_platform{
-              std::make_shared<testing::NiceMock<MockPlatform>>(mt::fake_shared(mock_ipc_operations))},
           graphics_changer{std::make_shared<mtd::NullDisplayChanger>()},
           surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
           report{mr::null_session_mediator_report()},
@@ -256,7 +227,7 @@
           stubbed_session{std::make_shared<StubbedSession>()},
           null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)},
           mediator{
-            shell, graphics_platform, graphics_changer,
+            shell, mt::fake_shared(mock_ipc_operations), graphics_changer,
             surface_pixel_formats, report,
             std::make_shared<mtd::NullEventSink>(),
             resource_cache, stub_screencast, &connector, nullptr, nullptr}
@@ -269,7 +240,6 @@
     MockConnector connector;
     testing::NiceMock<MockBufferPacker> mock_ipc_operations;
     std::shared_ptr<testing::NiceMock<mtd::MockShell>> const shell;
-    std::shared_ptr<MockPlatform> const graphics_platform;
     std::shared_ptr<mf::DisplayChanger> const graphics_changer;
     std::vector<MirPixelFormat> const surface_pixel_formats;
     std::shared_ptr<mf::SessionMediatorReport> const report;
@@ -313,7 +283,7 @@
     };
 
     mf::SessionMediator mediator{
-        shell, graphics_platform, graphics_changer,
+        shell, mt::fake_shared(mock_ipc_operations), graphics_changer,
         surface_pixel_formats, report,
         std::make_shared<mtd::NullEventSink>(),
         resource_cache, stub_screencast, context, nullptr, nullptr};
@@ -417,7 +387,7 @@
         .WillByDefault(Return(mt::fake_shared(config)));
 
     mf::SessionMediator mediator(
-        shell, graphics_platform, mock_display,
+        shell, mt::fake_shared(mock_ipc_operations), mock_display,
         surface_pixel_formats, report,
         std::make_shared<mtd::NullEventSink>(),
         resource_cache, std::make_shared<mtd::NullScreencast>(),
@@ -619,7 +589,7 @@
         .WillOnce(Return(mt::fake_shared(stub_display_config)));
 
     mf::SessionMediator mediator{
-        shell, graphics_platform, mock_display_selector,
+        shell, mt::fake_shared(mock_ipc_operations), mock_display_selector,
         surface_pixel_formats, report,
         std::make_shared<mtd::NullEventSink>(), resource_cache,
         std::make_shared<mtd::NullScreencast>(),
@@ -873,7 +843,7 @@
     EXPECT_CALL(mock_cache, save_fd(_,fake_fd2));
 
     mf::SessionMediator mediator{
-        shell, graphics_platform, graphics_changer,
+        shell, mt::fake_shared(mock_ipc_operations), graphics_changer,
         surface_pixel_formats, report,
         std::make_shared<mtd::NullEventSink>(),
         mt::fake_shared(mock_cache), stub_screencast, &connector, nullptr, nullptr};
@@ -891,3 +861,52 @@
     buffer_request.mutable_buffer()->set_buffer_id(exchanged_buffer.buffer_id());
     buffer_request.mutable_buffer()->clear_fd();
 }
+
+//FIXME: we have an platform specific request in the protocol!
+TEST_F(SessionMediator, drm_auth_magic_calls_platform_operation_abstraction)
+{
+    using namespace testing;
+
+    int magic{0x3248};
+    int test_response{4};
+    mg::PlatformIPCPackage response{{test_response}, {}};
+    mg::PlatformIPCPackage request;
+    drm_request.set_magic(magic);
+
+    EXPECT_CALL(mock_ipc_operations, platform_operation(_, _))
+        .Times(1)
+        .WillOnce(DoAll(SaveArg<1>(&request), Return(response)));
+
+    mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
+    mediator.drm_auth_magic(nullptr, &drm_request, &drm_response, null_callback.get());
+    mediator.disconnect(nullptr, nullptr, nullptr, null_callback.get());
+
+    ASSERT_THAT(request.ipc_data.size(), Eq(1));
+    EXPECT_THAT(request.ipc_data[0], Eq(magic));
+    EXPECT_THAT(drm_response.status_code(), Eq(test_response));
+}
+
+TEST_F(SessionMediator, drm_auth_magic_sets_status_code_on_error)
+{
+    using namespace testing;
+
+    mp::ConnectParameters connect_parameters;
+    mp::Connection connection;
+
+    unsigned int const drm_magic{0x10111213};
+    int const error_number{667};
+
+    EXPECT_CALL(mock_ipc_operations, platform_operation(_, _))
+        .WillOnce(Throw(::boost::enable_error_info(std::exception())
+            << boost::errinfo_errno(error_number)));
+
+    mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
+
+    mp::DRMMagic magic;
+    mp::DRMAuthMagicStatus status;
+    magic.set_magic(drm_magic);
+
+    mediator.drm_auth_magic(nullptr, &magic, &status, null_callback.get());
+
+    EXPECT_EQ(error_number, status.status_code());
+}
 
=== removed file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_session_mediator_android.cpp	2014-10-27 22:31:16 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright © 2012 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: Alexandros Frantzis <[e-mail]>
- */
-
-#include "mir/frontend/session_mediator_report.h"
-#include "src/server/frontend/session_mediator.h"
-#include "src/server/frontend/resource_cache.h"
-#include "src/server/scene/application_session.h"
-#include "src/server/report/null_report_factory.h"
-#include "mir/frontend/shell.h"
-#include "mir/scene/surface_creation_parameters.h"
-#include "mir/graphics/display.h"
-#include "mir/graphics/platform.h"
-#include "mir/graphics/platform_ipc_package.h"
-
-#include "mir_test_doubles/null_display_changer.h"
-#include "mir_test_doubles/mock_session.h"
-#include "mir_test_doubles/stub_shell.h"
-#include "mir_test_doubles/null_platform.h"
-#include "mir_test_doubles/null_event_sink.h"
-#include "mir_test_doubles/stub_buffer_allocator.h"
-#include "mir_test_doubles/null_screencast.h"
-
-#include <gtest/gtest.h>
-
-#include <stdexcept>
-
-namespace mf = mir::frontend;
-namespace mg = mir::graphics;
-namespace geom = mir::geometry;
-namespace mp = mir::protobuf;
-namespace mtd = mir::test::doubles;
-namespace mr = mir::report;
-
-namespace
-{
-
-struct SessionMediatorAndroidTest : public ::testing::Test
-{
-    SessionMediatorAndroidTest()
-        : shell{std::make_shared<mtd::StubShell>()},
-          graphics_platform{std::make_shared<mtd::NullPlatform>()},
-          display_changer{std::make_shared<mtd::NullDisplayChanger>()},
-          surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
-          report{mr::null_session_mediator_report()},
-          resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, graphics_platform, display_changer,
-                   surface_pixel_formats, report,
-                   std::make_shared<mtd::NullEventSink>(),
-                   resource_cache, std::make_shared<mtd::NullScreencast>(), nullptr, nullptr, nullptr},
-          null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}
-    {
-    }
-
-    std::shared_ptr<mtd::StubShell> const shell;
-    std::shared_ptr<mtd::NullPlatform> const graphics_platform;
-    std::shared_ptr<mf::DisplayChanger> const display_changer;
-    std::vector<MirPixelFormat> const surface_pixel_formats;
-    std::shared_ptr<mf::SessionMediatorReport> const report;
-    std::shared_ptr<mf::ResourceCache> const resource_cache;
-    mf::SessionMediator mediator;
-
-    std::unique_ptr<google::protobuf::Closure> null_callback;
-};
-
-}
-
-TEST_F(SessionMediatorAndroidTest, drm_auth_magic_throws)
-{
-    mp::ConnectParameters connect_parameters;
-    mp::Connection connection;
-
-    mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
-
-    mp::DRMMagic magic;
-    magic.set_magic(0x10111213);
-
-    EXPECT_THROW({
-        mediator.drm_auth_magic(nullptr, &magic, nullptr, null_callback.get());
-    }, std::logic_error);
-}
 
=== removed file 'tests/unit-tests/frontend/test_session_mediator_mesa.cpp'
--- tests/unit-tests/frontend/test_session_mediator_mesa.cpp	2014-10-27 22:31:16 +0000
+++ tests/unit-tests/frontend/test_session_mediator_mesa.cpp	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright © 2012-2014 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: Alexandros Frantzis <[e-mail]>
- */
-
-#include "mir/frontend/session_mediator_report.h"
-#include "src/server/frontend/session_mediator.h"
-#include "src/server/frontend/resource_cache.h"
-#include "src/server/scene/application_session.h"
-#include "src/server/frontend/session_mediator.h"
-#include "src/server/report/null_report_factory.h"
-#include "mir/frontend/shell.h"
-#include "mir/graphics/display.h"
-#include "mir/graphics/drm_authenticator.h"
-#include "mir/frontend/event_sink.h"
-
-#include <boost/exception/errinfo_errno.hpp>
-#include <boost/throw_exception.hpp>
-
-#include "mir_test_doubles/null_display.h"
-#include "mir_test_doubles/null_event_sink.h"
-#include "mir_test_doubles/null_display_changer.h"
-#include "mir_test_doubles/null_platform.h"
-#include "mir_test_doubles/mock_session.h"
-#include "mir_test_doubles/stub_shell.h"
-#include "mir_test_doubles/null_screencast.h"
-
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-namespace mf = mir::frontend;
-namespace mg = mir::graphics;
-namespace geom = mir::geometry;
-namespace mp = mir::protobuf;
-namespace mtd = mir::test::doubles;
-namespace mr = mir::report;
-
-namespace
-{
-
-class MockAuthenticatingPlatform : public mtd::NullPlatform, public mg::DRMAuthenticator
-{
- public:
-    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator() override
-    {
-        return std::shared_ptr<mg::GraphicBufferAllocator>();
-    }
-
-    MOCK_METHOD1(drm_auth_magic, void(unsigned int));
-};
-
-struct SessionMediatorMesaTest : public ::testing::Test
-{
-    SessionMediatorMesaTest()
-        : shell{std::make_shared<mtd::StubShell>()},
-          mock_platform{std::make_shared<MockAuthenticatingPlatform>()},
-          display_changer{std::make_shared<mtd::NullDisplayChanger>()},
-          surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
-          report{mr::null_session_mediator_report()},
-          resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, mock_platform, display_changer,
-                   surface_pixel_formats, report,
-                   std::make_shared<mtd::NullEventSink>(),
-                   resource_cache, std::make_shared<mtd::NullScreencast>(), nullptr, nullptr,
-                   nullptr},
-          null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}
-    {
-    }
-
-    std::shared_ptr<mtd::StubShell> const shell;
-    std::shared_ptr<MockAuthenticatingPlatform> const mock_platform;
-    std::shared_ptr<mf::DisplayChanger> const display_changer;
-    std::vector<MirPixelFormat> const surface_pixel_formats;
-    std::shared_ptr<mf::SessionMediatorReport> const report;
-    std::shared_ptr<mf::ResourceCache> const resource_cache;
-    mf::SessionMediator mediator;
-
-    std::unique_ptr<google::protobuf::Closure> null_callback;
-};
-
-}
-
-TEST_F(SessionMediatorMesaTest, drm_auth_magic_uses_drm_authenticator)
-{
-    mp::ConnectParameters connect_parameters;
-    mp::Connection connection;
-
-    unsigned int const drm_magic{0x10111213};
-    int const no_error{0};
-
-    EXPECT_CALL(*mock_platform, drm_auth_magic(drm_magic))
-        .Times(1);
-
-    mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
-
-    mp::DRMMagic magic;
-    mp::DRMAuthMagicStatus status;
-    magic.set_magic(drm_magic);
-
-    mediator.drm_auth_magic(nullptr, &magic, &status, null_callback.get());
-
-    EXPECT_EQ(no_error, status.status_code());
-}
-
-TEST_F(SessionMediatorMesaTest, drm_auth_magic_sets_status_code_on_error)
-{
-    using namespace testing;
-
-    mp::ConnectParameters connect_parameters;
-    mp::Connection connection;
-
-    unsigned int const drm_magic{0x10111213};
-    int const error_number{667};
-
-    EXPECT_CALL(*mock_platform, drm_auth_magic(drm_magic))
-        .WillOnce(Throw(::boost::enable_error_info(std::exception())
-            << boost::errinfo_errno(error_number)));
-
-    mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
-
-    mp::DRMMagic magic;
-    mp::DRMAuthMagicStatus status;
-    magic.set_magic(drm_magic);
-
-    mediator.drm_auth_magic(nullptr, &magic, &status, null_callback.get());
-
-    EXPECT_EQ(error_number, status.status_code());
-}
 
=== modified file 'tests/unit-tests/graphics/android/CMakeLists.txt'
--- tests/unit-tests/graphics/android/CMakeLists.txt	2014-10-01 06:25:56 +0000
+++ tests/unit-tests/graphics/android/CMakeLists.txt	2014-11-13 16:42:20 +0000
@@ -13,6 +13,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_display_buffer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_internal_client_interpreter.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_internal_client.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_ipc_operations.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_resource_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_fb_simple_swapper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_fb_device.cpp
 
=== added file 'tests/unit-tests/graphics/android/test_ipc_operations.cpp'
--- tests/unit-tests/graphics/android/test_ipc_operations.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/graphics/android/test_ipc_operations.cpp	2014-11-13 16:42:20 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 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: Kevin DuBois <[e-mail]>
+ */
+
+#include "src/platform/graphics/android/ipc_operations.h"
+#include "mir/graphics/platform_ipc_package.h"
+#include <gtest/gtest.h>
+
+namespace mg = mir::graphics;
+namespace mga = mir::graphics::android;
+
+struct IpcOperations : public ::testing::Test
+{
+    mga::IpcOperations ipc_operations;
+};
+
+/* ipc packaging tests */
+TEST_F(IpcOperations, test_ipc_data_packed_correctly_for_full_ipc)
+{
+    //android has no valid operations platform specific operations yet, expect throw
+    mg::PlatformIPCPackage package{
+        std::vector<int32_t>{2,4,8,16,32},
+        std::vector<int32_t>{fileno(tmpfile()), fileno(tmpfile())}
+    };
+
+    EXPECT_THROW({
+        ipc_operations.platform_operation(0u, package);
+    }, std::invalid_argument);
+
+    EXPECT_THROW({
+        ipc_operations.platform_operation(1u, package);
+    }, std::invalid_argument);
+
+    for (auto fd : package.ipc_fds)
+        close(fd); 
+}
 
=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2014-10-27 13:06:48 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2014-11-13 16:42:20 +0000
@@ -200,9 +200,13 @@
     EXPECT_CALL(mock_drm, drmAuthMagic(mock_drm.fake_drm.fd(),magic))
         .WillOnce(Return(0));
 
+    mg::PlatformIPCPackage magic_pkg{{magic}, {}};
+    int drm_opcode{44};
     auto platform = create_platform();
-    auto authenticator = std::dynamic_pointer_cast<mg::DRMAuthenticator>(platform);
-    authenticator->drm_auth_magic(magic);
+    auto ipc_ops = platform->make_ipc_operations();
+    auto response_pkg = ipc_ops->platform_operation(drm_opcode, magic_pkg);
+    ASSERT_THAT(response_pkg.ipc_data.size(), Eq(1));
+    EXPECT_THAT(response_pkg.ipc_data[0], Eq(0));
 }
 
 TEST_F(MesaGraphicsPlatform, drm_auth_magic_throws_if_drm_function_fails)
@@ -214,11 +218,13 @@
     EXPECT_CALL(mock_drm, drmAuthMagic(mock_drm.fake_drm.fd(),magic))
         .WillOnce(Return(-1));
 
+    int drm_opcode{44};
     auto platform = create_platform();
-    auto authenticator = std::dynamic_pointer_cast<mg::DRMAuthenticator>(platform);
+    auto ipc_ops = platform->make_ipc_operations();
+    mg::PlatformIPCPackage magic_pkg{{magic}, {}};
 
     EXPECT_THROW({
-        authenticator->drm_auth_magic(magic);
+        ipc_ops->platform_operation(drm_opcode, magic_pkg);
     }, std::runtime_error);
 }