From 567a2e879f2228a1a16f4ee78357ff3982b97113 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 31 Mar 2022 16:50:36 +1030 Subject: [PATCH 1/3] Update to 5.24.4 --- .gitignore | 1 + kwin.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9a717a4..badb5fd 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /kwin-5.24.1.tar.xz /kwin-5.24.2.tar.xz /kwin-5.24.3.tar.xz +/kwin-5.24.4.tar.xz diff --git a/kwin.spec b/kwin.spec index 7102fe0..c792a10 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.24.3 -Release: 3%{?dist} +Version: 5.24.4 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -374,6 +374,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Thu Mar 31 2022 Justin Zobel - 5.24.4-1 +- Update to 5.24.4 + * Mon Mar 21 2022 Adam Williamson - 5.24.3-3 - Backport MR #2163 (edited to cover vbox) to fix VM cursor offset (#2063969) diff --git a/sources b/sources index 89747e0..397de2a 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (kwin-5.24.1.tar.xz) = 191fe8d4363ea98adabd75c045b48e10490d8002abe2f0a0c199cb51447b371165a85ed2b98d04128a069661e8ebf4fce0323421c09bddf9372acf6f8d5d2461 SHA512 (kwin-5.24.2.tar.xz) = 6bb536e1d11f02c8d103e3f975d6100eb4a04cf579b209ecdcf9785c91f55e14b563076299c727419cc6553dc82ce02edc8688d09ad71dc87d43f73b9041a138 SHA512 (kwin-5.24.3.tar.xz) = b0a578036b84b457c968f583ba0bb44dacddd04cf0e7a86664a6348df3e44ee77d818347a2cb7d9daf2b8425d81695b996fcf272cee80b88947e230b66639b97 +SHA512 (kwin-5.24.4.tar.xz) = 2e1389a68e373791bd397294c834fb1cdbab24f32253eeaf505bb1878b8a8a5cd02d1250cae181c00dc73d6a524ff44cd1fbf2e101f13adf915f30f15c738df3 From 8c1b9d577813e21866eb8d1f8adfaba44fb56db0 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 31 Mar 2022 21:29:13 +1030 Subject: [PATCH 2/3] Remove unnecessary patch --- 2163-edited.patch | 63 ----------------------------------------------- kwin.spec | 8 +----- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 2163-edited.patch diff --git a/2163-edited.patch b/2163-edited.patch deleted file mode 100644 index b6cd48f..0000000 --- a/2163-edited.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e686da9ddedd820d3a7c3c21033c48276c251636 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl -Date: Sun, 20 Mar 2022 05:12:48 +0100 -Subject: [PATCH] backends/drm: fall back to legacy mode in virtual machines - -Virtual machines aren't properly supporting atomic mode setting yet, which -causes the cursor to be offset, and will cause more issues with overlay -planes. In order to prevent that from impacting users, fall back to legacy, -unless KWIN_DRM_NO_AMS is set. - -BUG: 427060 -FIXED-IN: 5.24.4 ---- - src/backends/drm/drm_gpu.cpp | 11 +++++++---- - src/backends/drm/drm_gpu.h | 1 + - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp -index 51b8719f57..26d6b27b04 100644 ---- a/src/backends/drm/drm_gpu.cpp -+++ b/src/backends/drm/drm_gpu.cpp -@@ -75,9 +75,10 @@ DrmGpu::DrmGpu(DrmBackend *backend, const QString &devNode, int fd, dev_t device - m_addFB2ModifiersSupported = drmGetCap(fd, DRM_CAP_ADDFB2_MODIFIERS, &capability) == 0 && capability == 1; - qCDebug(KWIN_DRM) << "drmModeAddFB2WithModifiers is" << (m_addFB2ModifiersSupported ? "supported" : "not supported") << "on GPU" << m_devNode; - -- // find out if this GPU is using the NVidia proprietary driver -+ // find out what driver this kms device is using - DrmScopedPointer version(drmGetVersion(fd)); - m_isNVidia = strstr(version->name, "nvidia-drm"); -+ m_isVirtualMachine = strstr(version->name, "virtio") || strstr(version->name, "qxl") || strstr(version->name, "vmwgfx") || strstr(version->name, "vboxvideo"); - m_gbmDevice = gbm_create_device(m_fd); - - m_socketNotifier = new QSocketNotifier(fd, QSocketNotifier::Read, this); -@@ -148,9 +149,11 @@ clockid_t DrmGpu::presentationClock() const - void DrmGpu::initDrmResources() - { - // try atomic mode setting -- bool tmp = false; -- bool noAMS = qEnvironmentVariableIntValue("KWIN_DRM_NO_AMS", &tmp) != 0 && tmp; -- if (noAMS) { -+ bool isEnvVarSet = false; -+ bool noAMS = qEnvironmentVariableIntValue("KWIN_DRM_NO_AMS", &isEnvVarSet) != 0 && isEnvVarSet; -+ if (m_isVirtualMachine && !isEnvVarSet) { -+ qCWarning(KWIN_DRM, "Atomic Mode Setting disabled on GPU %s because of cursor offset issues in virtual machines", qPrintable(m_devNode)); -+ } else if (noAMS) { - qCWarning(KWIN_DRM) << "Atomic Mode Setting requested off via environment variable. Using legacy mode on GPU" << m_devNode; - } else if(drmSetClientCap(m_fd, DRM_CLIENT_CAP_ATOMIC, 1) != 0) { - qCWarning(KWIN_DRM) << "drmSetClientCap for Atomic Mode Setting failed. Using legacy mode on GPU" << m_devNode; -diff --git a/src/backends/drm/drm_gpu.h b/src/backends/drm/drm_gpu.h -index 97c2d8ddc2..1e1f7e3b15 100644 ---- a/src/backends/drm/drm_gpu.h -+++ b/src/backends/drm/drm_gpu.h -@@ -118,6 +118,7 @@ private: - bool m_atomicModeSetting; - bool m_addFB2ModifiersSupported = false; - bool m_isNVidia; -+ bool m_isVirtualMachine; - clockid_t m_presentationClock; - gbm_device* m_gbmDevice; - EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; --- -GitLab - diff --git a/kwin.spec b/kwin.spec index c792a10..05e6797 100644 --- a/kwin.spec +++ b/kwin.spec @@ -40,12 +40,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. ## proposed patches -# Fallback to legacy mode in VMs to fix cursor offset bug: -# https://invent.kde.org/plasma/kwin/-/merge_requests/2163 -# https://bugzilla.redhat.com/show_bug.cgi?id=2063969 -# edited to add 'vboxvideo' for VirtualBox -Patch0: 2163-edited.patch - # Base BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros @@ -375,7 +369,7 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog * Thu Mar 31 2022 Justin Zobel - 5.24.4-1 -- Update to 5.24.4 +- Update to 5.24.4 and remove patch * Mon Mar 21 2022 Adam Williamson - 5.24.3-3 - Backport MR #2163 (edited to cover vbox) to fix VM cursor offset (#2063969) From 60b820da8ef309427a0a85e0c330328c47d6e6c9 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 3 May 2022 19:50:54 +0200 Subject: [PATCH 3/3] 5.24.5 --- .gitignore | 1 + kwin.spec | 5 ++++- sources | 5 +---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index badb5fd..785e1fa 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ /kwin-5.24.2.tar.xz /kwin-5.24.3.tar.xz /kwin-5.24.4.tar.xz +/kwin-5.24.5.tar.xz diff --git a/kwin.spec b/kwin.spec index 05e6797..7872d11 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.24.4 +Version: 5.24.5 Release: 1%{?dist} Summary: KDE Window manager @@ -368,6 +368,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue May 03 2022 Marc Deop - 5.24.5-1 +- 5.24.5 + * Thu Mar 31 2022 Justin Zobel - 5.24.4-1 - Update to 5.24.4 and remove patch diff --git a/sources b/sources index 397de2a..87eca20 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (kwin-5.24.1.tar.xz) = 191fe8d4363ea98adabd75c045b48e10490d8002abe2f0a0c199cb51447b371165a85ed2b98d04128a069661e8ebf4fce0323421c09bddf9372acf6f8d5d2461 -SHA512 (kwin-5.24.2.tar.xz) = 6bb536e1d11f02c8d103e3f975d6100eb4a04cf579b209ecdcf9785c91f55e14b563076299c727419cc6553dc82ce02edc8688d09ad71dc87d43f73b9041a138 -SHA512 (kwin-5.24.3.tar.xz) = b0a578036b84b457c968f583ba0bb44dacddd04cf0e7a86664a6348df3e44ee77d818347a2cb7d9daf2b8425d81695b996fcf272cee80b88947e230b66639b97 -SHA512 (kwin-5.24.4.tar.xz) = 2e1389a68e373791bd397294c834fb1cdbab24f32253eeaf505bb1878b8a8a5cd02d1250cae181c00dc73d6a524ff44cd1fbf2e101f13adf915f30f15c738df3 +SHA512 (kwin-5.24.5.tar.xz) = 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089