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

canonical · Sep 6, 2023 · 9016b3b · 9016b3b
2 parents d95549e + 2a61739
commit 9016b3b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/debian/libmiral6.symbols b/debian/libmiral6.symbols
@@ -422,5 +422,10 @@ 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
diff --git a/src/miral/CMakeLists.txt b/src/miral/CMakeLists.txt
@@ -69,6 +69,7 @@ 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

diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
@@ -61,7 +61,6 @@ char const* const mo::null_console = "none";
 char const* const mo::auto_console = "auto";
 
 char const* const mo::vt_option_name = "vt";
-
 char const* const mo::smooth_boot_opt = "smooth-boot";
 
 

diff --git a/src/platforms/gbm-kms/server/kms/platform.cpp b/src/platforms/gbm-kms/server/kms/platform.cpp
@@ -28,6 +28,8 @@
 #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"

diff --git a/tests/platform_test_harness/graphics_platform_test_harness.cpp b/tests/platform_test_harness/graphics_platform_test_harness.cpp
@@ -18,6 +18,7 @@
 #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"

diff --git a/tests/unit-tests/platforms/gbm-kms/kms/test_display_generic.cpp b/tests/unit-tests/platforms/gbm-kms/kms/test_display_generic.cpp
@@ -21,6 +21,7 @@
 #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"
@@ -36,6 +37,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <fcntl.h>
+#include <memory>
 
 namespace mg = mir::graphics;
 namespace mgg = mg::gbm;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,7 +61,6 @@ char const* const mo::null_console = "none";
		char const* const mo::auto_console = "auto";

		char const* const mo::vt_option_name = "vt";

		char const* const mo::smooth_boot_opt = "smooth-boot";


Expand Down