Mir

Merge lp:~kdub/mir/power-control-to-display into lp:mir

power-control-to-display
Merge into development-branch

Proposed by Kevin DuBois on 2014-12-17

Status:	Merged
Approved by:	Daniel van Vugt on 2015-01-09
Approved revision:	2170
Merged at revision:	2210
Proposed branch:	lp:~kdub/mir/power-control-to-display
Merge into:	lp:mir
Prerequisite:	lp:~kdub/mir/hwc-common-cleanups
Diff against target:	1343 lines (+272/-268) 30 files modified src/platforms/android/display.cpp (+34/-13) src/platforms/android/display.h (+3/-0) src/platforms/android/display_buffer.cpp (+3/-13) src/platforms/android/display_buffer_builder.h (+3/-0) src/platforms/android/display_device.h (+2/-2) src/platforms/android/fb_device.cpp (+30/-18) src/platforms/android/fb_device.h (+13/-1) src/platforms/android/framebuffers.cpp (+5/-4) src/platforms/android/framebuffers.h (+1/-0) src/platforms/android/hwc_blanking_control.cpp (+6/-2) src/platforms/android/hwc_common_device.cpp (+1/-37) src/platforms/android/hwc_common_device.h (+0/-7) src/platforms/android/hwc_configuration.h (+2/-1) src/platforms/android/hwc_device.cpp (+2/-3) src/platforms/android/hwc_device.h (+3/-4) src/platforms/android/hwc_fb_device.cpp (+5/-2) src/platforms/android/hwc_fb_device.h (+1/-2) src/platforms/android/output_builder.cpp (+13/-1) src/platforms/android/output_builder.h (+3/-2) src/platforms/android/resource_factory.cpp (+2/-5) tests/include/mir_test_doubles/mock_display_device.h (+1/-1) tests/include/mir_test_doubles/stub_display_builder.h (+23/-2) tests/unit-tests/graphics/android/test_display.cpp (+52/-6) tests/unit-tests/graphics/android/test_display_buffer.cpp (+16/-10) tests/unit-tests/graphics/android/test_fb_device.cpp (+12/-17) tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp (+3/-3) tests/unit-tests/graphics/android/test_hwc_common_device.cpp (+2/-70) tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+8/-3) tests/unit-tests/graphics/android/test_hwc_device.cpp (+20/-28) tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+3/-11)
To merge this branch:	bzr merge lp:~kdub/mir/power-control-to-display
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-01-09
Cemil Azizoglu (community)			Approve on 2015-01-08
Alan Griffiths			Approve on 2015-01-07
Robert Carr (community)			Approve on 2015-01-06
Daniel van Vugt		2014-12-17	Abstain on 2015-01-06
Review via email: mp+245006@code.launchpad.net

Commit Message

android: move the display control from mga::DisplayDevice implementations to mga::Display.
mga::Display is the object that's best positioned to see and configure all the displays.

Description of the Change

android: move the display control from mga::DisplayDevice implementations to mga::Display.
mga::Display is the object that's best positioned to see and configure all the displays.

note: This branch has mga::Display controlling the display, and mga::DisplayBuffer used as storage space for the DisplayConfigurationOutput information. The subsequent branch will have the DisplayConfigurationOutput information move to mga::Display as well.

note: I have a hazy memory of us wanting to improve DisplayBufferBuilder's name, so added a TODO in l155

Kevin DuBois (kdub) wrote on 2014-12-17:

conflicts a bit with unbury-display-config-query, will fix-up once one of them lands

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17:

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

review: Approve (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2014-12-29:

Text conflict in src/platforms/android/display_buffer.cpp
Text conflict in src/platforms/android/hwc_blanking_control.cpp
Text conflict in src/platforms/android/hwc_common_device.cpp
Text conflict in src/platforms/android/hwc_configuration.h
Text conflict in tests/include/mir_test_doubles/stub_display_builder.h
Text conflict in tests/unit-tests/graphics/android/test_fb_device.cpp
Text conflict in tests/unit-tests/graphics/android/test_hwc_common_device.cpp
Text conflict in tests/unit-tests/graphics/android/test_hwc_configuration.cpp
Text conflict in tests/unit-tests/graphics/android/test_hwc_device.cpp
Text conflict in tests/unit-tests/graphics/android/test_hwc_fb_device.cpp
10 conflicts encountered.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-01-05:

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

review: Approve (continuous-integration)

Robert Carr (robertcarr) wrote on 2015-01-05:

+} catch (...) {}

Can we log this?

+ off = false;

I think that the BlankingControl impl needs a mutex, or perhaps in Display::safe_power_mode_off

+ config.power_mode(mga::DisplayName::primary, mode);

It's enough to take ownership of the configuration mutex.

review: Needs Fixing

Robert Carr (robertcarr) wrote on 2015-01-05:

Im not so sure the mutex is really an issue I guess as its only not held during config changes during the ctor and dtor...I doubt this could be particularly problematic. I think it's worth acquiring the mutex from the dtor though (it may be worth updating the signature: safe_power_mode_off->safe_power_mode_off_locked).

Kevin DuBois (kdub) wrote on 2015-01-05:

> +} catch (...) {}
>
> Can we log this?

Some drivers report incorrect failure error codes on startup, I'd rather not log anything to avoid having people think there's problems when the driver is operating as best as we can get it to.

> + off = false;
>
> I think that the BlankingControl impl needs a mutex, or perhaps in
> Display::safe_power_mode_off
>
> + config.power_mode(mga::DisplayName::primary, mode);
>
> It's enough to take ownership of the configuration mutex.

Display now serializes the calls between the display posting functions and the blanking controls. The second mutex is not needed, nor could a mutex in BlankingControl protect against the display trying to post and turn on/off at the same time.

Kevin DuBois (kdub) wrote on 2015-01-05:

> +} catch (...) {}
>
> Can we log this?

Some drivers report incorrect failure error codes on startup, I'd rather not log anything to avoid having people think there's problems when the driver is operating as best as we can get it to.

Daniel van Vugt (vanvugt) on 2015-01-06:

review: Abstain

Robert Carr (robertcarr) wrote on 2015-01-06:

>> Some drivers report incorrect failure error codes on startup, I'd rather not log anything to >> avoid having people think there's problems when the driver is operating as best as we can get >> it to.

I would make the other call. Remember users aren't looking at logs. We are interpreting logs from users. The message could even warn of false positives.

>> Display now serializes the calls between the display posting functions and the blanking
>> controls. The second mutex is not needed, nor could a mutex in BlankingControl protect against >> the display trying to post and turn on/off at the same time.

Ah, sorry

review: Approve

Alan Griffiths (alan-griffiths) wrote on 2015-01-07:

Just nits

> > +} catch (...) {}
> >
> > Can we log this?
>
> Some drivers report incorrect failure error codes on startup, I'd rather not
> log anything to avoid having people think there's problems when the driver is
> operating as best as we can get it to.

Preexisting I guess, but I think that deserves a comment to explain the code.

~~~~

92 + ~Display();

Destructors ought to be noexcept

review: Needs Fixing

Kevin DuBois (kdub) wrote on 2015-01-07:

nits addressed

Alan Griffiths (alan-griffiths) wrote on 2015-01-07:

> nits addressed

Although I'd have put the comment at the "catch (...) {}" not at just one of the two call sites.

review: Approve

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-01-07:

Just marking so I get a chance to review. I should be able to do it later today.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-01-07:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-07:

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

review: Approve (continuous-integration)

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-01-08:

Ok.

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/989/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/737
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/169/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/737
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3867
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16946

