Mir

Merge lp:~mir-team/mir/0.26-old into lp:mir/ubuntu

0.26-old
Merge into ubuntu

Proposed by Cemil Azizoglu on 2017-03-16

Status:

Merged

Approved by:

Cemil Azizoglu on 2017-03-22

Approved revision:

4046

Merged at revision:

1299

Proposed branch:

lp:~mir-team/mir/0.26-old

Merge into:

lp:mir/ubuntu

Diff against target:

1470 lines (+797/-80)

31 files modified

CMakeLists.txt (+1/-1)
debian/changelog (+27/-0)
include/client/mir_toolkit/client_types.h (+9/-0)
include/client/mir_toolkit/extensions/gbm_buffer.h (+90/-0)
include/client/mir_toolkit/mir_display_configuration.h (+2/-1)
include/client/mir_toolkit/rs/mir_render_surface.h (+22/-1)
src/client/display_configuration_api.cpp (+1/-1)
src/client/mir_presentation_chain_api.cpp (+22/-0)
src/client/mir_render_surface_api.cpp (+1/-0)
src/client/symbols.map (+2/-0)
src/platform/options/default_configuration.cpp (+1/-1)
src/platforms/mesa/client/client_buffer.cpp (+8/-4)
src/platforms/mesa/client/client_platform.cpp (+149/-5)
src/platforms/mesa/client/client_platform.h (+2/-1)
src/platforms/mesa/include/native_buffer.h (+3/-0)
src/platforms/mesa/server/kms/real_kms_display_configuration.cpp (+1/-0)
src/server/compositor/multi_monitor_arbiter.cpp (+2/-1)
src/server/frontend/session_mediator.cpp (+2/-1)
src/server/graphics/nested/nested_display_configuration.cpp (+8/-5)
src/server/graphics/nested/nested_display_configuration.h (+1/-1)
src/server/scene/application_session.cpp (+3/-0)
src/server/shell/surface_specification.cpp (+3/-1)
src/utils/out.c (+0/-3)
tests/acceptance-tests/test_custom_window_management.cpp (+47/-0)
tests/acceptance-tests/test_new_display_configuration.cpp (+8/-5)
tests/acceptance-tests/test_presentation_chain.cpp (+228/-43)
tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp (+17/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+22/-0)
tests/unit-tests/platforms/mesa/client/test_client_platform.cpp (+97/-5)
tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp (+2/-0)
tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+16/-0)

To merge this branch:

bzr merge lp:~mir-team/mir/0.26-old

Related bugs:

Bug #1393578: Subpixel order not included in Mir display information	Medium	Fix Released
Bug #1645372: support display scaling slider in unity8	High	Fix Released
Bug #1660017: EDID does not change when hotplugging a monitor	Medium	Fix Released
Bug #1661072: [regression] Mir 0.26.0 - spinner loading animation, minimize, maximize too fast	Medium	Fix Released
Bug #1661128: [regression] Unity8 stutters constantly (like half frame rate) using Mir 0.26.0	High	Fix Released
Bug #1661163: [regression] mirout crashes when connecting to unity8 or any nested server: [libprotobuf FATAL /usr/include/google/protobuf/repeated_field.h:1408] CHECK failed: (index) < (current_size_):	High	Fix Released
Bug #1661498: [regression] Segfault on detect_fd_leaks during acceptance tests (in DisplayConfiguration/{DisplayFormatSetting,DisplaySubpixelSetting})	Medium	Fix Released
Bug #1661508: [regression] Nested server segfaults or rapidly logs exceptions when a fullscreen client starts [in mir_presentation_chain_set_dropping_mode ... std::exception::what: Operation not permitted]	Critical	Fix Released
Bug #1661521: [regression] Windowed clients of nested servers are all black	Critical	Fix Released
Bug #1661704: mir_window_request_persistent_id_sync seg faults when called twice	Critical	Fix Released
Bug #1662942: libmirclient-dev missing build depndency on libmircore-dev	Medium	Fix Released
Bug #1663062: [regression] Software clients of nested servers with size >=480x480 are all black in Mir 0.25.0 and later (or stretched and distorted under Unity8)	Critical	Fix Released
Bug #1663197: mir_window_spec_set_cursor_name() doesn't trigger mir::scene::SurfaceObserver::cursor_image_set_to	High	Fix Released
Bug #1664760: Mir server crashed with SIGSEGV in mir::compositor::TemporaryBuffer::size() called from mir::gl::tessellate_renderable_into_rectangle()	High	Fix Released
Bug #1666372: Nested servers (Unity8) periodically stutter (half frame rate) with Mir 0.26.1	High	Fix Released
Bug #1667645: If the only surface in a session cannot take focus the server crashes	High	Fix Released
Bug #1669444: [regression] OSK input shaping no longer works correctly	High	Fix Released
Bug #1670876: Setting MirWindowSpec parameters always causes window's input_region to be reset	High	Fix Committed
Bug #1672955: unity-system-compositor crashed with SIGSEGV in libinput_device_config_accel_is_available() from libinput_device_config_accel_set_speed() from mir::input::evdev::LibInputDevice::apply_settings()	Critical	Fix Released
Bug #1673533: Presentation chains should support various Vulkan presentation modes	Wishlist	Fix Released
Bug #1673534: Need an extension for GBM buffers to replace mir_buffer_get_buffer_package()	Wishlist	Fix Released
Bug #1675138: Please transition to latest Boost	High	Fix Released
Bug #1675357: Mir sending key repeat events continually to nested shell after VT switch (causes Unity8 lockup for a while)	High	Fix Released
Bug #1677239: mir_demo_standalone_render_overlays fails to link	Critical	Fix Released
Bug #1685186: [SRU] Mir needs to be updated to 0.26 in 16.04LTS	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-03-22
Daniel van Vugt			Approve on 2017-03-22
Cemil Azizoglu (community)			Approve on 2017-03-22
Brandon Schaefer (community)		2017-03-16	Approve on 2017-03-16
Review via email: mp+320092@code.launchpad.net

Commit message

Mir 0.26.2 release.

Description of the change

Mir 0.26.2 release.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-16:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/95/rebuild

review: Approve (continuous-integration)

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2017-03-16:

lgtm

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2017-03-16:

1- Should

mir_connection_present_mode_supported
mir_presentation_chain_set_mode

be marked deprecated?

2- Should

mir_buffer_get_buffer_package

be marked deprecated?

review: Needs Information

Revision history for this message

Kevin DuBois (kdub) wrote on 2017-03-17:

1) I'd say don't mark deprecated, hiding the MirRenderSurface stuff in the rs/ directory should be enough discourangement for people trying to use that before the rename
2) iirc, its still used in nested, so may have to use a pragma to suppress there. Externally, the only thing I'm aware that's using it is the vulkan wsi to get the gbm fd (and that should transition). So ideally, should be marked deprecated, but if its not for practical reasons in this release, thats alright by me too

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-03-17:

> 1) I'd say don't mark deprecated, hiding the MirRenderSurface stuff in the rs/
> directory should be enough discourangement for people trying to use that
> before the rename

According to 1a/7 the ABIs ought to remain after 1.0, so it won't be a disaster if someone uses them. Vis: "Rename MirRenderSurface to MirSurface etc, but export RS ABIs"

So, no need to deprecate.

lp:~mir-team/mir/0.26-old updated on 2017-03-17

4042. By Cemil Azizoglu on 2017-03-17: Possible fix for 1661498. Needs to run through the silo to be sure.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-17:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/96/rebuild

review: Needs Fixing (continuous-integration)

lp:~mir-team/mir/0.26-old updated on 2017-03-18

4043. By Cemil Azizoglu on 2017-03-18: Testing

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-18:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/97/rebuild

review: Needs Fixing (continuous-integration)

lp:~mir-team/mir/0.26-old updated on 2017-03-20

4044. By Daniel van Vugt on 2017-03-20: Fix build failure in Cemil's experimental change

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-20:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/98/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-03-20:

Experimental revisions 4043 and 4044 need removing before any release.

review: Needs Fixing

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2017-03-21:

> Experimental revisions 4043 and 4044 need removing before any release.

I am not sure why but I cannot 'push --overwrite' this branch. Perhaps you put a lock on it?

lp:~mir-team/mir/0.26-old updated on 2017-03-22

4045. By Cemil Azizoglu on 2017-03-22: Reverse the previous "fix" as it doesn't work.
4046. By Cemil Azizoglu on 2017-03-22: Fix lp:1661498

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2017-03-22:

