Added experimnetal nouveau support.

Right now it's just PoC and not suitable for daily use.
Also nouveau lacks support of modern cards and most of GTX 400/500 won't work.
Bumped version number.

Author: z0rc

INSTALL

@@ -9,6 +9,7 @@ Unfortunately, I can provide limited support for them.
 Also it's strongly recommended to run 'git submodule init' before starting the
 installation process.
 
+
 MANUAL INSTALLATION
 
 1) Install proprietary nVidia graphics driver in distro's preferred way (under
@@ -74,6 +75,14 @@ variants (tested only with KDE right now), but it's up to you to find which is
 working with your DE.
 
 
+MODULE OPTION
+
+Originally debumblebee supported only closed source nVidia module. But starting
+from version 0.6 nouveau support was added. Still it's very experimental and not
+suitable for daily use as nouveau lacks support of modern hardware. So right now
+this is just PoC which might be extended later.
+
+
 POWERSAVE OPTION
 
 There is POWER_SAVE option in configuration file. If you set it to "yes", than

README

@@ -25,6 +25,9 @@ This project allows you to utilize nVidia graphics card with proprietary driver
 while running main desktop on Intel card. This service is only for Intel/nVidia
 combination, it won't work with Intel/ATI or any other combination.
 
+Also it provides experimental support of nouveau module, but main goal is still
+support of proprietary driver.
+
 debumblebee is combination of additional X server for nVidia graphics card and
 VirtualGL package which allows to access nVidia X server screen from Intel X
 server screen with full OpenGL support.

VERSION

@@ -1 +1 @@
-0.5
+0.6

install-files/contrib/power_off_on/K53SJ/disablecard

@@ -2,6 +2,12 @@
 
 # This script should contain the command(s) necessary to switch off the nVidia card.
 