review: Needs Fixing (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2015-01-09:

Looks like a CI hiccup that's affecting other branches too. Trying to top approve...

PS Jenkins bot (ps-jenkins) on 2015-01-09:

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:

Emanuele Antonio Faraone

Gerry Boland

Kevin DuBois

Mir development team

 === modified file 'src/platforms/android/display.cpp'
 --- src/platforms/android/display.cpp	2014-12-08 04:03:47 +0000
 +++ src/platforms/android/display.cpp	2015-01-07 20:57:51 +0000
@@ -32,14 +32,28 @@
  namespace mg=mir::graphics;
  namespace geom=mir::geometry;
--mga::Display::Display(std::shared_ptr<mga::DisplayBufferBuilder> const& display_buffer_builder,
--                                    std::shared_ptr<mg::GLProgramFactory> const& gl_program_factory,
--                                    std::shared_ptr<GLConfig> const& gl_config,
--                                    std::shared_ptr<DisplayReport> const& display_report)
--    : display_buffer_builder{display_buffer_builder},
--      gl_context{display_buffer_builder->display_format(), *gl_config, *display_report},
--      display_buffer{display_buffer_builder->create_display_buffer(*gl_program_factory, gl_context)}
--{
++namespace
++{
++void safe_power_mode(mga::HwcConfiguration& config, MirPowerMode mode) noexcept
++try
++{
++    config.power_mode(mga::DisplayName::primary, mode);
++} catch (...) {}
++}
++
++mga::Display::Display(
++    std::shared_ptr<mga::DisplayBufferBuilder> const& display_buffer_builder,
++    std::shared_ptr<mg::GLProgramFactory> const& gl_program_factory,
++    std::shared_ptr<GLConfig> const& gl_config,
++    std::shared_ptr<DisplayReport> const& display_report) :
++    display_buffer_builder{display_buffer_builder},
++    gl_context{display_buffer_builder->display_format(), *gl_config, *display_report},
++    display_buffer{display_buffer_builder->create_display_buffer(*gl_program_factory, gl_context)},
++    hwc_config{display_buffer_builder->create_hwc_configuration()}
++{
++    //Some drivers (depending on kernel state) incorrectly report an error code indicating that the display is already on. Ignore the first failure.
++    safe_power_mode(*hwc_config, mir_power_mode_on);
++
      display_report->report_successful_setup_of_native_resources();
      gl_context.make_current();
@@ -48,6 +62,12 @@
      display_report->report_successful_display_construction();
+ }
++mga::Display::~Display() noexcept
++{
++    if (display_buffer->configuration().power_mode != mir_power_mode_off)
++        safe_power_mode(*hwc_config, mir_power_mode_off);
++}
++
  void mga::Display::for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f)
+ {
      std::lock_guard<decltype(configuration_mutex)> lock{configuration_mutex};
@@ -67,16 +87,17 @@
  void mga::Display::configure(mg::DisplayConfiguration const& configuration)
+ {
      if (!configuration.valid())
--    {
--        BOOST_THROW_EXCEPTION(
--            std::logic_error("Invalid or inconsistent display configuration"));
--    }
++        BOOST_THROW_EXCEPTION(std::logic_error("Invalid or inconsistent display configuration"));
      std::lock_guard<decltype(configuration_mutex)> lock{configuration_mutex};
      configuration.for_each_output([&](mg::DisplayConfigurationOutput const& output)
+     {
--        display_buffer->configure(output);
++        if (display_buffer->configuration().power_mode != output.power_mode)
++        {
++            hwc_config->power_mode(mga::DisplayName::primary, output.power_mode);
++            display_buffer->configure(output);
++        }
      });
+ }
 === modified file 'src/platforms/android/display.h'
 --- src/platforms/android/display.h	2014-12-08 04:03:47 +0000
 +++ src/platforms/android/display.h	2015-01-07 20:57:51 +0000
@@ -21,6 +21,7 @@
  #include "mir/graphics/display.h"
  #include "gl_context.h"
++#include "hwc_configuration.h"
  #include <memory>
  #include <mutex>
@@ -47,6 +48,7 @@
                              std::shared_ptr<GLProgramFactory> const& gl_program_factory,
                              std::shared_ptr<GLConfig> const& gl_config,
                              std::shared_ptr<DisplayReport> const& display_report);
++    ~Display() noexcept;
      void for_each_display_buffer(std::function<void(graphics::DisplayBuffer&)> const& f) override;
@@ -75,6 +77,7 @@
      //we only have a primary display at the moment
      std::unique_ptr<ConfigurableDisplayBuffer> const display_buffer;
++    std::unique_ptr<HwcConfiguration> const hwc_config;
  };
+ }
 === modified file 'src/platforms/android/display_buffer.cpp'
 --- src/platforms/android/display_buffer.cpp	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/display_buffer.cpp	2015-01-07 20:57:51 +0000
@@ -128,19 +128,9 @@
  void mga::DisplayBuffer::configure(DisplayConfigurationOutput const& new_configuration)
