Merge lp:~mir-team/mir/0.18.2 into lp:mir/0.18

[Kevin DuBois]

MP for Temporary silo to address lp: #1517205 and to provide additional quirk.

MP for Temporary silo to address lp: #1517205 and to provide additional quirk.

[lp:~mir-team/mir/0.18.2]

3194. By Kevin DuBois on 2016-01-27

 port over quirk bits

3195. By Kevin DuBois on 2016-01-27

capture 0.18.1 release sig

3196. By Kevin DuBois on 2016-01-27

update the changelog appropriately

[Daniel van Vugt (vanvugt)]

The target branch contains additional fixes already that you haven't mentioned in the changelog. See: https://bugs.launchpad.net/mir/+milestone/0.18.2

review: Needs Fixing

[lp:~mir-team/mir/0.18.2]

3197. By Daniel van Vugt on 2016-01-28

debian/changelog: Mention other fixes already landed.

3198. By Daniel van Vugt on 2016-01-28

Remove questionmark

[Daniel van Vugt (vanvugt)]

Fixed the changelog. But is that right? Are you really fixing bug 1517205 with this?

review: Needs Information

[Kevin DuBois (kdub)]

@Daniel, walked back some of the changes yesterday and didn't get a chance to update this MP.

More likely than not, there won't be a 0.18.2, as 0.19.0 will contain what is needed by PES. This was set up as a contingency release in case 0.19.0 got blocked.

I'll self-disapprove for now before taking this down when 0.19 is released.

review: Disapprove

Unmerged revisions

3198. By Daniel van Vugt on 2016-01-28

Remove questionmark

3197. By Daniel van Vugt on 2016-01-28

debian/changelog: Mention other fixes already landed.

3196. By Kevin DuBois on 2016-01-27

update the changelog appropriately

3195. By Kevin DuBois on 2016-01-27

capture 0.18.1 release sig

