From 082e88179d8a355d5e67e62c5031d3d689ea3d5b Mon Sep 17 00:00:00 2001
From: James Meyer <jams@linhes.org>
Date: Wed, 29 Dec 2010 00:53:07 +0000
Subject: system-templates/linhes-config: rework xconfig.sh for better nvidia
 support. Still needs work, but the system will now install with nvidia cards.

---
 abs/core/LinHES-config/PKGBUILD                    | 146 +-------
 abs/core/LinHES-config/xconfig.sh                  | 118 +++---
 abs/core/nvidia/PKGBUILD                           |   2 +-
 abs/core/system-templates/PKGBUILD                 |   4 +-
 .../templates/xorg/173_supported.txt               |  43 +++
 .../templates/xorg/96xx_supported.txt              | 219 +++---------
 .../templates/xorg/nvidia_supported.txt            | 394 +++++++++++++++++++++
 .../templates/xorg/xorg.conf.nvidia                |  52 +--
 8 files changed, 569 insertions(+), 409 deletions(-)
 create mode 100644 abs/core/system-templates/templates/xorg/173_supported.txt
 create mode 100644 abs/core/system-templates/templates/xorg/nvidia_supported.txt

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 3fa31cd..939a788 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.2
-pkgrel=15
+pkgrel=16
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -110,7 +110,7 @@ md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
          'f88d2fb88339a4bf8ec9217a3fbcdef7'
          '8ac1cfd2eca0f641737da0d0aca416a7'
          '9ae8d79f620c6d19973c55c32a921874'
-         '4620f6f498ef4523398635cb0bd59425'
+         '95526b4d3dec6c9341088fb6511d831a'
          'bf32873c56d04c45ff0682f4e345e517'
          'e459ed069317bccb20351f037a9df3d2'
          '22c5e24bf87ad94ee2244d9016a0eea2'
@@ -122,147 +122,7 @@ md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
          '9151c74fcaf18ec4cf5e757cfdbc7017'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
          '5b41cfc6f4ad5cdbcd28cf980110f135'
-         'ee7c8e1f025ce1527ecfffabafb26806'
-         '41b03fb1e0a9d9ae7588e3b813212772'
-         'a9ffe72c3ede99d505fdc97572a7c256'
-         'df43bce1712320508d4eef8449c5d223'
-         '65d93f15ac85adf8299552581789a731'
-         '4badc3c664c55f87396a473e6c14d4bc'
-         '36f5953944f98c50c0212a584996028e'
-         'fe5e31b833cc6707209e9d656b6eb53c'
-         'd328d63eaa4252f3d4888476c79bbff6'
-         '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
-         '857a831e8627727306208f0e776b1b98'
-         'a7ed97cb1460978c823ff1d7c02b5c90'
-         '2596460462cf6c889cf8f95485537b20'
-         'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
-         '1a4694fcd694b362c339bda781ed0f3e'
-         'e36da536dd651ef182e7642337889e77'
-         '985891a43f7c4c983eb2a362162f1a0f'
-         'd7a8cd4a0060399ae22e69f74e04eb07'
-         '7a45287a07145fde5aa664583d4f6fba'
-         'f88d2fb88339a4bf8ec9217a3fbcdef7'
-         '8ac1cfd2eca0f641737da0d0aca416a7'
-         '9ae8d79f620c6d19973c55c32a921874'
-         '4620f6f498ef4523398635cb0bd59425'
-         'bf32873c56d04c45ff0682f4e345e517'
-         'e459ed069317bccb20351f037a9df3d2'
-         '22c5e24bf87ad94ee2244d9016a0eea2'
-         '6aff504ed5e860adc1b7317cd0780900'
-         '55fccb1da0417a896b724f7cfc32dd5a'
-         'ab2aa42c2947148c2b1cac0ade6d1d55'
-         'd429b59d3cfb37b0624c6a4a71a7c2c0'
-         'a225143e3df6f56d451c2875e54ddbae'
-         '9151c74fcaf18ec4cf5e757cfdbc7017'
-         '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '5b41cfc6f4ad5cdbcd28cf980110f135'
-         'ee7c8e1f025ce1527ecfffabafb26806'
-         '41b03fb1e0a9d9ae7588e3b813212772'
-         'a9ffe72c3ede99d505fdc97572a7c256'
-         'df43bce1712320508d4eef8449c5d223'
-         '65d93f15ac85adf8299552581789a731'
-         '4badc3c664c55f87396a473e6c14d4bc'
-         '36f5953944f98c50c0212a584996028e'
-         'fe5e31b833cc6707209e9d656b6eb53c'
-         '5c89f5c9c34b4f6e9b2e2c0e2d83f873'
-         '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
-         '857a831e8627727306208f0e776b1b98'
-         '2f3de6bf907a04dcdcfe4f1418721b60'
-         '2596460462cf6c889cf8f95485537b20'
-         'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
-         '1a4694fcd694b362c339bda781ed0f3e'
-         'e36da536dd651ef182e7642337889e77'
-         '985891a43f7c4c983eb2a362162f1a0f'
-         'd7a8cd4a0060399ae22e69f74e04eb07'
-         '7a45287a07145fde5aa664583d4f6fba'
-         'f88d2fb88339a4bf8ec9217a3fbcdef7'
-         '8ac1cfd2eca0f641737da0d0aca416a7'
-         '9ae8d79f620c6d19973c55c32a921874'
-         '4620f6f498ef4523398635cb0bd59425'
-         'bf32873c56d04c45ff0682f4e345e517'
-         'e459ed069317bccb20351f037a9df3d2'
-         '22c5e24bf87ad94ee2244d9016a0eea2'
-         '6aff504ed5e860adc1b7317cd0780900'
-         '55fccb1da0417a896b724f7cfc32dd5a'
-         'ab2aa42c2947148c2b1cac0ade6d1d55'
-         'd429b59d3cfb37b0624c6a4a71a7c2c0'
-         'a225143e3df6f56d451c2875e54ddbae'
-         '9151c74fcaf18ec4cf5e757cfdbc7017'
-         '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '5b41cfc6f4ad5cdbcd28cf980110f135'
-         'ee7c8e1f025ce1527ecfffabafb26806'
-         '41b03fb1e0a9d9ae7588e3b813212772'
-         'a9ffe72c3ede99d505fdc97572a7c256'
-         'df43bce1712320508d4eef8449c5d223'
-         '65d93f15ac85adf8299552581789a731'
-         '4badc3c664c55f87396a473e6c14d4bc'
-         '36f5953944f98c50c0212a584996028e'
-         'fe5e31b833cc6707209e9d656b6eb53c'
-         'f0988a801216b44c96bf17e24a23e3a9'
-         '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
-         '857a831e8627727306208f0e776b1b98'
-         '2f3de6bf907a04dcdcfe4f1418721b60'
-         '2596460462cf6c889cf8f95485537b20'
-         'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
-         '1a4694fcd694b362c339bda781ed0f3e'
-         'e36da536dd651ef182e7642337889e77'
-         '985891a43f7c4c983eb2a362162f1a0f'
-         'd7a8cd4a0060399ae22e69f74e04eb07'
-         '7a45287a07145fde5aa664583d4f6fba'
-         'f88d2fb88339a4bf8ec9217a3fbcdef7'
-         '8ac1cfd2eca0f641737da0d0aca416a7'
-         '9ae8d79f620c6d19973c55c32a921874'
-         '4620f6f498ef4523398635cb0bd59425'
-         'bf32873c56d04c45ff0682f4e345e517'
-         'e459ed069317bccb20351f037a9df3d2'
-         '22c5e24bf87ad94ee2244d9016a0eea2'
-         '6aff504ed5e860adc1b7317cd0780900'
-         '55fccb1da0417a896b724f7cfc32dd5a'
-         'ab2aa42c2947148c2b1cac0ade6d1d55'
-         'd429b59d3cfb37b0624c6a4a71a7c2c0'
-         'a225143e3df6f56d451c2875e54ddbae'
-         '9151c74fcaf18ec4cf5e757cfdbc7017'
-         '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '5b41cfc6f4ad5cdbcd28cf980110f135'
-         'ee7c8e1f025ce1527ecfffabafb26806'
-         '41b03fb1e0a9d9ae7588e3b813212772'
-         'a9ffe72c3ede99d505fdc97572a7c256'
-         'df43bce1712320508d4eef8449c5d223'
-         '65d93f15ac85adf8299552581789a731'
-         '4badc3c664c55f87396a473e6c14d4bc'
-         '36f5953944f98c50c0212a584996028e'
-         'fe5e31b833cc6707209e9d656b6eb53c'
-         'f0988a801216b44c96bf17e24a23e3a9'
-         '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
-         '40d1ffb2ae8b14f242063e4121950d80'
-         '2f3de6bf907a04dcdcfe4f1418721b60'
-         '2596460462cf6c889cf8f95485537b20'
-         'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
-         '1a4694fcd694b362c339bda781ed0f3e'
-         'e36da536dd651ef182e7642337889e77'
-         '985891a43f7c4c983eb2a362162f1a0f'
-         'd7a8cd4a0060399ae22e69f74e04eb07'
-         '7a45287a07145fde5aa664583d4f6fba'
-         'f88d2fb88339a4bf8ec9217a3fbcdef7'
-         '8ac1cfd2eca0f641737da0d0aca416a7'
-         '9ae8d79f620c6d19973c55c32a921874'
-         '4620f6f498ef4523398635cb0bd59425'
-         'bf32873c56d04c45ff0682f4e345e517'
-         'e459ed069317bccb20351f037a9df3d2'
-         '22c5e24bf87ad94ee2244d9016a0eea2'
-         '6aff504ed5e860adc1b7317cd0780900'
-         '55fccb1da0417a896b724f7cfc32dd5a'
-         'ab2aa42c2947148c2b1cac0ade6d1d55'
-         'd429b59d3cfb37b0624c6a4a71a7c2c0'
-         'a225143e3df6f56d451c2875e54ddbae'
-         '9151c74fcaf18ec4cf5e757cfdbc7017'
-         '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '5b41cfc6f4ad5cdbcd28cf980110f135'
-         '79a670ecbfbebd55c3e89aca9b7cff49'
+         'da74d6f6d0272881f7724eb642a8ec69'
          '41b03fb1e0a9d9ae7588e3b813212772'
          'a9ffe72c3ede99d505fdc97572a7c256'
          'df43bce1712320508d4eef8449c5d223'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index 2fad821..fff7f44 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#set -x
 #SET DISPLAYCARD to force a cardtype
 #SET DISPLAYRES to force Xres, ENV takes precendent over cmdline
 #displayres=cmdline
