Merge lp:~morphis/mir/support-for-dropped-fb-support into lp:mir/ubuntu

[Simon Fels]

[lp:~morphis/mir/support-for-dropped-fb-support]

3195. By Simon Fels on 2016-01-21

Merge with lp:mir/ubuntu

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3195
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~morphis/mir/support-for-dropped-fb-support/+merge/283442/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5588
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/6/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/6/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/6/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5585
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8028
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26882

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Please rebase and re-propose for lp:mir instead.

review: Needs Resubmitting

[Simon Fels (morphis)]

This is just for the time being until mir 0.19 is released with those changes included. Simply ignore it. We only need it to get a silo with those changes.

review: Disapprove

[Kevin DuBois (kdub)]

mir 0.19 will contain this device quirk (silo 10). moving off mir's active review list.

Unmerged revisions

3195. By Simon Fels on 2016-01-21

Merge with lp:mir/ubuntu

3194. By Simon Fels on 2016-01-21

Merge lp:~thomas-voss/mir/test-support-for-dropped-fb-support

3193. By Daniel van Vugt on 2016-01-19

No change. Just waking Jenkins up.

3192. By Daniel van Vugt on 2016-01-18

Correct the package version string

3191. By Daniel van Vugt on 2016-01-18

Update the changelog

3190. By Cemil Azizoglu on 2016-01-18

Fix buffer leak causing server crashes after repeated screencasts.

The workaround for LP: #1454201 caused LP: #1523900. This fixes the former
properly, and hence avoids the latter.

3189. By Daniel van Vugt on 2016-01-18

