Timo Aaltonen pushed to branch ubuntu at X Strike Force / xserver / xorg-server
Commits:
-
59634792
by Timo Aaltonen at 2018-09-17T13:42:47Z
-
dac6a621
by Timo Aaltonen at 2018-09-18T14:13:59Z
-
58909e40
by Timo Aaltonen at 2018-09-18T14:39:39Z
-
8f19e597
by Timo Aaltonen at 2018-09-19T09:10:49Z
-
7b895a7a
by Timo Aaltonen at 2018-09-19T09:15:30Z
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:
| 1 |
+xorg-server (2:1.20.1-2ubuntu1) cosmic; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * Merge from Debian.
|
|
| 4 |
+ |
|
| 5 |
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 19 Sep 2018 12:11:14 +0300
|
|
| 6 |
+ |
|
| 7 |
+xorg-server (2:1.20.1-2) unstable; urgency=medium
|
|
| 8 |
+ |
|
| 9 |
+ * control, rules: Use libunwind for backtracing.
|
|
| 10 |
+ * 07_use-modesetting-driver-by-default-on-GeForce.diff: Add a patch from
|
|
| 11 |
+ Fedora to use modesetting on NVIDIA GeForce8 and newer.
|
|
| 12 |
+ |
|
| 13 |
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 18 Sep 2018 17:27:28 +0300
|
|
| 14 |
+ |
|
| 1 | 15 |
xorg-server (2:1.20.1-1ubuntu2) cosmic; urgency=medium
|
| 2 | 16 |
|
| 3 | 17 |
* prime-sync-refactor.diff: Fix crash on modesetting+amdgpu hybrid.
|
| ... | ... | @@ -31,6 +31,7 @@ Build-Depends: |
| 31 | 31 |
libaudit-dev [linux-any],
|
| 32 | 32 |
libdrm-dev (>= 2.4.89) [!hurd-i386],
|
| 33 | 33 |
libgl1-mesa-dev (>= 9.2),
|
| 34 |
+ libunwind-dev,
|
|
| 34 | 35 |
libxmuu-dev (>= 1:0.99.1),
|
| 35 | 36 |
libxext-dev (>= 1:0.99.1),
|
| 36 | 37 |
libx11-dev (>= 2:1.6),
|
| 1 |
+From aa2f34d80ef3118eae0cce73b610c36cdcb978fe Mon Sep 17 00:00:00 2001
|
|
| 2 |
+From: Ben Skeggs <bskeggs@redhat.com>
|
|
| 3 |
+Date: Sat, 22 Apr 2017 02:26:28 +1000
|
|
| 4 |
+Subject: [PATCH xserver] xfree86: use modesetting driver by default on GeForce
|
|
| 5 |
+ 8 and newer
|
|
| 6 |
+ |
|
| 7 |
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
| 8 |
+---
|
|
| 9 |
+ hw/xfree86/common/xf86pciBus.c | 20 ++++++++++++++++++++
|
|
| 10 |
+ 1 file changed, 20 insertions(+)
|
|
| 11 |
+ |
|
| 12 |
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
|
|
| 13 |
+index 8158c2b62..78d1c947d 100644
|
|
| 14 |
+--- a/hw/xfree86/common/xf86pciBus.c
|
|
| 15 |
++++ b/hw/xfree86/common/xf86pciBus.c
|
|
| 16 |
+@@ -37,6 +37,7 @@
|
|
| 17 |
+ #include <unistd.h>
|
|
| 18 |
+ #include <X11/X.h>
|
|
| 19 |
+ #include <pciaccess.h>
|
|
| 20 |
++#include <xf86drm.h>
|
|
| 21 |
+ #include "os.h"
|
|
| 22 |
+ #include "Pci.h"
|
|
| 23 |
+ #include "xf86.h"
|
|
| 24 |
+@@ -1190,6 +1191,25 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
|
|
| 25 |
+ int idx = 0;
|
|
| 26 |
+
|
|
| 27 |
+ #ifdef __linux__
|
|
| 28 |
++ char busid[32];
|
|
| 29 |
++ int fd;
|
|
| 30 |
++
|
|
| 31 |
++ snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
|
|
| 32 |
++ dev->domain, dev->bus, dev->dev, dev->func);
|
|
| 33 |
++
|
|
| 34 |
++ /* 'modesetting' is preferred for GeForce 8 and newer GPUs */
|
|
| 35 |
++ fd = drmOpenWithType("nouveau", busid, DRM_NODE_RENDER);
|
|
| 36 |
++ if (fd >= 0) {
|
|
| 37 |
++ uint64_t args[] = { 11 /* NOUVEAU_GETPARAM_CHIPSET_ID */, 0 };
|
|
| 38 |
++ int ret = drmCommandWriteRead(fd, 0 /* DRM_NOUVEAU_GETPARAM */,
|
|
| 39 |
++ &args, sizeof(args));
|
|
| 40 |
++ drmClose(fd);
|
|
| 41 |
++ if (ret == 0) {
|
|
| 42 |
++ if (args[1] == 0x050 || args[1] >= 0x80)
|
|
| 43 |
++ break;
|
|
| 44 |
++ }
|
|
| 45 |
++ }
|
|
| 46 |
++
|
|
| 47 |
+ driverList[idx++] = "nouveau";
|
|
| 48 |
+ #endif
|
|
| 49 |
+ driverList[idx++] = "nv";
|
|
| 50 |
+--
|
|
| 51 |
+2.12.2
|
|
| 52 |
+ |
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 |
03_static-nettle.diff
|
| 6 | 6 |
05_Revert-Unload-submodules.diff
|
| 7 | 7 |
06_use-intel-only-on-pre-gen4.diff
|
| 8 |
+07_use-modesetting-driver-by-default-on-GeForce.diff
|
|
| 8 | 9 |
|
| 9 | 10 |
## Ubuntu patches, not upstreamable
|
| 10 | 11 |
168_glibc_trace_to_stderr.patch
|
| ... | ... | @@ -41,6 +41,7 @@ confflags += \ |
| 41 | 41 |
confflags_main = \
|
| 42 | 42 |
--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" \
|
| 43 | 43 |
--enable-composite \
|
| 44 |
+ --enable-libunwind \
|
|
| 44 | 45 |
--enable-record \
|
| 45 | 46 |
--enable-xv \
|
| 46 | 47 |
--enable-xvmc \
|