@@ -7,6 +8,8 @@ NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf
 BASE=""
 . /etc/profile
 NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt"
+NVIDIA_173="$TEMPLATES/xorg/173_supported.txt"
+NVIDIA_SUPPORTED="$TEMPLATES/xorg/nvidia_supported.txt"
 #TEMPLATES="/usr/share/templates"
 MYTHHOME=$BASE/home/mythtv
 
@@ -30,7 +33,7 @@ function Xvalues {
         Xcardtype=$VGACARDTYPE
     fi
     echo "Will use $VGACARDTYPE"
-    currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
+    #currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
 }
 
 function presetupX {
@@ -93,22 +96,27 @@ function setupAdvancedX {
 #    echo $ML
     case $Xcardtype in
         NVIDIA|nVidia|nvidia)
+            nvidia_driver_install
             case $Xconnection in
                 DVI)    ConnectedMonitor=DFP ;;
                 vga)    ConnectedMonitor=CRT;;
                 Auto)   ConnectedMonitor=Auto;;
                 TV)     ConnectedMonitor=TV
-                        echo "Option \"TVStandard\" \"$XTVstandard\""  >>/tmp/options
-                        echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options
+                        nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --tv-standard="$XTVstandard"
+                        nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf  --tv-out-format="$XTVconnection"
+                    #    echo "Option \"TVStandard\" \"$XTVstandard\""  >>/tmp/options
+                    #    echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options
                     ;;
+                *)      ConnectedMonitor=Auto;;
             esac
             if [ "$ConnectedMonitor" = Auto ]
             then
                 echo "auto connection"
             else
-                echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options
-                echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options
-                echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options
+                nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf   --connected-monitor="$ConnectedMonitor"
+                #echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options
+                #echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options
+                #echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options
             fi
 
             if  [ "$XignoreEDID" = 1 ]
