Merge lp:~peat-new/mir/use-hwc-blanking-control-with-hwc10 into lp:mir

[Ratchanan Srirattanamet]

android: create HwcBlankingControl as HWC configuration on HWC 1.0

This changes screen initialization on a device using HWC 1.0 from the FB HAL way to the HWC way. This makes vsync works, as previously vsync is not enabled in FbControl.

This fix, together with the hack from lp:~peat-new/mir/hack-eglswapbuffer-call-fbpost , makes graphics with HWComposer works on Samsung Galaxy Tab 2 7.0. So, to properly support this device, the hack must be verified if it's the correct way to do. This is beyond my knowledge and requires a developer to have a look at it.

[Daniel van Vugt (vanvugt)]

Waiting to hear what the robots have to say:
https://code.launchpad.net/~mir-team/mir/use-hwc-blanking-control-with-hwc10/+merge/303359

review: Needs Information

[Daniel van Vugt (vanvugt)]

Sounds reasonable and Jenkins is happy too:
https://code.launchpad.net/~mir-team/mir/use-hwc-blanking-control-with-hwc10/+merge/303359

Now just waiting for kdub I guess.

review: Approve

[Alan Griffiths (alan-griffiths)]

LGTM, but I think paranoia dictates that we autoland from a branch controlled by a team member.

review: Approve

[Kevin DuBois (kdub)]

iirc, - if (force_backup_display || hwc_version == mga::HwcVersion::hwc10) was for the Galaxy Nexus, but that's not really a supported device anymore.

The only 'supported' device that uses hwc 1.0 is the goldfish emulator used in the Ubuntu SDK. We'll have to check that in the test plan for whatever release this goes out with. lgtm otherwsie.

review: Approve

[Daniel van Vugt (vanvugt)]

OK then, per Alan's comment please put your approvals here:
https://code.launchpad.net/~mir-team/mir/use-hwc-blanking-control-with-hwc10/+merge/303359

[Daniel van Vugt (vanvugt)]

Forget it. CI is broken in multiple new ways almost every day.

I've had enough and will land some things by hand. Just like the good old days...

=== modified file 'src/platforms/android/server/hal_component_factory.cpp'
--- src/platforms/android/server/hal_component_factory.cpp	2016-08-14 10:00:08 +0000
+++ src/platforms/android/server/hal_component_factory.cpp	2016-08-18 19:52:21 +0000
@@ -31,6 +31,7 @@
 #include "hwc_fb_device.h"
 #include "graphic_buffer_allocator.h"
 #include "cmdstream_sync_factory.h"