Everything should be good now.

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-22:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/99/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-03-22:

^^^
Bug 1646375. Try again.

Revision history for this message

Daniel van Vugt (vanvugt) on 2017-03-22:

review: Abstain

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-03-22:

Passes basic sanity checks. No visible ABI breaks.

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-22:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/100/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2017-03-22:

^^^
Another https://bugs.launchpad.net/mir/+bug/1646375

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-22:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/101/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-02-02 14:25:53 +0000
 +++ CMakeLists.txt	2017-03-22 01:44:09 +0000
@@ -29,7 +29,7 @@
  set(MIR_VERSION_MAJOR 0)
  set(MIR_VERSION_MINOR 26)
--set(MIR_VERSION_PATCH 1)
++set(MIR_VERSION_PATCH 2)
  add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
  add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
 === modified file 'debian/changelog'
 --- debian/changelog	2017-02-09 21:46:32 +0000
 +++ debian/changelog	2017-03-22 01:44:09 +0000
@@ -1,3 +1,30 @@
++mir (0.26.2-0ubuntu1) UNRELEASED; urgency=medium
++
++  * New upstream release 0.26.2 (https://launchpad.net/mir/+milestone/0.26.2)
++    - Bugs fixed:
++      . EDID does not change when hotplugging a monitor (LP: #1660017)
++      . [regression] mirout crashes when connecting to unity8 or any nested
++        server: [libprotobuf FATAL /usr/include/google/protobuf/repeated_field.
++        h:1408] CHECK failed: (index) < (current_size_) (LP: #1661163)
++      . Mir server crashed with SIGSEGV in
++        mir::compositor::TemporaryBuffer::size() called from
++        mir::gl::tessellate_renderable_into_rectangle() (LP: #1664760)
++      . Nested servers (Unity8) periodically stutter (half frame rate) with
++        Mir 0.26.1 (LP: #1666372)
++      . Don't dereference the end iterator in ms::ApplicationSession::
++        surface_after() (LP: #1667645)
++      . [regression] OSK input shaping no longer works correctly (LP: #1669444)
++      . Setting MirWindowSpec parameters always causes window's input_region
++        to be reset (LP: #1670876)
++      . Subpixel order not included in Mir display information (LP: #1393578)
++      . Presentation chains should support various swap interval modes
++        (LP: #1673533)
++      . Need an extension for GBM buffers to replace
++        mir_buffer_get_buffer_package() (LP: #1673534)
++      . Seg fault on detect_fd_leaks (LP: #1661498)
++
++ -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Mon, 20 Feb 2017 13:37:13 +0800
++
  mir (0.26.1+17.04.20170209.1-0ubuntu1) zesty; urgency=medium
    * New upstream release 0.26.1 (https://launchpad.net/mir/+milestone/0.26.1)
 === modified file 'include/client/mir_toolkit/client_types.h'
 --- include/client/mir_toolkit/client_types.h	2017-02-02 19:52:04 +0000
 +++ include/client/mir_toolkit/client_types.h	2017-03-22 01:44:09 +0000
@@ -254,6 +254,15 @@
      mir_buffer_layout_linear  = 1,
  } MirBufferLayout;
++typedef enum MirPresentMode
++{
++    mir_present_mode_immediate, //same as VK_PRESENT_MODE_IMMEDIATE_KHR
++    mir_present_mode_mailbox, //same as VK_PRESENT_MODE_MAILBOX_KHR
++    mir_present_mode_fifo, //same as VK_PRESENT_MODE_FIFO_KHR
++    mir_present_mode_fifo_relaxed, //same as VK_PRESENT_MODE_FIFO_RELAXED_KHR
++    mir_present_mode_num_modes
++} MirPresentMode;
++
  /**
   * Retrieved information about a MirWindow. This is most useful for learning
   * how and where to write to a 'mir_buffer_usage_software' surface.
 === modified file 'include/client/mir_toolkit/extensions/gbm_buffer.h'
 --- include/client/mir_toolkit/extensions/gbm_buffer.h	2017-02-02 19:38:06 +0000
 +++ include/client/mir_toolkit/extensions/gbm_buffer.h	2017-03-22 01:44:09 +0000
@@ -29,6 +29,8 @@
  /** Allocate a MirBuffer via gbm
+  *
++ *  available in V1 and V2.
++ *
   *  The callback will be called when the buffer is available for use.
   *  It will be called once when created, and once per every
   *  mir_presentation_chain_submit_buffer.
@@ -53,6 +55,15 @@
      unsigned int gbm_bo_flags,
      MirBufferCallback available_callback, void* available_context);
++/** v2 version of mir_connection_allocate_buffer_gbm, with more accurate types.
++ */
++typedef void (*MirConnectionAllocateBufferGbm)(
++    MirConnection* connection,
++    uint32_t width, uint32_t height,
++    uint32_t gbm_pixel_format,
++    uint32_t gbm_bo_flags,
++    MirBufferCallback available_callback, void* available_context);
++
  typedef struct MirExtensionGbmBufferV1
+ {
      mir_connection_allocate_buffer_gbm allocate_buffer_gbm;
@@ -65,6 +76,85 @@
          connection, "mir_extension_gbm_buffer", 1);
+ }
++/** Allocate a MirBuffer via gbm and wait for the allocation.
++ *  available in V2.
++ *  The buffer can be destroyed via mir_buffer_release().
++ *
++ *   \param [in] connection            The connection
++ *   \param [in] width                 Requested buffer width
++ *   \param [in] height                Requested buffer height
++ *   \param [in] gbm_pixel_format      The pixel format, one of the GBM_FORMATs
++ *   \param [in] gbm_bo_flags          The gbm_bo_flags for the buffer.
++ *   \return                           The buffer
++ **/
++typedef MirBuffer* (*MirConnectionAllocateBufferGbmSync)(
++    MirConnection* connection,
++    uint32_t width, uint32_t height,
++    uint32_t gbm_pixel_format,
++    uint32_t gbm_bo_flags);
++
++/** Check if a MirBuffer is suitable for import via GBM_BO_IMPORT_FD
++ *
++ *   \param [in] buffer The buffer
++ *   \return            True if suitable, false if unsuitable
++ */
++typedef bool (*MirBufferIsGbmImportable)(MirBuffer* buffer);
++
++/** Access the fd a MirBuffer suitable for gbm import
++ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
++ *   \warning           The fd is owned by the buffer. Do not close() it.
++ *   \param [in] buffer The buffer
++ *   \return            The fd
++ */
++typedef int (*MirBufferGbmFd)(MirBuffer* buffer);
++
++/** Get the stride of a MirBuffer
++ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
++ *   \param [in] buffer The buffer
++ *   \return            The stride of the buffer
++ */
++typedef uint32_t (*MirBufferGbmStride)(MirBuffer* buffer);
++
++/** Get the GBM_FORMAT of a MirBuffer
++ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
++ *   \param [in] buffer The buffer
++ *   \return            The GBM_FORMAT of the buffer
++ */
++typedef uint32_t (*MirBufferGbmFormat)(MirBuffer* buffer);
++
++/** Get the gbm_bo_flags of a MirBuffer
++ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
++ *   \param [in] buffer The buffer
++ *   \return            The gbm_bo_flags of the buffer
++ */
++typedef uint32_t (*MirBufferGbmFlags)(MirBuffer* buffer);
++
++/** Get the age of a MirBuffer
++ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
++ *   \param [in] buffer The buffer
++ *   \return            The age of the buffer
++ */
++typedef unsigned int (*MirBufferGbmAge)(MirBuffer* buffer);
++
++typedef struct MirExtensionGbmBufferV2
++{
++    MirConnectionAllocateBufferGbm allocate_buffer_gbm;
++    MirConnectionAllocateBufferGbmSync allocate_buffer_gbm_sync;
++    MirBufferIsGbmImportable is_gbm_importable;
++    MirBufferGbmFd fd;
++    MirBufferGbmStride stride;
++    MirBufferGbmFormat format;
++    MirBufferGbmFlags flags;
++    MirBufferGbmAge age;
++} MirExtensionGbmBufferV2;
++
++static inline MirExtensionGbmBufferV2 const* mir_extension_gbm_buffer_v2(
++    MirConnection* connection)
++{
++    return (MirExtensionGbmBufferV2 const*) mir_connection_request_extension(
++        connection, "mir_extension_gbm_buffer", 2);
++}
++
  #ifdef __cplusplus
+ }
  #endif
 === modified file 'include/client/mir_toolkit/mir_display_configuration.h'
 --- include/client/mir_toolkit/mir_display_configuration.h	2017-01-26 19:58:38 +0000
 +++ include/client/mir_toolkit/mir_display_configuration.h	2017-03-22 01:44:09 +0000
@@ -59,7 +59,8 @@
   *               supportable at this time.
   */
  int mir_display_config_get_max_simultaneous_outputs(
--    MirDisplayConfig const* config);
++    MirDisplayConfig const* config)
++    __attribute__((deprecated("Not accurate in Mir 0.26 and later. May be removed in future.")));
  /**
   * Get the number of outputs available in this display configuration.
 === modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
 --- include/client/mir_toolkit/rs/mir_render_surface.h	2017-02-02 19:38:06 +0000
 +++ include/client/mir_toolkit/rs/mir_render_surface.h	2017-03-22 01:44:09 +0000
@@ -145,7 +145,8 @@
  __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
  /**
-- * Obtain the presentation chain backing a given render surface
++ * Obtain the presentation chain backing a given render surface.
++ * The MirPresentationChain is created in mir_present_mode_fifo submission mode.
+  *
   * \return                       The chain contained in the given render surface
   *                               or 'nullptr' if it, or
@@ -156,6 +157,26 @@
      MirRenderSurface* render_surface)
  __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
++/** Query whether the server supports a given presentation mode.
++ *
++ *  \param [in] connection  The connection
++ *  \param [in] mode        The MirPresentMode
++ *  \return                 True if supported, false if not
++ */
++bool mir_connection_present_mode_supported(
++    MirConnection* connection, MirPresentMode mode);
++
++/** Respecify the submission mode that the MirPresentationChain is operating with.
++ *  The buffers currently queued will immediately be requeued according
++ *  to the new mode.
++ *
++ *  \pre    mir_connection_present_mode_supported must indicate that the mode is supported
++ *  \param [in] chain   The chain
++ *  \param [in] mode    The mode to change to
++ */
++void mir_presentation_chain_set_mode(
++    MirPresentationChain* chain, MirPresentMode mode);
++
  /**
   * Set the MirWindowSpec to contain a specific cursor.
+  *
 === modified file 'src/client/display_configuration_api.cpp'
 --- src/client/display_configuration_api.cpp	2017-01-26 19:58:38 +0000
 +++ src/client/display_configuration_api.cpp	2017-03-22 01:44:09 +0000
@@ -113,7 +113,7 @@
  int mir_display_config_get_max_simultaneous_outputs(MirDisplayConfig const* config)
+ {
--    return config->display_card(0).max_simultaneous_outputs();
++    return mir_display_config_get_num_outputs(config);
+ }
  int mir_output_get_id(MirOutput const* output)
 === modified file 'src/client/mir_presentation_chain_api.cpp'
 --- src/client/mir_presentation_chain_api.cpp	2017-01-25 03:34:22 +0000
 +++ src/client/mir_presentation_chain_api.cpp	2017-03-22 01:44:09 +0000
@@ -20,6 +20,7 @@
  #include "mir_toolkit/mir_buffer.h"
  #include "mir_toolkit/mir_buffer_private.h"
  #include "mir_connection.h"
++#include "connection_surface_map.h"
  #include "buffer.h"
  #include "mir_presentation_chain.h"
  #include "mir/uncaught.h"
@@ -90,3 +91,24 @@
+ {
      MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+ }
++
++bool mir_connection_present_mode_supported(
++    MirConnection*, MirPresentMode mode)
++{
++    return mode == mir_present_mode_fifo || mode == mir_present_mode_mailbox;
++}
++
++void mir_presentation_chain_set_mode(
++    MirPresentationChain* chain, MirPresentMode mode)
++try
++{
++    mir::require(chain && mir_connection_present_mode_supported(chain->connection(), mode));
++    if (mode == mir_present_mode_fifo)
++        chain->set_queueing_mode();
++    if (mode == mir_present_mode_mailbox)
++        chain->set_dropping_mode();
++}
++catch (std::exception const& ex)
++{
++    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
++}
 === modified file 'src/client/mir_render_surface_api.cpp'
 --- src/client/mir_render_surface_api.cpp	2017-02-06 09:43:47 +0000
 +++ src/client/mir_render_surface_api.cpp	2017-03-22 01:44:09 +0000
@@ -18,6 +18,7 @@
  #include "mir_connection.h"
  #include "render_surface.h"
++#include "presentation_chain.h"
  #include "mir/uncaught.h"
  #include "mir/require.h"
  #include "connection_surface_map.h"
 === modified file 'src/client/symbols.map'
 --- src/client/symbols.map	2017-02-06 09:43:47 +0000
 +++ src/client/symbols.map	2017-03-22 01:44:09 +0000
@@ -374,6 +374,8 @@
      mir_render_surface_get_size;
      mir_render_surface_set_size;
      mir_render_surface_release;
++    mir_connection_present_mode_supported;
++    mir_presentation_chain_set_mode;
      mir_window_spec_add_render_surface;
      mir_window_spec_set_cursor_render_surface;
 === modified file 'src/platform/options/default_configuration.cpp'
 --- src/platform/options/default_configuration.cpp	2017-01-18 02:29:37 +0000
 +++ src/platform/options/default_configuration.cpp	2017-03-22 01:44:09 +0000
@@ -174,7 +174,7 @@
              "How to handle the SharedLibraryProber report. [{log,lttng,off}]")
          (shell_report_opt, po::value<std::string>()->default_value(off_opt_value),
           "How to handle the Shell report. [{log,off}]")
--        (composite_delay_opt, po::value<int>()->default_value(-1),
++        (composite_delay_opt, po::value<int>()->default_value(0),
              "Compositor frame delay in milliseconds (how long to wait for new "
              "frames from clients before compositing). Higher values result in "
              "lower latency but risk causing frame skipping. "
 === modified file 'src/platforms/mesa/client/client_buffer.cpp'
 --- src/platforms/mesa/client/client_buffer.cpp	2017-02-03 19:28:14 +0000
 +++ src/platforms/mesa/client/client_buffer.cpp	2017-03-22 01:44:09 +0000
@@ -76,10 +76,14 @@
      size_t const size_in_bytes;
  };
--std::shared_ptr<mir::graphics::mesa::NativeBuffer> to_native_buffer(MirBufferPackage const& package)
++std::shared_ptr<mir::graphics::mesa::NativeBuffer> to_native_buffer(
++    MirBufferPackage const& package, bool gbm, uint32_t native_format, uint32_t native_flags)
+ {
      auto buffer = std::make_shared<mir::graphics::mesa::NativeBuffer>();
      *static_cast<MirBufferPackage*>(buffer.get()) = package;
++    buffer->is_gbm_buffer = gbm;
++    buffer->native_format = native_format;
++    buffer->native_flags = native_flags;
      return buffer;
+ }
@@ -90,7 +94,7 @@
      std::shared_ptr<MirBufferPackage> const& package,
      geom::Size size, MirPixelFormat pf) :
      buffer_file_ops{buffer_file_ops},
--    creation_package{to_native_buffer(*package)},
++    creation_package{to_native_buffer(*package, false, 0, 0)},
      rect({geom::Point{0, 0}, size}),
      buffer_pf{pf},
      egl_image_attrs{
@@ -117,9 +121,9 @@
      std::shared_ptr<BufferFileOps> const& buffer_file_ops,
      std::shared_ptr<MirBufferPackage> const& package,
      geometry::Size size,
--    unsigned int native_pf, unsigned int /*native_flags*/) :
++    unsigned int native_pf, unsigned int native_flags) :
      buffer_file_ops{buffer_file_ops},
--    creation_package{to_native_buffer(*package)},
++    creation_package{to_native_buffer(*package, true, native_pf, native_flags)},
      rect({geom::Point{0, 0}, size}),
      buffer_pf{mir::graphics::mesa::gbm_format_to_mir_format(native_pf)},
      egl_image_attrs{
 === modified file 'src/platforms/mesa/client/client_platform.cpp'
 --- src/platforms/mesa/client/client_platform.cpp	2017-02-02 19:38:06 +0000
 +++ src/platforms/mesa/client/client_platform.cpp	2017-03-22 01:44:09 +0000
@@ -23,7 +23,9 @@
  #include "native_surface.h"
  #include "mir/client_buffer_factory.h"
  #include "mir/client_context.h"
++#include "mir/client_buffer.h"
  #include "mir/mir_render_surface.h"
++#include "mir/mir_buffer.h"
  #include "mir/weak_egl.h"
  #include "mir/platform_message.h"
  #include "mir_toolkit/mesa/platform_operation.h"
@@ -33,6 +35,8 @@
  #include <boost/throw_exception.hpp>
  #include <stdexcept>
  #include <cstring>
++#include <mutex>
++#include <condition_variable>
  namespace mgm=mir::graphics::mesa;
  namespace mcl=mir::client;
@@ -123,9 +127,9 @@
  void allocate_buffer_gbm(
      MirConnection* connection,
--    int width, int height,
--    unsigned int gbm_pixel_format,
--    unsigned int gbm_bo_flags,
++    uint32_t width, uint32_t height,
++    uint32_t gbm_pixel_format,
++    uint32_t gbm_bo_flags,
      MirBufferCallback available_callback, void* available_context)
+ {
      auto context = mcl::to_client_context(connection);
@@ -134,6 +138,142 @@
          available_callback, available_context);
+ }
++void allocate_buffer_gbm_legacy(
++    MirConnection* connection,
++    int width, int height,
++    unsigned int gbm_pixel_format,
++    unsigned int gbm_bo_flags,
++    MirBufferCallback available_callback, void* available_context)
++{
++    allocate_buffer_gbm(
++        connection, static_cast<uint32_t>(width), static_cast<uint32_t>(height),
++        static_cast<uint32_t>(gbm_pixel_format), static_cast<uint32_t>(gbm_bo_flags),
++        available_callback, available_context);
++}
++
++MirBuffer* allocate_buffer_gbm_sync(
++    MirConnection* connection,
++    uint32_t width, uint32_t height,
++    uint32_t gbm_pixel_format,
++    uint32_t gbm_bo_flags)
++try
++{
++    struct BufferSync
++    {
++        void set_buffer(MirBuffer* b)
++        {
++            std::unique_lock<decltype(mutex)> lk(mutex);
++            buffer = b;
++            cv.notify_all();
++        }
++
++        MirBuffer* wait_for_buffer()
++        {
++            std::unique_lock<decltype(mutex)> lk(mutex);
++            cv.wait(lk, [this]{ return buffer; });
++            return buffer;
++        }
++    private:
++        std::mutex mutex;
++        std::condition_variable cv;
++        MirBuffer* buffer = nullptr;
++    } sync;
++
++    allocate_buffer_gbm(
++        connection, width, height, gbm_pixel_format, gbm_bo_flags,
++        [](auto* b, auto* context){ reinterpret_cast<BufferSync*>(context)->set_buffer(b); }, &sync);
++    return sync.wait_for_buffer();
++}
++catch (...)
++{
++    return nullptr;
++}
++
++bool is_gbm_importable(MirBuffer* b)
++try
++{
++    if (!b)
++        return false;
++    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
++    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
++    if (!native)
++        return false;
++    return native->is_gbm_buffer;
++}
++catch (...)
++{
++    return false;
++}
++
++int import_fd(MirBuffer* b)
++try
++{
++    if (!is_gbm_importable(b))
++        return -1;
++    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
++    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
++    return native->fd[0];
++}
++catch (...)
++{
++    return -1;
++}
++
++uint32_t buffer_stride(MirBuffer* b)
++try
++{
++    if (!is_gbm_importable(b))
++        return 0;
++    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
++    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
++    return native->stride;
++}
++catch (...)
++{
++    return 0;
++}
++
++uint32_t buffer_format(MirBuffer* b)
++try
++{
++    if (!is_gbm_importable(b))
++        return 0;
++    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
++    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
++    return native->native_format;
++}
++catch (...)
++{
++    return 0;
++}
++
++uint32_t buffer_flags(MirBuffer* b)
++try
++{
++    if (!is_gbm_importable(b))
++        return 0;
++    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
++    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
++    return native->native_flags;
++}
++catch (...)
++{
++    return 0;
++}
++
++unsigned int buffer_age(MirBuffer* b)
++try
++{
++    if (!is_gbm_importable(b))
++        return 0;
++    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
++    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
++    return native->age;
++}
++catch (...)
++{
++    return 0;
++}
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  MirBufferStream* get_hw_stream(
@@ -164,7 +304,9 @@
        gbm_dev{nullptr},
        drm_extensions{auth_fd_ext, auth_magic_ext},
        mesa_auth{set_device, this},
--      gbm_buffer{allocate_buffer_gbm},
++      gbm_buffer1{allocate_buffer_gbm_legacy},
++      gbm_buffer2{allocate_buffer_gbm, allocate_buffer_gbm_sync,
++                 is_gbm_importable, import_fd, buffer_stride, buffer_format, buffer_flags, buffer_age},
        hw_stream{get_hw_stream}
+ {
+ }
@@ -289,7 +431,9 @@
      if (!strcmp(extension_name, "mir_extension_set_gbm_device") && (version == 1))
          return &mesa_auth;
      if (!strcmp(extension_name, "mir_extension_gbm_buffer") && (version == 1))
--        return &gbm_buffer;
++        return &gbm_buffer1;
++    if (!strcmp(extension_name, "mir_extension_gbm_buffer") && (version == 2))
++        return &gbm_buffer2;
      if (!strcmp(extension_name, "mir_extension_hardware_buffer_stream") && (version == 1))
          return &hw_stream;
 === modified file 'src/platforms/mesa/client/client_platform.h'
 --- src/platforms/mesa/client/client_platform.h	2017-02-02 18:32:54 +0000
 +++ src/platforms/mesa/client/client_platform.h	2017-03-22 01:44:09 +0000
@@ -65,7 +65,8 @@
      gbm_device* gbm_dev;
      MirExtensionMesaDRMAuthV1 drm_extensions;
      MirExtensionSetGbmDeviceV1 mesa_auth;
--    MirExtensionGbmBufferV1 gbm_buffer;
++    MirExtensionGbmBufferV1 gbm_buffer1;
++    MirExtensionGbmBufferV2 gbm_buffer2;
      MirExtensionHardwareBufferStreamV1 hw_stream;
  };
 === modified file 'src/platforms/mesa/include/native_buffer.h'
 --- src/platforms/mesa/include/native_buffer.h	2017-01-18 02:29:37 +0000
 +++ src/platforms/mesa/include/native_buffer.h	2017-03-22 01:44:09 +0000
@@ -34,6 +34,9 @@
  struct NativeBuffer : graphics::NativeBuffer, MirBufferPackage
+ {
      struct gbm_bo *bo;
++    bool is_gbm_buffer;
++    uint32_t native_format;
++    uint32_t native_flags;
  };
+ }
+ }
 === modified file 'src/platforms/mesa/server/kms/real_kms_display_configuration.cpp'
 --- src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-01-18 02:29:37 +0000
 +++ src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-03-22 01:44:09 +0000
@@ -370,6 +370,7 @@
          output.current_format = mir_pixel_format_xrgb_8888;
          output.subpixel_arrangement = kms_subpixel_to_mir_subpixel(connector.subpixel);
          output.gamma = gamma;
++        output.edid = edid;
+     }
+ }
 === modified file 'src/server/compositor/multi_monitor_arbiter.cpp'
 --- src/server/compositor/multi_monitor_arbiter.cpp	2017-01-18 02:29:37 +0000
 +++ src/server/compositor/multi_monitor_arbiter.cpp	2017-03-22 01:44:09 +0000
@@ -67,9 +67,10 @@
      auto& last_entry = onscreen_buffers.front();
      last_entry.use_count++;
++    auto last_entry_buffer = last_entry.buffer;
      if (mode == mc::MultiMonitorMode::multi_monitor_sync)
          clean_onscreen_buffers(lk);
--    return last_entry.buffer;
++    return last_entry_buffer;
+ }
  void mc::MultiMonitorArbiter::compositor_release(std::shared_ptr<mg::Buffer> const& buffer)
 === modified file 'src/server/frontend/session_mediator.cpp'
 --- src/server/frontend/session_mediator.cpp	2017-02-08 20:22:59 +0000
 +++ src/server/frontend/session_mediator.cpp	2017-03-22 01:44:09 +0000
@@ -678,7 +678,8 @@
              id, geom::Displacement{surface_specification.hotspot_x(), surface_specification.hotspot_y()} };
+     }
--    mods.input_shape = extract_input_shape_from(&surface_specification);
++    if (surface_specification.input_shape_size() > 0)
++        mods.input_shape = extract_input_shape_from(&surface_specification);
      auto const id = mf::SurfaceId(request->surface_id().value());
 === modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
 --- src/server/graphics/nested/nested_display_configuration.cpp	2017-01-18 13:59:18 +0000
 +++ src/server/graphics/nested/nested_display_configuration.cpp	2017-03-22 01:44:09 +0000
