Timo Aaltonen pushed to branch ubuntu at X Strike Force / xserver / xorg-server
Commits: 59634792 by Timo Aaltonen at 2018-09-17T13:42:47Z control, rules: Use libunwind for backtracing. - - - - - dac6a621 by Timo Aaltonen at 2018-09-18T14:13:59Z 07_use-modesetting-driver-by-default-on-GeForce.diff: Add a patch from Fedora to use modesetting on NVIDIA GeForce8 and newer. - - - - - 58909e40 by Timo Aaltonen at 2018-09-18T14:39:39Z release to unstable - - - - - 8f19e597 by Timo Aaltonen at 2018-09-19T09:10:49Z Merge branch 'debian-unstable' into ubuntu - - - - - 7b895a7a by Timo Aaltonen at 2018-09-19T09:15:30Z upload to cosmic - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/07_use-modesetting-driver-by-default-on-GeForce.diff - debian/patches/series - debian/rules.flags Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,17 @@ +xorg-server (2:1.20.1-2ubuntu1) cosmic; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen <[email protected]> Wed, 19 Sep 2018 12:11:14 +0300 + +xorg-server (2:1.20.1-2) unstable; urgency=medium + + * control, rules: Use libunwind for backtracing. + * 07_use-modesetting-driver-by-default-on-GeForce.diff: Add a patch from + Fedora to use modesetting on NVIDIA GeForce8 and newer. + + -- Timo Aaltonen <[email protected]> Tue, 18 Sep 2018 17:27:28 +0300 + xorg-server (2:1.20.1-1ubuntu2) cosmic; urgency=medium * prime-sync-refactor.diff: Fix crash on modesetting+amdgpu hybrid. ===================================== debian/control ===================================== @@ -31,6 +31,7 @@ Build-Depends: libaudit-dev [linux-any], libdrm-dev (>= 2.4.89) [!hurd-i386], libgl1-mesa-dev (>= 9.2), + libunwind-dev, libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1), libx11-dev (>= 2:1.6), ===================================== debian/patches/07_use-modesetting-driver-by-default-on-GeForce.diff ===================================== @@ -0,0 +1,52 @@ +From aa2f34d80ef3118eae0cce73b610c36cdcb978fe Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <[email protected]> +Date: Sat, 22 Apr 2017 02:26:28 +1000 +Subject: [PATCH xserver] xfree86: use modesetting driver by default on GeForce + 8 and newer + +Signed-off-by: Ben Skeggs <[email protected]> +--- + hw/xfree86/common/xf86pciBus.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index 8158c2b62..78d1c947d 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -37,6 +37,7 @@ + #include <unistd.h> + #include <X11/X.h> + #include <pciaccess.h> ++#include <xf86drm.h> + #include "os.h" + #include "Pci.h" + #include "xf86.h" +@@ -1190,6 +1191,25 @@ xf86VideoPtrToDriverList(struct pci_device *dev, + int idx = 0; + + #ifdef __linux__ ++ char busid[32]; ++ int fd; ++ ++ snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d", ++ dev->domain, dev->bus, dev->dev, dev->func); ++ ++ /* 'modesetting' is preferred for GeForce 8 and newer GPUs */ ++ fd = drmOpenWithType("nouveau", busid, DRM_NODE_RENDER); ++ if (fd >= 0) { ++ uint64_t args[] = { 11 /* NOUVEAU_GETPARAM_CHIPSET_ID */, 0 }; ++ int ret = drmCommandWriteRead(fd, 0 /* DRM_NOUVEAU_GETPARAM */, ++ &args, sizeof(args)); ++ drmClose(fd); ++ if (ret == 0) { ++ if (args[1] == 0x050 || args[1] >= 0x80) ++ break; ++ } ++ } ++ + driverList[idx++] = "nouveau"; + #endif + driverList[idx++] = "nv"; +-- +2.12.2 + ===================================== debian/patches/series ===================================== @@ -5,6 +5,7 @@ 03_static-nettle.diff 05_Revert-Unload-submodules.diff 06_use-intel-only-on-pre-gen4.diff +07_use-modesetting-driver-by-default-on-GeForce.diff ## Ubuntu patches, not upstreamable 168_glibc_trace_to_stderr.patch ===================================== debian/rules.flags ===================================== @@ -41,6 +41,7 @@ confflags += \ confflags_main = \ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \ --enable-composite \ + --enable-libunwind \ --enable-record \ --enable-xv \ --enable-xvmc \ View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/8840185f2c09e228d23b7c23c1cc30f2f76d75dc...7b895a7a5703c1cf58952b6e61acea46b28528b6 -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/8840185f2c09e228d23b7c23c1cc30f2f76d75dc...7b895a7a5703c1cf58952b6e61acea46b28528b6 You're receiving this email because of your account on salsa.debian.org.