3194. By Kevin DuBois on 2016-01-27

 port over quirk bits

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-18 18:06:23 +0000
+++ debian/changelog	2016-01-28 09:56:28 +0000
@@ -1,4 +1,18 @@
-mir (0.18.1-0ubuntu1) UNRELEASED; urgency=medium
+mir (0.18.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.18.2 (https://launchpad.net/mir/+milestone/0.18.2)
+    - No ABI changes. Bug fix release only.
+    - Bugs fixed:
+      . Fix buffer leak causing server crashes after repeated screencasts.
+        (LP: #1523900)
+      . Fix Mir failing to start some servers: Avoid choosing graphics-dummy
+        (or no driver at all) over mesa-kms on a desktop with DRM/Intel
+        graphics. (LP: #1528082)
+      . Add quirk for device that cannot allocate fb buffers. (LP: #1517205)
+
+ -- Kevin DuBois <[e-mail]>  Wed, 27 Jan 2016 09:36:46 -0500
+
+mir (0.18.1+16.04.20160115-0ubuntu1) xenial; urgency=medium
 
   * New upstream release 0.18.1 (https://launchpad.net/mir/+milestone/0.18.1)
     - No ABI changes. Bug fix release only.
 
=== modified file 'src/platforms/android/server/android_alloc_adaptor.cpp'
--- src/platforms/android/server/android_alloc_adaptor.cpp	2015-12-11 12:22:15 +0000
+++ src/platforms/android/server/android_alloc_adaptor.cpp	2016-01-28 09:56:28 +0000
@@ -104,7 +104,7 @@
     case mga::BufferUsage::use_hardware:
         return (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER);
     case mga::BufferUsage::use_framebuffer_gles:
-        return (GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB);
+        return quirks->fb_gralloc_bits();
     case mga::BufferUsage::use_software:
         return (GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE);
     default:
 
=== modified file 'src/platforms/android/server/device_quirks.cpp'
--- src/platforms/android/server/device_quirks.cpp	2015-11-30 18:29:57 +0000
+++ src/platforms/android/server/device_quirks.cpp	2016-01-28 09:56:28 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "device_quirks.h"
+#include "hardware/gralloc.h"
 
 #include <mir/options/option.h>
 #include <boost/program_options/options_description.hpp>
@@ -37,7 +38,7 @@
 char const* const num_framebuffers_opt = "enable-num-framebuffers-quirk";
 char const* const gralloc_cannot_be_closed_safely_opt = "enable-gralloc-cannot-be-closed-safely-quirk";
 char const* const width_alignment_opt = "enable-width-alignment-quirk";
-
+char const* const fb_ion_heap_opt = "fb-ion-heap";
 std::string determine_device_name(mga::PropertiesWrapper const& properties)
 {
     char const default_value[] = "";
@@ -60,6 +61,11 @@
     return quirk_enabled && device_name == "krillin";
 }
 
+bool device_has_fb_ion_heap(std::string const& device_name, bool quirk_enabled)
+{
+    return quirk_enabled && (device_name != "Aquaris_M10_FHD");
+}
+
 bool clear_fb_context_fence_for(std::string const& device_name)
 {
     return device_name == "krillin" || device_name == "mx4" || device_name == "manta";
@@ -72,7 +78,8 @@
       num_framebuffers_(num_framebuffers_for(device_name, true)),
       gralloc_cannot_be_closed_safely_(gralloc_cannot_be_closed_safely_for(device_name, true)),
       enable_width_alignment_quirk{true},
-      clear_fb_context_fence_{clear_fb_context_fence_for(device_name)}
+      clear_fb_context_fence_{clear_fb_context_fence_for(device_name)},
+      fb_ion_heap_{device_has_fb_ion_heap(device_name, true)}
 {
 }
 
@@ -81,7 +88,8 @@
       num_framebuffers_(num_framebuffers_for(device_name, options.get(num_framebuffers_opt, true))),
       gralloc_cannot_be_closed_safely_(gralloc_cannot_be_closed_safely_for(device_name, options.get(gralloc_cannot_be_closed_safely_opt, true))),
       enable_width_alignment_quirk(options.get(width_alignment_opt, true)),
-      clear_fb_context_fence_{clear_fb_context_fence_for(device_name)}
+      clear_fb_context_fence_{clear_fb_context_fence_for(device_name)},
+      fb_ion_heap_{device_has_fb_ion_heap(device_name, options.get(fb_ion_heap_opt, true))}
 {
 }
 
@@ -107,6 +115,14 @@
     return clear_fb_context_fence_;
 }
 
+int mga::DeviceQuirks::fb_gralloc_bits() const
+{
+    if (fb_ion_heap_)
+        return GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB;
+
+    return GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE;
+}
+
 void mga::DeviceQuirks::add_options(boost::program_options::options_description& config)
 {
     config.add_options()
@@ -118,5 +134,9 @@
          "[platform-specific] Only close gralloc if it is safe to do so (krillin quirk)  [{true,false}]")
          (width_alignment_opt,
           boost::program_options::value<bool>()->default_value(true),
-          "[platform-specific] Enable width alignment (vegetahd quirk) [{true,false}]");
+          "[platform-specific] Enable width alignment (vegetahd quirk) [{true,false}]")
+         (fb_ion_heap_opt,
+          boost::program_options::value<bool>()->default_value(true),
+          "[platform-specific] device has ion heap for framebuffer allocation available [{true, false}]");
+
 }
 
=== modified file 'src/platforms/android/server/device_quirks.h'
--- src/platforms/android/server/device_quirks.h	2015-11-30 12:36:04 +0000
+++ src/platforms/android/server/device_quirks.h	2016-01-28 09:56:28 +0000
@@ -64,6 +64,7 @@
     bool gralloc_cannot_be_closed_safely() const;
     int aligned_width(int width) const;
     bool clear_fb_context_fence() const;
+    int fb_gralloc_bits() const;
 
     static void add_options(boost::program_options::options_description& config);
 
@@ -75,6 +76,7 @@
     bool const gralloc_cannot_be_closed_safely_;
     bool const enable_width_alignment_quirk;
     bool const clear_fb_context_fence_;
+    bool const fb_ion_heap_;
 };
 }
 }
 
=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
--- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2015-12-11 12:22:15 +0000
+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2016-01-28 09:56:28 +0000
@@ -18,6 +18,7 @@
 
 #include "src/platforms/android/server/android_alloc_adaptor.h"
 #include "src/platforms/android/server/device_quirks.h"
+#include "mir/options/program_option.h"
 #include "mir/graphics/android/native_buffer.h"
 
 #include "mir/test/doubles/mock_android_alloc_device.h"
@@ -37,10 +38,8 @@
 {
 public:
     AdaptorICSTest()
-     : fb_usage_flags(GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB),
-       hw_usage_flags(GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER),
-       sw_usage_flags(GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE)
-    {}
+    {
+    }
 
     virtual void SetUp()
     {
@@ -61,9 +60,15 @@
     MirPixelFormat pf;
     geom::Size size;
     mga::BufferUsage usage;
-    int const fb_usage_flags;
-    int const hw_usage_flags;
-    int const sw_usage_flags;
+    int const fb_usage_flags
+        {GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB};
+    int const fb_usage_flags_broken_device
+        {GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE};
+    int const hw_usage_flags
+       {GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER};
+    int const sw_usage_flags
+        {GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN |
+         GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE};
 };
 
 TEST_F(AdaptorICSTest, resource_type_test_fail_ret)
@@ -181,6 +186,26 @@
     alloc_adaptor->alloc_buffer(size, pf, mga::BufferUsage::use_framebuffer_gles);
 }
 
+TEST_F(AdaptorICSTest, adaptor_gralloc_usage_conversion_fb_gles_with_quirk)
+{
+    using namespace testing;
+
+    mir::options::ProgramOption options;
+
+    boost::program_options::options_description description;
+    description.add_options()("fb-ion-heap", boost::program_options::value<bool>()->default_value(true), "");
+    std::array<char const*, 3> args { "progname", "--fb-ion-heap", "false"};
+    options.parse_arguments(description, args.size(), args.data());
+    auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}, options);
+
+    alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, quirks);
+
+    EXPECT_CALL(*mock_alloc_device, alloc_interface(_,_,_,_,fb_usage_flags_broken_device,_,_));
+    EXPECT_CALL(*mock_alloc_device, free_interface(_,_));
+
+    alloc_adaptor->alloc_buffer(size, pf, mga::BufferUsage::use_framebuffer_gles);
+}
+
 TEST_F(AdaptorICSTest, handle_size_is_correct)
 {
     auto native_handle = alloc_adaptor->alloc_buffer(size, pf, usage);
 
=== modified file 'tests/unit-tests/graphics/android/test_device_detection.cpp'
--- tests/unit-tests/graphics/android/test_device_detection.cpp	2015-11-30 18:28:36 +0000
+++ tests/unit-tests/graphics/android/test_device_detection.cpp	2016-01-28 09:56:28 +0000
@@ -18,7 +18,7 @@
 
 #include "src/platforms/android/server/device_quirks.h"
 #include "mir/options/program_option.h"
-
+#include <hardware/gralloc.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -215,6 +215,16 @@
         mga::DeviceQuirks::add_options(desc);
     }
 
