Skip to content

Commit

Permalink
Updated comments in xorg.conf files
Browse files Browse the repository at this point in the history
Mostly about the new 10-ignore-devices.conf one, but also a bit in both
others.
  • Loading branch information
ArchangeGabriel committed May 19, 2016
1 parent 57b046b commit 85f04ba
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 20 deletions.
5 changes: 5 additions & 0 deletions conf/xorg.conf.d/10-ignore-devices.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# If you connect a display to one of the outputs wired to the Nvidia card, you
# have to comment this whole file. Note that you can leave it commented even
# without currently attached monitor, at the cost of greater optirun startup
# time.

Section "InputClass"
Identifier "IgnoreDevices"
MatchDevicePath "/dev/input/event*|/dev/input/mouse*|/dev/input/js*|/dev/input/mice*"
Expand Down
10 changes: 5 additions & 5 deletions conf/xorg.conf.nouveau
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ 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.
# 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 was needed on Ubuntu 13.04 for instance.
# BusID "PCI:01:00:0"

EndSection
33 changes: 18 additions & 15 deletions conf/xorg.conf.nvidia
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,28 @@ 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.
# 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). It was 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.
# This option doesn't hurt and it is required on platforms running
# more than one nvidia graphics card with the proprietary driver.
# (E.g. Macbook Pro pre-2010 with nVidia 9400M + 9600M GT).
# If this option is not set, the new Xorg may blacken the screen and
# render it unusable (unless you have some way to run killall Xorg).
# 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.
# This option does not hurt and it is required on platforms running more than
# one nvidia graphics card with the proprietary driver (e.g. Macbook Pro
# pre-2010 with nVidia 9400M + 9600M GT).
# If this option is not set, the new Xorg may blacken the screen and render
# it unusable (unless you have some way to run killall Xorg).
Option "ProbeAllGpus" "false"

Option "NoLogo" "true"

# Do not probe display properties while there is no expected display.
Option "UseEDID" "false"
Option "UseDisplayDevice" "none"

Expand All @@ -39,4 +41,5 @@ Section "Device"
# allowing the X server to start when the monitor is disconnected.

# Option "AllowEmptyInitialConfiguration"

EndSection

0 comments on commit 85f04ba

Please sign in to comment.