@@ -103,7 +103,7 @@
      auto current_format  = mir_output_get_current_pixel_format(output);
      auto power_mode      = mir_output_get_power_mode(output);
      auto orientation     = mir_output_get_orientation(output);
--    auto local_config    = get_local_config_for(output_id);
++    auto local_config    = get_local_config_for(output);
      uint32_t preferred_index = mir_output_get_preferred_mode_index(output);
      uint32_t current_index   = mir_output_get_current_mode_index(output);
@@ -198,13 +198,16 @@
+ }
  mgn::NestedDisplayConfiguration::LocalOutputConfig
--mgn::NestedDisplayConfiguration::get_local_config_for(uint32_t output_id) const
++mgn::NestedDisplayConfiguration::get_local_config_for(MirOutput const* output) const
+ {
      std::lock_guard<std::mutex> lock{local_config_mutex};
--    LocalOutputConfig const default_values {1.0f, mir_form_factor_monitor,
--                                            mir_subpixel_arrangement_unknown,
--                                            {}, mir_output_gamma_unsupported};
++    auto const output_id = mir_output_get_id(output);
++
++    LocalOutputConfig const default_values{
++        1.0f, mir_form_factor_monitor,
++        mir_output_get_subpixel_arrangement(output),
++        {}, mir_output_gamma_unsupported};
      bool inserted;
      decltype(local_config)::iterator keypair;
 === modified file 'src/server/graphics/nested/nested_display_configuration.h'
 --- src/server/graphics/nested/nested_display_configuration.h	2017-01-18 02:29:37 +0000
 +++ src/server/graphics/nested/nested_display_configuration.h	2017-03-22 01:44:09 +0000
@@ -67,7 +67,7 @@
      };
      std::unordered_map<uint32_t, LocalOutputConfig> mutable local_config;
