Index: trunk/i386/libsaio/nvidia.c =================================================================== --- trunk/i386/libsaio/nvidia.c (revision 2136) +++ trunk/i386/libsaio/nvidia.c (revision 2137) @@ -298,11 +298,16 @@ // 0300 - 030F // 0310 - 031F // 0320 - 032F + { 0x10DE032F, 0x17C02068, "Wistron NV34GL" }, // 0330 - 033F // 0340 - 034F + { 0x10DE0345, 0x1B130343, "Jaton NV36.5" }, + { 0x10DE0349, 0x1179FF00, "Toshiba NV36M Pro" }, { 0x10DE034B, 0x1179FF00, "Toshiba NV36MAP" }, + + { 0x10DE034F, 0x1179FF00, "Toshiba NV36GL" }, // 0350 - 035F // 0360 - 036F // 0370 - 037F @@ -624,6 +629,7 @@ { 0x10DE0648, 0x1043900F, "Asus GeForge 9600M GS" }, { 0x10DE0649, 0x10439013, "Asus GeForge 9600M GT" }, + { 0x10DE0649, 0x1043202D, "Asus GeForge GT 220M" }, // 0650 - 065F { 0x10DE065C, 0x10280250, "Dell Quadro FX 770M" }, { 0x10DE065C, 0x103C30E7, "HP Quadro FX 770M" }, @@ -639,6 +645,7 @@ // 06C0 - 06CF { 0x10DE06C0, 0x10438359, "Asus GeForce GTX 480" }, { 0x10DE06C0, 0x10DE075F, "nVidia GeForce GTX 480" }, + { 0x10DE06C0, 0x19DA1152, "Zotac GeForce GTX 480" }, { 0x10DE06C0, 0x38421480, "EVGA GTX 480" }, { 0x10DE06C0, 0x38421482, "EVGA GTX 480" }, @@ -782,6 +789,7 @@ { 0x10DE08A2, 0x106B00D4, "Apple GeForce 320M" }, // 08B0 - 08BF + { 0x10DE08B2, 0x10431592, "Asus GeForce 300M" }, // 08C0 - 08CF // 08D0 - 08DF // 08E0 - 08EF @@ -867,6 +875,15 @@ { 0x10DE0A34, 0x17AA38FF, "Lenovo GeForce GT 240M" }, { 0x10DE0A34, 0x17C010D0, "Wistron GeForce GT 240M" }, { 0x10DE0A34, 0x17C0208D, "Wistron GeForce GT 240M" }, + + { 0x10DE0A3D, 0x10280443, "Dell N11P-ES" }, + { 0x10DE0A3D, 0x103C1521, "HP N11P-ES" }, + { 0x10DE0A3D, 0x104D905E, "Sony N11P-ES" }, + { 0x10DE0A3D, 0x104D9060, "Sony N11P-ES" }, + { 0x10DE0A3D, 0x104D9067, "Sony N11P-ES" }, + { 0x10DE0A3D, 0x17AA2143, "Lenovo N11P-ES" }, + { 0x10DE0A3D, 0x17AA2144, "Lenovo N11P-ES" }, + { 0x10DE0A3D, 0x17AA2145, "Lenovo N11P-ES" }, // 0A40 - 0A4F // 0A50 - 0A5F // 0A60 - 0A6F @@ -1272,6 +1289,14 @@ // 0FC0 - 0FCF { 0x10DE0FC2, 0x103C0936, "HP GeForce GT 630" }, { 0x10DE0FC2, 0x174B0630, "PC Panther GeForce GT 630" }, + + { 0x10DE0FC6, 0x10B00FC6, "Gainward GeForce GTX 650" }, + { 0x10DE0FC6, 0x10DE0973, "nVidia GeForce GTX 650" }, + { 0x10DE0FC6, 0x14583553, "Gigabyte GeForce GTX 650" }, + { 0x10DE0FC6, 0x14583555, "Gigabyte GeForce GTX 650" }, + { 0x10DE0FC6, 0x15690FC6, "Palit GeForce GTX 650" }, + { 0x10DE0FC6, 0x19DA1288, "Zotac GeForce GTX 650" }, + // 0FD0 - 0FDF { 0x10DE0FD1, 0x10280552, "Dell GeForce GT 650M" }, { 0x10DE0FD1, 0x10280566, "Dell GeForce GT 650M" }, @@ -1433,10 +1458,28 @@ { 0x10DE1055, 0x104D908A, "Sony GeForce 410M" }, { 0x10DE1055, 0x104D908B, "Sony GeForce 410M" }, + { 0x10DE1058, 0x10432AED, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x10432AF1, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x104310AC, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x104310BC, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x1043112D, "Asus GeForce GT 610M" }, { 0x10DE1058, 0x10431457, "Asus GeForce GT 610M" }, { 0x10DE1058, 0x10431652, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x10432130, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x10432133, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x10438536, "Asus GeForce GT 610M" }, + { 0x10DE1058, 0x144DC652, "Samsung GeForce GT 610M" }, + { 0x10DE1058, 0x17AA3901, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA3902, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA3977, "Lenovo GeForce GT 610M" }, { 0x10DE1058, 0x17AA397D, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA3983, "Lenovo GeForce GT 610M" }, { 0x10DE1058, 0x17AA5001, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA5003, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA5005, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA5007, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA500F, "Lenovo GeForce GT 610M" }, + { 0x10DE1058, 0x17AA5012, "Lenovo GeForce GT 610M" }, { 0x10DE105A, 0x10250505, "Acer GeForce 610M" }, { 0x10DE105A, 0x10250507, "Acer GeForce 610M" }, @@ -1456,7 +1499,8 @@ { 0x10DE1080, 0x1458351B, "Gigabyte GeForce GTX 580" }, { 0x10DE1080, 0x1458351E, "Gigabyte GeForce GTX 580" }, { 0x10DE1080, 0x14622550, "MSi GeForce GTX 580" }, - { 0x10DE1080, 0x14622561, "MSI N580GTX Lightning" }, // The Real Deal + { 0x10DE1080, 0x14622561, "MSI N580GTX Lightning" }, + { 0x10DE1080, 0x14622563, "MSI N580GTX Lightning" }, { 0x10DE1080, 0x196E086A, "PNY GeForce GTX 580" }, { 0x10DE1080, 0x19DA2203, "Zotac GeForce GTX 580" }, { 0x10DE1080, 0x38421582, "EVGA GeForce GTX 580" }, @@ -1593,6 +1637,7 @@ { 0x10DE1183, 0x14622843, "MSi GTX 660 Ti" }, { 0x10DE1183, 0x19DA1280, "Zotac GTX 660 Ti" }, + { 0x10DE1185, 0x10DE098A, "nVidia GeForce GTX 660" }, { 0x10DE1185, 0x174B2260, "PC Partner GeForce GTX 660" }, { 0x10DE1188, 0x10438406, "Asus GeForce GTX 690" }, @@ -1622,12 +1667,14 @@ { 0x10DE11A0, 0x15580372, "Clevo GeForce GTX 680M" }, { 0x10DE11A0, 0x15585105, "Clevo GeForce GTX 680M" }, { 0x10DE11A0, 0x15587102, "Clevo GeForce GTX 680M" }, + { 0x10DE11A1, 0x104310AD, "Asus GeForce GTX 670MX" }, { 0x10DE11A1, 0x104321AB, "Asus GeForce GTX 670MX" }, { 0x10DE11A1, 0x15580270, "Clevo GeForce GTX 670MX" }, { 0x10DE11A1, 0x15580371, "Clevo GeForce GTX 670MX" }, { 0x10DE11A1, 0x15585105, "Clevo GeForce GTX 670MX" }, { 0x10DE11A1, 0x15587102, "Clevo N13E-GR" }, + { 0x10DE11A7, 0x15585105, "Clevo GeForce GTX 675MX" }, { 0x10DE11A7, 0x15587102, "Clevo GeForce GTX 675MX" }, // 11B0 - 11BF @@ -1644,6 +1691,10 @@ { 0x10DE11BE, 0x15587102, "Clevo Quadro K3000M" }, // 11C0 - 11CF { 0x10DE11C0, 0x10DE0995, "Inno3D GeForce GTX660" }, + + { 0x10DE11C6, 0x1043842A, "Asus GeForce GTX 650 Ti" }, + { 0x10DE11C6, 0x10DE1016, "nVidia GeForce GTX 650 Ti" }, + { 0x10DE11C6, 0x156911C6, "Palit GeForce GTX 650 Ti" }, // 11D0 - 11DF // 11E0 - 11EF // 11F0 - 11FF @@ -1984,7 +2035,7 @@ { 0x10DE032B, NV_SUB_IDS, "Quadro FX 500/600 PCI" }, { 0x10DE032C, NV_SUB_IDS, "GeForce FX Go53xx Series" }, { 0x10DE032D, NV_SUB_IDS, "GeForce FX Go5100" }, - // { 0x10DE032F, NV_SUB_IDS, "NVIDIA NV34GL" }, + { 0x10DE032F, NV_SUB_IDS, "NV34GL" }, // 0330 - 033F { 0x10DE0330, NV_SUB_IDS, "GeForce FX 5900 Ultra" }, { 0x10DE0331, NV_SUB_IDS, "GeForce FX 5900" }, @@ -1998,14 +2049,14 @@ { 0x10DE0342, NV_SUB_IDS, "GeForce FX 5700" }, { 0x10DE0343, NV_SUB_IDS, "GeForce FX 5700LE" }, { 0x10DE0344, NV_SUB_IDS, "GeForce FX 5700VE" }, - // { 0x10DE0345, NV_SUB_IDS, "NVIDIA NV36.5" }, + { 0x10DE0345, NV_SUB_IDS, "NV36.5" }, { 0x10DE0347, NV_SUB_IDS, "GeForce FX Go5700" }, { 0x10DE0348, NV_SUB_IDS, "GeForce FX Go5700" }, { 0x10DE0349, NV_SUB_IDS, "NV36M Pro" }, { 0x10DE034B, NV_SUB_IDS, "NV36MAP" }, { 0x10DE034C, NV_SUB_IDS, "Quadro FX Go1000" }, { 0x10DE034E, NV_SUB_IDS, "Quadro FX 1100" }, - // { 0x10DE034F, NV_SUB_IDS, "NVIDIA NV36GL" }, + { 0x10DE034F, NV_SUB_IDS, "NV36GL" }, // 0350 - 035F // 0360 - 036F // 0370 - 037F @@ -2338,7 +2389,7 @@ { 0x10DE0840, NV_SUB_IDS, "GeForce 8200M" }, { 0x10DE0844, NV_SUB_IDS, "GeForce 9100M G" }, { 0x10DE0845, NV_SUB_IDS, "GeForce 8200M G" }, - { 0x10DE0846, NV_SUB_IDS, "GeForce 9200" }, + { 0x10DE0846, NV_SUB_IDS, "GeForce 9200" }, // Tesla M2050 ?? { 0x10DE0847, NV_SUB_IDS, "GeForce 9100" }, { 0x10DE0848, NV_SUB_IDS, "GeForce 8300" }, { 0x10DE0849, NV_SUB_IDS, "GeForce 8200" }, @@ -2354,7 +2405,7 @@ { 0x10DE0862, NV_SUB_IDS, "GeForce 9400M G" }, { 0x10DE0863, NV_SUB_IDS, "GeForce 9400M" }, { 0x10DE0864, NV_SUB_IDS, "GeForce 9300" }, - { 0x10DE0865, NV_SUB_IDS, "GeForce 9300" }, + { 0x10DE0865, NV_SUB_IDS, "GeForce 9300" }, // ION ?? { 0x10DE0866, NV_SUB_IDS, "GeForce 9400M G" }, { 0x10DE0867, NV_SUB_IDS, "GeForce 9400" }, { 0x10DE0868, NV_SUB_IDS, "nForce 760i SLI" }, @@ -2374,21 +2425,21 @@ { 0x10DE087A, NV_SUB_IDS, "GeForce 9400" }, { 0x10DE087D, NV_SUB_IDS, "ION 9400M" }, { 0x10DE087E, NV_SUB_IDS, "ION LE" }, - { 0x10DE087F, NV_SUB_IDS, "ION LE" }, + { 0x10DE087F, NV_SUB_IDS, "ION LE" }, // Tesla M2070-Q ?? // 0880 - 088F // 0890 - 089F // 08A0 - 08AF { 0x10DE08A0, NV_SUB_IDS, "GeForce 320M" }, - // { 0x10DE08A1, NV_SUB_IDS, "NVIDIA MCP89-MZT" }, + { 0x10DE08A1, NV_SUB_IDS, "MCP89-MZT" }, { 0x10DE08A2, NV_SUB_IDS, "GeForce 320M" }, { 0x10DE08A3, NV_SUB_IDS, "GeForce 320M" }, { 0x10DE08A4, NV_SUB_IDS, "GeForce 320M" }, { 0x10DE08A5, NV_SUB_IDS, "GeForce 320M" }, // 08B0 - 08BF - // { 0x10DE08B0, NV_SUB_IDS, "MCP83 MMD" }, + { 0x10DE08B0, NV_SUB_IDS, "MCP83 MMD" }, { 0x10DE08B1, NV_SUB_IDS, "GeForce 300M" }, - // { 0x10DE08B2, NV_SUB_IDS, "NVIDIA MCP83-MJ" }, - // { 0x10DE08B3, NV_SUB_IDS, "NVIDIA MCP89 MM9" }, + { 0x10DE08B2, NV_SUB_IDS, "GeForce 300M" }, // MCP83-MJ + { 0x10DE08B3, NV_SUB_IDS, "MCP89 MM9" }, // 08C0 - 08CF // 08D0 - 08DF // 08E0 - 08EF @@ -2415,7 +2466,7 @@ // { 0x10DE0A10, NV_SUB_IDS, "NVIDIA GT212" }, // 0A20 - 0A2F { 0x10DE0A20, NV_SUB_IDS, "GeForce GT 220" }, - // { 0x10DE0A21, NV_SUB_IDS, "NVIDIA D10M2-20" }, + { 0x10DE0A21, NV_SUB_IDS, "D10M2-20" }, { 0x10DE0A22, NV_SUB_IDS, "GeForce 315" }, { 0x10DE0A23, NV_SUB_IDS, "GeForce 210" }, { 0x10DE0A26, NV_SUB_IDS, "GeForce 405" }, @@ -2433,13 +2484,13 @@ { 0x10DE0A35, NV_SUB_IDS, "GeForce GT 325M" }, { 0x10DE0A38, NV_SUB_IDS, "Quadro 400" }, { 0x10DE0A3C, NV_SUB_IDS, "Quadro FX 880M" }, - { 0x10DE0A3D, NV_SUB_IDS, "NVIDIA N10P-ES" }, - // { 0x10DE0A3F, NV_SUB_IDS, "NVIDIA GT216-INT" }, + { 0x10DE0A3D, NV_SUB_IDS, "N10P-ES" }, + { 0x10DE0A3F, NV_SUB_IDS, "GT216-INT" }, // 0A40 - 0A4F // 0A50 - 0A5F // 0A60 - 0A6F { 0x10DE0A60, NV_SUB_IDS, "GeForce G210" }, - // { 0x10DE0A61, NV_SUB_IDS, "NVIDIA NVS 2100" }, + { 0x10DE0A61, NV_SUB_IDS, "NVS 2100" }, { 0x10DE0A62, NV_SUB_IDS, "GeForce 205" }, { 0x10DE0A63, NV_SUB_IDS, "GeForce 310" }, { 0x10DE0A64, NV_SUB_IDS, "ION" }, @@ -2465,9 +2516,9 @@ { 0x10DE0A7A, NV_SUB_IDS, "GeForce 315M" }, { 0x10DE0A7B, NV_SUB_IDS, "GeForce 505" }, { 0x10DE0A7C, NV_SUB_IDS, "Quadro FX 380M" }, - // { 0x10DE0A7D, NV_SUB_IDS, "NVIDIA GT218-ES" }, - // { 0x10DE0A7E, NV_SUB_IDS, "NVIDIA GT218-INT-S" }, - // { 0x10DE0A7F, NV_SUB_IDS, "NVIDIA GT218-INT-B" }, + { 0x10DE0A7D, NV_SUB_IDS, "N11M-ES" }, //SUBIDS + { 0x10DE0A7E, NV_SUB_IDS, "GT218-INT-S" }, + { 0x10DE0A7F, NV_SUB_IDS, "GT218-INT-B" }, // 0A80 - 0A8F // 0A90 - 0A9F // 0AA0 - 0AAF @@ -2512,8 +2563,8 @@ { 0x10DE0CA8, NV_SUB_IDS, "GeForce GTS 260M" }, { 0x10DE0CA9, NV_SUB_IDS, "GeForce GTS 250M" }, { 0x10DE0CAC, NV_SUB_IDS, "GeForce GT 220" }, - // { 0x10DE0CAD, NV_SUB_IDS, "NVIDIA N10E-ES" }, - // { 0x10DE0CAE, NV_SUB_IDS, "NVIDIA GT215-INT" }, + { 0x10DE0CAD, NV_SUB_IDS, "N10E-ES" }, // SUBIDS + { 0x10DE0CAE, NV_SUB_IDS, "GT215-INT" }, { 0x10DE0CAF, NV_SUB_IDS, "GeForce GT 335M" }, // 0CB0 - 0CBF { 0x10DE0CB0, NV_SUB_IDS, "GeForce GTS 350M" }, @@ -2648,6 +2699,7 @@ // 0FF0 - 0FFF { 0x10DE0FFB, NV_SUB_IDS, "Quadro K2000M" }, { 0x10DE0FFC, NV_SUB_IDS, "Quadro K1000M" }, + { 0x10DE0FFD, NV_SUB_IDS, "NVS 510" }, { 0x10DE0FFF, NV_SUB_IDS, "Quadro 410" }, // 1000 - 100F // 1010 - 101F @@ -2736,20 +2788,20 @@ // 1190 - 119F // 11A0 - 11AF { 0x10DE11A0, NV_SUB_IDS, "GeForce GTX 680M" }, - { 0x10DE11A1, NV_SUB_IDS, "GeForce GTX 670MX" }, - { 0x10DE11A7, NV_SUB_IDS, "GeForce GTX 675MX" }, + { 0x10DE11A1, NV_SUB_IDS, "GeForce GTX 670MX" }, + { 0x10DE11A7, NV_SUB_IDS, "GeForce GTX 675MX" }, // 11B0 - 11BF - { 0x10DE11BA, NV_SUB_IDS, "Quadro K5000" }, + { 0x10DE11BA, NV_SUB_IDS, "Quadro K5000" }, { 0x10DE11BC, NV_SUB_IDS, "Quadro K5000M" }, { 0x10DE11BD, NV_SUB_IDS, "Quadro K4000M" }, { 0x10DE11BE, NV_SUB_IDS, "Quadro K3000M" }, // 11C0 - 11CF { 0x10DE11C0, NV_SUB_IDS, "GeForce GTX 660" }, - { 0x10DE11C6, NV_SUB_IDS, "GeForce GTX 650" }, + { 0x10DE11C6, NV_SUB_IDS, "GeForce GTX 650" }, // 11D0 - 11DF // 11E0 - 11EF // 11F0 - 11FF - { 0x10DE11FA, NV_SUB_IDS, "Quadro K4000" }, + { 0x10DE11FA, NV_SUB_IDS, "Quadro K4000" }, // 1200 - 120F { 0x10DE1200, NV_SUB_IDS, "GeForce GTX 560 Ti" }, { 0x10DE1201, NV_SUB_IDS, "GeForce GTX 560" }, @@ -3155,9 +3207,13 @@ case 0x0647: // 9600M GT 0647 vram_size = 512*1024*1024; break; - /*case 0x0649: // 9600M GT 0649 - vram_size = 1024*1024*1024; - break;*/ + case 0x0649: // 9600M GT 0649 + // 10DE06491043202D 1GB VRAM + if (((nvda_dev->subsys_id.subsys.vendor_id << 16) | nvda_dev->subsys_id.subsys.device_id) == 0x1043202D ) + { + vram_size = 1024*1024*1024; + } + break; case 0x0A65: // GT 210 case 0x0DE0: // GT 440 case 0x0DE1: // GT 430