summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2019-01-01 14:59:00 +0100
committerSven Eden <sven.eden@gmx.de>2019-01-01 14:59:21 +0100
commit4684e925d21d3875f4f34ffa21eaa58e5357e22f (patch)
treecd63531264c63f2ec1d3ececf65174890146dc2e
parentmedia-gfx/makeSimplexTexture: Depend on next pwxLib (diff)
downloadseden-4684e925d21d3875f4f34ffa21eaa58e5357e22f.tar.gz
seden-4684e925d21d3875f4f34ffa21eaa58e5357e22f.tar.bz2
seden-4684e925d21d3875f4f34ffa21eaa58e5357e22f.zip
x11-misc/bumblebee: Fix uvm support patch
Signed-Off-By: Sven Eden <sven.eden@gmx.de> Package-Manager: Portage-2.3.53, Repoman-2.3.12
-rw-r--r--x11-misc/bumblebee/files/nvidia-uvm-support.patch77
-rw-r--r--x11-misc/bumblebee/metadata.xml2
2 files changed, 40 insertions, 39 deletions
diff --git a/x11-misc/bumblebee/files/nvidia-uvm-support.patch b/x11-misc/bumblebee/files/nvidia-uvm-support.patch
index 54e8707..f0c92cb 100644
--- a/x11-misc/bumblebee/files/nvidia-uvm-support.patch
+++ b/x11-misc/bumblebee/files/nvidia-uvm-support.patch
@@ -1,38 +1,39 @@
---- a/src/bbsecondary.c 2013-04-26 22:49:03.018174178 +0700
-+++ b/src/bbsecondary.c 2014-11-11 20:14:32.663347521 +0700
-@@ -119,6 +119,23 @@
- if (!module_load(module_name, driver_name)) {
- set_bb_error("Could not load GPU driver");
- return false;
-+ } else {
-+ /* XXX NVIDIA UVM support */
-+ if (strstr(module_name, "nvidia")) { /* We are using NVIDIA's proprietary driver */
-+ char uvm_module_name[1024];
-+ sprintf(uvm_module_name, "%s-uvm", module_name);
-+ if (!module_load(uvm_module_name, "nvidia_uvm")) {
-+ char log_string[1024];
-+ sprintf(log_string, "Cannot load UVM module: %s\n", uvm_module_name);
-+ bb_log(LOG_ERR, log_string);
-+ /* Let's try the new nvidia-modeset if they have no uvm module installed: */
-+ sprintf(uvm_module_name, "%s-modeset", module_name);
-+ if (!module_load(uvm_module_name, "nvidia_uvm")) {
-+ sprintf(log_string, "Cannot load MODESET module either: %s\n", uvm_module_name);
-+ bb_log(LOG_ERR, log_string);
-+ }
-+ }
-+ }
- }
- }
- return true;
-@@ -240,6 +257,12 @@
- }
- /* unload the driver loaded by the graphica card */
- if (pci_get_driver(driver, pci_bus_id_discrete, sizeof driver)) {
-+ /* XXX NVIDIA UVM support */
-+ if (strstr(driver, "nvidia")) {
-+ module_unload("nvidia_drm");
-+ module_unload("nvidia_modeset");
-+ module_unload("nvidia_uvm");
-+ }
- module_unload(driver);
- }
+--- a/src/bbsecondary.c 2019-01-01 14:54:00.322574712 +0100
++++ b/src/bbsecondary.c 2019-01-01 14:56:06.237570395 +0100
+@@ -119,6 +119,23 @@
+ if (!module_load(module_name, driver_name)) {
+ set_bb_error("Could not load GPU driver");
+ return false;
++ } else {
++ /* XXX NVIDIA UVM support */
++ if (strstr(module_name, "nvidia")) { /* We are using NVIDIA's proprietary driver */
++ char uvm_module_name[1024];
++ sprintf(uvm_module_name, "%s-uvm", module_name);
++ if (!module_load(uvm_module_name, "nvidia_uvm")) {
++ char log_string[1024];
++ sprintf(log_string, "Cannot load UVM module: %s\n", uvm_module_name);
++ bb_log(LOG_ERR, log_string);
++ /* Let's try the new nvidia-modeset if they have no uvm module installed: */
++ sprintf(uvm_module_name, "%s-modeset", module_name);
++ if (!module_load(uvm_module_name, "nvidia_uvm")) {
++ sprintf(log_string, "Cannot load MODESET module either: %s\n", uvm_module_name);
++ bb_log(LOG_ERR, log_string);
++ }
++ }
++ }
+ }
+ }
+ return true;
+@@ -244,6 +261,12 @@
+ if (unload_driver || bb_config.force_driver_unload) {
+ /* unload the driver loaded by the graphica card */
+ if (pci_get_driver(driver, pci_bus_id_discrete, sizeof driver)) {
++ /* XXX NVIDIA UVM support */
++ if (strstr(driver, "nvidia")) {
++ module_unload("nvidia_drm");
++ module_unload("nvidia_modeset");
++ module_unload("nvidia_uvm");
++ }
+ module_unload(driver);
+ }
+ }
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index e145305..18bdb97 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mva@mva.name</email>
<description>
If you have any issues with Bumblebee on Gentoo, please contact me.