summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2011-04-27 01:32:24 +0000
committerAnssi Hannula <anssi@mageia.org>2011-04-27 01:32:24 +0000
commit0da6af78aaed13218c892e5134d780af476f3df4 (patch)
tree47876651ef95aeec320376401bab2f3b06a0005e
parentbd82acc050b47d470787896ce85b10c2e3ec2ab6 (diff)
downloaddrakx-kbd-mouse-x11-0da6af78aaed13218c892e5134d780af476f3df4.tar
drakx-kbd-mouse-x11-0da6af78aaed13218c892e5134d780af476f3df4.tar.gz
drakx-kbd-mouse-x11-0da6af78aaed13218c892e5134d780af476f3df4.tar.bz2
drakx-kbd-mouse-x11-0da6af78aaed13218c892e5134d780af476f3df4.tar.xz
drakx-kbd-mouse-x11-0da6af78aaed13218c892e5134d780af476f3df4.zip
display_driver_helper: do not load radeon driver if the proprietary
driver is temporarily disabled on a PowerXpress system
-rw-r--r--NEWS3
-rw-r--r--tools/display_driver_helper5
2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 86915b0..713809a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- display_driver_helper: do not load radeon driver if the proprietary
+ driver is temporarily disabled on a PowerXpress system
+
Version 0.95 - 23 April 2011
- harddrake: configure default resolution (and background) even if card
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 9376d43..90ab102 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -51,6 +51,11 @@ check_driver() {
radeon)
# implicitely loaded by X.org
check_xorg $name 0 || return 1
+ # Do not load if the proprietary driver is temporarily disabled
+ # on a PowerXpress system.
+ # TODO: this check could be omitted if radeon was explicitely
+ # specified in xorg.conf - but that is only known by check_xorg.
+ check_gl /etc/fglrx/pxpress-free.ld.so.conf && return 1
IS_KMS=1
# radeon needs to loaded before X server
NEEDS_LOAD_NOW=1