+    void enable_fb_ion_quirk()
+    {
+        int const argc = 2;
+        char const* argv[argc] = {
+            __PRETTY_FUNCTION__,
+            "--fb-ion-heap=false"
+        };
+
+        options.parse_arguments(desc, argc, argv);
+    }
     void disable_num_framebuffers_quirk()
     {
         int const argc = 2;
@@ -312,3 +322,40 @@
     mga::DeviceQuirks quirks(mock_ops, options);
     EXPECT_THAT(quirks.aligned_width(720), Eq(720));
 }
+
+TEST_F(DeviceQuirks, returns_correct_gralloc_bits_with_fb_ion_quirk_for_device)
+{
+    using namespace testing;
+    char const default_str[] = "";
+    char const name_str[] = "Aquaris_M10_FHD";
+    MockOps mock_ops;
+    EXPECT_CALL(mock_ops, property_get(StrEq("ro.product.device"), _, StrEq(default_str)))
+        .Times(1)
+        .WillOnce(Invoke([&](char const*, char* value, char const*)
+        {
+            strncpy(value, name_str, PROP_VALUE_MAX);
+            return 0;
+        }));
+
+    mga::DeviceQuirks quirks(mock_ops, options);
+    EXPECT_THAT(quirks.fb_gralloc_bits(),
+        testing::Eq(GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE));
+}
+
+TEST_F(DeviceQuirks, returns_correct_gralloc_bits_without_fb_ion_quirk)
+{
+    MockOps mock_ops;
+    mga::DeviceQuirks quirks(mock_ops, options);
+    EXPECT_THAT(quirks.fb_gralloc_bits(),
+        testing::Eq(GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB));
+}
+
+TEST_F(DeviceQuirks, returns_correct_gralloc_bits_with_fb_ion_quirk)
+{
+    using namespace testing;
+    MockOps mock_ops;
+    enable_fb_ion_quirk();
+    mga::DeviceQuirks quirks(mock_ops, options);
+    EXPECT_THAT(quirks.fb_gralloc_bits(),
+        testing::Eq(GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE));
+}