From 672ae9a577e12acf35e6eab1eac5bc5e94c28320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 11 Apr 2022 11:12:37 +0200 Subject: [PATCH] Fix basic graphic mode not working with simpledrm (#2067151) --- ...pt-devices-with-the-simpledrm-driver.patch | 34 +++++++++++++++++++ xorg-x11-server.spec | 6 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-xf86-Accept-devices-with-the-simpledrm-driver.patch diff --git a/0001-xf86-Accept-devices-with-the-simpledrm-driver.patch b/0001-xf86-Accept-devices-with-the-simpledrm-driver.patch new file mode 100644 index 0000000..3dc5796 --- /dev/null +++ b/0001-xf86-Accept-devices-with-the-simpledrm-driver.patch @@ -0,0 +1,34 @@ +From b9218fadf3c09d83566549279d68886d8258f79c Mon Sep 17 00:00:00 2001 +From: nerdopolis +Date: Thu, 30 Sep 2021 08:51:18 -0400 +Subject: [PATCH] xf86: Accept devices with the 'simpledrm' driver. + +SimpleDRM 'devices' are a fallback device, and do not have a busid +so they are getting skipped. This will allow simpledrm to work +with the modesetting driver +--- + hw/xfree86/common/xf86platformBus.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index 0e0a995ac..45028f7a6 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -557,8 +557,13 @@ xf86platformProbeDev(DriverPtr drvp) + } + else { + /* for non-seat0 servers assume first device is the master */ +- if (ServerIsNotSeat0()) ++ if (ServerIsNotSeat0()) { + break; ++ } else { ++ /* Accept the device if the driver is simpledrm */ ++ if (strcmp(xf86_platform_devices[j].attribs->driver, "simpledrm") == 0) ++ break; ++ } + + if (xf86IsPrimaryPlatform(&xf86_platform_devices[j])) + break; +-- +2.35.1 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e632148..63a51d6 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -46,7 +46,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.20.14 -Release: 4%{?gitdate:.%{gitdate}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}}%{?dist} URL: http://www.x.org License: MIT @@ -98,6 +98,7 @@ Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch # Backports from "master" upstream: Patch100: 0001-present-Check-for-NULL-to-prevent-crash.patch Patch101: 0001-render-Fix-build-with-gcc-12.patch +Patch102: 0001-xf86-Accept-devices-with-the-simpledrm-driver.patch BuildRequires: make BuildRequires: systemtap-sdt-devel @@ -513,6 +514,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Fri Apr 8 2022 Jocelyn Falempe - 1.20.14-5 +- Fix basic graphic mode not working with simpledrm (#2067151) + * Fri Jan 28 2022 Olivier Fourdan - 1.20.14-4 - Fix build with GCC 12 (#2047134)