--    LocalOutputConfig get_local_config_for(uint32_t output_id) const;
++    LocalOutputConfig get_local_config_for(MirOutput const* output) const;
      void set_local_config_for(uint32_t output_id, LocalOutputConfig const& config);
  };
 === modified file 'src/server/scene/application_session.cpp'
 --- src/server/scene/application_session.cpp	2017-02-02 18:25:05 +0000
 +++ src/server/scene/application_session.cpp	2017-03-22 01:44:09 +0000
@@ -235,6 +235,9 @@
      if (next == surfaces.end())
          next = std::find_if(begin(surfaces), current, can_take_focus);
++    if (next == end(surfaces))
++        return {};
++
      return next->second;
+ }
 === modified file 'src/server/shell/surface_specification.cpp'
 --- src/server/shell/surface_specification.cpp	2015-10-15 04:20:44 +0000
 +++ src/server/shell/surface_specification.cpp	2017-03-22 01:44:09 +0000
@@ -37,6 +37,7 @@
          !aux_rect.is_set() &&
          !edge_attachment.is_set() &&
          !min_width.is_set() &&
++        !min_height.is_set() &&
          !max_width.is_set() &&
          !max_height.is_set() &&
          !width_inc.is_set() &&
@@ -45,5 +46,6 @@
          !max_aspect.is_set() &&
          !streams.is_set() &&
          !parent.is_set() &&
