Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 7b895a7a
xorg-server (2:1.20.1-2ubuntu1) cosmic; urgency=medium
* Merge from Debian.
-- Timo Aaltonen <tjaalton@debian.org> 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 <tjaalton@debian.org> 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
View file @ 7b895a7a
......@@ -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 → 100644
View file @ 7b895a7a
From aa2f34d80ef3118eae0cce73b610c36cdcb978fe Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
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 <bskeggs@redhat.com>
---
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
View file @ 7b895a7a
......@@ -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
View file @ 7b895a7a
......@@ -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 \
......