From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 6 Dec 2015 05:32:13 +0000 (+0100)
Subject: x11-drivers/nvidia-drivers: Unload nvidia-modeset as needed (bug #566242 by Adam... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5b59b721ce933854d4f6191fc67536d0f5e0113a;p=gentoo.git

x11-drivers/nvidia-drivers: Unload nvidia-modeset as needed (bug #566242 by Adam Shea).

Package-Manager: portage-2.2.26
---

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
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
rename to 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)"