Merge branch 'flickerless-no-crtc' into flickerless-boot

Author: mattkae

debian/libmiral6.symbols

@@ -422,10 +422,5 @@ libmiral.so.6 libmiral6 #MINVER#
  (c++)"vtable for miral::MinimalWindowManager@MIRAL_4.0" 4.0.0
  (c++)"vtable for miral::WindowManagementPolicy@MIRAL_4.0" 4.0.0
  MIRAL_4.1@MIRAL_4.1 4.1.0
- (c++)"miral::SmoothBootSupport::SmoothBootSupport()@MIRAL_4.1" 4.1.0
- (c++)"miral::SmoothBootSupport::SmoothBootSupport(miral::SmoothBootSupport const&)@MIRAL_4.1" 4.1.0
- (c++)"miral::SmoothBootSupport::operator()(mir::Server&) const@MIRAL_4.1" 4.1.0
- (c++)"miral::SmoothBootSupport::operator=(miral::SmoothBootSupport const&)@MIRAL_4.1" 4.1.0
- (c++)"miral::SmoothBootSupport::~SmoothBootSupport()@MIRAL_4.1" 4.1.0
  (c++)"miral::WaylandExtensions::zwp_input_method_v1@MIRAL_4.1" 4.1.0
  (c++)"miral::WaylandExtensions::zwp_input_panel_v1@MIRAL_4.1" 4.1.0

src/miral/CMakeLists.txt

@@ -69,7 +69,6 @@ add_library(miral SHARED
     window_specification.cpp            ${miral_include}/miral/window_specification.h
     internal_client.cpp                 ${miral_include}/miral/internal_client.h
     prepend_event_filter.cpp            ${miral_include}/miral/prepend_event_filter.h
-    smooth_boot_support.cpp             ${miral_include}/miral/smooth_boot_support.h
     set_command_line_handler.cpp        ${miral_include}/miral/set_command_line_handler.h
     set_terminator.cpp                  ${miral_include}/miral/set_terminator.h
     set_window_management_policy.cpp    ${miral_include}/miral/set_window_management_policy.h

src/miral/symbols.map

@@ -478,11 +478,6 @@ global:
   extern "C++" {
     miral::WaylandExtensions::zwp_input_method_v1*;
     miral::WaylandExtensions::zwp_input_panel_v1*;
-    miral::SmoothBootSupport::?SmoothBootSupport*;
-    miral::SmoothBootSupport::SmoothBootSupport*;
-    miral::SmoothBootSupport::operator*;
-    typeinfo?for?miral::SmoothBootSupport;
-    vtable?for?miral::SmoothBootSupport;
   };
 
 } MIRAL_4.0;

src/platforms/gbm-kms/server/kms/display_buffer.cpp

