Skip to content

Commit 85f04ba

Browse files
Updated comments in xorg.conf files
Mostly about the new 10-ignore-devices.conf one, but also a bit in both others.
1 parent 57b046b commit 85f04ba

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

conf/xorg.conf.d/10-ignore-devices.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# If you connect a display to one of the outputs wired to the Nvidia card, you
2+
# have to comment this whole file. Note that you can leave it commented even
3+
# without currently attached monitor, at the cost of greater optirun startup
4+
# time.
5+
16
Section "InputClass"
27
Identifier "IgnoreDevices"
38
MatchDevicePath "/dev/input/event*|/dev/input/mouse*|/dev/input/js*|/dev/input/mice*"

conf/xorg.conf.nouveau

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Section "Device"
77
Identifier "DiscreteNvidia"
88
Driver "nouveau"
99

10-
# If the X server does not automatically detect your VGA device,
11-
# you can manually set it here.
12-
# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
13-
# as you see in the commented example.
14-
# This Setting is needed on Ubuntu 13.04.
10+
# If the X server does not automatically detect your VGA device, you can
11+
# manually set it here.
12+
# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data as
13+
# you see in the commented example.
14+
# This setting was needed on Ubuntu 13.04 for instance.
1515
# BusID "PCI:01:00:0"
1616

1717
EndSection

conf/xorg.conf.nvidia

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,28 @@ Section "Device"
88
Driver "nvidia"
99
VendorName "NVIDIA Corporation"
1010

11-
# If the X server does not automatically detect your VGA device,
12-
# you can manually set it here.
13-
# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
14-
# as you see in the commented example.
15-
# This Setting may be needed in some platforms with more than one
16-
# nvidia card, which may confuse the proprietary driver (e.g.,
17-
# trying to take ownership of the wrong device). Also needed on Ubuntu 13.04.
11+
# If the X server does not automatically detect your VGA device, you can
12+
# manually set it here.
13+
# To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data as
14+
# you see in the commented example.
15+
# This setting may be needed in some platforms with more than one nvidia
16+
# card, which may confuse the proprietary driver (e.g., trying to take
17+
# ownership of the wrong device). It was also needed on Ubuntu 13.04.
1818
# BusID "PCI:01:00:0"
1919

20-
# Setting ProbeAllGpus to false prevents the new proprietary driver
21-
# instance spawned to try to control the integrated graphics card,
22-
# which is already being managed outside bumblebee.
23-
# This option doesn't hurt and it is required on platforms running
24-
# more than one nvidia graphics card with the proprietary driver.
25-
# (E.g. Macbook Pro pre-2010 with nVidia 9400M + 9600M GT).
26-
# If this option is not set, the new Xorg may blacken the screen and
27-
# render it unusable (unless you have some way to run killall Xorg).
20+
# Setting ProbeAllGpus to false prevents the new proprietary driver instance
21+
# spawned to try to control the integrated graphics card, which is already
22+
# being managed outside bumblebee.
23+
# This option does not hurt and it is required on platforms running more than
24+
# one nvidia graphics card with the proprietary driver (e.g. Macbook Pro
25+
# pre-2010 with nVidia 9400M + 9600M GT).
26+
# If this option is not set, the new Xorg may blacken the screen and render
27+
# it unusable (unless you have some way to run killall Xorg).
2828
Option "ProbeAllGpus" "false"
2929

3030
Option "NoLogo" "true"
31+
32+
# Do not probe display properties while there is no expected display.
3133
Option "UseEDID" "false"
3234
Option "UseDisplayDevice" "none"
3335

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

4143
# Option "AllowEmptyInitialConfiguration"
44+
4245
EndSection

0 commit comments

Comments
 (0)