--        !input_shape.is_set();
++        !input_shape.is_set() &&
++        !shell_chrome.is_set();
+ }
 === modified file 'src/utils/out.c'
 --- src/utils/out.c	2017-01-18 02:29:37 +0000
 +++ src/utils/out.c	2017-03-22 01:44:09 +0000
@@ -410,9 +410,6 @@
          int num_outputs = mir_display_config_get_num_outputs(conf);
--        printf("Max %d simultaneous outputs\n",
--               mir_display_config_get_max_simultaneous_outputs(conf));
--
          for (int i = 0; i < num_outputs; ++i)
+         {
              MirOutput const* out = mir_display_config_get_output(conf, i);
 === modified file 'tests/acceptance-tests/test_custom_window_management.cpp'
 --- tests/acceptance-tests/test_custom_window_management.cpp	2017-01-18 04:43:15 +0000
 +++ tests/acceptance-tests/test_custom_window_management.cpp	2017-03-22 01:44:09 +0000
@@ -363,6 +363,53 @@
      mir_connection_release(connection);
+ }
++TEST_F(CustomWindowManagement, apply_input_shape_to_surface)
++{
++    start_server();
++
++    auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
++
++    int const width{800}, height{600};
++    MirPixelFormat const format{mir_pixel_format_bgr_888};
++    auto surface_spec = mir_create_normal_window_spec(connection, width, height);
++    mir_window_spec_set_pixel_format(surface_spec, format);
++
++    auto window = mir_create_window_sync(surface_spec);
++    mir_window_spec_release(surface_spec);
++
++    surface_spec = mir_create_window_spec(connection);
++
++    mt::Signal received;
++
++    MirRectangle rect{ 0, 0, 100, 101 };
++    mir_window_spec_set_input_shape(surface_spec, &rect, 1);
++
++    auto const check_apply_surface = [&received](
++        std::shared_ptr<ms::Session> const&,
++        std::shared_ptr<ms::Surface> const&,
++        msh::SurfaceSpecification const& spec)
++        {
++            EXPECT_TRUE(spec.input_shape.is_set());
++            received.raise();
++        };
++    EXPECT_CALL(window_manager, modify_surface(_,_,_)).WillOnce(Invoke(check_apply_surface));
++
++    mir_window_apply_spec(window, surface_spec);
++    mir_window_spec_release(surface_spec);
++
++    EXPECT_TRUE(received.wait_for(400ms));
++
++    surface_spec = mir_create_window_spec(connection);
++    mir_window_spec_set_input_shape(surface_spec, nullptr, 0);
++
++    mir_window_apply_spec(window, surface_spec);
++    mir_window_spec_release(surface_spec);
++    EXPECT_TRUE(received.wait_for(400ms));
++
++    mir_window_release_sync(window);
++    mir_connection_release(connection);
++}
++
  TEST_F(CustomWindowManagement, when_the_client_places_a_new_surface_the_request_reaches_the_window_manager)
+ {
      int const width{800};
 === modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
 --- tests/acceptance-tests/test_new_display_configuration.cpp	2017-01-26 19:58:38 +0000
 +++ tests/acceptance-tests/test_new_display_configuration.cpp	2017-03-22 01:44:09 +0000
@@ -475,9 +475,10 @@
      using namespace testing;
      auto format = GetParam();
--    mtd::StubDisplayConfig single_format_config(1, {format});
++    auto single_format_config =
++        std::make_shared<mtd::StubDisplayConfig>(1, std::vector<MirPixelFormat>{format});
--    apply_config_change_and_wait_for_propagation(mt::fake_shared(single_format_config));
++    apply_config_change_and_wait_for_propagation(single_format_config);
      DisplayClient client{new_connection()};
@@ -507,9 +508,11 @@
 .0,
          true,
          subpixel_arrangement};
--    mtd::StubDisplayConfig single_subpixel_config({output});
--
--    apply_config_change_and_wait_for_propagation(mt::fake_shared(single_subpixel_config));
++
++    auto single_subpixel_config =
++        std::make_shared<mtd::StubDisplayConfig>(std::vector<mg::DisplayConfigurationOutput>{output});
++
++    apply_config_change_and_wait_for_propagation(single_subpixel_config);
      DisplayClient client{new_connection()};
 === modified file 'tests/acceptance-tests/test_presentation_chain.cpp'
 --- tests/acceptance-tests/test_presentation_chain.cpp	2017-02-02 19:38:06 +0000
 +++ tests/acceptance-tests/test_presentation_chain.cpp	2017-03-22 01:44:09 +0000
@@ -24,9 +24,15 @@
  #include "mir_toolkit/mir_extension_core.h"
  #include "mir_toolkit/extensions/fenced_buffers.h"
  #include "mir_test_framework/connected_client_headless_server.h"