+#include "android_format_conversion-inl.h"
 
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
@@ -184,8 +185,10 @@
 
 std::unique_ptr<mga::HwcConfiguration> mga::HalComponentFactory::create_hwc_configuration()
 {
-    if (force_backup_display || hwc_version == mga::HwcVersion::hwc10)
+    if (force_backup_display)
         return std::unique_ptr<mga::HwcConfiguration>(new mga::FbControl(fb_native));
+    else if (hwc_version == mga::HwcVersion::hwc10)
+        return std::unique_ptr<mga::HwcConfiguration>(new mga::HwcBlankingControl(hwc_wrapper, mga::to_mir_format(fb_native->format)));
     else if (hwc_version < mga::HwcVersion::hwc14)
         return std::unique_ptr<mga::HwcConfiguration>(new mga::HwcBlankingControl(hwc_wrapper));
     else

=== modified file 'src/platforms/android/server/hwc_blanking_control.cpp'
--- src/platforms/android/server/hwc_blanking_control.cpp	2016-08-09 06:44:52 +0000
+++ src/platforms/android/server/hwc_blanking_control.cpp	2016-08-18 19:52:21 +0000
@@ -99,6 +99,15 @@
 {
 }
 
+mga::HwcBlankingControl::HwcBlankingControl(
+    std::shared_ptr<mga::HwcWrapper> const& hwc_device,
+    MirPixelFormat format) :
+    hwc_device{hwc_device},
+    off{false},
+    format{format}
+{
+}
+
 void mga::HwcBlankingControl::power_mode(DisplayName display_name, MirPowerMode mode_request)
 {
     if (mode_request == mir_power_mode_on)
@@ -149,7 +158,7 @@
         type = mg::DisplayConfigurationOutputType::displayport;
         form_factor = mir_form_factor_monitor;
     }
-    
+
     return {
         as_output_id(name),
         mg::DisplayConfigurationCardId{0},
@@ -239,7 +248,7 @@
     {
         if (display_name == mga::DisplayName::primary)
             BOOST_THROW_EXCEPTION(std::runtime_error("primary display disconnected"));
-        else   
+        else
             return populate_config(display_name, {0,0}, 0.0f, {0,0}, mir_power_mode_off, mir_pixel_format_invalid, false);
     }
 

=== modified file 'src/platforms/android/server/hwc_configuration.h'
--- src/platforms/android/server/hwc_configuration.h	2015-06-17 05:20:42 +0000
+++ src/platforms/android/server/hwc_configuration.h	2016-08-18 19:52:21 +0000
@@ -39,7 +39,7 @@
 public:
     virtual ~HwcConfiguration() = default;
     virtual void power_mode(DisplayName, MirPowerMode) = 0;
-    virtual DisplayConfigurationOutput active_config_for(DisplayName) = 0; 
+    virtual DisplayConfigurationOutput active_config_for(DisplayName) = 0;
     virtual ConfigChangeSubscription subscribe_to_config_changes(
         std::function<void()> const& hotplug_cb,
         std::function<void(DisplayName)> const& vsync_cb) = 0;
@@ -55,6 +55,7 @@
 {
 public:
     HwcBlankingControl(std::shared_ptr<HwcWrapper> const&);
+    HwcBlankingControl(std::shared_ptr<HwcWrapper> const&, MirPixelFormat format);
     void power_mode(DisplayName, MirPowerMode) override;
     DisplayConfigurationOutput active_config_for(DisplayName) override;
     ConfigChangeSubscription subscribe_to_config_changes(

=== modified file 'tests/unit-tests/platforms/android/server/test_output_builder.cpp'
--- tests/unit-tests/platforms/android/server/test_output_builder.cpp	2016-08-14 10:00:08 +0000
+++ tests/unit-tests/platforms/android/server/test_output_builder.cpp	2016-08-18 19:52:21 +0000
@@ -21,6 +21,7 @@
 #include "src/platforms/android/server/resource_factory.h"
 #include "src/platforms/android/server/hwc_loggers.h"
 #include "src/platforms/android/server/hwc_configuration.h"
+#include "src/platforms/android/server/fb_device.h"
 #include "src/platforms/android/server/device_quirks.h"
 #include "src/platforms/android/server/hwc_layerlist.h"
 #include "mir/test/doubles/mock_buffer.h"
@@ -127,7 +128,36 @@
     factory.create_display_device();
 }
 
-TEST_F(HalComponentFactory, allocates_correct_hwc_configuration)
+TEST_F(HalComponentFactory, allocates_correct_hwc_configuration_for_backup_display)
+{
+    using namespace testing;
+    EXPECT_CALL(*mock_resource_factory, create_fb_native_device());
+    EXPECT_CALL(*mock_resource_factory, create_hwc_wrapper(_))
+        .WillOnce(Throw(std::runtime_error("")));
+
+    mga::HalComponentFactory factory(
+        mock_resource_factory,
+        mock_hwc_report,
+        quirks);
+    auto hwc_config = factory.create_hwc_configuration();
+    EXPECT_THAT(dynamic_cast<mga::FbControl*>(hwc_config.get()), Ne(nullptr));
+}
+
+TEST_F(HalComponentFactory, allocates_correct_hwc_configuration_for_hwc_version_10_to_13)
+{
+    using namespace testing;
+    EXPECT_CALL(*mock_resource_factory, create_hwc_wrapper(_))
+        .WillOnce(Return(std::make_tuple(mock_wrapper, mga::HwcVersion::hwc10)));
+
+    mga::HalComponentFactory factory(
+        mock_resource_factory,
+        mock_hwc_report,
+        quirks);
+    auto hwc_config = factory.create_hwc_configuration();
+    EXPECT_THAT(dynamic_cast<mga::HwcBlankingControl*>(hwc_config.get()), Ne(nullptr));
+}
+
+TEST_F(HalComponentFactory, allocates_correct_hwc_configuration_for_hwc_version_14_and_later)
 {
     using namespace testing;
     EXPECT_CALL(*mock_resource_factory, create_hwc_wrapper(_))