+ {
--    //power mode
--    MirPowerMode intended_power_mode = new_configuration.power_mode;
--    if ((intended_power_mode == mir_power_mode_standby) ||
--        (intended_power_mode == mir_power_mode_suspend))
--    {
--        intended_power_mode = mir_power_mode_off;
--    }
--
--    if (intended_power_mode != current_configuration.power_mode)
--    {
--        display_device->mode(intended_power_mode);
--        current_configuration.power_mode = intended_power_mode;
--    }
++    if (new_configuration.power_mode != mir_power_mode_on)
++        display_device->content_cleared();
++    current_configuration.power_mode = new_configuration.power_mode;
      //TODO: We don't support rotation yet, so
      //we preserve this orientation change so the compositor can rotate everything in GL
 === modified file 'src/platforms/android/display_buffer_builder.h'
 --- src/platforms/android/display_buffer_builder.h	2014-12-08 04:03:47 +0000
 +++ src/platforms/android/display_buffer_builder.h	2015-01-07 20:57:51 +0000
@@ -31,7 +31,9 @@
  namespace android
+ {
  class GLContext;
++class HwcConfiguration;
++//TODO: this name needs improvement.
  class DisplayBufferBuilder
+ {
  public:
@@ -40,6 +42,7 @@
      virtual MirPixelFormat display_format() = 0;
      virtual std::unique_ptr<ConfigurableDisplayBuffer> create_display_buffer(
          GLProgramFactory const& gl_program_factory, GLContext const& gl_context) = 0;
++    virtual std::unique_ptr<HwcConfiguration> create_hwc_configuration() = 0;
  protected:
      DisplayBufferBuilder() = default;
 === modified file 'src/platforms/android/display_device.h'
 --- src/platforms/android/display_device.h	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/display_device.h	2015-01-07 20:57:51 +0000
@@ -49,8 +49,8 @@
          RenderableList const& list,
          RenderableListCompositor const& list_compositor) = 0;
--    //TODO: remove the following from this interface
--    virtual void mode(MirPowerMode mode) = 0;
++    //notify the DisplayDevice that the screen content was cleared in a way other than the above fns
++    virtual void content_cleared() = 0;
  protected:
      DisplayDevice() = default;
 === modified file 'src/platforms/android/fb_device.cpp'
 --- src/platforms/android/fb_device.cpp	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/fb_device.cpp	2015-01-07 20:57:51 +0000
@@ -32,16 +32,38 @@
  namespace mga=mir::graphics::android;
  namespace geom=mir::geometry;
--mga::FBDevice::FBDevice(
--    std::shared_ptr<framebuffer_device_t> const& fbdev)
--    : fb_device(fbdev)
++mga::FbControl::FbControl(std::shared_ptr<framebuffer_device_t> const& fbdev) :
++    fb_device(fbdev)
+ {
      if (fb_device->setSwapInterval)
--    {
          fb_device->setSwapInterval(fb_device.get(), 1);
--    }
--
--    mode(mir_power_mode_on);
++}
++
++void mga::FbControl::power_mode(DisplayName display, MirPowerMode mode)
++{
++    if (display != mga::DisplayName::primary)
++        BOOST_THROW_EXCEPTION(std::runtime_error("fb device cannot activate non-primary display"));
++
++    int enable = 0;
++    if (mode == mir_power_mode_on)
++        enable = 1;
++
++    if (fb_device->enableScreen)
++        fb_device->enableScreen(fb_device.get(), enable);
++}
++
++mga::DisplayAttribs mga::FbControl::active_attribs_for(DisplayName)
++{
++    return mga::DisplayAttribs{
++      {fb_device->width, fb_device->height},
++      {0,0},
++      fb_device->fps,
++      true};
++}
++
++mga::FBDevice::FBDevice(std::shared_ptr<framebuffer_device_t> const& fbdev) :
++    fb_device(fbdev)
++{
+ }
  void mga::FBDevice::post_gl(SwappingGLContext const& context)
@@ -62,16 +84,6 @@
      return false;
+ }
--void mga::FBDevice::mode(MirPowerMode mode)
++void mga::FBDevice::content_cleared()
+ {
--    int enable = 0;
--    if (mode == mir_power_mode_on)
--    {
--        enable = 1;
--    }
--
--    if (fb_device->enableScreen)
--    {
--        fb_device->enableScreen(fb_device.get(), enable);
--    }
+ }
 === modified file 'src/platforms/android/fb_device.h'
 --- src/platforms/android/fb_device.h	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/fb_device.h	2015-01-07 20:57:51 +0000
@@ -20,6 +20,7 @@
  #define MIR_GRAPHICS_ANDROID_FB_DEVICE_H_
  #include "display_device.h"
++#include "hwc_configuration.h"
  #include <hardware/gralloc.h>
  #include <hardware/fb.h>
@@ -30,12 +31,22 @@
  namespace android
+ {
++class FbControl : public HwcConfiguration
++{
++public:
++    FbControl(std::shared_ptr<framebuffer_device_t> const& fbdev);
++    void power_mode(DisplayName, MirPowerMode) override;
++    DisplayAttribs active_attribs_for(DisplayName) override;
++
++private:
++    std::shared_ptr<framebuffer_device_t> const fb_device;
++};
++
  class FBDevice : public DisplayDevice
+ {
  public:
      FBDevice(std::shared_ptr<framebuffer_device_t> const& fbdev);
--    void mode(MirPowerMode mode);
      virtual void post_gl(SwappingGLContext const& context);
      virtual bool post_overlays(
          SwappingGLContext const& context,
@@ -44,6 +55,7 @@
  private:
      std::shared_ptr<framebuffer_device_t> const fb_device;
++    void content_cleared() override;
  };
+ }
 === modified file 'src/platforms/android/framebuffers.cpp'
 --- src/platforms/android/framebuffers.cpp	2014-12-12 21:41:20 +0000
 +++ src/platforms/android/framebuffers.cpp	2015-01-07 20:57:51 +0000
@@ -82,10 +82,11 @@
  mga::Framebuffers::Framebuffers(
      std::shared_ptr<mga::GraphicBufferAllocator> const& buffer_allocator,
--    std::shared_ptr<framebuffer_device_t> const& fb)
--    : format{mga::to_mir_format(fb->format)},
--      size({fb->width, fb->height}),
--      refresh_rate_hz{fb->fps}
++    geom::Size size, double vrefresh_hz,
++    std::shared_ptr<framebuffer_device_t> const& fb) :
++    format{mga::to_mir_format(fb->format)},
++    size{size},
++    refresh_rate_hz{vrefresh_hz}
+ {
      //guarantee always 2 fb's allocated
      auto fb_num = static_cast<unsigned int>(fb->numFramebuffers);
 === modified file 'src/platforms/android/framebuffers.h'
 --- src/platforms/android/framebuffers.h	2014-12-12 21:20:11 +0000
 +++ src/platforms/android/framebuffers.h	2015-01-07 20:57:51 +0000
@@ -43,6 +43,7 @@
      Framebuffers(std::shared_ptr<GraphicBufferAllocator> const& buffer_allocator,
                   geometry::Size size, double vrefresh_hz, unsigned int num_framebuffers);
      Framebuffers(std::shared_ptr<GraphicBufferAllocator> const& buffer_allocator,
++                 geometry::Size size, double vrefresh_hz,
                   std::shared_ptr<framebuffer_device_t> const& fb);
      MirPixelFormat fb_format();
 === modified file 'src/platforms/android/hwc_blanking_control.cpp'
 --- src/platforms/android/hwc_blanking_control.cpp	2014-12-20 01:59:45 +0000
 +++ src/platforms/android/hwc_blanking_control.cpp	2015-01-07 20:57:51 +0000
@@ -26,7 +26,8 @@
  mga::HwcBlankingControl::HwcBlankingControl(
      std::shared_ptr<mga::HwcWrapper> const& hwc_device) :
--    hwc_device{hwc_device}
++    hwc_device{hwc_device},
++    off{false}
+ {
+ }
@@ -36,11 +37,14 @@
+     {
          hwc_device->display_on(display_name);
          hwc_device->vsync_signal_on(display_name);
++        off = false;
+     }
--    else
++    //suspend, standby, and off all count as off
++    else if (!off)
+     {
          hwc_device->vsync_signal_off(display_name);
          hwc_device->display_off(display_name);
++        off = true;
+     }
+ }
 === modified file 'src/platforms/android/hwc_common_device.cpp'
 --- src/platforms/android/hwc_common_device.cpp	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/hwc_common_device.cpp	2015-01-07 20:57:51 +0000
@@ -44,13 +44,10 @@
  mga::HWCCommonDevice::HWCCommonDevice(
      std::shared_ptr<HwcWrapper> const& hwc_device,
--    std::shared_ptr<HwcConfiguration> const& hwc_config,
      std::shared_ptr<HWCVsyncCoordinator> const& coordinator) :
      coordinator(coordinator),
      callbacks(std::make_shared<mga::HWCCallbacks>()),
--    hwc_device(hwc_device),
--    hwc_config(hwc_config),
--    current_mode(mir_power_mode_on)
++    hwc_device(hwc_device)
+ {
      callbacks->hooks.invalidate = invalidate_hook;
      callbacks->hooks.vsync = vsync_hook;
@@ -58,28 +55,10 @@
      callbacks->self = this;
      hwc_device->register_hooks(callbacks);
--
--    try
--    {
--        mode(mir_power_mode_on);
--    } catch (...)
--    {
--        //TODO: log failure here. some drivers will throw if the screen is already on, which
--        //      is not a fatal condition
--    }
+ }
  mga::HWCCommonDevice::~HWCCommonDevice() noexcept
+ {
--    if (current_mode == mir_power_mode_on)
--    {
--        try
--        {
--            mode(mir_power_mode_off);
--        } catch (...)
--        {
--        }
--    }
      callbacks->self = nullptr;
+ }
@@ -87,18 +66,3 @@
+ {
      coordinator->notify_vsync();
+ }
--
--void mga::HWCCommonDevice::mode(MirPowerMode mode_request)
--{
--    hwc_config->power_mode(mga::DisplayName::primary, mode_request);
--
--    if (mode_request == mir_power_mode_off)
--        turned_screen_off();
--
--    //TODO the mode should be in the display mode structure that gets passed to the rest of the system
--    current_mode = mode_request;
--}
--
--void mga::HWCCommonDevice::turned_screen_off()
--{
--}
 === modified file 'src/platforms/android/hwc_common_device.h'
 --- src/platforms/android/hwc_common_device.h	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/hwc_common_device.h	2015-01-07 20:57:51 +0000
@@ -48,23 +48,16 @@
      virtual ~HWCCommonDevice() noexcept;
      void notify_vsync();
--    void mode(MirPowerMode mode);
  protected:
      HWCCommonDevice(std::shared_ptr<HwcWrapper> const& hwc_wrapper,
--                    std::shared_ptr<HwcConfiguration> const& configuration,
                      std::shared_ptr<HWCVsyncCoordinator> const& coordinator);
      std::shared_ptr<HWCVsyncCoordinator> const coordinator;
  private:
--    virtual void turned_screen_off();
--
      std::shared_ptr<HWCCallbacks> const callbacks;
      std::shared_ptr<HwcWrapper> const hwc_device;
--    std::shared_ptr<HwcConfiguration> const hwc_config;
--
--    MirPowerMode current_mode;
  };