Avoid choosing graphics-dummy (or no driver at all) over mesa-kms on a
desktop with DRM/Intel graphics. (LP: #1528082)

The right choice is obviously mesa-kms even if it fails to initialize
DRM/VT things. If however mesa-x11 or another driver can be used instead,
it will be.

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-15 11:45:05 +0000
+++ debian/changelog	2016-01-21 13:45:56 +0000
@@ -12,6 +12,19 @@
 
  -- kevin gunn <[e-mail]>  Fri, 15 Jan 2016 11:45:05 +0000
 
+mir (0.18.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.18.1 (https://launchpad.net/mir/+milestone/0.18.1)
+    - No ABI changes. Bug fix release only.
+    - Bugs fixed:
+      . [regression] pinch to zoom not working reliably (LP: #1531517)
+      . Buffer leak during repeated mirscreencasts causes server to be killed
+        (LP: #1523900)
+      . [regression] Mir servers choose graphics-dummy (or no driver at all)
+        over mesa-kms on a desktop (LP: #1528082)
+
+ -- Andreas Pokorny <[e-mail]>  Fri, 15 Jan 2016 12:18:35 +0100
+
 mir (0.18.0+16.04.20151216.1-0ubuntu1) xenial; urgency=medium
 
   [ Kevin DuBois ]

=== modified file 'debian/rules'
--- debian/rules	2015-09-17 20:32:32 +0000
+++ debian/rules	2016-01-21 13:45:56 +0000
@@ -14,7 +14,7 @@
 export MIR_SERVER_LOGGING = on
 override_dh_auto_test:
 ifeq ($(DEB_HOST_ARCH_ENDIAN),little)
-	GTEST_OUTPUT=xml:./ dh_auto_test --max-parallel=1 -- ARGS="-V"
+	echo "Disabled running of test suite during package builds."
 else
 	echo "Testsuite disabled on $(DEB_HOST_ARCH) due to lack of big-endian support."
 endif
@@ -28,6 +28,10 @@
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
 	  -DMIR_RUN_INTEGRATION_TESTS=OFF \
+	  -D_FILE_OFFSET_BITS=64 \
+	  -D_GNU_SOURCE=1 \
+	  -D_LARGEFILE64_SOURCE=1 \
+	  -D_LARGEFILE_SOURCE=1 \
 	  -DMIR_PLATFORM=android\;mesa-kms\;mesa-x11
 else
 ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH)),)

=== 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-21 13:45:56 +0000
@@ -33,6 +33,16 @@
 
 namespace
 {
+int framebuffer_gles_gralloc_flags()
+{
+    static const int flags =
+            ::getenv("MIR_PLATFORM_GRAPHICS_ANDROID_FB_SUPPORT") == nullptr ?
+            GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE :
+            GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB;
+
+    return flags;
+}
+
 struct AndroidBufferHandleDeleter
 {
     AndroidBufferHandleDeleter(std::shared_ptr<alloc_device_t> const& alloc_dev)
@@ -104,7 +114,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 framebuffer_gles_gralloc_flags();
     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/gl_context.cpp'
--- src/platforms/android/server/gl_context.cpp	2015-07-21 04:30:03 +0000
+++ src/platforms/android/server/gl_context.cpp	2016-01-21 13:45:56 +0000
@@ -71,7 +71,7 @@
 {
     EGLint const required_egl_config_attr [] =
     {
-        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
         EGL_DEPTH_SIZE, gl_config.depth_buffer_bits(),
         EGL_STENCIL_SIZE, gl_config.stencil_buffer_bits(),

=== modified file 'src/platforms/android/server/platform.cpp'
--- src/platforms/android/server/platform.cpp	2015-12-11 12:22:15 +0000
+++ src/platforms/android/server/platform.cpp	2016-01-21 13:45:56 +0000
@@ -153,6 +153,11 @@
     auto overlay_option = should_use_overlay_optimization(*options);
     hwc_report->report_overlay_optimization(overlay_option);
     auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
+
+    //try loading the fb module
+    static auto fb_module = display_resource_factory->create_fb_native_device();
+    printf("loaded fb_module: %p\n", static_cast<void*>(fb_module.get()));
+    
     auto buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(quirks);
     auto component_factory = std::make_shared<mga::HalComponentFactory>(
         buffer_allocator, display_resource_factory, hwc_report, quirks);

=== modified file 'src/platforms/android/server/server_render_window.cpp'
--- src/platforms/android/server/server_render_window.cpp	2015-11-24 14:18:33 +0000
+++ src/platforms/android/server/server_render_window.cpp	2016-01-21 13:45:56 +0000
@@ -34,6 +34,19 @@
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
+namespace
+{
+int framebuffer_gles_gralloc_flags()
+{
+    static const int flags =
+            ::getenv("MIR_PLATFORM_GRAPHICS_ANDROID_FB_SUPPORT") == nullptr ?
+            GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE :
+            GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB;
+
+    return flags;
+}
+}
+
 mga::ServerRenderWindow::ServerRenderWindow(
     std::shared_ptr<mga::FramebufferBundle> const& fb_bundle,
     MirPixelFormat format,
@@ -93,7 +106,7 @@
         case NATIVE_WINDOW_CONCRETE_TYPE:
             return NATIVE_WINDOW_FRAMEBUFFER;
         case NATIVE_WINDOW_CONSUMER_USAGE_BITS:
-            return GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB;
+            return framebuffer_gles_gralloc_flags(); 
         default:
             {
             std::stringstream sstream;

=== modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
--- src/platforms/mesa/server/kms/platform_symbols.cpp	2015-12-16 13:05:17 +0000
+++ src/platforms/mesa/server/kms/platform_symbols.cpp	2016-01-21 13:45:56 +0000
@@ -190,7 +190,25 @@
     if (platform_option_used)
         return mg::PlatformPriority::best;
 
-    return mg::PlatformPriority::unsupported;
+    /* We failed to set mastership. However, still on most systems mesa-kms
+     * is the right driver to choose. Landing here just means the user did
+     * not specify --vt or is running from ssh. Still in most cases mesa-kms
+     * is the correct option so give it a go. Better to fail trying to switch
+     * VTs (and tell the user that) than to refuse to load the correct
+     * driver at all. (LP: #1528082)
+     *
+     * Just make sure we are below PlatformPriority::supported in case
+     * mesa-x11 or android can be used instead.
+     *
+     * TODO: Revisit the priority terminology. having a range of values between
+     *       "supported" and "unsupported" is potentially confusing.
+     * TODO: Revisit the return code of this function. We document that
+     *       integer values outside the enum are allowed but C++ disallows it
+     *       without a cast. So we should return an int or typedef to int
+     *       instead.
+     */
+    return static_cast<mg::PlatformPriority>(
+        mg::PlatformPriority::supported - 1);
 }
 
 mir::ModuleProperties const description = {

=== modified file 'src/renderers/gl/program_family.cpp'
--- src/renderers/gl/program_family.cpp	2015-09-11 12:29:40 +0000
+++ src/renderers/gl/program_family.cpp	2016-01-21 13:45:56 +0000
@@ -19,7 +19,6 @@
 #include "program_family.h"
 
 #include <mutex>
-#include <EGL/egl.h>
 
 namespace mir
 {
@@ -59,10 +58,6 @@
     // need any reference counting or to worry about how many copy constructions
     // might have been followed by destructor calls during container resizes.
 
-    // Workaround for lp:1454201. Release any current GL context to avoid crashes
-    // in the glDelete* functions that follow.
-    eglMakeCurrent(eglGetCurrentDisplay(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-
     for (auto& p : program)
     {
         if (p.second.id)

=== modified file 'src/renderers/gl/renderer.cpp'
--- src/renderers/gl/renderer.cpp	2015-10-26 13:23:05 +0000
+++ src/renderers/gl/renderer.cpp	2016-01-21 13:45:56 +0000
@@ -180,7 +180,10 @@
     set_rotation(0.0f);
 }
 
-mrg::Renderer::~Renderer() = default;
+mrg::Renderer::~Renderer()
+{
+    render_target.ensure_current();
+}
 
 void mrg::Renderer::tessellate(std::vector<mgl::Primitive>& primitives,
                                 mg::Renderable const& renderable) const

=== modified file 'tests/unit-tests/graphics/mesa/kms/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/kms/test_platform.cpp	2015-12-16 13:01:56 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_platform.cpp	2016-01-21 13:45:56 +0000
@@ -332,6 +332,26 @@
     EXPECT_EQ(mg::PlatformPriority::best, probe(options));
 }
 
+TEST_F(MesaGraphicsPlatform, probe_returns_in_between_when_cant_set_master)
+{   // Regression test for LP: #1528082
+    using namespace testing;
+
+    mtf::UdevEnvironment udev_environment;
+    boost::program_options::options_description po;
+    mir::options::ProgramOption options;
+
+    udev_environment.add_standard_device("standard-drm-devices");
+
+    EXPECT_CALL(mock_drm, drmSetMaster(_))
+        .WillOnce(Return(-1));
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    auto prio = probe(options);
+    EXPECT_THAT(prio, Gt(mg::PlatformPriority::unsupported));
+    EXPECT_THAT(prio, Lt(mg::PlatformPriority::supported));
+}
+
 TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_vt_option_exist)
 {
     mtf::UdevEnvironment udev_environment;

=== modified file 'tests/unit-tests/renderers/gl/CMakeLists.txt'
--- tests/unit-tests/renderers/gl/CMakeLists.txt	2015-09-07 11:54:56 +0000
+++ tests/unit-tests/renderers/gl/CMakeLists.txt	2016-01-21 13:45:56 +0000
@@ -1,5 +1,4 @@
 list(APPEND UNIT_TEST_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_gl_program_family.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_gl_renderer.cpp
 )
 

=== removed file 'tests/unit-tests/renderers/gl/test_gl_program_family.cpp'
--- tests/unit-tests/renderers/gl/test_gl_program_family.cpp	2015-09-11 12:29:40 +0000
+++ tests/unit-tests/renderers/gl/test_gl_program_family.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#include "src/renderers/gl/program_family.h"
-#include "mir/test/doubles/mock_gl.h"
-#include "mir/test/doubles/mock_egl.h"
-
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-namespace mtd = mir::test::doubles;
-namespace mrg = mir::renderer::gl;
-
-// Regression test for LP: #1454201
-TEST(GLProgramFamily, releases_gl_context_before_deleting_shader_objects)
-{
-    using namespace testing;
-
-    NiceMock<mtd::MockGL> mock_gl;
-    NiceMock<mtd::MockEGL> mock_egl;
-
-    ON_CALL(mock_gl, glCreateShader(_)).WillByDefault(Return(1));
-    ON_CALL(mock_gl, glCreateProgram()).WillByDefault(Return(1));
-
-    {
-        mrg::ProgramFamily family;
-        family.add_program("vertex shader", "fragment shader");
-
-        InSequence seq;
-        EXPECT_CALL(mock_egl, eglMakeCurrent(_,EGL_NO_SURFACE,EGL_NO_SURFACE,EGL_NO_CONTEXT));
-        EXPECT_CALL(mock_gl, glDeleteProgram(_)).Times(1);
-        EXPECT_CALL(mock_gl, glDeleteShader(_)).Times(2);
-    }
-}

=== modified file 'tests/unit-tests/renderers/gl/test_gl_renderer.cpp'
--- tests/unit-tests/renderers/gl/test_gl_renderer.cpp	2015-10-26 12:25:02 +0000
+++ tests/unit-tests/renderers/gl/test_gl_renderer.cpp	2016-01-21 13:45:56 +0000
@@ -265,6 +265,8 @@
     EXPECT_CALL(mock_display_buffer, make_current());
 
     mrg::Renderer renderer(mock_display_buffer);
+
+    testing::Mock::VerifyAndClearExpectations(&mock_display_buffer);
 }
 
 TEST_F(GLRenderer, releases_display_buffer_current_when_destroyed)
@@ -274,6 +276,21 @@
     EXPECT_CALL(mock_display_buffer, release_current());
 }
 
+TEST_F(GLRenderer, makes_display_buffer_current_before_deleting_programs)
+{
+    mrg::Renderer renderer(mock_display_buffer);
+
+    InSequence seq;
+    EXPECT_CALL(mock_display_buffer, make_current());
+    EXPECT_CALL(mock_display_buffer, swap_buffers());
+    EXPECT_CALL(mock_display_buffer, make_current());
+    EXPECT_CALL(mock_gl, glDeleteProgram(_)).Times(AtLeast(1));
+    EXPECT_CALL(mock_gl, glDeleteShader(_)).Times(AtLeast(1));
+    EXPECT_CALL(mock_display_buffer, release_current());
+
+    renderer.render(renderable_list);
+}
+
 TEST_F(GLRenderer, makes_display_buffer_current_before_rendering)
 {
     mrg::Renderer renderer(mock_display_buffer);
@@ -283,6 +300,8 @@
     EXPECT_CALL(mock_gl, glClear(_));
 
     renderer.render(renderable_list);
+
+    testing::Mock::VerifyAndClearExpectations(&mock_display_buffer);
 }
 
 TEST_F(GLRenderer, swaps_buffers_after_rendering)