From 0da6af78aaed13218c892e5134d780af476f3df4 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Wed, 27 Apr 2011 01:32:24 +0000 Subject: display_driver_helper: do not load radeon driver if the proprietary driver is temporarily disabled on a PowerXpress system --- NEWS | 3 +++ tools/display_driver_helper | 5 +++++ 2 files changed, 8 insertions(+) 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 -- cgit v1.2.1