Hello community, here is the log from the commit of package bumblebee for openSUSE:Factory checked in at 2015-01-29 09:57:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bumblebee (Old) and /work/SRC/openSUSE:Factory/.bumblebee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bumblebee" Changes: -------- --- /work/SRC/openSUSE:Factory/bumblebee/bumblebee.changes 2014-11-12 00:22:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bumblebee.new/bumblebee.changes 2015-01-29 09:57:08.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 21 08:55:40 UTC 2015 - arnaldo.coe...@gmail.com + +- Added patch to correctly load/unload nvidia-uvm: + * nvidia-uvm-support.patch + +------------------------------------------------------------------- New: ---- nvidia-uvm-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bumblebee.spec ++++++ --- /var/tmp/diff_new_pack.bn8kj5/_old 2015-01-29 09:57:10.000000000 +0100 +++ /var/tmp/diff_new_pack.bn8kj5/_new 2015-01-29 09:57:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bumblebee # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Hardware/Other Url: https://github.com/Bumblebee-Project/bumblebee Source0: http://bumblebee-project.org/%{name}-%{version}.tar.gz +Patch0: nvidia-uvm-support.patch BuildRequires: glib2-devel BuildRequires: help2man BuildRequires: pciutils @@ -65,6 +66,8 @@ %prep # extract the source and go into the bumblebee directory %setup -q +# Apply patch to add support for nvidia-uvm +%patch0 -p1 %build %configure \ ++++++ nvidia-uvm-support.patch ++++++ --- 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,17 @@ 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); + } + } } } return true; @@ -232,6 +243,10 @@ } /* 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_uvm"); + } module_unload(driver); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