++#include "mir/test/doubles/null_display_buffer_compositor_factory.h"
  #include "mir/geometry/size.h"
++#include "mir/graphics/buffer.h"
++#include "mir/graphics/renderable.h"
++#include "mir/compositor/scene_element.h"
  #include "mir/fd.h"
++#include "mir/raii.h"
++#include <atomic>
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
@@ -35,6 +41,7 @@
  namespace mt = mir::test;
  namespace mc = mir::compositor;
  namespace geom = mir::geometry;
++namespace mtd = mir::test::doubles;
  using namespace testing;
  using namespace std::chrono_literals;
@@ -47,10 +54,11 @@
      Chain(Chain const&) = delete;
      Chain& operator=(Chain const&) = delete;
--    Chain(MirConnection* connection) :
++    Chain(MirConnection* connection, MirPresentMode mode) :
          rs(mir_connection_create_render_surface_sync(connection, 0, 0)),
          chain(mir_render_surface_get_presentation_chain(rs))
+     {
++        mir_presentation_chain_set_mode(chain, mode);
+     }
      MirRenderSurface* content()
@@ -94,8 +102,11 @@
          mir_window_release_sync(window);
+     }
  protected:
--    SurfaceWithChain(MirConnection* connection, std::function<MirWindow*(Chain&)> const& fn) :
--        chain_(connection),
++    SurfaceWithChain(
++        MirConnection* connection,
++        MirPresentMode mode,
++        std::function<MirWindow*(Chain&)> const& fn) :
++        chain_(connection, mode),
          window(fn(chain_))
+     {
+     }
@@ -109,8 +120,10 @@
      SurfaceWithChainFromStart(SurfaceWithChainFromStart const&) = delete;
      SurfaceWithChainFromStart& operator=(SurfaceWithChainFromStart const&) = delete;
--    SurfaceWithChainFromStart(MirConnection* connection, geom::Size size, MirPixelFormat pf) :
--        SurfaceWithChain(connection,
++    SurfaceWithChainFromStart(
++        MirConnection* connection, MirPresentMode mode,
++        geom::Size size, MirPixelFormat pf) :
++        SurfaceWithChain(connection, mode,
          std::bind(&SurfaceWithChainFromStart::create_surface, this,
              std::placeholders::_1, connection, size, pf))
+     {
@@ -132,38 +145,43 @@
+     }
  };
--struct SurfaceWithChainFromReassociation : SurfaceWithChain
--{
--    SurfaceWithChainFromReassociation(SurfaceWithChainFromReassociation const&) = delete;
--    SurfaceWithChainFromReassociation& operator=(SurfaceWithChainFromReassociation const&) = delete;
--    SurfaceWithChainFromReassociation(MirConnection* connection, geom::Size size, MirPixelFormat pf) :
--        SurfaceWithChain(connection,
--        std::bind(&SurfaceWithChainFromReassociation::create_surface, this,
--            std::placeholders::_1, connection, size, pf))
--    {
--    }
--private:
--    MirWindow* create_surface(Chain& chain, MirConnection* connection, geom::Size size, MirPixelFormat pf)
--    {
--        MirWindowSpec* spec = mir_create_normal_window_spec(
--            connection, size.width.as_int(), size.height.as_int());
--        mir_window_spec_set_pixel_format(spec, pf);
--        auto window = mir_create_window_sync(spec);
--        mir_window_spec_release(spec);
--        spec = mir_create_window_spec(connection);
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--        mir_window_spec_add_render_surface(
--            spec, chain.content(), size.width.as_int(), size.height.as_int(), 0, 0);
--#pragma GCC diagnostic pop
--        mir_window_apply_spec(window, spec);
--        mir_window_spec_release(spec);
--        return window;
--    }
--};
--
  struct PresentationChain : mtf::ConnectedClientHeadlessServer
+ {
++    bool stall_compositor = false;
++    void SetUp()
++    {
++        server.override_the_display_buffer_compositor_factory(
++            [&]
++            {
++                struct StubDBCFactory : mc::DisplayBufferCompositorFactory
++                {
++                    StubDBCFactory(bool& stall_compositor) : stall_compositor(stall_compositor) {}
++
++                    std::unique_ptr<mir::compositor::DisplayBufferCompositor>
++                        create_compositor_for(mir::graphics::DisplayBuffer&) override
++                    {
++                        struct StubDBC : mir::compositor::DisplayBufferCompositor
++                        {
++                            StubDBC(bool& stall_compositor) : stall_compositor(stall_compositor) {}
++
++                            void composite(mir::compositor::SceneElementSequence&& seq) override
++                            {
++                                while (stall_compositor)
++                                    std::this_thread::yield();
++                                for (auto& s : seq)
++                                    s->renderable()->buffer();
++                            }
++                            bool& stall_compositor;
++                        };
++                        return std::make_unique<StubDBC>(stall_compositor);
++                    }
++                    bool& stall_compositor;
++                };
++                return std::make_unique<StubDBCFactory>(stall_compositor);
++            });
++        mtf::ConnectedClientHeadlessServer::SetUp();
++    }
++
      geom::Size const size {100, 20};
      MirPixelFormat const pf = mir_pixel_format_abgr_8888;
  };
