make sure nvidia-drm module does not brake optimus as nvidia-modeset module did

2 files changed, 4 insertions, 3 deletions

diff --git a/x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild
index e3b80418..8700ac23 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 		# Dirty fix for issue https://github.com/Bumblebee-Project/Bumblebee/issues/699
 		# cherry picked from https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56
-		epatch "${FILESDIR}/${P}-handle-nvidia-modeset.patch"
+		epatch "${FILESDIR}/${P}-handle-nvidia-modeset-and-nvidia-drm.patch"
 }
 
 src_configure() {
diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch
index 742a5d8e..e71dd086 100644
--- a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset.patch
+++ b/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch
@@ -1,7 +1,7 @@
 diff -Nur a/src/module.c b/src/module.c
 --- a/src/module.c	2013-04-26 16:49:03.022174178 +0100
-+++ b/src/module.c	2016-09-19 18:50:43.080311387 +0100
-@@ -96,7 +96,9 @@
++++ b/src/module.c	2016-10-22 18:41:42.151021720 +0100
+@@ -96,7 +96,10 @@
      int retries = 30;
      bb_log(LOG_INFO, "Unloading %s driver\n", driver);
      char *mod_argv[] = {
@@ -9,6 +9,7 @@ diff -Nur a/src/module.c b/src/module.c
 +      "modprobe",
 +      "-r",
 +      "nvidia_modeset",
++      "nvidia_drm",
        driver,
        NULL
      };