+ }
 === modified file 'src/platforms/android/hwc_configuration.h'
 --- src/platforms/android/hwc_configuration.h	2015-01-05 23:03:19 +0000
 +++ src/platforms/android/hwc_configuration.h	2015-01-07 20:57:51 +0000
@@ -38,7 +38,7 @@
      bool connected;
  };
--//interface adapting for the blanking interface differences between HWC 1.0-1.3 and HWC 1.4+
++//interface adapting for the blanking interface differences between fb, HWC 1.0-1.3, and HWC 1.4+
  class HwcConfiguration
+ {
  public:
@@ -61,6 +61,7 @@
      DisplayAttribs active_attribs_for(DisplayName) override;
  private:
      std::shared_ptr<HwcWrapper> const hwc_device;
++    bool off;
  };
+ }
 === modified file 'src/platforms/android/hwc_device.cpp'
 --- src/platforms/android/hwc_device.cpp	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/hwc_device.cpp	2015-01-07 20:57:51 +0000
@@ -66,10 +66,9 @@
+ }
  mga::HwcDevice::HwcDevice(std::shared_ptr<HwcWrapper> const& hwc_wrapper,
--                          std::shared_ptr<HwcConfiguration> const& hwc_config,
                            std::shared_ptr<HWCVsyncCoordinator> const& coordinator,
                            std::shared_ptr<LayerAdapter> const& layer_adapter)
--    : HWCCommonDevice(hwc_wrapper, hwc_config, coordinator),
++    : HWCCommonDevice(hwc_wrapper, coordinator),
        hwc_list{layer_adapter, {}, fbtarget_plus_skip_size},
        hwc_wrapper(hwc_wrapper)
+ {
@@ -188,7 +187,7 @@
      return true;
+ }
--void mga::HwcDevice::turned_screen_off()
++void mga::HwcDevice::content_cleared()
+ {
      onscreen_overlay_buffers.clear();
+ }
 === modified file 'src/platforms/android/hwc_device.h'
 --- src/platforms/android/hwc_device.h	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/hwc_device.h	2015-01-07 20:57:51 +0000
@@ -44,19 +44,18 @@
  public:
      HwcDevice(
          std::shared_ptr<HwcWrapper> const& hwc_wrapper,
--        std::shared_ptr<HwcConfiguration> const& hwc_config,
          std::shared_ptr<HWCVsyncCoordinator> const& coordinator,
          std::shared_ptr<LayerAdapter> const& layer_adapter);
--    virtual void post_gl(SwappingGLContext const& context) override;
--    virtual bool post_overlays(
++    void post_gl(SwappingGLContext const& context) override;
++    bool post_overlays(
          SwappingGLContext const& context,
          RenderableList const& list,
          RenderableListCompositor const& list_compositor) override;
++    void content_cleared() override;
  private:
      bool buffer_is_onscreen(Buffer const&) const;
--    void turned_screen_off() override;
      LayerList hwc_list;
      std::vector<std::shared_ptr<Buffer>> onscreen_overlay_buffers;
 === modified file 'src/platforms/android/hwc_fb_device.cpp'
 --- src/platforms/android/hwc_fb_device.cpp	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/hwc_fb_device.cpp	2015-01-07 20:57:51 +0000
@@ -38,9 +38,8 @@
  mga::HwcFbDevice::HwcFbDevice(
      std::shared_ptr<HwcWrapper> const& hwc_wrapper,
      std::shared_ptr<framebuffer_device_t> const& fb_device,
--    std::shared_ptr<HwcConfiguration> const& config,
      std::shared_ptr<HWCVsyncCoordinator> const& coordinator) :
--    HWCCommonDevice(hwc_wrapper, config, coordinator),
++    HWCCommonDevice(hwc_wrapper, coordinator),
      hwc_wrapper(hwc_wrapper),
      fb_device(fb_device),
      layer_list{std::make_shared<IntegerSourceCrop>(), {}, 1}
@@ -87,3 +86,7 @@
+ {
      return false;
+ }
++
++void mga::HwcFbDevice::content_cleared()
++{
++}
 === modified file 'src/platforms/android/hwc_fb_device.h'
 --- src/platforms/android/hwc_fb_device.h	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/hwc_fb_device.h	2015-01-07 20:57:51 +0000
@@ -31,14 +31,12 @@
  namespace android
+ {
  class HwcWrapper;
--class HwcConfiguration;
  class HwcFbDevice : public HWCCommonDevice
+ {
  public:
      HwcFbDevice(std::shared_ptr<HwcWrapper> const& hwc_wrapper,
                  std::shared_ptr<framebuffer_device_t> const& fb_device,
--                std::shared_ptr<HwcConfiguration> const& hwc_config,
                  std::shared_ptr<HWCVsyncCoordinator> const& coordinator);
      virtual void post_gl(SwappingGLContext const& context);
@@ -48,6 +46,7 @@
          RenderableListCompositor const& list_compositor);
  private:
++    void content_cleared() override;
      std::shared_ptr<HwcWrapper> const hwc_wrapper;
      std::shared_ptr<framebuffer_device_t> const fb_device;
      static int const num_displays{1};
 === modified file 'src/platforms/android/output_builder.cpp'
 --- src/platforms/android/output_builder.cpp	2014-12-15 20:52:57 +0000
 +++ src/platforms/android/output_builder.cpp	2015-01-07 20:57:51 +0000
@@ -16,6 +16,7 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
++#include "fb_device.h"
  #include "device_quirks.h"
  #include "output_builder.h"
  #include "display_resource_factory.h"
@@ -24,6 +25,7 @@
  #include "framebuffers.h"
  #include "real_hwc_wrapper.h"
  #include "hwc_report.h"
++#include "hwc_configuration.h"
  #include "hwc_layers.h"
  #include "hwc_configuration.h"
@@ -57,7 +59,9 @@
      if (force_backup_display || hwc_native->common.version == HWC_DEVICE_API_VERSION_1_0)
+     {
          fb_native = res_factory->create_fb_native_device();
--        framebuffers = std::make_shared<mga::Framebuffers>(buffer_allocator, fb_native);
++        mga::FbControl fb_control{fb_native};
++        auto attribs = fb_control.active_attribs_for(mga::DisplayName::primary);
++        framebuffers = std::make_shared<mga::Framebuffers>(buffer_allocator, attribs.pixel_size, attribs.vrefresh_hz, fb_native);
+     }
      else
+     {
@@ -118,3 +122,11 @@
          gl_program_factory,
          overlay_optimization));
+ }
++
++std::unique_ptr<mga::HwcConfiguration> mga::OutputBuilder::create_hwc_configuration()
++{
++    if (force_backup_display || hwc_native->common.version == HWC_DEVICE_API_VERSION_1_0)
++        return std::unique_ptr<mga::HwcConfiguration>(new mga::FbControl(fb_native));
++    else
++        return std::unique_ptr<mga::HwcConfiguration>(new mga::HwcBlankingControl(hwc_wrapper));
++}
 === modified file 'src/platforms/android/output_builder.h'
 --- src/platforms/android/output_builder.h	2014-12-11 02:43:01 +0000
 +++ src/platforms/android/output_builder.h	2015-01-07 20:57:51 +0000
