Permalink
Browse files

Unsplit "Device" section across xorg.conf files

This fixes the widely faced issue in Bumblebee 3.2
  • Loading branch information...
1 parent 2207fdc commit 5aeefc221c751122a30cfb2d48025f85479bd8e6 @ArchangeGabriel ArchangeGabriel committed Apr 26, 2013
Showing with 18 additions and 15 deletions.
  1. +1 −3 Makefile.am
  2. +0 −11 conf/xorg.conf.d/busid.conf
  3. +8 −0 conf/xorg.conf.nouveau
  4. +9 −1 conf/xorg.conf.nvidia
View
@@ -23,9 +23,7 @@ endif
bin_SCRIPTS = scripts/bumblebee-bugreport
xconfddir = $(bumblebeedconfdir)/xorg.conf.d
-xconfd_DATA = \
- conf/xorg.conf.d/10-dummy.conf \
- conf/xorg.conf.d/busid.conf
+xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS)
EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
@@ -1,11 +0,0 @@
-Section "Device"
- Identifier "DiscreteNvidia"
-# If the X server does not automatically detect your VGA device,
-# you can manually set it here.
-# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
-# as you see in the commented example.
-# This Setting may be needed in some platforms with more than one
-# nvidia card, which may confuse the proprietary driver (e.g.,
-# trying to take ownership of the wrong device). Also needed on Ubuntu 13.04.
-# BusID "PCI:02:00:0"
-EndSection
@@ -7,4 +7,12 @@ EndSection
Section "Device"
Identifier "DiscreteNvidia"
Driver "nouveau"
+
+# If the X server does not automatically detect your VGA device,
+# you can manually set it here.
+# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
+# as you see in the commented example.
+# This Setting is needed on Ubuntu 13.04.
+# BusID "PCI:01:00:0"
+
EndSection
View
@@ -9,6 +9,15 @@ Section "Device"
Driver "nvidia"
VendorName "NVIDIA Corporation"
+# If the X server does not automatically detect your VGA device,
+# you can manually set it here.
+# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
+# as you see in the commented example.
+# This Setting may be needed in some platforms with more than one
+# nvidia card, which may confuse the proprietary driver (e.g.,
+# trying to take ownership of the wrong device). Also needed on Ubuntu 13.04.
+# BusID "PCI:01:00:0"
+
# Setting ProbeAllGpus to false prevents the new proprietary driver
# instance spawned to try to control the integrated graphics card,
# which is already being managed outside bumblebee.
@@ -23,4 +32,3 @@ Section "Device"
Option "UseEDID" "false"
Option "UseDisplayDevice" "none"
EndSection
-

0 comments on commit 5aeefc2

Please sign in to comment.