@@ -221,9 +239,22 @@
+ }
++TEST_F(PresentationChain, supported_modes)
++{
++    EXPECT_TRUE(mir_connection_present_mode_supported(
++        connection, mir_present_mode_fifo));
++    EXPECT_TRUE(mir_connection_present_mode_supported(
++        connection, mir_present_mode_mailbox));
++    //TODOs:
++    EXPECT_FALSE(mir_connection_present_mode_supported(
++        connection, mir_present_mode_fifo_relaxed));
++    EXPECT_FALSE(mir_connection_present_mode_supported(
++        connection, mir_present_mode_immediate));
++}
++
  TEST_F(PresentationChain, allocation_calls_callback)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      MirBufferSync context;
      mir_connection_allocate_buffer(
@@ -237,7 +268,7 @@
  TEST_F(PresentationChain, can_access_platform_message_representing_buffer)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      MirBufferSync context;
      mir_connection_allocate_buffer(
@@ -259,7 +290,7 @@
  TEST_F(PresentationChain, has_native_fence)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      auto ext = mir_extension_fenced_buffers_v1(connection);
      ASSERT_THAT(ext, Ne(nullptr));
@@ -281,7 +312,7 @@
  TEST_F(PresentationChain, can_map_for_cpu_render)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      MirGraphicsRegion region;
      MirBufferLayout region_layout = mir_buffer_layout_unknown;
@@ -307,7 +338,7 @@
  TEST_F(PresentationChain, submission_will_eventually_call_callback)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      auto const num_buffers = 2u;
      std::array<MirBufferSync, num_buffers> contexts;
@@ -338,7 +369,7 @@
  TEST_F(PresentationChain, buffers_can_be_destroyed_before_theyre_returned)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      MirBufferSync context;
      auto buffer = mir_connection_allocate_buffer_sync(
@@ -350,7 +381,7 @@
  TEST_F(PresentationChain, buffers_can_be_flushed)
+ {
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo,size, pf);
      auto buffer = mir_connection_allocate_buffer_sync(
          connection, size.width.as_int(), size.height.as_int(), pf);
@@ -409,7 +440,7 @@
      geom::Height height { 33 };
      auto format = mir_pixel_format_abgr_8888;
--    SurfaceWithChainFromStart window(connection, size, pf);
++    SurfaceWithChainFromStart window(connection, mir_present_mode_fifo, size, pf);
      auto buffer = mir_connection_allocate_buffer_sync(
          connection, width.as_int(), height.as_int(), format);
      EXPECT_THAT(mir_buffer_get_width(buffer), Eq(width.as_uint32_t()));
@@ -434,3 +465,157 @@
      EXPECT_THAT(mir_buffer_get_error_message(buffer), Not(StrEq("")));
      mir_buffer_release(buffer);
+ }
++
++namespace
++{
++    struct TrackedBuffer
++    {
++        TrackedBuffer(MirConnection* connection, std::atomic<unsigned int>& counter) :
++            buffer(mir_connection_allocate_buffer_sync(connection, 100, 100, pf)),
++            counter(counter)
++        {
++        }
++        ~TrackedBuffer()
++        {
++            mir_buffer_release(buffer);
++        }
++
++        void submit_to(MirPresentationChain* chain)
++        {
++            std::unique_lock<std::mutex> lk(mutex);
++            if (!avail)
++                throw std::runtime_error("test problem");
++            avail = false;
++            mir_presentation_chain_submit_buffer(chain, buffer, tavailable, this);
++        }
++
++        static void tavailable(MirBuffer*, void* ctxt)
++        {
++            TrackedBuffer* buf = reinterpret_cast<TrackedBuffer*>(ctxt);
++            buf->ready();
++        }
++
++        void ready()
++        {
++            last_count_ = counter.fetch_add(1);
++            std::unique_lock<std::mutex> lk(mutex);
++            avail = true;
++            cv.notify_all();
++        }
++
++        bool wait_ready(std::chrono::milliseconds ms)
++        {
++            std::unique_lock<std::mutex> lk(mutex);
++            return cv.wait_for(lk, ms, [this] { return avail; });
++        }
++
++        bool is_ready() { return avail; }
++        unsigned int last_count() const
++        {
++            return last_count_;
++        }
++
++        MirPixelFormat pf = mir_pixel_format_abgr_8888;
++        MirBuffer* buffer;
++        std::atomic<unsigned int>& counter;
++        unsigned int last_count_ = 0u;
++        bool avail = true;
++        std::condition_variable cv;
++        std::mutex mutex;
++    };
++}
++
++TEST_F(PresentationChain, fifo_looks_correct_from_client_perspective)
++{
++    SurfaceWithChainFromStart window(
++        connection, mir_present_mode_fifo, size, pf);
++
++    int const num_buffers = 5;
++
++    std::atomic<unsigned int> counter{ 0u };
++    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
++    for (auto& buffer : buffers)
++        buffer = std::make_unique<TrackedBuffer>(connection, counter);
++    for(auto& b : buffers)
++        b->submit_to(window.chain());
++
++    //the last one that will return;
++    EXPECT_TRUE(buffers[3]->wait_ready(5s));
++    EXPECT_THAT(buffers[0]->last_count(), Lt(buffers[1]->last_count()));
++    EXPECT_THAT(buffers[1]->last_count(), Lt(buffers[2]->last_count()));
++    EXPECT_THAT(buffers[2]->last_count(), Lt(buffers[3]->last_count()));
++    EXPECT_FALSE(buffers[4]->is_ready());
++}
++
++TEST_F(PresentationChain, fifo_queues_when_compositor_isnt_consuming)
++{
++    SurfaceWithChainFromStart window(
++        connection, mir_present_mode_fifo, size, pf);
++    int const num_buffers = 5;
++    std::atomic<unsigned int> counter{ 0u };
++    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
++    for (auto& buffer : buffers)
++        buffer = std::make_unique<TrackedBuffer>(connection, counter);
++    {
++        auto const stall = mir::raii::paired_calls(
++            [this] { stall_compositor = true; },
++            [this] { stall_compositor = false; });
++        for (auto& b : buffers)
++            b->submit_to(window.chain());
++        for (auto &b : buffers)
++            EXPECT_FALSE(b->is_ready());
++    }
++    for (auto i = 0u; i < buffers.size() - 1; i++)
++        EXPECT_TRUE(buffers[i]->wait_ready(5s));
++}
++
++TEST_F(PresentationChain, mailbox_looks_correct_from_client_perspective)
++{
++    auto const stall = mir::raii::paired_calls(
++        [this] { stall_compositor = true; },
++        [this] { stall_compositor = false; });
++    SurfaceWithChainFromStart window(
++        connection, mir_present_mode_mailbox, size, pf);
++
++    int const num_buffers = 5;
++
++    std::atomic<unsigned int> counter{ 0u };
++    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
++    for (auto& buffer : buffers)
++        buffer = std::make_unique<TrackedBuffer>(connection, counter);
++
++    for(auto i = 0u; i < buffers.size(); i++)
++    {
++        buffers[i]->submit_to(window.chain());
++        if (i > 0)
++            EXPECT_TRUE(buffers[i-1]->wait_ready(5s));
++    }
++
++    for(auto i = 0u; i < num_buffers - 1; i++)
++        EXPECT_TRUE(buffers[i]->is_ready());
++    EXPECT_FALSE(buffers[4]->is_ready());
++}
++
++TEST_F(PresentationChain, fifo_queues_clears_out_on_transition_to_mailbox)
++{
++    SurfaceWithChainFromStart window(
++        connection, mir_present_mode_fifo, size, pf);
++    int const num_buffers = 5;
++    std::atomic<unsigned int> counter{ 0u };
++    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
++    for (auto& buffer : buffers)
++        buffer = std::make_unique<TrackedBuffer>(connection, counter);
++
++    auto const stall = mir::raii::paired_calls(
++        [this] { stall_compositor = true; },
++        [this] { stall_compositor = false; });
++    for (auto& b : buffers)
++        b->submit_to(window.chain());
++    for (auto &b : buffers)
++        EXPECT_FALSE(b->is_ready());
++
++    mir_presentation_chain_set_mode(window.chain(), mir_present_mode_mailbox);
++
++    for (auto i = 0u; i < buffers.size() - 1; i++)
++        EXPECT_TRUE(buffers[i]->wait_ready(5s));
++}
 === modified file 'tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp'
 --- tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp	2017-01-18 02:29:37 +0000
 +++ tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp	2017-03-22 01:44:09 +0000
@@ -538,6 +538,23 @@
      EXPECT_THAT(b3->id(), Eq(buffers[2]->id()));
+ }
++TEST_F(MultiMonitorArbiter, checks_if_buffer_is_valid_after_clean_onscreen_buffer)
++{
++    int comp_id1{0};
++
++    schedule.set_schedule({buffers[0], buffers[1], buffers[2], buffers[3]});
++
++    arbiter.advance_schedule();
++    arbiter.advance_schedule();
++    arbiter.advance_schedule();
++    arbiter.advance_schedule();
++
++    auto b1 = arbiter.compositor_acquire(&comp_id1);
++
++    EXPECT_THAT(b1->id(), Eq(buffers[3]->id()));
++    EXPECT_THAT(b1->size(), Eq(buffers[3]->size()));
++}
++
  TEST_F(MultiMonitorArbiter, releases_buffer_on_destruction)
+ {
      mc::MultiMonitorArbiter arbiter{guarantee, mt::fake_shared(mock_map), mt::fake_shared(schedule)};
 === modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
 --- tests/unit-tests/frontend/test_session_mediator.cpp	2017-02-08 20:22:59 +0000
 +++ tests/unit-tests/frontend/test_session_mediator.cpp	2017-03-22 01:44:09 +0000
@@ -706,6 +706,28 @@
      mediator.modify_surface(&mods, &null, null_callback.get());
+ }
++//LP: #1670876
++MATCHER(InputRegionSet, "input region set")
++{
++    return arg.input_shape.is_set();
++}
++TEST_F(SessionMediator, does_not_reset_input_region_if_region_not_set)
++{
++    using namespace testing;
++    mp::Void null;
++    mp::SurfaceModifications mods;
++
++    mediator.connect(&connect_parameters, &connection, null_callback.get());
++    mediator.create_surface(&surface_parameters, &surface_response, null_callback.get());
++    mods.mutable_surface_id()->set_value(surface_response.id().value());
++    mods.mutable_surface_specification()->set_min_width(1);
++
++    EXPECT_CALL(*shell, modify_surface(_,
++        mf::SurfaceId{surface_response.id().value()}, Not(InputRegionSet())));
++
++    mediator.modify_surface(&mods, &null, null_callback.get());
++}
++
  TEST_F(SessionMediator, allocates_software_buffers_from_the_session)
+ {
      using namespace testing;
 === modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
 --- tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2017-02-02 18:25:05 +0000
 +++ tests/unit-tests/platforms/mesa/client/test_client_platform.cpp	2017-03-22 01:44:09 +0000
@@ -19,9 +19,12 @@
  #include "mir/client_platform.h"
  #include "mir/shared_library.h"
  #include "mir/raii.h"
++#include "src/platforms/mesa/client/buffer_file_ops.h"
++#include "src/platforms/mesa/client/client_buffer.h"
  #include "src/platforms/mesa/client/mesa_native_display_container.h"
  #include "src/client/rpc/mir_basic_rpc_channel.h"
  #include "src/client/mir_connection.h"
++#include "src/client/buffer.h"
  #include "mir_test_framework/client_platform_factory.h"
  #include "mir/test/doubles/mock_egl.h"
  #include "mir/test/doubles/mock_egl_native_surface.h"
@@ -50,6 +53,12 @@
  namespace
+ {
++struct StubOps : mclm::BufferFileOps
++{
++    int close(int) const override { return 0; }
++    void* map(int, off_t, size_t) const override { return nullptr; }
++    void unmap(void*, size_t) const override {}
++};
  struct StubClientContext : mcl::ClientContext
+ {
@@ -98,10 +107,28 @@
          return platform->platform_operation(request_msg.get());
+     }
++    std::shared_ptr<MirBufferPackage> make_pkg()
++    {
++        auto pkg = std::make_shared<MirBufferPackage>();
++        pkg->width = width;
++        pkg->height = height;
++        pkg->stride = stride;
++        pkg->fd_items = 1;
++        pkg->fd[0] = fake_fd;
++        pkg->data_items = 0;
++        return pkg;
++    }
++
      StubClientContext client_context;
      std::shared_ptr<mir::client::ClientPlatform> platform =
          mtf::create_mesa_client_platform(&client_context);
      mir::test::doubles::MockEGL mock_egl;
++    int fake_fd = 11;
++    int width = 23;
++    int height = 230;
++    int stride = 81290;
++    int flags = GBM_BO_USE_RENDERING;
++    int pf = GBM_FORMAT_ABGR8888;
  };
+ }
@@ -203,16 +230,14 @@
      EXPECT_NE(nullptr, egl_native_window);
+ }
--TEST_F(MesaClientPlatformTest, can_allocate_buffer)
++TEST_F(MesaClientPlatformTest, can_allocate_buffer_v1)
+ {
      using namespace std::literals::chrono_literals;
      mtd::StubConnectionConfiguration conf(platform);
      MirConnection connection(conf);
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--    mir_wait_for(connection.connect("", [](MirConnection*, void*){}, nullptr));
--#pragma GCC diagnostic pop
++    if (auto wh = connection.connect("", [](MirConnection*, void*){}, nullptr))
++        wh->wait_for_all();
      int width = 32;
      int height = 90;
@@ -230,6 +255,73 @@
      EXPECT_THAT(conf.channel->channel_call_count, Eq(call_count + 1));
+ }
++TEST_F(MesaClientPlatformTest, can_allocate_buffer_v2)
++{
++    using namespace std::literals::chrono_literals;
++
++    mtd::StubConnectionConfiguration conf(platform);
++    MirConnection connection(conf);
++    if (auto wh = connection.connect("", [](MirConnection*, void*){}, nullptr))
++        wh->wait_for_all();
++
++    int width = 32;
++    int height = 90;
++    auto ext = static_cast<MirExtensionGbmBufferV1*>(
++        platform->request_interface("mir_extension_gbm_buffer", 2));
++    ASSERT_THAT(ext, Ne(nullptr));
++    ASSERT_THAT(ext->allocate_buffer_gbm, Ne(nullptr));
++
++    auto call_count = conf.channel->channel_call_count;
++    ext->allocate_buffer_gbm(
++        &connection, width, height, pf, flags,
++        [] (::MirBuffer*, void*) {}, nullptr);
++    EXPECT_THAT(conf.channel->channel_call_count, Eq(call_count + 1));
++}
++
++TEST_F(MesaClientPlatformTest, shm_buffer_is_not_gbm_compatible)
++{
++    mtd::StubConnectionConfiguration conf(platform);
++    MirConnection connection(conf);
++    if (auto wh = connection.connect("", [](MirConnection*, void*){}, nullptr))
++        wh->wait_for_all();
++    auto ext = static_cast<MirExtensionGbmBufferV2*>(
++        platform->request_interface("mir_extension_gbm_buffer", 2));
++    ASSERT_THAT(ext, Ne(nullptr));
++    ASSERT_THAT(ext->is_gbm_importable, Ne(nullptr));
++
++    auto client_buffer = std::make_shared<mclm::ClientBuffer>(
++        std::make_shared<StubOps>(), make_pkg(), geom::Size{width, height}, mir_pixel_format_rgb_888);
++    mcl::Buffer mirbuffer(nullptr, nullptr, 0, client_buffer, nullptr, mir_buffer_usage_software);
++    EXPECT_FALSE(ext->is_gbm_importable(reinterpret_cast<MirBuffer*>(&mirbuffer)));
++}
++
++TEST_F(MesaClientPlatformTest, bo_buffer_is_gbm_compatible)
++{
++    mtd::StubConnectionConfiguration conf(platform);
++    MirConnection connection(conf);
++    if (auto wh = connection.connect("", [](MirConnection*, void*){}, nullptr))
++        wh->wait_for_all();
++    auto ext = static_cast<MirExtensionGbmBufferV2*>(
++        platform->request_interface("mir_extension_gbm_buffer", 2));
++    auto client_buffer = std::make_shared<mclm::ClientBuffer>(
++        std::make_shared<StubOps>(), make_pkg(), geom::Size{width, height}, pf, flags);
++    mcl::Buffer mirbuffer(nullptr, nullptr, 0, client_buffer, nullptr, mir_buffer_usage_hardware);
++
++    ASSERT_THAT(ext, Ne(nullptr));
++    ASSERT_THAT(ext->is_gbm_importable, Ne(nullptr));
++    ASSERT_THAT(ext->fd, Ne(nullptr));
++    ASSERT_THAT(ext->stride, Ne(nullptr));
++    ASSERT_THAT(ext->format, Ne(nullptr));
++    ASSERT_THAT(ext->flags, Ne(nullptr));
++    ASSERT_THAT(ext->age, Ne(nullptr));
++    EXPECT_TRUE(ext->is_gbm_importable(reinterpret_cast<MirBuffer*>(&mirbuffer)));
++    EXPECT_THAT(ext->fd(reinterpret_cast<MirBuffer*>(&mirbuffer)), Eq(fake_fd));
++    EXPECT_THAT(ext->stride(reinterpret_cast<MirBuffer*>(&mirbuffer)), Eq(stride));
++    EXPECT_THAT(ext->format(reinterpret_cast<MirBuffer*>(&mirbuffer)), Eq(pf));
++    EXPECT_THAT(ext->flags(reinterpret_cast<MirBuffer*>(&mirbuffer)), Eq(flags));
++    EXPECT_THAT(ext->age(reinterpret_cast<MirBuffer*>(&mirbuffer)), Eq(0));
++}
++
  TEST_F(MesaClientPlatformTest, converts_gbm_format_correctly)