@@ -47,10 +47,11 @@
          OverlayOptimization overlay_option,
          std::shared_ptr<HwcReport> const& hwc_report);
--    MirPixelFormat display_format();
++    MirPixelFormat display_format() override;
      std::unique_ptr<ConfigurableDisplayBuffer> create_display_buffer(
          GLProgramFactory const& gl_program_factory,
--        GLContext const& gl_context);
++        GLContext const& gl_context) override;
++    std::unique_ptr<HwcConfiguration> create_hwc_configuration() override;
  private:
      std::shared_ptr<GraphicBufferAllocator> const buffer_allocator;
 === modified file 'src/platforms/android/resource_factory.cpp'
 --- src/platforms/android/resource_factory.cpp	2014-12-19 02:31:34 +0000
 +++ src/platforms/android/resource_factory.cpp	2015-01-07 20:57:51 +0000
@@ -29,7 +29,6 @@
  #include "hwc_fb_device.h"
  #include "hwc_layerlist.h"
  #include "hwc_vsync.h"
--#include "hwc_configuration.h"
  #include "display.h"
  #include "real_hwc_wrapper.h"
@@ -95,8 +94,7 @@
      std::shared_ptr<LayerAdapter> const& layer_adapter) const
+ {
      auto syncer = std::make_shared<mga::HWCVsync>();
--    auto config = std::make_shared<mga::HwcBlankingControl>(wrapper);
--    return std::make_shared<mga::HwcDevice>(wrapper, config, syncer, layer_adapter);
++    return std::make_shared<mga::HwcDevice>(wrapper, syncer, layer_adapter);
+ }
  std::shared_ptr<mga::DisplayDevice> mga::ResourceFactory::create_hwc_fb_device(
@@ -104,6 +102,5 @@
      std::shared_ptr<framebuffer_device_t> const& fb_native_device) const
+ {
      auto syncer = std::make_shared<mga::HWCVsync>();
--    auto config = std::make_shared<mga::HwcBlankingControl>(wrapper);
--    return std::make_shared<mga::HwcFbDevice>(wrapper, fb_native_device, config, syncer);
++    return std::make_shared<mga::HwcFbDevice>(wrapper, fb_native_device, syncer);
+ }
 === modified file 'tests/include/mir_test_doubles/mock_display_device.h'
 --- tests/include/mir_test_doubles/mock_display_device.h	2014-12-19 02:31:34 +0000
 +++ tests/include/mir_test_doubles/mock_display_device.h	2015-01-07 20:57:51 +0000
@@ -35,7 +35,7 @@
+ {
  public:
      ~MockDisplayDevice() noexcept {}
--    MOCK_METHOD1(mode, void(MirPowerMode));
++    MOCK_METHOD0(content_cleared, void());
      MOCK_METHOD1(post_gl, void(graphics::android::SwappingGLContext const&));
      MOCK_METHOD3(post_overlays, bool(
          graphics::android::SwappingGLContext const&,
 === modified file 'tests/include/mir_test_doubles/stub_display_builder.h'
 --- tests/include/mir_test_doubles/stub_display_builder.h	2014-12-19 02:31:34 +0000
 +++ tests/include/mir_test_doubles/stub_display_builder.h	2015-01-07 20:57:51 +0000
@@ -21,6 +21,7 @@
  #include "src/platforms/android/display_buffer_builder.h"
  #include "src/platforms/android/configurable_display_buffer.h"
++#include "src/platforms/android/hwc_configuration.h"
  #include <gmock/gmock.h>
  namespace mir
@@ -53,17 +54,24 @@
                     graphics::DisplayConfigurationCardId{0},
                     graphics::DisplayConfigurationOutputType::vga,
                     {}, {}, 0, {}, false, false, {}, 0, mir_pixel_format_abgr_8888,
--                   mir_power_mode_off,
++                   mir_power_mode_on,
                     mir_orientation_normal};
+     }
  private:
      geometry::Rectangle rect;
  };
++struct MockHwcConfiguration : public graphics::android::HwcConfiguration
++{
++    MOCK_METHOD2(power_mode, void(graphics::android::DisplayName, MirPowerMode));
++    MOCK_METHOD1(active_attribs_for, graphics::android::DisplayAttribs(graphics::android::DisplayName));
++};
++
  struct StubDisplayBuilder : public graphics::android::DisplayBufferBuilder
+ {
      StubDisplayBuilder(geometry::Size sz)
--        : sz(sz)
++        : sz(sz),
++          mock_config{new testing::NiceMock<MockHwcConfiguration>()}
+     {
+     }
@@ -84,8 +92,21 @@
          return std::unique_ptr<graphics::android::ConfigurableDisplayBuffer>(
                  new StubConfigurableDisplayBuffer(geometry::Rectangle{{0,0},sz}));
+     }
++
++    std::unique_ptr<graphics::android::HwcConfiguration> create_hwc_configuration() override
++    {
++        auto config = std::unique_ptr<MockHwcConfiguration>(new testing::NiceMock<MockHwcConfiguration>());
++        std::swap(config, mock_config);
++        return std::move(config);
++    }
++    void with_next_config(std::function<void(MockHwcConfiguration& mock_config)> const& fn)
++    {
++        fn(*mock_config);
++    }
++
      geometry::Size sz;
++    std::unique_ptr<MockHwcConfiguration> mock_config;
  };
+ }
+ }
 === modified file 'tests/unit-tests/graphics/android/test_display.cpp'
 --- tests/unit-tests/graphics/android/test_display.cpp	2014-12-19 02:31:34 +0000
 +++ tests/unit-tests/graphics/android/test_display.cpp	2015-01-07 20:57:51 +0000
@@ -263,14 +263,60 @@
      }, std::runtime_error);
+ }
++
++TEST_F(Display, turns_on_db_at_construction_and_off_at_destruction)
++{
++    stub_db_factory->with_next_config([](mtd::MockHwcConfiguration& mock_config)
++    {
++        testing::InSequence seq;
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_on));
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_off));
++    });
++
++    mga::Display display(
++        stub_db_factory,
++        stub_gl_program_factory,
++        stub_gl_config,
++        null_display_report);
++}
++
++TEST_F(Display, first_power_on_is_not_fatal) //lp:1345533
++{
++    stub_db_factory->with_next_config([](mtd::MockHwcConfiguration& mock_config)
++    {
++        ON_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_on))
++            .WillByDefault(testing::Throw(std::runtime_error("")));
++    });
++
++    EXPECT_NO_THROW({
++        mga::Display display(stub_db_factory, stub_gl_program_factory, stub_gl_config, null_display_report);});
++}
++
++TEST_F(Display, catches_exceptions_when_turning_off_in_destructor)
++{
++    stub_db_factory->with_next_config([](mtd::MockHwcConfiguration& mock_config)
++    {
++        testing::InSequence seq;
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_on));
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_off))
++            .WillOnce(testing::Throw(std::runtime_error("")));
++    });
++    mga::Display display(stub_db_factory, stub_gl_program_factory, stub_gl_config, null_display_report);
++}
++
  TEST_F(Display, configures_display_buffer)
