Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at 2019-01-15 13:14:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Tue Jan 15 13:14:46 2019 rev:365 rq:663606 version:1.20.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes
2018-11-26 10:17:53.181902814 +0100
+++
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.28833/xorg-x11-server.changes
2019-01-15 13:14:47.840432125 +0100
@@ -1,0 +2,8 @@
+Wed Jan 2 11:36:57 UTC 2019 - [email protected]
+
+- u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
+ * X server does not support mixing fbdev with other drivers, so
+ claiming pci slots when a fb slot is already claimed only leads
+ to quiting with fatal error. (bsc#1119431)
+
+-------------------------------------------------------------------
New:
----
u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.XPWHjZ/_old 2019-01-15 13:14:49.660430699 +0100
+++ /var/tmp/diff_new_pack.XPWHjZ/_new 2019-01-15 13:14:49.660430699 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-server
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -228,6 +228,8 @@
Patch1502: U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch
+Patch1503: u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
+
%description
This package contains the X.Org Server.
@@ -371,6 +373,8 @@
%patch1502 -p1
+%patch1503 -p1
+
%build
test -e source-file-list || \
find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \
++++++ u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch ++++++
Author: Michal Srb <[email protected]>
Subject: xfree86: Do not claim pci slots if fb slot is already claimed.
Patch-Mainline: To be upstreamed
References: bsc#1119431
The xf86PostProbe would terminate with fatal error if both fb and pci
slot were claimed at the same time, so there is no point in trying.
The opposite logic is already implemented - fb slots will not be claimed
if a pci slot was claimed.
This fixes issue with xf86-video-fbdev and xf86-video-vesa activating at
the same time (when /dev/fb0 is provided by the vesafb kernel driver).
---
hw/xfree86/common/xf86pciBus.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 0718cdcb0..24396a63c 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -212,6 +212,9 @@ xf86ClaimPciSlot(struct pci_device *d, DriverPtr drvp,
EntityPtr p = NULL;
int num;
+ if (fbSlotClaimed)
+ return -1;
+
if (xf86CheckPciSlot(d)) {
num = xf86AllocateEntity();
p = xf86Entities[num];
--
2.16.4