@@ -125,8 +125,29 @@ mgg::DisplayBuffer::DisplayBuffer(
 {
     listener->report_successful_setup_of_native_resources();
 
-    if (!smooth_transition)
+    bool needs_crtc_set = false;
+    for (auto& output : outputs)
+    {
+        try
+        {
+            geometry::Rectangle rectangle = output->get_rectangle();
+            if (rectangle != area)
+            {
+                needs_crtc_set = true;
+                break;
+            }
+        }
+        catch (std::invalid_argument&)
+        {
+            needs_crtc_set = true;
+            break;
+        }
+    }
+
+    if (needs_crtc_set)
     {
+        mir::log_info("Clearing screen due to differing encountered and target modes");
+        // TODO: Pull a supported format out of KMS rather than assuming XRGB8888
         auto initial_fb = std::make_shared<mgg::CPUAddressableFB>(
             std::move(drm_fd),
             false,

src/platforms/gbm-kms/server/kms/kms_output.h

@@ -25,7 +25,6 @@
 #include "mir/graphics/dmabuf_buffer.h"
 #include "mir/graphics/drm_formats.h"
 #include "mir_toolkit/common.h"
-
 #include "kms-utils/drm_mode_resources.h"
 
 #include <gbm.h>
@@ -75,6 +74,7 @@ class KMSOutput
     virtual int max_refresh_rate() const = 0;
 
     virtual bool set_crtc(FBHandle const& fb) = 0;
+    virtual auto get_rectangle() -> mir::geometry::Rectangle = 0;
     virtual void clear_crtc() = 0;
     virtual bool schedule_page_flip(FBHandle const& fb) = 0;
     virtual void wait_for_page_flip() = 0;

src/platforms/gbm-kms/server/kms/platform.cpp

@@ -28,8 +28,6 @@
 #include "mir/options/option.h"
 #include "mir/options/configuration.h"
 #include "one_shot_device_observer.h"
-#include "mir/options/configuration.h"
-#include "mir/options/option.h"
 #include <gbm.h>
 
 #define MIR_LOG_COMPONENT "platform-graphics-gbm-kms"
@@ -40,6 +38,7 @@
 
 namespace mg = mir::graphics;
 namespace mgg = mg::gbm;
+namespace mo = mir::options;
 
 namespace
 {
@@ -304,7 +303,7 @@ mir::UniqueModulePtr<mg::Display> mgg::Platform::create_display(
     std::shared_ptr<mir::options::Option> const& options,
     std::shared_ptr<GraphicBufferAllocator> const& allocator)
 {
-    auto smooth_boot = options->is_set(options::smooth_boot_opt);
+    auto smooth_boot = options->is_set(mo::smooth_boot_opt);
     return make_module_ptr<mgg::Display>(
         provider,
         drm_fd,

src/platforms/gbm-kms/server/kms/real_kms_output.cpp

@@ -257,6 +257,19 @@ bool mgg::RealKMSOutput::set_crtc(FBHandle const& fb)
     return true;
 }
 
+auto mgg::RealKMSOutput::get_rectangle() -> mir::geometry::Rectangle
+{
+    if (!ensure_crtc())
+    {
+        mir::log_error("Output %s has no associated CRTC to get ", mgk::connector_name(connector).c_str());
+        BOOST_THROW_EXCEPTION(std::invalid_argument("get_crtc: Output has no associated CRTC to get"));
+    }
+
+    return mir::geometry::Rectangle(
+        mir::geometry::Point(current_crtc->x, current_crtc->y),
+        mir::geometry::Size(current_crtc->width, current_crtc->height));
+}
+
 void mgg::RealKMSOutput::clear_crtc()
 {
     try

src/platforms/gbm-kms/server/kms/real_kms_output.h

@@ -49,6 +49,7 @@ class RealKMSOutput : public KMSOutput
     int max_refresh_rate() const override;
 
     bool set_crtc(FBHandle const& fb) override;
+    auto get_rectangle() -> mir::geometry::Rectangle override;
     void clear_crtc() override;
     bool schedule_page_flip(FBHandle const& fb) override;
     void wait_for_page_flip() override;

tests/mir_test_framework/platform_graphics_throw.cpp

@@ -94,9 +94,6 @@ class ExceptionThrowingPlatform : public mg::DisplayPlatform, public mg::Renderi
 
         return stub_display_platform->create_display(ptr, shared_ptr, options, allocator);
     }
-
-private:
-    enum ExceptionLocation : uint32_t
     {
         at_constructor,
         at_create_buffer_allocator,

tests/platform_test_harness/graphics_platform_test_harness.cpp

@@ -18,7 +18,6 @@
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
-#include "mir/options/option.h"
 #include "mir/options/program_option.h"
 #include "mir/shared_library.h"
 #include "mir/renderer/gl/context_source.h"

tests/unit-tests/platforms/gbm-kms/kms/mock_kms_output.h

@@ -39,6 +39,7 @@ struct MockKMSOutput : public graphics::gbm::KMSOutput
         return set_crtc_thunk(&fb);
     }
 
+    MOCK_METHOD0(get_rectangle, geometry::Rectangle());
     MOCK_METHOD1(set_crtc_thunk, bool(graphics::gbm::FBHandle const*));
     MOCK_METHOD0(clear_crtc, void());
 

tests/unit-tests/platforms/gbm-kms/kms/test_display_generic.cpp

@@ -21,7 +21,6 @@
 #include "mir/test/doubles/mock_egl.h"
 #include "mir/test/doubles/mock_gl.h"
 #include "mir/test/doubles/stub_gl_config.h"
-#include "mir/test/doubles/mock_option.h"
 #include "mir/test/doubles/null_emergency_cleanup.h"
 #include "mir/test/doubles/stub_console_services.h"
 #include "mir/test/doubles/stub_buffer_allocator.h"
@@ -37,7 +36,6 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <fcntl.h>
-#include <memory>
 
 namespace mg = mir::graphics;
 namespace mgg = mg::gbm;