+ {
--    using namespace testing;
--    mga::Display display(
--        stub_db_factory,
--        stub_gl_program_factory,
--        stub_gl_config,
--        null_display_report);
++    stub_db_factory->with_next_config([](mtd::MockHwcConfiguration& mock_config)
++    {
++        testing::InSequence seq;
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_on));
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_standby));
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_off));
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_suspend));
++        EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_off));
++    });
++
++    mga::Display display(stub_db_factory, stub_gl_program_factory, stub_gl_config, null_display_report);
      auto configuration = display.configuration();
      configuration->for_each_output([&](mg::UserDisplayConfigurationOutput& output)
 === modified file 'tests/unit-tests/graphics/android/test_display_buffer.cpp'
 --- tests/unit-tests/graphics/android/test_display_buffer.cpp	2014-12-19 02:31:34 +0000
 +++ tests/unit-tests/graphics/android/test_display_buffer.cpp	2015-01-07 20:57:51 +0000
@@ -287,15 +287,10 @@
  TEST_F(DisplayBuffer, changes_display_power_mode)
+ {
--    using namespace testing;
      mga::DisplayBuffer db(
          mock_fb_bundle, mock_display_device, native_window, *gl_context, stub_program_factory, mga::OverlayOptimization::enabled);
--    Sequence seq;
--    EXPECT_CALL(*mock_display_device, mode(mir_power_mode_off))
--        .InSequence(seq);
--    EXPECT_CALL(*mock_display_device, mode(mir_power_mode_on))
--        .InSequence(seq);
++    EXPECT_CALL(*mock_display_device, content_cleared());
      auto config = db.configuration();
      config.power_mode = mir_power_mode_off;
@@ -306,22 +301,33 @@
      db.configure(config);
+ }
--TEST_F(DisplayBuffer, disregards_double_display_power_mode_request)
++TEST_F(DisplayBuffer, power_mode_request_stored)
+ {
--    using namespace testing;
      mga::DisplayBuffer db(
          mock_fb_bundle, mock_display_device, native_window, *gl_context, stub_program_factory, mga::OverlayOptimization::enabled);
--    EXPECT_CALL(*mock_display_device, mode(mir_power_mode_off))
--        .Times(1);
++    EXPECT_CALL(*mock_display_device, content_cleared())
++        .Times(3);
      auto config = db.configuration();
++    EXPECT_EQ(config.power_mode, mir_power_mode_on);
      config.power_mode = mir_power_mode_off;
      db.configure(config);
++
++    config = db.configuration();
++    EXPECT_EQ(config.power_mode, mir_power_mode_off);
      config.power_mode = mir_power_mode_suspend;
      db.configure(config);
++
++    config = db.configuration();
++    EXPECT_EQ(config.power_mode, mir_power_mode_suspend);
      config.power_mode = mir_power_mode_standby;
      db.configure(config);
++
++    config = db.configuration();
++    EXPECT_EQ(config.power_mode, mir_power_mode_standby);
++    config.power_mode = mir_power_mode_on;
++    db.configure(config);
+ }
  //configuration tests
 === modified file 'tests/unit-tests/graphics/android/test_fb_device.cpp'
 --- tests/unit-tests/graphics/android/test_fb_device.cpp	2014-12-19 02:31:34 +0000
 +++ tests/unit-tests/graphics/android/test_fb_device.cpp	2015-01-07 20:57:51 +0000
@@ -98,28 +98,19 @@
      fbdev.post_gl(mock_context);
+ }
--TEST_F(FBDevice, sets_swapinterval_1_on_start)
--{
--    EXPECT_CALL(*fb_hal_mock, setSwapInterval_interface(fb_hal_mock.get(), 1))
--        .Times(1);
--    mga::FBDevice fbdev(fb_hal_mock);
--}
--
  //not all fb devices provide a swap interval hook. make sure we don't explode if thats the case
  TEST_F(FBDevice, does_not_segfault_if_null_swapinterval_hook)
+ {
      fb_hal_mock->setSwapInterval = nullptr;
--    mga::FBDevice fbdev(fb_hal_mock);
++    mga::FbControl fb_control(fb_hal_mock);
+ }
  TEST_F(FBDevice, can_screen_on_off)
+ {
--    fb_hal_mock->setSwapInterval = nullptr;
      using namespace testing;
--    //constructor turns on
      Sequence seq;
--    EXPECT_CALL(*fb_hal_mock, enableScreen_interface(_,1))
--        .InSequence(seq);
++    EXPECT_CALL(*fb_hal_mock, setSwapInterval_interface(fb_hal_mock.get(), 1))
++        .Times(1);
      EXPECT_CALL(*fb_hal_mock, enableScreen_interface(_,0))
          .InSequence(seq);
      EXPECT_CALL(*fb_hal_mock, enableScreen_interface(_,0))
@@ -129,9 +120,13 @@
      EXPECT_CALL(*fb_hal_mock, enableScreen_interface(_,1))
          .InSequence(seq);
--    mga::FBDevice fbdev(fb_hal_mock);
--    fbdev.mode(mir_power_mode_standby);
--    fbdev.mode(mir_power_mode_suspend);
--    fbdev.mode(mir_power_mode_off);
--    fbdev.mode(mir_power_mode_on);
++    mga::FbControl fb_control(fb_hal_mock);
++    fb_control.power_mode(mga::DisplayName::primary, mir_power_mode_standby);
++    fb_control.power_mode(mga::DisplayName::primary, mir_power_mode_suspend);
++    fb_control.power_mode(mga::DisplayName::primary, mir_power_mode_off);
++    fb_control.power_mode(mga::DisplayName::primary, mir_power_mode_on);
++
++    EXPECT_THROW({
++        fb_control.power_mode(mga::DisplayName::external, mir_power_mode_on);
++    }, std::runtime_error);
+ }
 === modified file 'tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp'
 --- tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp	2014-12-20 01:59:45 +0000
 +++ tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp	2015-01-07 20:57:51 +0000
@@ -157,7 +157,7 @@
          .Times(fbnum)
          .WillRepeatedly(Return(nullptr));
--    mga::Framebuffers framebuffers(mock_allocator, mock_fb_hal);
++    mga::Framebuffers framebuffers(mock_allocator, display_size, vrefresh_hz, mock_fb_hal);
      EXPECT_EQ(display_size, framebuffers.fb_size());
      EXPECT_EQ(mir_pixel_format_abgr_8888, framebuffers.fb_format());
+ }
@@ -171,12 +171,12 @@
          .Times(2)
          .WillRepeatedly(Return(nullptr));
--    mga::Framebuffers framebuffers(mock_allocator, slightly_malformed_fb_hal_mock);
++    mga::Framebuffers framebuffers(mock_allocator, display_size, vrefresh_hz, slightly_malformed_fb_hal_mock);
+ }
  TEST_F(PostingFBBundleTest, last_rendered_returns_valid)
