From 20424d8e6b6ff806c34b76a38dff622730821a5b Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Tue, 25 Oct 2022 23:31:41 +0800 Subject: [PATCH] xf86: Accept devices with the 'simpledrm' driver Signed-off-by: Chunmei Xu --- ...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 23f898b..65a3a66 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 # X.org requires lazy relocations to work. %undefine _hardened_build %undefine _strict_symbol_defs_build @@ -69,6 +69,7 @@ Patch18: 0001-present-Check-for-NULL-to-prevent-crash.patch # Fix a regression with hybrid gfx and NVIDIA proprietary driver # https://bugzilla.redhat.com/show_bug.cgi?id=2052605 Patch19: 0001-modesetting-Fix-msSharePixmapBacking-Segfault-Regres.patch +Patch20: 0001-xf86-Accept-devices-with-the-simpledrm-driver.patch Patch1001: 0001-render-Fix-build-with-gcc-12.patch BuildRequires: make @@ -463,6 +464,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Tue Oct 25 2022 Chunmei Xu - 1:1:1.20.14-3 +- xf86: Accept devices with the 'simpledrm' driver + * Tue Jul 12 2022 happy_orange - 1:1:1.20.14-2 - bugfix the some xorg modules loading error in iso -- Gitee