From ff5f8b054daaf2d23351592eea7e5e4856a0a1f46e9c028092981bd472e60e70 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 22 Jul 2021 12:48:07 +0000 Subject: [PATCH] - U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch * this should fixes crashes of xfce when running under qemu (boo#1188559) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=800 --- ...ip-not-possible-when-glamor-is-not-s.patch | 24 +++++++++++++++++++ xorg-x11-server.changes | 7 ++++++ xorg-x11-server.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch diff --git a/U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch b/U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch new file mode 100644 index 0000000..88fbce6 --- /dev/null +++ b/U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch @@ -0,0 +1,24 @@ +From 3793e12407b6b1511c8655a2665ec5ce41bc820d Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Thu, 22 Jul 2021 14:31:35 +0200 +Subject: [PATCH] modesetting: unflip not possible when glamor is not set + +This is fixing crashes of xfce when running under qemu +--- + hw/xfree86/drivers/modesetting/present.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: xorg-server-1.20.12/hw/xfree86/drivers/modesetting/present.c +=================================================================== +--- xorg-server-1.20.12.orig/hw/xfree86/drivers/modesetting/present.c ++++ xorg-server-1.20.12/hw/xfree86/drivers/modesetting/present.c +@@ -257,6 +257,9 @@ ms_present_check_unflip(RRCrtcPtr crtc, + pixmap->devKind != drmmode_bo_get_pitch(&ms->drmmode.front_bo)) + return FALSE; + ++ if (!ms->drmmode.glamor) ++ return FALSE; ++ + #ifdef GBM_BO_WITH_MODIFIERS + /* Check if buffer format/modifier is supported by all active CRTCs */ + gbm = glamor_gbm_bo_from_pixmap(screen, pixmap); diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 76d7ef4..9880aa1 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 22 12:33:48 UTC 2021 - Stefan Dirsch + +- U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch + * this should fixes crashes of xfce when running under qemu + (boo#1188559) + ------------------------------------------------------------------- Thu Jul 22 09:30:11 UTC 2021 - Dirk Müller diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d7399fa..020f9de 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -253,6 +253,7 @@ Patch1900: u_no-lto-for-tests.patch Patch1910: u_modesetting-Fix-dirty-updates-for-sw-rotation.patch Patch1911: U_present-get_crtc-should-not-return-crtc-when-its-scr.patch +Patch1912: U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch %description This package contains the X.Org Server. @@ -405,6 +406,7 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch1900 -p1 %patch1910 -p1 %patch1911 -p1 +%patch1912 -p1 %build %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects