debian/changelog | 14 +++++ debian/patches/series | 1 debian/patches/xf86-fixup-detection.patch | 79 ++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+)
New commits: commit 31fe86c4bd0e28fa5515e3755931d90f5f7bb426 Author: Alberto Milone <alberto.mil...@canonical.com> Date: Fri Jun 14 17:22:01 2013 +0200 Release 2:1.13.3-0ubuntu12 diff --git a/debian/changelog b/debian/changelog index 846d6bb..aea1674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -xorg-server (2:1.13.3-0ubuntu12) UNRELEASED; urgency=low +xorg-server (2:1.13.3-0ubuntu12) saucy; urgency=low - * + * Disable xf86-fixup-detection.patch for now as it breaks PRIME + with nvidia. - -- Alberto Milone <alberto.mil...@canonical.com> Fri, 14 Jun 2013 13:48:05 +0200 + -- Alberto Milone <alberto.mil...@canonical.com> Fri, 14 Jun 2013 17:21:16 +0200 xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low commit e70b437c7dfb0269f5b33a0ae34d961f2a373e9e Author: Alberto Milone <alberto.mil...@canonical.com> Date: Fri Jun 14 15:48:03 2013 +0200 disable xf86-fixup-detection.patch for now The patch currently breaks PRIME with nvidia diff --git a/debian/patches/series b/debian/patches/series index 41520ff..34abd18 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,7 +44,7 @@ include-GPU-screens-in-DPMS-code.patch # hybrid graphics fixes for xserver 1.13 228_autobind_gpu.patch -xf86-fixup-detection.patch +#xf86-fixup-detection.patch # hotplug fixes xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch commit 309eda47aa99ff05aa6cd6f359ac0a7a65419098 Author: Alberto Milone <alberto.mil...@canonical.com> Date: Fri Jun 14 13:48:12 2013 +0200 Start work on 2:1.13.3-0ubuntu12 diff --git a/debian/changelog b/debian/changelog index a9ab4d0..846d6bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.13.3-0ubuntu12) UNRELEASED; urgency=low + + * + + -- Alberto Milone <alberto.mil...@canonical.com> Fri, 14 Jun 2013 13:48:05 +0200 + xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low * Add patch to fix device enumeration with nvidia drivers. (LP: #1190546) commit 99c8acc83b89190ffcf5f83a62cd70a1283b6cb3 Author: Alberto Milone <alberto.mil...@canonical.com> Date: Fri Jun 14 13:47:48 2013 +0200 Release to Saucy diff --git a/debian/changelog b/debian/changelog index ef81dab..a9ab4d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low + + * Add patch to fix device enumeration with nvidia drivers. (LP: #1190546) + - xf86-fixup-detection.patch + + -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 13 Jun 2013 13:00:58 +0200 + xorg-server (2:1.13.3-0ubuntu10) saucy; urgency=low * Add patch to fix DPMS. (LP: #1184999) commit daabf2b23246a0987ed60b76c56ede56b132d46b Author: Alberto Milone <alberto.mil...@canonical.com> Date: Fri Jun 14 13:46:12 2013 +0200 Add patch to fix device enumeration with nvidia drivers. (LP: #1190546) Author: Maarten Lankhorst diff --git a/debian/patches/series b/debian/patches/series index 4290015..41520ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,6 +44,7 @@ include-GPU-screens-in-DPMS-code.patch # hybrid graphics fixes for xserver 1.13 228_autobind_gpu.patch +xf86-fixup-detection.patch # hotplug fixes xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch diff --git a/debian/patches/xf86-fixup-detection.patch b/debian/patches/xf86-fixup-detection.patch new file mode 100644 index 0000000..e454c75 --- /dev/null +++ b/debian/patches/xf86-fixup-detection.patch @@ -0,0 +1,79 @@ +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -546,6 +546,15 @@ + for (k = 0; k < xf86NumEntities; k++) { + EntityPtr pEnt = xf86Entities[k]; + ++#ifdef XSERVER_PLATFORM_BUS ++ if (pEnt->bus.type == BUS_PLATFORM && ++ pEnt->bus.id.plat->pdev && ++ MATCH_PCI_DEVICES(pEnt->bus.id.plat->pdev, pPci)) { ++ foundScreen = TRUE; ++ break; ++ } ++#endif ++ + if (pEnt->bus.type != BUS_PCI) + continue; + if (pEnt->bus.id.pci == pPci) { +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -167,11 +167,12 @@ + for (i = 0; i < xf86NumEntities; i++) { + const EntityPtr u = xf86Entities[i]; + +- if (pd->pdev && u->bus.type == BUS_PCI) +- return !MATCH_PCI_DEVICES(pd->pdev, u->bus.id.pci); +- if ((u->bus.type == BUS_PLATFORM) && (pd == u->bus.id.plat)) { ++ if (pd->pdev && u->bus.type == BUS_PCI && ++ MATCH_PCI_DEVICES(pd->pdev, u->bus.id.pci)) ++ return FALSE; ++ ++ if ((u->bus.type == BUS_PLATFORM) && (pd == u->bus.id.plat)) + return FALSE; +- } + } + return TRUE; + } +@@ -302,6 +303,11 @@ + for (nent = 0; nent < xf86NumEntities; nent++) { + EntityPtr pEnt = xf86Entities[nent]; + ++ if (dev->pdev && pEnt->bus.type == BUS_PCI && ++ MATCH_PCI_DEVICES(dev->pdev, pEnt->bus.id.pci)) { ++ return FALSE; ++ } ++ + if (pEnt->bus.type != BUS_PLATFORM) + continue; + if (pEnt->bus.id.plat == dev) { +@@ -368,18 +374,15 @@ + /* for non-seat0 servers assume first device is the master */ + if (ServerIsNotSeat0()) + break; +- if (xf86_platform_devices[j].pdev) { +- if (xf86IsPrimaryPlatform(&xf86_platform_devices[j])) +- break; +- } +- else { ++ if (xf86IsPrimaryPlatform(&xf86_platform_devices[j])) ++ break; ++ else + /* there's no way to handle real platform devices at this point, + * as there's no valid busID to be used, so try to move forward + * in case there's only one platform device, and see if the + * driver's probe succeeds or not at least once */ + if ((xf86_num_platform_devices == 1) && (!foundScreen)) + break; +- } + } + } + +@@ -398,6 +401,7 @@ + } + } + ++ free(devList); + return foundScreen; + } + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1uolel-00029x...@vasks.debian.org