From 7d9b936e6a6a806419af877ba56eb5873a0b01ec Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 7 Oct 2010 16:37:24 +0200 Subject: [PATCH] xorg-server: use xorg-nvidia-chd.conf if CrystalHD card is detected Signed-off-by: Stephan Raue --- packages/x11/xserver/xorg-server/init.d/15_xorg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/init.d/15_xorg b/packages/x11/xserver/xorg-server/init.d/15_xorg index 4aaebc3144..79a09250f1 100755 --- a/packages/x11/xserver/xorg-server/init.d/15_xorg +++ b/packages/x11/xserver/xorg-server/init.d/15_xorg @@ -28,6 +28,7 @@ XORG_DEFAULT_CONF="/etc/X11/xorg.conf" XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" + XORG_NVIDIA_CHD_CONF="/etc/X11/xorg-nvidia-chd.conf" XORG_USER_CONF="/storage/.config/xorg.conf" XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp" @@ -46,7 +47,14 @@ ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so XORG_ARGS="$XORG_ARGS -ignoreABI" - XORG_CONF="$XORG_NVIDIA_CONF" + + # check if we have an Broadcom CrystalHD card installed, so we can disable + # the use of shared memory + if lspci -n | grep 0480 | grep -q 14e4; then + XORG_CONF="$XORG_NVIDIA_CHD_CONF" + else + XORG_CONF="$XORG_NVIDIA_CONF" + fi else