summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-12-06 06:32:13 +0100
committerJeroen Roovers <jer@gentoo.org>2015-12-06 06:32:13 +0100
commit5b59b721ce933854d4f6191fc67536d0f5e0113a (patch)
tree5852a3ca5528183b5942da2809f1977188a9bade /x11-drivers/nvidia-drivers
parentgames-fps/duke3d-data: Stable for HPPA (bug #567518). (diff)
downloadgentoo-5b59b721ce933854d4f6191fc67536d0f5e0113a.tar.gz
gentoo-5b59b721ce933854d4f6191fc67536d0f5e0113a.tar.bz2
gentoo-5b59b721ce933854d4f6191fc67536d0f5e0113a.zip
x11-drivers/nvidia-drivers: Unload nvidia-modeset as needed (bug #566242 by Adam Shea).
Package-Manager: portage-2.2.26
Diffstat (limited to 'x11-drivers/nvidia-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf3
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild)2
2 files changed, 4 insertions, 1 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
new file mode 100644
index 000000000000..48a827365542
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
@@ -0,0 +1,3 @@
+# Nvidia UVM support
+
+remove nvidia modprobe -r --ignore-remove nvidia-modeset nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
index 44a9162ac849..e81b1bce7b0b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
@@ -244,7 +244,7 @@ src_install() {
# pkg_preinst, see bug #491414
insinto /etc/modprobe.d
newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
- use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+ doins "${FILESDIR}"/nvidia-rmmod.conf
# Ensures that our device nodes are created when not using X
exeinto "$(get_udevdir)"