Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2016-02-17 10:30:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2016-01-23 01:15:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2016-02-17 12:26:38.000000000 +0100 @@ -1,0 +2,30 @@ +Wed Feb 10 15:07:32 UTC 2016 - [email protected] + +- u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch + Fix up primary device detection for the platform bus to fix the Xserver + on older iMacs (boo#835975). + +------------------------------------------------------------------- +Tue Feb 9 20:55:28 UTC 2016 - [email protected] + +- Update to version 1.18.1: + First release in the 1.18 stable branch. Major themes are bugfixes in + glamor, the modesetting driver, and the Present extension. + + Xwayland users may want to apply the following pair of patches in + addition to this release: + + https://patchwork.freedesktop.org/patch/72945/raw/ + https://patchwork.freedesktop.org/patch/72951/raw/ + + which combined fix an input issue when hotplugging monitors. Both are + likely to be included in a future release unless testing discovers + further problems. + +- Remove upstreamed patches: + + ux_xserver_xvfb-randr.patch + + U_systemd-logind-do-not-rely-on-directed-signals.patch + + U_kdrive-UnregisterFd-Fix-off-by-one.patch + + U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch + +------------------------------------------------------------------- Old: ---- U_kdrive-UnregisterFd-Fix-off-by-one.patch U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch U_systemd-logind-do-not-rely-on-directed-signals.patch ux_xserver_xvfb-randr.patch xorg-server-1.18.0.tar.bz2 New: ---- u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch xorg-server-1.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.C2k8p9/_old 2016-02-17 12:26:39.000000000 +0100 +++ /var/tmp/diff_new_pack.C2k8p9/_new 2016-02-17 12:26:39.000000000 +0100 @@ -26,7 +26,7 @@ Name: xorg-x11-server -%define dirsuffix 1.18.0 +%define dirsuffix 1.18.1 Summary: X License: MIT @@ -167,7 +167,6 @@ # PATCH-FIX-UPSTREAM u_x86emu-include-order.patch [email protected] -- Change include order to avoid conflict with system header, remove duplicate definitions Patch102: u_x86emu-include-order.patch Patch104: u_xorg-server-xdmcp.patch -Patch105: ux_xserver_xvfb-randr.patch # PATCH-FIX-UPSTREAM u_exa-only-draw-valid-trapezoids.patch bnc#853846 [email protected] -- Fixes possible crash of server using invalid trapezoids. 2013-12-12 patch is waiting in mailing list to be upstreamed. Patch106: u_exa-only-draw-valid-trapezoids.patch Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch @@ -179,11 +178,9 @@ Patch160: u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch -Patch204: U_systemd-logind-do-not-rely-on-directed-signals.patch -Patch205: U_kdrive-UnregisterFd-Fix-off-by-one.patch Patch206: u_busfault_sigaction-Only-initialize-pointer-when-matched.patch -Patch207: U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch Patch208: u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch +Patch209: u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -274,7 +271,6 @@ %patch101 %patch102 -p1 %patch104 -p1 -%patch105 -p1 %patch106 -p1 %patch112 -p1 @@ -286,11 +282,9 @@ %patch160 -p1 -%patch204 -p1 -%patch205 -p1 %patch206 -p1 -%patch207 -p1 %patch208 -p1 +%patch209 -p1 %patch1000 -p1 ++++++ u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch ++++++ From: Egbert Eich <[email protected]> Date: Wed Feb 10 15:55:51 2016 +0100 Subject: [PATCH]pci/primary: Fix up primary PCI device detection for the platfrom bus Patch-mainline: to be upstreamed Git-commit: 85d81d3ec321572aea31d34a87632442687a54f5 References: boo#835975 Signed-off-by: Egbert Eich <[email protected]> The detection wheter a device is the primary PCI device currently relies on libciaccess. This checks of the PCI device is a VGA boot device. On some systems however, the primary card is not flagged like that - this it is not discovered. The subsequent PCI probing has a fallback heuristic designed for this situation. This however causes the primary device to be flagged as a PCI bus device, not a 'platform bus' device. To fix this, we check in the subsequent xf86platformPrimary() wheter the primary device is flagged as a PCI bus device. If this is the case and the same device is in the list of the 'platform bus' devices, we reflag it as such. This fixes the detection of the primary device on older iMacs. Signed-off-by: Egbert Eich <[email protected]> --- hw/xfree86/common/xf86platformBus.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 8b3a862..efa6d1a 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -622,6 +622,35 @@ void xf86platformPrimary(void) xf86Msg(X_NONE, "\tfalling back to %s\n", primaryBus.id.plat->attribs->syspath); } + } else if (xf86_num_platform_devices > 0 && primaryBus.type == BUS_PCI) { + /* + * FIXUP: platform_find_pci_info() may not always find the primary + * platform device. If a primary device is a platform device but was + * identified as PCI device, let's fix this up here. + */ + int i; + + for (i = 0; i < xf86_num_platform_devices; i++) { + char *busid = xf86_platform_odev_attributes(i)->busid; + int domain, bus, dev, func; + int ret; + + if (strncmp(busid, "pci:", 4) != 0) + continue; + + ret = sscanf(busid, "pci:%04x:%02x:%02x.%u", + &domain, &bus, &dev, &func); + if (ret != 4) + continue; + + if (domain == primaryBus.id.pci->domain && + bus == primaryBus.id.pci->bus && + dev == primaryBus.id.pci->dev && + func == primaryBus.id.pci->func) { + primaryBus.id.plat = &xf86_platform_devices[i]; + primaryBus.type = BUS_PLATFORM; + } + } } } #endif ++++++ xorg-server-1.18.0.tar.bz2 -> xorg-server-1.18.1.tar.bz2 ++++++ ++++ 7458 lines of diff (skipped)