+ {
--    mga::Framebuffers framebuffers(mock_allocator, mock_fb_hal);
++    mga::Framebuffers framebuffers(mock_allocator, display_size, vrefresh_hz, mock_fb_hal);
      auto test_buffer = framebuffers.last_rendered_buffer();
      EXPECT_TRUE((test_buffer == buffer1) || (test_buffer == buffer2));
 === modified file 'tests/unit-tests/graphics/android/test_hwc_common_device.cpp'
 --- tests/unit-tests/graphics/android/test_hwc_common_device.cpp	2014-12-20 01:59:45 +0000
 +++ tests/unit-tests/graphics/android/test_hwc_common_device.cpp	2015-01-07 20:57:51 +0000
@@ -41,15 +41,6 @@
  namespace mtd=mir::test::doubles;
  namespace geom=mir::geometry;
--namespace
--{
--struct MockDisplayConfiguration : mga::HwcConfiguration
--{
--    MOCK_METHOD2(power_mode, void(mga::DisplayName, MirPowerMode));
--    MOCK_METHOD1(active_attribs_for, mga::DisplayAttribs(mga::DisplayName));
--};
--}
--
  template<typename T>
  class HWCCommon : public ::testing::Test
+ {
@@ -59,7 +50,6 @@
          mock_fbdev = std::make_shared<mtd::MockFBHalDevice>();
          mock_device = std::make_shared<testing::NiceMock<mtd::MockHWCDeviceWrapper>>();
          mock_vsync = std::make_shared<testing::NiceMock<mtd::MockVsyncCoordinator>>();
--        mock_config = std::make_shared<testing::NiceMock<MockDisplayConfiguration>>();
+     }
      std::shared_ptr<mga::DisplayDevice> make_display_device();
@@ -68,19 +58,18 @@
      std::shared_ptr<mtd::MockVsyncCoordinator> mock_vsync;
      std::shared_ptr<mtd::MockHWCDeviceWrapper> mock_device;
      std::shared_ptr<mtd::MockFBHalDevice> mock_fbdev;
--    std::shared_ptr<MockDisplayConfiguration> mock_config;
  };
  template <>
  std::shared_ptr<mga::DisplayDevice> HWCCommon<mga::HwcFbDevice>::make_display_device()
+ {
--    return std::make_shared<mga::HwcFbDevice>(mock_device, mock_fbdev, mock_config, mock_vsync);
++    return std::make_shared<mga::HwcFbDevice>(mock_device, mock_fbdev, mock_vsync);
+ }
  template <>
  std::shared_ptr<mga::DisplayDevice> HWCCommon<mga::HwcDevice>::make_display_device()
+ {
--    return std::make_shared<mga::HwcDevice>(mock_device, mock_config, mock_vsync, std::make_shared<mga::IntegerSourceCrop>());
++    return std::make_shared<mga::HwcDevice>(mock_device, mock_vsync, std::make_shared<mga::IntegerSourceCrop>());
+ }
  typedef ::testing::Types<mga::HwcFbDevice, mga::HwcDevice> HWCDeviceTestTypes;
@@ -117,60 +106,3 @@
      device = nullptr;
      EXPECT_THAT(callbacks->self, Eq(nullptr));
+ }
--
--TYPED_TEST(HWCCommon, registers_hooks_before_turning_on_display)
--{
--    using namespace testing;
--
--    Sequence seq;
--    EXPECT_CALL(*this->mock_device, register_hooks(_))
--        .InSequence(seq);
--    EXPECT_CALL(*this->mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_on))
--        .InSequence(seq);
--
--    auto device = this->make_display_device();
--    testing::Mock::VerifyAndClearExpectations(this->mock_config.get());
--}
--
--TYPED_TEST(HWCCommon, test_hwc_display_is_deactivated_on_destroy)
--{
--    auto device = this->make_display_device();
--    EXPECT_CALL(*this->mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_off));
--    device.reset();
--}
--
--TYPED_TEST(HWCCommon, catches_exception_during_destruction)
--{
--    auto device = this->make_display_device();
--    EXPECT_CALL(*this->mock_config, power_mode(mga::DisplayName::primary, mir_power_mode_off))
--        .WillOnce(testing::Throw(std::runtime_error("")));
--    device.reset();
--}
--
--TYPED_TEST(HWCCommon, callback_calls_hwcvsync)
--{
--    using namespace testing;
--    std::shared_ptr<mga::HWCCallbacks> callbacks;
--    EXPECT_CALL(*(this->mock_device), register_hooks(_))
--        .Times(1)
--        .WillOnce(SaveArg<0>(&callbacks));
--
--    auto device = this->make_display_device();
--
--    EXPECT_CALL(*this->mock_vsync, notify_vsync())
--        .Times(1);
--    ASSERT_THAT(callbacks, Ne(nullptr));
--    callbacks->hooks.vsync(&callbacks->hooks, 0, 0);
--
--    callbacks->self = nullptr;
--    callbacks->hooks.vsync(&callbacks->hooks, 0, 0);
--}
--
--TYPED_TEST(HWCCommon, first_power_on_is_not_fatal) //lp:1345533
--{
--    ON_CALL(*this->mock_config, power_mode(testing::_, mir_power_mode_on))
--        .WillByDefault(testing::Throw(std::runtime_error("error")));
--    EXPECT_NO_THROW({
--        auto device = this->make_display_device();
--    });
--}
 === modified file 'tests/unit-tests/graphics/android/test_hwc_configuration.cpp'
 --- tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2014-12-20 01:59:45 +0000
 +++ tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-01-07 20:57:51 +0000
@@ -42,18 +42,23 @@
      config.power_mode(display, mir_power_mode_on);
+ }
--TEST_F(HwcConfiguration, turns_screen_off)
++TEST_F(HwcConfiguration, turns_screen_off_for_off_suspend_and_standby)
+ {
      testing::InSequence seq;
      EXPECT_CALL(*mock_hwc_wrapper, vsync_signal_off(display));
      EXPECT_CALL(*mock_hwc_wrapper, display_off(display));
--    EXPECT_CALL(*mock_hwc_wrapper, vsync_signal_off(display));
--    EXPECT_CALL(*mock_hwc_wrapper, display_off(display));
++    EXPECT_CALL(*mock_hwc_wrapper, display_on(display));
++    EXPECT_CALL(*mock_hwc_wrapper, vsync_signal_on(display));
      EXPECT_CALL(*mock_hwc_wrapper, vsync_signal_off(display));
      EXPECT_CALL(*mock_hwc_wrapper, display_off(display));
      config.power_mode(display, mir_power_mode_off);
      //HWC version 1.3 and prior do not support anything more than on and off.
++    config.power_mode(display, mir_power_mode_suspend);
++    config.power_mode(display, mir_power_mode_off);
++    config.power_mode(display, mir_power_mode_standby);
++    config.power_mode(display, mir_power_mode_on);
++    config.power_mode(display, mir_power_mode_standby);
      //translate this into blanking the screen
      config.power_mode(display, mir_power_mode_suspend);
      config.power_mode(display, mir_power_mode_standby);
 === modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
 --- tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-12-20 01:59:45 +0000
 +++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2015-01-07 20:57:51 +0000
@@ -50,12 +50,6 @@
  namespace
+ {
--struct StubConfig : public mga::HwcConfiguration
--{
--    void power_mode(mga::DisplayName, MirPowerMode) override {}
--    mga::DisplayAttribs active_attribs_for(mga::DisplayName) override { return {{}, {}, 0.0, false}; }
--};
--
  struct MockFileOps : public mga::SyncFileOps
+ {
      MOCK_METHOD3(ioctl, int(int,int,void*));
@@ -105,8 +99,7 @@
          mock_device(std::make_shared<testing::NiceMock<mtd::MockHWCDeviceWrapper>>()),
          stub_context{stub_fb_buffer},
          renderlist({stub_renderable1, stub_renderable2}),
--        layer_adapter{std::make_shared<mga::IntegerSourceCrop>()},
--        stub_config{std::make_shared<StubConfig>()}
++        layer_adapter{std::make_shared<mga::IntegerSourceCrop>()}
+     {
          fill_hwc_layer(layer, &comp_rect, position1, *stub_buffer1, HWC_FRAMEBUFFER, 0);
          fill_hwc_layer(layer2, &comp2_rect, position2, *stub_buffer2, HWC_FRAMEBUFFER, 0);
@@ -152,7 +145,6 @@
      mtd::StubSwappingGLContext stub_context;
      mg::RenderableList renderlist;
      std::shared_ptr<mga::LayerAdapter> const layer_adapter;
--    std::shared_ptr<mga::HwcConfiguration> const stub_config;
  };
+ }
@@ -168,7 +160,7 @@
      EXPECT_CALL(*mock_device, prepare(MatchesPrimaryList(expected_list)))
          .Times(1);
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      device.post_gl(stub_context);
+ }
@@ -202,7 +194,7 @@
      EXPECT_CALL(mock_compositor, render(expected_renderable_list,Ref(stub_context)))
          .InSequence(seq);
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist, mock_compositor));
+ }
@@ -227,7 +219,7 @@
          .InSequence(seq);
      EXPECT_CALL(*mock_device, prepare(MatchesPrimaryList(expected_list2)))
          .InSequence(seq);
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist, stub_compositor));
      device.post_gl(stub_context);