+ {
      EXPECT_THAT(platform->native_format_for(mir_pixel_format_argb_8888), Eq(GBM_FORMAT_ARGB8888));
 === modified file 'tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp'
 --- tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-01-18 13:59:18 +0000
 +++ tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-03-22 01:44:09 +0000
@@ -81,6 +81,7 @@
      output->set_power_mode(mir_power_mode_on);
      output->set_orientation(mir_orientation_normal);
      output->set_edid(valid_edid, sizeof(valid_edid));
++    output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
      return std::make_shared<MirDisplayConfig>(conf);
+ }
@@ -121,6 +122,7 @@
          output->set_power_mode(mir_power_mode_on);
          output->set_orientation(mir_orientation_normal);
          output->set_edid(valid_edid, sizeof(valid_edid));
++        output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
+     }
      return std::make_shared<MirDisplayConfig>(conf);
 === modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-01-18 13:59:18 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-03-22 01:44:09 +0000
@@ -169,6 +169,22 @@
      EXPECT_NE(0, matches);
+ }
++TEST(NestedDisplayConfiguration, includes_host_subpixel_arrangement)
++{
++    auto host_conf = mt::build_trivial_configuration();
++    auto const output = mir_display_config_get_output(host_conf.get(), 0);
++    auto host_subpixel = mir_output_get_subpixel_arrangement(output);
++
++    mgn::NestedDisplayConfiguration nested_conf(host_conf);
++    int matches = 0;
++    nested_conf.for_each_output([&](mg::DisplayConfigurationOutput const& output)
++        {
++            ASSERT_EQ(host_subpixel, output.subpixel_arrangement);
++            ++matches;
++        });
++    EXPECT_NE(0, matches);
++}
++
  TEST(NestedDisplayConfiguration, clone_matches_original_configuration)
+ {
      mgn::NestedDisplayConfiguration config(mt::build_non_trivial_configuration());