+if [ -r /etc/default/debumblebee ]; then
+	. /etc/default/debumblebee
+else
+	MODULE=nvidia
+fi
+
 acpi_call () {
 	echo "$*" > /proc/acpi/call
 	result=$(cat /proc/acpi/call)
@@ -25,10 +31,10 @@ acpi_call () {
 	esac
 }
 
-rmmod nvidia
+rmmod $MODULE
 
-if lsmod | grep -q nvidia; then
-	echo "Error: could not unload nvidia module, leaving card turned on." 1>&2
+if lsmod | grep -q $MODULE; then
+	echo "Error: could not unload $MODULE module, leaving card turned on." 1>&2
 	exit 1
 fi
 

install-files/contrib/power_off_on/K53SJ/enablecard

@@ -2,6 +2,12 @@
 
 # This script should contain the command(s) necessary to switch on the nVidia card.
 
+if [ -r /etc/default/debumblebee ]; then
+	. /etc/default/debumblebee
+else
+	MODULE=nvidia
+fi
+
 acpi_call () {
 	echo "$*" > /proc/acpi/call
 	result=$(cat /proc/acpi/call)
@@ -23,9 +29,9 @@ fi
 # This one works only for ASUS K53SJ.
 acpi_call "\_SB.PCI0.PEGR.GFX0._PS0"
 
-modprobe nvidia
+modprobe $MODULE
 
-if lsmod | grep -q nvidia; then
+if lsmod | grep -q $MODULE; then
 	echo "Enabling nVidia card succeded."
 	exit 0
 else

install-files/contrib/power_off_on/XPS_L501X__/disablecard

@@ -2,6 +2,12 @@
 
 # This script should contain the command(s) necessary to switch off the nVidia card.
 
+if [ -r /etc/default/debumblebee ]; then
+	. /etc/default/debumblebee
+else
+	MODULE=nvidia
+fi
+
 acpi_call () {
 	echo "$*" > /proc/acpi/call
 	result=$(cat /proc/acpi/call)
@@ -25,10 +31,10 @@ acpi_call () {
 	esac
 }
 
-rmmod nvidia
+rmmod $MODULE
 
-if lsmod | grep -q nvidia; then
-	echo "Error: could not unload nvidia module, leaving card turned on." 1>&2
+if lsmod | grep -q $MODULE; then
+	echo "Error: could not unload $MODULE module, leaving card turned on." 1>&2
 	exit 1
 fi
 

install-files/contrib/power_off_on/XPS_L501X__/enablecard

@@ -2,6 +2,12 @@
 
 # This script should contain the command(s) necessary to switch on the nVidia card.
 
+if [ -r /etc/default/debumblebee ]; then
+	. /etc/default/debumblebee
+else
+	MODULE=nvidia
+fi
+
 acpi_call () {
 	echo "$*" > /proc/acpi/call
 	result=$(cat /proc/acpi/call)
@@ -23,9 +29,9 @@ fi
 # This one works only for Dell XPS L501X.
 acpi_call "\_SB.PCI0.P0P2.PEGP._PS0"
 
-modprobe nvidia
+modprobe $MODULE
 
-if lsmod | grep -q nvidia; then
+if lsmod | grep -q $MODULE; then
 	echo "Enabling nVidia card succeded."
 	exit 0
 else

install-files/debian.install

@@ -7,7 +7,7 @@ echo "\nInstalling required packages."
 # Here we are installing standard nVidia package, which provides everything we need to make nVidia card running.
 # sudo is needed for ON_DEMAND option, dmidecode is required for autodetecting ConnectedMonitor option on some laptops.
 apt-get update
-apt-get -y install nvidia-kernel-dkms sudo dmidecode dpkg-dev
+apt-get -y install nvidia-kernel-dkms libgl1-mesa-dri-experimental sudo dmidecode dpkg-dev
 if [ $? -ne 0 ]; then
 	echo "\nPackage manager failed to install nvidia packages." 1>&2
 	echo "Please check that you have non-free repository enabled." 1>&2
@@ -38,7 +38,7 @@ rm -f /tmp/VirtualGL_*.deb
 
 echo "\nInstalling and configuring support files."
 
-cp debian/xorg.conf.nvidia /etc/X11/
+cp debian/xorg.conf.* /etc/X11/
 cp debian/debumblebee /etc/init.d/debumblebee
 cp debian/debumblebee.default /etc/default/debumblebee
 cp debian/debumblebee.sudoers /etc/sudoers.d/debumblebee

install-files/debian.uninstall

@@ -16,6 +16,7 @@ rm -f /etc/default/debumblebee
 rm -f /etc/sudoers.d/debumblebee
 rm -f /etc/bash_completion.d/optirun
 rm -f /etc/X11/xorg.conf.nvidia
+rm -f /etc/X11/xorg.conf.nouveau
 rm -f /usr/local/bin/optirun*
 rm -f /usr/local/bin/*ablecard
 rm -rf /usr/local/lib/debumblebee

install-files/debian/debumblebee

@@ -17,17 +17,25 @@
 if [ -r /etc/default/debumblebee ]; then
 	. /etc/default/debumblebee
 else
+	MODULE=nvidia
 	VGL_DISPLAY=:8
 fi
 
 PATH=/sbin:/usr/local/sbin:/usr/sbin:/bin:/usr/local/bin:/usr/bin
-LD_LIBRARY_PATH=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/nvidia
 DESC="Optimus X server"
 NAME=debumblebee
 DAEMON=/usr/bin/X
-DAEMON_ARGS="-config /etc/X11/xorg.conf.nvidia -modulepath /usr/local/lib/debumblebee,/usr/lib/xorg/modules -sharevts $VGL_DISPLAY"
 PIDFILE=/tmp/.X${VGL_DISPLAY#?}-lock
 SCRIPTNAME=/etc/init.d/$NAME
+if [ $MODULE = nvidia ]; then
+	LD_LIBRARY_PATH=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/nvidia
+	DAEMON_ARGS="-config /etc/X11/xorg.conf.nvidia -modulepath /usr/local/lib/debumblebee,/usr/lib/xorg/modules -sharevts $VGL_DISPLAY"
+elif [ $MODULE = nouveau ]; then
+	DAEMON_ARGS="-config /etc/X11/xorg.conf.nouveau -sharevts $VGL_DISPLAY"
+else
+	echo "Error: unknown MODULE option." 1>&2
+	exit 1
+fi
 
 . /lib/lsb/init-functions
 

install-files/debian/debumblebee.default

@@ -1,3 +1,8 @@
+# Select module which will be used with nVidia card.
+# Default variant is 'nvidia' which is closed source and gives more perfomance.
+# Another possible option is open source 'nouveau', but it's slower.
+MODULE=nvidia
+
 # Do not run nVidia X server constantly and start it only when needed.
 # Enabled by default.
 ON_DEMAND=yes

install-files/debian/optirun

@@ -11,15 +11,27 @@ fi
 # Default options.
 OPT_VERBOSE=$VERBOSE
 OPT_HELP=false
-OPT_LIB=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/nvidia
+if [ $MODULE = nvidia ]; then
+	OPT_LIB=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/nvidia
+elif [ $MODULE = nouveau ]; then
+	OPT_LIB=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`
+else
+	echo "Error: unknown MODULE option." 2>&1
+fi
 
 # Parsing command line.
 if [ $# -eq 0 ]; then
 	OPT_HELP=true
 else
 	while [ $# -gt 0 ]; do
 		case "$1" in
-			-3|-32|--32) OPT_LIB=/usr/lib32/nvidia ;;
+			-3|-32|--32)
+				if [ $MODULE = nvidia ]; then
+					OPT_LIB=/usr/lib32/nvidia
+				elif [ $MODULE = nouveau ]; then
+					OPT_LIB=/usr/lib32
+				fi
+				;;
 			-h|-help|--help) OPT_HELP=true ;;
 			-v|-verbose|--verbose) OPT_VERBOSE=yes ;;
 			--) shift; break ;;

install-files/debian/xorg.conf.nouveau

@@ -0,0 +1,28 @@
+Section "Device"
+    Identifier     "Device1"
+    Driver         "nouveau"
+    BusID          "PCI:1:0:0"
+EndSection
+
+Section "Screen"
+    Identifier     "Screen1"
+    Device         "Device1"
+    Monitor        "Monitor1"
+    DefaultDepth   24
+    SubSection     "Display"
+        Depth      24
+        Modes      "1920x1200" "1920x1080" "1680x1050" "1600x1200" "1440x900" "1366x768" "1280x1024" "1280x800"
+    EndSubSection
+EndSection
+
+Section "Monitor"
+    Identifier     "Monitor1"
+    Modeline       "1920x1200" 193.25 1920 2056 2256 2592 1200 1203 1209 1245 -hsync +vsync
+    Modeline       "1920x1080" 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync
+    Modeline       "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync
+    Modeline       "1600x1200" 161.00 1600 1712 1880 2160 1200 1203 1207 1245 -hsync +vsync
+    Modeline       "1440x900"  106.50 1440 1528 1672 1904 900  903  909  934  -hsync +vsync
+    Modeline       "1366x768"  71.80  1366 1414 1446 1526 768  771  777  784  -hsync -vsync
+    Modeline       "1280x1024" 109.00 1280 1368 1496 1712 1024 1027 1034 1063 -hsync +vsync
+    Modeline       "1280x800"  83.50  1280 1352 1480 1680 800  803  809  831  -hsync +vsync
+EndSection