@@ -125,16 +133,16 @@ function setupAdvancedX {
                 HS="# Hsync edid used "
                 VR="# Vertrefresh edid used "
             fi
-            echo "Option  \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options
-            echo "Option  \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options
-
-
-            sed -e "s/^.*Modes.*$/${ML}/" \
-                -e "/INSERT MODELINE/r  $TEMPLATES/xorg/modeline.$Xcategory" \
-                -e "s/^.*DisplaySize.*$/ $DS/" \
-                -e "s/^#.*HorizSync.*$/ $HS/g" \
-                -e "s/^#.*VertRefresh.*$/ $VR/g" \
-                -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
+#             echo "Option  \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options
+#             echo "Option  \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options
+#
+#
+#             sed -e "s/^.*Modes.*$/${ML}/" \
+#                 -e "/INSERT MODELINE/r  $TEMPLATES/xorg/modeline.$Xcategory" \
+#                 -e "s/^.*DisplaySize.*$/ $DS/" \
+#                 -e "s/^#.*HorizSync.*$/ $HS/g" \
+#                 -e "s/^#.*VertRefresh.*$/ $VR/g" \
+#                 -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
             ;;
 
         ati|ATI)
@@ -179,6 +187,57 @@ function setupAdvancedX {
     esac
 }
 
