summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2012-04-05 02:49:31 +0000
committerAnssi Hannula <anssi@mageia.org>2012-04-05 02:49:31 +0000
commit3bbbe26aa84dc04589637c075435601fa3978193 (patch)
treef878a48c3d6147a5dc0fafe07afe7747f0c6caf2
parent7106e86e6db0c3b220aef19648d59b87bd0c86b5 (diff)
downloaddrakx-kbd-mouse-x11-3bbbe26aa84dc04589637c075435601fa3978193.tar
drakx-kbd-mouse-x11-3bbbe26aa84dc04589637c075435601fa3978193.tar.gz
drakx-kbd-mouse-x11-3bbbe26aa84dc04589637c075435601fa3978193.tar.bz2
drakx-kbd-mouse-x11-3bbbe26aa84dc04589637c075435601fa3978193.tar.xz
drakx-kbd-mouse-x11-3bbbe26aa84dc04589637c075435601fa3978193.zip
display_driver_helper: allow use of nouveau without xorg.conf
-rw-r--r--NEWS2
-rw-r--r--tools/display_driver_helper4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 15e6131..dd5c85d 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
- handle drivers needing firmware (mga#1471, mga#3421)
- display_driver_helper changes:
o drop support for unused and unuseful --check-initrd option
+ o allow use of nouveau without xorg.conf as it is now autoselected by
+ X server in that case
Version 0.99 - 18 December 2011
- default to 24bit with QXL driver (16 bit doesn't work)
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 2cf2acf..1ef1dac 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -66,8 +66,8 @@ check_driver() {
NEEDS_LOAD_NOW=1
;;
nouveau)
- # these KMS drivers require an explicit directive in xorg.conf
- check_xorg $name 1 || return 1
+ # implicitely loaded by X.org
+ check_xorg $name 0 || return 1
IS_KMS=1
;;
fglrx)