aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorlcapriotti <lcapriotti@svn>2010-10-22 07:25:27 +0000
committerlcapriotti <lcapriotti@svn>2010-10-22 07:25:27 +0000
commit1efe2e9cd3e5afa20f9dd716e96dcd716c70d0f1 (patch)
treed9082e8b69c85e60818b88064624298ed475f038 /tools
parent2257342af0268c37c301210cbda34b0b2ae94d00 (diff)
allow aticonfig work to on a proper environment
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@34933 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools')
-rwxr-xr-xtools/XBMCLive/live.d/01-configureXorg.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/XBMCLive/live.d/01-configureXorg.sh b/tools/XBMCLive/live.d/01-configureXorg.sh
index d9dcabaeb2..2f16a881b8 100755
--- a/tools/XBMCLive/live.d/01-configureXorg.sh
+++ b/tools/XBMCLive/live.d/01-configureXorg.sh
@@ -67,6 +67,13 @@ if [ "$GPUTYPE" = "NVIDIA" ]; then
fi
if [ "$GPUTYPE" = "AMD" ]; then
+ # Try fglrx first
+ if [ $LSBRELEASE -gt 910 ]; then
+ # only on lucid!
+ update-alternatives --set gl_conf /usr/lib/fglrx/ld.so.conf
+ ldconfig
+ fi
+
# run aticonfig
/usr/lib/fglrx/bin/aticonfig --initial --sync-vsync=on -f
ATICONFIG_RETURN_CODE=$?
@@ -74,13 +81,13 @@ if [ "$GPUTYPE" = "AMD" ]; then
if [ $ATICONFIG_RETURN_CODE -eq 255 ]; then
# aticonfig returns 255 on old unsuported ATI cards
# Let the X default ati driver handle the card
- modprobe radeon # Required to permit KMS switching and support hardware GL
- else
if [ $LSBRELEASE -gt 910 ]; then
# only on lucid!
- update-alternatives --set gl_conf /usr/lib/fglrx/ld.so.conf
+ # revert to mesa
+ update-alternatives --set gl_conf /usr/lib/mesa/ld.so.conf
ldconfig
fi
+ modprobe radeon # Required to permit KMS switching and support hardware GL
fi
fi