@@ -260,7 +252,7 @@
      EXPECT_CALL(*mock_native_buffer3, update_usage(fb_release_fence, mga::BufferAccess::read))
          .InSequence(seq);
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      device.post_gl(stub_context);
      //check that the retire fence is closed
@@ -292,7 +284,7 @@
          &target_layer
      };
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_CALL(*mock_native_buffer1, copy_fence())
          .Times(0);
@@ -346,7 +338,7 @@
          &target_layer
      };
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_CALL(*mock_native_buffer3, copy_fence())
          .Times(0);
@@ -384,7 +376,7 @@
      EXPECT_CALL(*mock_device, set(_))
          .Times(1);
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist, stub_compositor));
      EXPECT_FALSE(device.post_overlays(stub_context, renderlist, stub_compositor));
+ }
@@ -392,7 +384,7 @@
  TEST_F(HwcDevice, submits_every_time_if_at_least_one_layer_is_gl_rendered)
+ {
      using namespace testing;
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      ON_CALL(*mock_device, prepare(_))
          .WillByDefault(Invoke([&](std::array<hwc_display_contents_1_t*, HWC_NUM_DISPLAY_TYPES> const& contents)
@@ -415,7 +407,7 @@
      using namespace testing;
      mg::RenderableList renderlist({stub_renderable1});
      mg::RenderableList renderlist2({stub_renderable2});
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      std::list<hwc_layer_1_t*> expected_list1 { &layer, &target_layer };
      std::list<hwc_layer_1_t*> expected_list2 { &layer2, &target_layer };
@@ -439,7 +431,7 @@
          .WillOnce(Invoke(set_all_layers_to_overlay))
          .WillOnce(Return());
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      auto use_count_before = stub_buffer1.use_count();
      EXPECT_TRUE(device.post_overlays(stub_context, {stub_renderable1}, stub_compositor));
@@ -522,7 +514,7 @@
          .InSequence(seq)
          .WillOnce(Invoke(set_fences_fn));
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist, stub_compositor));
      //set only the 2nd layer to a new buffer. the first buffer has the same buffer, and would
      //still be onscreen if this wasn't against a mock
@@ -541,7 +533,7 @@
              contents[0]->hwLayers[1].compositionType = HWC_FRAMEBUFFER_TARGET;
          }));
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      auto use_count_before = stub_buffer1.use_count();
      EXPECT_TRUE(device.post_overlays(stub_context, {stub_renderable1}, stub_compositor));
@@ -550,7 +542,7 @@
  TEST_F(HwcDevice, rejects_empty_list)
+ {
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      std::list<std::shared_ptr<mg::Renderable>> renderlist{};
      EXPECT_FALSE(device.post_overlays(stub_context, renderlist, stub_compositor));
@@ -559,7 +551,7 @@
  //TODO: we could accept a 90 degree transform
  TEST_F(HwcDevice, rejects_list_containing_transformed)
+ {
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      auto renderable = std::make_shared<mtd::StubTransformedRenderable>();
      mg::RenderableList renderlist{renderable};
@@ -571,7 +563,7 @@
+ {
      using namespace testing;
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      mg::RenderableList renderlist{std::make_shared<mtd::PlaneAlphaRenderable>()};
      EXPECT_FALSE(device.post_overlays(stub_context, renderlist, stub_compositor));
@@ -583,13 +575,13 @@
      EXPECT_CALL(*mock_device, prepare(_))
          .WillOnce(Invoke(set_all_layers_to_overlay));
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      auto use_count_before = stub_buffer1.use_count();
      EXPECT_TRUE(device.post_overlays(stub_context, {stub_renderable1}, stub_compositor));
      EXPECT_THAT(stub_buffer1.use_count(), Gt(use_count_before));
--    device.mode(MirPowerMode::mir_power_mode_off);
++    device.content_cleared();
      EXPECT_THAT(stub_buffer1.use_count(), Eq(use_count_before));
+ }
@@ -678,7 +670,7 @@
          .InSequence(seq);
      //end second post
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist1, stub_compositor));
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist2, stub_compositor));
@@ -780,7 +772,7 @@
          .InSequence(seq);
      //end second post
--    mga::HwcDevice device(mock_device, stub_config, mock_vsync, layer_adapter);
++    mga::HwcDevice device(mock_device, mock_vsync, layer_adapter);
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist, stub_compositor));
      EXPECT_TRUE(device.post_overlays(stub_context, renderlist2, stub_compositor));
+ }
 === modified file 'tests/unit-tests/graphics/android/test_hwc_fb_device.cpp'
 --- tests/unit-tests/graphics/android/test_hwc_fb_device.cpp	2014-12-20 01:59:45 +0000
 +++ tests/unit-tests/graphics/android/test_hwc_fb_device.cpp	2015-01-07 20:57:51 +0000
@@ -43,11 +43,6 @@
  namespace
+ {
--struct StubConfig : public mga::HwcConfiguration
--{
--    void power_mode(mga::DisplayName, MirPowerMode) override {}
--    mga::DisplayAttribs active_attribs_for(mga::DisplayName) override { return {{}, {}, 0.0, false}; }
--};
  class HwcFbDevice : public ::testing::Test
+ {
  protected:
@@ -85,8 +80,6 @@
              .WillByDefault(Return(stub_native_buffer));
          ON_CALL(mock_context, last_rendered_buffer())
              .WillByDefault(Return(mock_buffer));
--
--        stub_config = std::make_shared<StubConfig>();
+     }
      int fake_dpy = 0;
@@ -104,7 +97,6 @@
      std::shared_ptr<mtd::StubAndroidNativeBuffer> stub_native_buffer;
      mtd::StubSwappingGLContext stub_context;
      testing::NiceMock<mtd::MockSwappingGLContext> mock_context;
--    std::shared_ptr<mga::HwcConfiguration> stub_config;
      hwc_layer_1_t skip_layer;
  };
+ }
@@ -126,7 +118,7 @@
      EXPECT_CALL(*mock_hwc_device_wrapper, set(MatchesListWithEglFields(expected_list, dpy, sur)))
          .InSequence(seq);
--    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device, stub_config, mock_vsync);
++    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device, mock_vsync);
      device.post_gl(mock_context);
+ }
@@ -143,7 +135,7 @@
          renderable2
      };
--    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device, stub_config, mock_vsync);
++    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device, mock_vsync);
      EXPECT_FALSE(device.post_overlays(stub_context, renderlist, stub_compositor));
+ }
@@ -162,6 +154,6 @@
          .InSequence(seq);
      EXPECT_CALL(*mock_vsync, wait_for_vsync())
          .InSequence(seq);
--    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device, stub_config, mock_vsync);
++    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device, mock_vsync);
      device.post_gl(mock_context);
+ }