From 62ba2168b90c4645f20c199982bca651f5d8fb9d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 10:41:53 -0500 Subject: [PATCH] import mutter-40.9-10.el9_1 --- ...ore-heuristics-to-decide-when-to-off.patch | 107 ++++++++++++++++++ ...-attemp-to-add-common-modes-on-conne.patch | 47 ++++++++ SPECS/mutter.spec | 10 +- 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-output-kms-Add-more-heuristics-to-decide-when-to-off.patch create mode 100644 SOURCES/0002-output-kms-Don-t-attemp-to-add-common-modes-on-conne.patch diff --git a/SOURCES/0001-output-kms-Add-more-heuristics-to-decide-when-to-off.patch b/SOURCES/0001-output-kms-Add-more-heuristics-to-decide-when-to-off.patch new file mode 100644 index 0000000..5547719 --- /dev/null +++ b/SOURCES/0001-output-kms-Add-more-heuristics-to-decide-when-to-off.patch @@ -0,0 +1,107 @@ +From 86000c32d64cea7be2e6ed911cb9ea5df1306c0e Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Thu, 18 Aug 2022 13:36:20 -0500 +Subject: [PATCH 1/2] output/kms: Add more heuristics to decide when to offer + fallback modes + +If the panel is connected via eDP and supports more than one mode +at different resolutions don't try to add more. + +Part-of: +(cherry picked from commit 96aa0fb8536eca579ceb1b17d83e19cf9e3e9e81) +(cherry picked from commit 877cc3eb7d44e2886395151f763ec09bea350444) +--- + src/backends/native/meta-output-kms.c | 56 +++++++++++++++++++++------ + 1 file changed, 44 insertions(+), 12 deletions(-) + +diff --git a/src/backends/native/meta-output-kms.c b/src/backends/native/meta-output-kms.c +index f35cdf04e1..9adc20bfd9 100644 +--- a/src/backends/native/meta-output-kms.c ++++ b/src/backends/native/meta-output-kms.c +@@ -224,6 +224,45 @@ compare_modes (const void *one, + meta_crtc_mode_get_name (crtc_mode_two)); + } + ++static gboolean ++are_all_modes_equally_sized (MetaOutputInfo *output_info) ++{ ++ const MetaCrtcModeInfo *base = ++ meta_crtc_mode_get_info (output_info->modes[0]); ++ int i; ++ ++ for (i = 1; i < output_info->n_modes; i++) ++ { ++ const MetaCrtcModeInfo *mode_info = ++ meta_crtc_mode_get_info (output_info->modes[i]); ++ ++ if (base->width != mode_info->width || ++ base->height != mode_info->height) ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static void ++maybe_add_fallback_modes (const MetaKmsConnectorState *connector_state, ++ MetaOutputInfo *output_info, ++ MetaGpuKms *gpu_kms, ++ MetaKmsConnector *kms_connector) ++{ ++ if (!connector_state->has_scaling) ++ return; ++ ++ if (output_info->connector_type == DRM_MODE_CONNECTOR_eDP && ++ !are_all_modes_equally_sized (output_info)) ++ return; ++ ++ meta_topic (META_DEBUG_KMS, "Adding common modes to connector %u on %s", ++ meta_kms_connector_get_id (kms_connector), ++ meta_gpu_kms_get_file_path (gpu_kms)); ++ add_common_modes (output_info, gpu_kms); ++} ++ + static gboolean + init_output_modes (MetaOutputInfo *output_info, + MetaGpuKms *gpu_kms, +@@ -252,14 +291,7 @@ init_output_modes (MetaOutputInfo *output_info, + output_info->preferred_mode = output_info->modes[i]; + } + +- if (connector_state->has_scaling) +- { +- meta_topic (META_DEBUG_KMS, "Adding common modes to connector %u on %s", +- meta_kms_connector_get_id (kms_connector), +- meta_gpu_kms_get_file_path (gpu_kms)); +- add_common_modes (output_info, gpu_kms); +- } +- ++ maybe_add_fallback_modes (connector_state, output_info, gpu_kms, kms_connector); + if (!output_info->modes) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +@@ -322,6 +354,10 @@ meta_output_kms_new (MetaGpuKms *gpu_kms, + output_info->height_mm = connector_state->height_mm; + } + ++ drm_connector_type = meta_kms_connector_get_connector_type (kms_connector); ++ output_info->connector_type = ++ meta_kms_connector_type_from_drm (drm_connector_type); ++ + if (!init_output_modes (output_info, gpu_kms, kms_connector, error)) + return NULL; + +@@ -349,10 +385,6 @@ meta_output_kms_new (MetaGpuKms *gpu_kms, + + meta_output_info_parse_edid (output_info, connector_state->edid_data); + +- drm_connector_type = meta_kms_connector_get_connector_type (kms_connector); +- output_info->connector_type = +- meta_kms_connector_type_from_drm (drm_connector_type); +- + output_info->tile_info = connector_state->tile_info; + + output = g_object_new (META_TYPE_OUTPUT_KMS, +-- +2.37.1 + diff --git a/SOURCES/0002-output-kms-Don-t-attemp-to-add-common-modes-on-conne.patch b/SOURCES/0002-output-kms-Don-t-attemp-to-add-common-modes-on-conne.patch new file mode 100644 index 0000000..38bc543 --- /dev/null +++ b/SOURCES/0002-output-kms-Don-t-attemp-to-add-common-modes-on-conne.patch @@ -0,0 +1,47 @@ +From cd8b90a7a7185c3f177469d1a37654a9e8539cd1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Thu, 29 Sep 2022 14:23:55 +0200 +Subject: [PATCH 2/2] output/kms: Don't attemp to add common modes on + connectors without modes + +We have no way to sanely add safe modes if there are no modes we can +compare with, thus don't try. + +Fixes the following crash: + + #0 are_all_modes_equally_sized at ../src/backends/native/meta-output-kms.c:284 + #1 maybe_add_fallback_modes at ../src/backends/native/meta-output-kms.c:310 + #2 init_output_modes at ../src/backends/native/meta-output-kms.c:347 + #3 meta_output_kms_new at ../src/backends/native/meta-output-kms.c:414 + #4 init_outputs at ../src/backends/native/meta-gpu-kms.c:332 + #5 meta_gpu_kms_read_current at ../src/backends/native/meta-gpu-kms.c:368 + #6 meta_gpu_kms_new at ../src/backends/native/meta-gpu-kms.c:403 + #7 create_gpu_from_udev_device at ../src/backends/native/meta-backend-native.c:461 + #8 init_gpus at ../src/backends/native/meta-backend-native.c:551 + #9 meta_backend_native_initable_init at ../src/backends/native/meta-backend-native.c:632 + +Fixes: 877cc3eb7d44e2886395151f763ec09bea350444 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2127801 +Part-of: +(cherry picked from commit 2c8adb19660cb2cd53381372833e088962437d3b) +--- + src/backends/native/meta-output-kms.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/backends/native/meta-output-kms.c b/src/backends/native/meta-output-kms.c +index 9adc20bfd9..058ab7c053 100644 +--- a/src/backends/native/meta-output-kms.c ++++ b/src/backends/native/meta-output-kms.c +@@ -250,6 +250,9 @@ maybe_add_fallback_modes (const MetaKmsConnectorState *connector_state, + MetaGpuKms *gpu_kms, + MetaKmsConnector *kms_connector) + { ++ if (!connector_state->modes) ++ return; ++ + if (!connector_state->has_scaling) + return; + +-- +2.37.1 + diff --git a/SPECS/mutter.spec b/SPECS/mutter.spec index a4c13d8..348f746 100644 --- a/SPECS/mutter.spec +++ b/SPECS/mutter.spec @@ -10,7 +10,7 @@ Name: mutter Version: 40.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -101,6 +101,10 @@ Patch40: 0001-events-Pass-CurrentTime-to-XIAllowEvents-when-unfree.patch # Backport night light availability property (#2057154) Patch41: 0001-monitor-manager-Add-NightLightSupported-property-to-.patch +# Don't add common modes if panel already has (#2125032) +Patch42: 0001-output-kms-Add-more-heuristics-to-decide-when-to-off.patch +Patch43: 0002-output-kms-Don-t-attemp-to-add-common-modes-on-conne.patch + BuildRequires: chrpath BuildRequires: pango-devel BuildRequires: startup-notification-devel @@ -247,6 +251,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog +* Thu Oct 20 2022 Jonas Ådahl ) - 40.9-10 +- Don't add common modes if panel already has + Resolves: #2125032 + * Tue Aug 16 2022 Jonas Ådahl ) - 40.9-9 - Backport night light availability property Resolves: #2057154