+function nvidia_driver_install {
+
+
+        cp "$TEMPLATES/xorg/xorg.conf.nvidia"  $BASE/etc/X11/xorg.conf.d/20-automv.conf
+        if [ ${Xres} = Auto ]
+        then
+            nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select"
+        else
+            nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=${Xres}
+        fi
+
+        if [ "$TESTMODE" != "test" ]
+        then
+
+
+            grep -qi "$CARDID" "$NVIDIA_SUPPORTED"
+            if [ $? = 0 ]
+            then
+                #install latest drivers
+                echo "installing current nvidia drivers"
+                pacman --noconfirm  -Rd libgl > /dev/null 2>&1
+                pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
+                pacman --noconfirm  -S nvidia nvidia-utils > /dev/null 2>&1
+            fi
+
+
+            #nvidia check right here
+            grep -qi "$CARDID" "$NVIDIA_96XX"
+            if [ $? = 0 ]
+            then
+                #install 96xx drivers
+                echo "installing nvidia 96xx drivers"
+                pacman --noconfirm  -Rd libgl > /dev/null 2>&1
+                pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
+                pacman --noconfirm  -S nvidia-96xx nvidia-96xx-utils  > /dev/null 2>&1
+            fi
+
+            grep -qi "$CARDID" "$NVIDIA_173"
+            if [ $? = 0 ]
+            then
+                #install latest drivers
+                echo "installing 173 nvidia drivers"
+                pacman --noconfirm  -Rd libgl > /dev/null 2>&1
+                pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
+                pacman --noconfirm  -S nvidia-173xx nvidia-173xx-utils > /dev/null 2>&1
+            fi
+        fi
+        echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
+        rm $BASE/etc/X11/xorg.conf.d/20-nvidia.conf
+}
+
 
 function setupX {
     Xvalues
@@ -188,32 +247,7 @@ function setupX {
     then
         case $VGACARDTYPE in
             nVidia)
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    #nvidia check right here
-                    grep -qi "$CARDID" "$NVIDIA_96XX"
-                    if [ $? = 0 ]
-                    then
-                        #install 96xx drivers
-                        echo "installing nvidia 96xx drivers"
-                        pacman --noconfirm  -Rd libgl > /dev/null 2>&1
-                        pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
-                        pacman --noconfirm  -S nvidia-96xx nvidia-96xx-utils  > /dev/null 2>&1
-                    else
-                        #install latest drivers
-                        echo "installing current nvidia drivers"
-                        pacman --noconfirm  -Rd libgl > /dev/null 2>&1
-                        pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
-                        pacman --noconfirm  -S nvidia nvidia-utils > /dev/null 2>&1
-                    fi
-                fi
-	        echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
+                    nvidia_driver_install
                 ;;
 
       #      VMware)
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 6553afe..25f32be 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=nvidia
 pkgver=260.19.12
 _kernver='2.6.36-LinHES'
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA drivers for kernel26."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 88e1835..94650c9 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
-pkgver=1.0
-pkgrel=45
+pkgver=2.0
+pkgrel=1
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core/system-templates/templates/xorg/173_supported.txt b/abs/core/system-templates/templates/xorg/173_supported.txt
new file mode 100644
index 0000000..95c3370
--- /dev/null
+++ b/abs/core/system-templates/templates/xorg/173_supported.txt
@@ -0,0 +1,43 @@
+GeForce PCX 5750    0x00FA
+GeForce PCX 5900    0x00FB
+Quadro FX 330/GeForce PCX 5300  0x00FC
+Quadro FX 330/Quadro NVS 280 PCI-E  0x00FD
+Quadro FX 1300  0x00FE
+GeForce FX 5800 Ultra   0x0301
+GeForce FX 5800 0x0302
+Quadro FX 2000  0x0308
+Quadro FX 1000  0x0309
+GeForce FX 5600 Ultra   0x0311
+GeForce FX 5600 0x0312
+GeForce FX 5600XT   0x0314
+GeForce FX Go5600   0x031A
+GeForce FX Go5650   0x031B
+Quadro FX Go700 0x031C
+GeForce FX 5200 0x0320
+GeForce FX 5200 Ultra   0x0321
+GeForce FX 5200 0x0322
+GeForce FX 5200LE   0x0323
+GeForce FX Go5200   0x0324
+GeForce FX Go5250   0x0325
+GeForce FX 5500 0x0326
+GeForce FX 5100 0x0327
+GeForce FX Go5200 32M/64M   0x0328
+Quadro NVS 55/280 PCI   0x032A
+Quadro FX 500/FX 600    0x032B
+GeForce FX Go53xx   0x032C
+GeForce FX Go5100   0x032D
+GeForce FX 5900 Ultra   0x0330
+GeForce FX 5900 0x0331
+GeForce FX 5900XT   0x0332
+GeForce FX 5950 Ultra   0x0333
+GeForce FX 5900ZT   0x0334
+Quadro FX 3000  0x0338
+Quadro FX 700   0x033F
+GeForce FX 5700 Ultra   0x0341
+GeForce FX 5700 0x0342
+GeForce FX 5700LE   0x0343
+GeForce FX 5700VE   0x0344
+GeForce FX Go5700   0x0347
+GeForce FX Go5700   0x0348
+Quadro FX Go1000    0x034C
+Quadro FX 1100  0x034E
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/xorg/96xx_supported.txt b/abs/core/system-templates/templates/xorg/96xx_supported.txt
index dd4833a..f7818ce 100644
--- a/abs/core/system-templates/templates/xorg/96xx_supported.txt
+++ b/abs/core/system-templates/templates/xorg/96xx_supported.txt
@@ -1,175 +1,44 @@
-    NVIDIA GPU product                    Device PCI ID
-    
-    GeForce 6800 Ultra                    0x0040
-    GeForce 6800                          0x0041
-    GeForce 6800 XE                       0x0043
-    GeForce 6800 XT                       0x0044
-    GeForce 6800 GT                       0x0045
-    GeForce 6800 GT                       0x0046
-    GeForce 6800 GS                       0x0047
-    GeForce 6800 XT                       0x0048
-    Quadro FX 4000                        0x004E
-    GeForce 7800 GTX                      0x0090
-    GeForce 7800 GTX                      0x0091
-    GeForce 7800 GT                       0x0092
-    GeForce 7800 GS                       0x0093
-    GeForce Go 7800                       0x0098
-    GeForce Go 7800 GTX                   0x0099
-    Quadro FX 4500                        0x009D
-    GeForce 6800 GS                       0x00C0
-    GeForce 6800                          0x00C1
-    GeForce 6800 LE                       0x00C2
-    GeForce 6800 XT                       0x00C3
-    GeForce Go 6800                       0x00C8
-    GeForce Go 6800 Ultra                 0x00C9
-    Quadro FX Go1400                      0x00CC
-    Quadro FX 3450/4000 SDI               0x00CD
-    Quadro FX 1400                        0x00CE
-    GeForce 6800/GeForce 6800 Ultra       0x00F0
-    GeForce 6600/GeForce 6600 GT          0x00F1
-    GeForce 6600                          0x00F2
-    GeForce 6200                          0x00F3
-    GeForce 6600 LE                       0x00F4
-    GeForce 7800 GS                       0x00F5
-    GeForce 6800 GS                       0x00F6
-    Quadro FX 3400/4400                   0x00F8
-    GeForce 6800 Ultra                    0x00F9
-    GeForce PCX 5750                      0x00FA
-    GeForce PCX 5900                      0x00FB
-    Quadro FX 330/GeForce PCX 5300        0x00FC
-    Quadro NVS 280 PCI-E/Quadro FX 330    0x00FD
-    Quadro FX 1300                        0x00FE
-    GeForce PCX 4300                      0x00FF
-    GeForce2 MX/MX 400                    0x0110
-    GeForce2 MX 100/200                   0x0111
-    GeForce2 Go                           0x0112
-    Quadro2 MXR/EX/Go                     0x0113
-    GeForce 6600 GT                       0x0140
-    GeForce 6600                          0x0141
-    GeForce 6600 LE                       0x0142
-    GeForce 6600 VE                       0x0143
-    GeForce Go 6600                       0x0144
-    GeForce 6610 XL                       0x0145
-    GeForce Go 6600 TE/6200 TE            0x0146
-    GeForce Go 6600                       0x0148
-    GeForce Go 6600 GT                    0x0149
-    Quadro NVS 440                        0x014A
-    Quadro FX 550                         0x014C
-    Quadro FX 540                         0x014E
-    GeForce 6200                          0x014F
-    GeForce 6500                          0x0160
-    GeForce 6200 TurboCache(TM)           0x0161
-    GeForce Go 6200                       0x0164
-    Quadro NVS 285                        0x0165
-    GeForce Go 6400                       0x0166
-    GeForce Go 6200                       0x0167
-    GeForce Go 6400                       0x0168
-    GeForce4 MX 460                       0x0170
-    GeForce4 MX 440                       0x0171
-    GeForce4 MX 420                       0x0172
-    GeForce4 MX 440-SE                    0x0173
-    GeForce4 440 Go                       0x0174
-    GeForce4 420 Go                       0x0175
-    GeForce4 420 Go 32M                   0x0176
-    GeForce4 460 Go                       0x0177
-    Quadro4 550 XGL                       0x0178
-    GeForce4 440 Go 64M                   0x0179
-    Quadro NVS                            0x017A
-    Quadro4 500 GoGL                      0x017C
-    GeForce4 410 Go 16M                   0x017D
-    GeForce4 MX 440 with AGP8X            0x0181
-    GeForce4 MX 440SE with AGP8X          0x0182
-    GeForce4 MX 420 with AGP8X            0x0183
-    GeForce4 MX 4000                      0x0185
-    Quadro4 580 XGL                       0x0188
-    Quadro NVS with AGP8X                 0x018A
-    Quadro4 380 XGL                       0x018B
-    Quadro NVS 50 PCI                     0x018C
-    GeForce2 Integrated GPU               0x01A0
-    GeForce 7300 LE                       0x01D1
-    Quadro NVS 110M                       0x01D7
-    GeForce Go 7300                       0x01D7
-    GeForce Go 7400                       0x01D8
-    Quadro NVS 110M                       0x01DA
-    Quadro NVS 120M                       0x01DB
-    Quadro FX 350M                        0x01DC
-    Quadro FX 350                         0x01DE
-    GeForce 7300 GS                       0x01DF
-    GeForce4 MX Integrated GPU            0x01F0
-    GeForce3                              0x0200
-    GeForce3 Ti 200                       0x0201
-    GeForce3 Ti 500                       0x0202
-    Quadro DCC                            0x0203
-    GeForce 6800                          0x0211
-    GeForce 6800 LE                       0x0212
-    GeForce 6800 GT                       0x0215
-    GeForce 6800 XT                       0x0218
-    GeForce 6150                          0x0240
-    GeForce 6150 LE                       0x0241
-    GeForce 6100                          0x0242
-    GeForce4 Ti 4600                      0x0250
-    GeForce4 Ti 4400                      0x0251
-    GeForce4 Ti 4200                      0x0253
-    Quadro4 900 XGL                       0x0258
-    Quadro4 750 XGL                       0x0259
-    Quadro4 700 XGL                       0x025B
-    GeForce4 Ti 4800                      0x0280
-    GeForce4 Ti 4200 with AGP8X           0x0281
-    GeForce4 Ti 4800 SE                   0x0282
-    GeForce4 4200 Go                      0x0286
-    Quadro4 980 XGL                       0x0288
-    Quadro4 780 XGL                       0x0289
-    Quadro4 700 GoGL                      0x028C
-    GeForce 7900 GTX                      0x0290
-    GeForce 7900 GT                       0x0291
-    GeForce Go 7900 GS                    0x0298
-    GeForce Go 7900 GTX                   0x0299
-    Quadro FX 2500M                       0x029A
-    Quadro FX 1500M                       0x029B
-    Quadro FX 5500                        0x029C
-    Quadro FX 3500                        0x029D
-    Quadro FX 1500                        0x029E
-    Quadro FX 4500 X2                     0x029F
-    GeForce 7600 GS                       0x02E1
-    GeForce FX 5800 Ultra                 0x0301
-    GeForce FX 5800                       0x0302
-    Quadro FX 2000                        0x0308
-    Quadro FX 1000                        0x0309
-    GeForce FX 5600 Ultra                 0x0311
-    GeForce FX 5600                       0x0312
-    GeForce FX 5600XT                     0x0314
-    GeForce FX Go5600                     0x031A
-    GeForce FX Go5650                     0x031B
-    Quadro FX Go700                       0x031C
-    GeForce FX 5200                       0x0320
-    GeForce FX 5200 Ultra                 0x0321
-    GeForce FX 5200                       0x0322
-    GeForce FX 5200LE                     0x0323
-    GeForce FX Go5200                     0x0324
-    GeForce FX Go5250                     0x0325
-    GeForce FX 5500                       0x0326
-    GeForce FX 5100                       0x0327
-    GeForce FX Go5200 32M/64M             0x0328
-    Quadro NVS 280 PCI                    0x032A
-    Quadro FX 500/600 PCI                 0x032B
-    GeForce FX Go53xx                     0x032C
-    GeForce FX Go5100                     0x032D
-    GeForce FX 5900 Ultra                 0x0330
-    GeForce FX 5900                       0x0331
-    GeForce FX 5900XT                     0x0332
-    GeForce FX 5950 Ultra                 0x0333
-    GeForce FX 5900ZT                     0x0334
-    Quadro FX 3000                        0x0338
-    Quadro FX 700                         0x033F
-    GeForce FX 5700 Ultra                 0x0341
-    GeForce FX 5700                       0x0342
-    GeForce FX 5700LE                     0x0343
-    GeForce FX 5700VE                     0x0344
-    GeForce FX Go5700                     0x0347
-    GeForce FX Go5700                     0x0348
-    Quadro FX Go1000                      0x034C
-    Quadro FX 1100                        0x034E
-    GeForce 7600 GT                       0x0391
-    GeForce 7600 GS                       0x0392
-    GeForce Go 7600                       0x0398
-    Quadro FX 560                         0x039E
\ No newline at end of file
+GeForce2 MX/MX 400  0x0110
+GeForce2 MX 100/200 0x0111
+GeForce2 Go 0x0112
+Quadro2 MXR/EX/Go   0x0113
+GeForce4 MX 460 0x0170
+GeForce4 MX 440 0x0171
+GeForce4 MX 420 0x0172
+GeForce4 MX 440-SE  0x0173
+GeForce4 440 Go 0x0174
+GeForce4 420 Go 0x0175
+GeForce4 420 Go 32M 0x0176
+GeForce4 460 Go 0x0177
+Quadro4 550 XGL 0x0178
+GeForce4 440 Go 64M 0x0179
+Quadro NVS 400  0x017A
+Quadro4 500 GoGL    0x017C
+GeForce4 410 Go 16M 0x017D
+GeForce4 MX 440 with AGP8X  0x0181
+GeForce4 MX 440SE with AGP8X    0x0182
+GeForce4 MX 420 with AGP8X  0x0183
+GeForce4 MX 4000    0x0185
+Quadro4 580 XGL 0x0188
+Quadro NVS 280 SD   0x018A
+Quadro4 380 XGL 0x018B
+Quadro NVS 50 PCI   0x018C
+GeForce2 Integrated GPU 0x01A0
+GeForce4 MX Integrated GPU  0x01F0
+GeForce3    0x0200
+GeForce3 Ti 200 0x0201
+GeForce3 Ti 500 0x0202
+Quadro DCC  0x0203
+GeForce4 Ti 4600    0x0250
+GeForce4 Ti 4400    0x0251
+GeForce4 Ti 4200    0x0253
+Quadro4 900 XGL 0x0258
+Quadro4 750 XGL 0x0259
+Quadro4 700 XGL 0x025B
+GeForce4 Ti 4800    0x0280
+GeForce4 Ti 4200 with AGP8X 0x0281
+GeForce4 Ti 4800 SE 0x0282
+GeForce4 4200 Go    0x0286
+Quadro4 980 XGL 0x0288
+Quadro4 780 XGL 0x0289
+Quadro4 700 GoGL    0x028C
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/xorg/nvidia_supported.txt b/abs/core/system-templates/templates/xorg/nvidia_supported.txt
new file mode 100644
index 0000000..ba238a6
--- /dev/null
+++ b/abs/core/system-templates/templates/xorg/nvidia_supported.txt
@@ -0,0 +1,394 @@
+#http://us.download.nvidia.com/XFree86/Linux-x86/260.19.29/README/supportedchips.html
+
+GeForce 6800 Ultra  0x0040  -
+GeForce 6800    0x0041  -
+GeForce 6800 LE 0x0042  -
+GeForce 6800 XE 0x0043  -
+GeForce 6800 XT 0x0044  -
+GeForce 6800 GT 0x0045  -
+GeForce 6800 GT 0x0046  -
+GeForce 6800 GS 0x0047  -
+GeForce 6800 XT 0x0048  -
+GeForce 7800 GTX    0x0090  -
+GeForce 7800 GTX    0x0091  -
+GeForce 7800 GT 0x0092  -
+GeForce 7800 GS 0x0093  -
+GeForce 7800 SLI    0x0095  -
+GeForce Go 7800 0x0098  -
+GeForce Go 7800 GTX 0x0099  -
+GeForce 6800 GS 0x00C0  -
+GeForce 6800    0x00C1  -
+GeForce 6800 LE 0x00C2  -
+GeForce 6800 XT 0x00C3  -
+GeForce Go 6800 0x00C8  -
+GeForce Go 6800 Ultra   0x00C9  -
+GeForce 6600 GT 0x00F1  -
+GeForce 6600    0x00F2  -
+GeForce 6200    0x00F3  -
+GeForce 6600 LE 0x00F4  -
+GeForce 7800 GS 0x00F5  -
+GeForce 6800 GS 0x00F6  -
+GeForce 6800 Ultra  0x00F9  -
+GeForce 6600 GT 0x0140  -
+GeForce 6600    0x0141  -
+GeForce 6600 LE 0x0142  -
+GeForce 6600 VE 0x0143  -
+GeForce Go 6600 0x0144  -
+GeForce 6610 XL 0x0145  -
+GeForce Go 6600 TE/6200 TE  0x0146  -
+GeForce 6700 XL 0x0147  -
+GeForce Go 6600 0x0148  -
+GeForce Go 6600 GT  0x0149  -
+GeForce 6200    0x014F  -
+GeForce 6500    0x0160  -
+GeForce 6200 TurboCache(TM) 0x0161  -
+GeForce 6200SE TurboCache(TM)   0x0162  -
+GeForce 6200 LE 0x0163  -
+GeForce Go 6200 0x0164  -
+GeForce Go 6400 0x0166  -
+GeForce Go 6200 0x0167  -
+GeForce Go 6400 0x0168  -
+GeForce 6250    0x0169  -
+GeForce 7100 GS 0x016A  -
+GeForce 8800 GTX    0x0191  -
+GeForce 8800 GTS    0x0193  -
+GeForce 8800 Ultra  0x0194  -
+Tesla C870  0x0197  -
+GeForce 7350 LE 0x01D0  -
+GeForce 7300 LE 0x01D1  -
+GeForce 7550 LE 0x01D2  -
+GeForce 7300 SE/7200 GS 0x01D3  -
+GeForce Go 7200 0x01D6  -
+GeForce Go 7300 0x01D7  -
+GeForce Go 7400 0x01D8  -
+GeForce 7500 LE 0x01DD  -
+GeForce 7300 GS 0x01DF  -
+GeForce 6200    0x0221  -
+GeForce 6200 A-LE   0x0222  -
+GeForce 6150    0x0240  -
+GeForce 6150 LE 0x0241  -
+GeForce 6100    0x0242  -
+GeForce Go 6150 0x0244  -
+GeForce Go 6100 0x0247  -
+GeForce 7900 GTX    0x0290  -
+GeForce 7900 GT/GTO 0x0291  -
+GeForce 7900 GS 0x0292  -
+GeForce 7950 GX2    0x0293  -
+GeForce 7950 GX2    0x0294  -
+GeForce 7950 GT 0x0295  -
+GeForce Go 7950 GTX 0x0297  -
+GeForce Go 7900 GS  0x0298  -
+GeForce 7600 GT 0x02E0  -
+GeForce 7600 GS 0x02E1  -
+GeForce 7300 GT 0x02E2  -
+GeForce 7900 GS 0x02E3  -
+GeForce 7950 GT 0x02E4  -
+GeForce 7650 GS 0x038B  -
+GeForce 7650 GS 0x0390  -
+GeForce 7600 GT 0x0391  -
+GeForce 7600 GS 0x0392  -
+GeForce 7300 GT 0x0393  -
+GeForce 7600 LE 0x0394  -
+GeForce 7300 GT 0x0395  -
+GeForce Go 7700 0x0397  -
+GeForce Go 7600 0x0398  -
+GeForce Go 7600 GT  0x0399  -
+GeForce 6150SE nForce 430   0x03D0  -
+GeForce 6100 nForce 405 0x03D1  -
+GeForce 6100 nForce 400 0x03D2  -
+GeForce 6100 nForce 420 0x03D5  -
+GeForce 7025 / nForce 630a  0x03D6  -
+GeForce 8600 GTS    0x0400  A
+GeForce 8600 GT 0x0401  A
+GeForce 8600 GT 0x0402  A
+GeForce 8600 GS 0x0403  A
+GeForce 8400 GS 0x0404  A
+GeForce 9500M GS    0x0405  A
+GeForce 8300 GS 0x0406  -
+GeForce 8600M GT    0x0407  A
+GeForce 9650M GS    0x0408  A
+GeForce 8700M GT    0x0409  A
+GeForce GT 330  0x0410  A
+GeForce 8400 SE 0x0420  -
+GeForce 8500 GT 0x0421  A
+GeForce 8400 GS 0x0422  A
+GeForce 8300 GS 0x0423  -
+GeForce 8400 GS 0x0424  A
+GeForce 8600M GS    0x0425  A
+GeForce 8400M GT    0x0426  A
+GeForce 8400M GS    0x0427  A
+GeForce 8400M G 0x0428  A
+GeForce 9400 GT 0x042C  A
+GeForce 9300M G 0x042E  A
+GeForce 7150M / nForce 630M 0x0531  -
+GeForce 7000M / nForce 610M 0x0533  -
+GeForce 7050 PV / nForce 630a   0x053A  -
+GeForce 7050 PV / nForce 630a   0x053B  -
+GeForce 7025 / nForce 630a  0x053E  -
+GeForce GTX 295 0x05E0  A
+GeForce GTX 280 0x05E1  A
+GeForce GTX 260 0x05E2  A
+GeForce GTX 285 0x05E3  A
+GeForce GTX 275 0x05E6  A
+Tesla C1060 0x05E7  A
+Tesla T10 Processor 0x05E7 0x0595   A
+Tesla T10 Processor 0x05E7 0x068F   A
+Tesla M1060 0x05E7 0x0697   A
+Tesla M1060 0x05E7 0x0743   A
+GeForce GTX 260 0x05EA  A
+GeForce GTX 295 0x05EB  A
+GeForce 8800 GTS 512    0x0600  A
+GeForce 9800 GT 0x0601  A
+GeForce 8800 GT 0x0602  A
+GeForce GT 230  0x0603  A
+GeForce 9800 GX2    0x0604  A
+GeForce 9800 GT 0x0605  A
+GeForce 8800 GS 0x0606  A
+GeForce GTS 240 0x0607  A
+GeForce 9800M GTX   0x0608  A
+GeForce 8800M GTS   0x0609  A
+GeForce GTX 280M    0x060A  A
+GeForce 9800M GT    0x060B  A
+GeForce 8800M GTX   0x060C  A
+GeForce 8800 GS 0x060D  A
+GeForce GTX 285M    0x060F  A
+GeForce 9600 GSO    0x0610  A
+GeForce 8800 GT 0x0611  A
+GeForce 9800 GTX/9800 GTX+  0x0612  A
+GeForce 9800 GTX+   0x0613  A
+GeForce 9800 GT 0x0614  A
+GeForce GTS 250 0x0615  A
+GeForce 9800M GTX   0x0617  A
+GeForce GTX 260M    0x0618  A
+GeForce 9600 GT 0x0622  A
+GeForce 9600 GS 0x0623  A
+GeForce 9600 GSO 512    0x0625  A
+GeForce GT 130  0x0626  A
+GeForce GT 140  0x0627  A
+GeForce 9800M GTS   0x0628  A
+GeForce 9700M GTS   0x062A  A
+GeForce 9800M GS    0x062B  A
+GeForce 9800M GTS   0x062C  A
+GeForce 9600 GT 0x062D  A
+GeForce 9600 GT 0x062E  A
+GeForce GTS 160M    0x0631  A
+GeForce GTS 150M    0x0632  A
+GeForce 9600 GSO    0x0635  A
+GeForce 9600 GT 0x0637  A
+GeForce 9500 GT 0x0640  A
+GeForce 9400 GT 0x0641  A
+GeForce 9500 GT 0x0643  A
+GeForce 9500 GS 0x0644  A
+GeForce 9500 GS 0x0645  A
+GeForce GT 120  0x0646  A
+GeForce 9600M GT    0x0647  A
+GeForce 9600M GS    0x0648  A
+GeForce 9600M GT    0x0649  A
+GeForce 9700M GT    0x064A  A
+GeForce 9500M G 0x064B  A
+GeForce 9650M GT    0x064C  A
+GeForce G 110M  0x0651  A
+GeForce GT 130M 0x0652  A
+GeForce GT 120M 0x0653  A
+GeForce GT 220M 0x0654  A
+GeForce 9650 S  0x0656  A
+GeForce 9400 GT 0x065B  A
+GeForce GTX 480 0x06C0  C
+GeForce GTX 465 0x06C4  C
+GeForce GTX 480M    0x06CA  C
+GeForce GTX 470 0x06CD  C
+Tesla C2050 0x06D1  C
+Tesla C2070 0x06D1 0x0772   C
+Tesla M2070 0x06D2  C
+Tesla S2050 0x06DE  C
+Tesla M2050 0x06DE 0x077A   C
+Tesla M2050 0x06DE 0x082F   C
+Tesla M2050 0x06DE 0x0843   C
+Tesla M2050 0x06DE 0x0846   C
+Tesla M2070-Q   0x06DF  C
+GeForce 9300 GE 0x06E0  B 1
+GeForce 9300 GS 0x06E1  B 1
+GeForce 8400    0x06E2  B 1
+GeForce 8400 SE 0x06E3  -
+GeForce 8400 GS 0x06E4  A 1
+GeForce 9300M GS    0x06E5  B 1
+GeForce G100    0x06E6  B 1
+GeForce 9300 SE 0x06E7  -
+GeForce 9200M GS    0x06E8  B 1
+GeForce 9300M GS    0x06E9  B 1
+GeForce G 105M  0x06EC  B 1
+GeForce G 103M  0x06EF  B 1
+GeForce G105M   0x06F1  B 1
+GeForce 7150 / nForce 630i  0x07E0  -
+GeForce 7100 / nForce 630i  0x07E1  -
+GeForce 7050 / nForce 630i  0x07E2  -
+GeForce 7050 / nForce 610i  0x07E3  -
+GeForce 7050 / nForce 620i  0x07E5  -
+GeForce 9100M G 0x0844  B 1
+GeForce 8200M G 0x0845  B 1
+GeForce 9200    0x0846  B 1
+GeForce 9100    0x0847  B 1
+GeForce 8300    0x0848  B 1
+GeForce 8200    0x0849  B 1
+nForce 730a 0x084A  B 1
+GeForce 9200    0x084B  B 1
+nForce 980a/780a SLI    0x084C  B 1
+nForce 750a SLI 0x084D  B 1
+GeForce 8100 / nForce 720a  0x084F  -
+GeForce 9400    0x0860  B 1
+GeForce 9400    0x0861  B 1
+GeForce 9400M G 0x0862  B 1
+GeForce 9400M   0x0863  B 1
+GeForce 9300    0x0864  B 1
+ION 0x0865  B 1
+GeForce 9400M G 0x0866  B 1
+GeForce 9400    0x0867  B 1
+nForce 760i SLI 0x0868  B 1
+GeForce 9400    0x086A  B 1
+GeForce 9300 / nForce 730i  0x086C  B 1
+GeForce 9200    0x086D  B 1
+GeForce 9100M G 0x086E  B 1
+GeForce 8200M G 0x086F  B 1
+GeForce 9400M   0x0870  B 1
+GeForce 9200    0x0871  B 1
+GeForce G102M   0x0872  B 1
+GeForce G102M   0x0873  B 1
+ION 0x0874  B 1
+ION 0x0876  B 1
+GeForce 9400    0x087A  B 1
+ION 0x087D  B 1
+ION LE  0x087E  B 1
+ION LE  0x087F  B 1
+GeForce GT 220  0x0A20  C
+GeForce 315 0x0A22  -
+GeForce 210 0x0A23  C
+GeForce GT 230M 0x0A28  C
+GeForce GT 330M 0x0A29  C
+GeForce GT 230M 0x0A2A  C
+GeForce GT 330M 0x0A2B  C
+GeForce GT 320M 0x0A2D  C
+GeForce GT 240M 0x0A34  C
+GeForce GT 325M 0x0A35  C
+GeForce G210    0x0A60  C
+GeForce 205 0x0A62  C
+GeForce 310 0x0A63  C
+Second Generation ION   0x0A64  C
+GeForce 210 0x0A65  C
+GeForce 310 0x0A66  C
+GeForce 315 0x0A67  -
+GeForce G105M   0x0A68  B
+GeForce G105M   0x0A69  B
+GeForce 305M    0x0A6E  C
+Second Generation ION   0x0A6F  C
+GeForce 310M    0x0A70  C
+GeForce 305M    0x0A71  C
+GeForce 310M    0x0A72  C
+GeForce 305M    0x0A73  C
+GeForce G210M   0x0A74  C
+GeForce 310M    0x0A75  C
+GeForce GT 330  0x0CA0  A
+GeForce GT 320  0x0CA2  C
+GeForce GT 240  0x0CA3  C
+GeForce GT 340  0x0CA4  C
+GeForce GT 330  0x0CA7  A
+GeForce GTS 260M    0x0CA8  C
+GeForce GTS 250M    0x0CA9  C
+GeForce GT 220  0x0CAC  -
+GeForce GT 335M 0x0CAF  C
+GeForce GTS 350M    0x0CB0  C
+GeForce GTS 360M    0x0CB1  C
+GeForce GTS 450 0x0DC4  C
+GeForce GTX 460M    0x0DD1  C
+GeForce GT 430  0x0DE1  C
+GeForce GT 415M 0x0DEE  C
+GeForce GT 425M 0x0DF0  C
+GeForce GT 420M 0x0DF1  C
+GeForce GT 435M 0x0DF2  C
+GeForce GT 420M 0x0DF3  C
+GeForce GTX 460 0x0E22  C
+GeForce GTX 460 SE  0x0E23  C
+GeForce GTX 460 0x0E24  C
+GeForce GTX 580 0x1080  C
+GeForce GTX 570 0x1081  C
+
+
+#NVIDIA Quadro GPUsNVIDIA GPU product    Device PCI ID*  VDPAU features
+Quadro FX 4000  0x004E  -
+Quadro FX 4500  0x009D  -
+Quadro FX Go1400    0x00CC  -
+Quadro FX 3450/4000 SDI 0x00CD  -
+Quadro FX 1400  0x00CE  -
+Quadro FX 3400/Quadro FX 4000   0x00F8  -
+Quadro NVS 440  0x014A  -
+Quadro FX 540M  0x014C  -
+Quadro FX 550   0x014D  -
+Quadro FX 540   0x014E  -
+Quadro NVS 285  0x0165  -
+Quadro FX 5600  0x019D  -
+Quadro FX 4600  0x019E  -
+Quadro NVS 110M 0x01DA  -
+Quadro NVS 120M 0x01DB  -
+Quadro FX 350M  0x01DC  -
+Quadro FX 350   0x01DE  -
+Quadro NVS 210S / GeForce 6150LE    0x0245  -
+Quadro NVS 510M 0x0299  -
+Quadro FX 2500M 0x029A  -
+Quadro FX 1500M 0x029B  -
+Quadro FX 5500  0x029C  -
+Quadro FX 3500  0x029D  -
+Quadro FX 1500  0x029E  -
+Quadro FX 4500 X2   0x029F  -
+Quadro FX 560M  0x039C  -
+Quadro FX 560   0x039E  -
+Quadro FX 370   0x040A  A
+Quadro NVS 320M 0x040B  A
+Quadro FX 570M  0x040C  A
+Quadro FX 1600M 0x040D  A
+Quadro FX 570   0x040E  A
+Quadro FX 1700  0x040F  A
+Quadro NVS 140M 0x0429  A
+Quadro NVS 130M 0x042A  A
+Quadro NVS 135M 0x042B  A
+Quadro FX 360M  0x042D  A
+Quadro NVS 290  0x042F  A
+Quadroplex 2200 D2  0x05ED  A
+Quadroplex 2200 S4  0x05F8  A
+Quadro CX   0x05F9  A
+Quadro FX 5800  0x05FD  A
+Quadro FX 4800  0x05FE  A
+Quadro FX 3800  0x05FF  A
+Quadro FX 4700 X2   0x0619  A
+Quadro FX 3700  0x061A  A
+Quadro VX 200   0x061B  A
+Quadro FX 3600M 0x061C  A
+Quadro FX 2800M 0x061D  A
+Quadro FX 3700M 0x061E  A
+Quadro FX 3800M 0x061F  A
+Quadro FX 1800  0x0638  A
+Quadro FX 2700M 0x063A  A
+Quadro FX 380   0x0658  A
+Quadro FX 580   0x0659  A
+Quadro FX 1700M 0x065A  A
+Quadro FX 770M  0x065C  A
+Quadro 6000 0x06D8  C
+Quadro 5000 0x06D9  C
+Quadro 5000M    0x06DA  C
+Quadro 4000 0x06DD  C
+Quadro NVS 150M 0x06EA  B 1
+Quadro NVS 160M 0x06EB  B 1
+Quadro NVS 420  0x06F8  B 1
+Quadro FX 370 LP    0x06F9  B 1
+Quadro NVS 450  0x06FA  B 1
+Quadro FX 370M  0x06FB  B 1
+Quadro NVS 295  0x06FD  B 1
+HICx16 + Graphics   0x06FF  B 1
+NVS 5100M   0x0A2C  C
+Quadro FX 880M  0x0A3C  C
+NVS 2100M   0x0A6A  C
+NVS 3100M   0x0A6C  C
+Quadro FX 380 LP    0x0A78  C
+Quadro FX 380M  0x0A7C  C
+Quadro FX 1800M 0x0CBC  C
+Quadro 2000 0x0DD8  C
+Quadro 600  0x0DF8  C
+NVS 300 0x10D8  C
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.nvidia b/abs/core/system-templates/templates/xorg/xorg.conf.nvidia
index 2c3b7f1..610bbe0 100755
--- a/abs/core/system-templates/templates/xorg/xorg.conf.nvidia
+++ b/abs/core/system-templates/templates/xorg/xorg.conf.nvidia
@@ -1,50 +1,10 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-Section "ServerFlags"
-        Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "extmod"
-#    Load           "type1"
-    Load           "freetype"
-    Load           "glx"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
 
 Section "Monitor"
     Identifier     "Monitor0"
     VendorName     "Unknown"
     ModelName      "Unknown"
-#    HorizSync       
-#    VertRefresh    
+#    HorizSync
+#    VertRefresh
     Option         "DPMS" "false"
 #    DisplaySize  203 153
 #INSERT MODELINE
@@ -55,8 +15,8 @@ Section "Device"
     Driver         "nvidia"
     VendorName     "NVIDIA Corporation"
     Option "DPI" "100 x 100"
-    Option "NoLogo" "1"    
-	
+    Option "NoLogo" "1"
+
 #INSERT HERE
 
 #END OPTIONS
@@ -69,7 +29,7 @@ Section "Device"
 #    Option  "CursorShadowXOffset"  "4"
 #    Option  "UseEdidFreqs" "True"
 #    Option  "NvAGP" "1"
- 
+
 
 
 
@@ -82,7 +42,7 @@ Section "Screen"
     DefaultDepth    24
     SubSection     "Display"
         Depth       24
-        Modes     "1280x720" 
+        Modes     "1280x720"
     EndSubSection
 EndSection
 
-- 
cgit v0.12

