Chameleon

Chameleon Commit Details

Date:2015-01-26 00:27:37 (4 years 8 months ago)
Author:ErmaC
Commit:2552
Parents: 2551
Message:Update nVidia device IDs and typo
Changes:
M/branches/ErmaC/Enoch/i386/libsaio/nvidia.c

File differences

branches/ErmaC/Enoch/i386/libsaio/nvidia.c
10161016
10171017
10181018
1019
10191020
10201021
10211022
......
13011302
13021303
13031304
1304
1305
13051306
13061307
13071308
......
13181319
13191320
13201321
1321
1322
13221323
13231324
13241325
......
13421343
13431344
13441345
1345
1346
13461347
13471348
13481349
13491350
1350
1351
13511352
13521353
13531354
......
14861487
14871488
14881489
1490
14891491
14901492
14911493
......
15671569
15681570
15691571
1570
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
15711592
1572
1593
15731594
15741595
1575
1576
1577
1578
1579
15801596
1581
1597
15821598
1583
1584
1599
1600
1601
15851602
15861603
15871604
1588
1605
1606
1607
15891608
1590
1591
1592
1593
1594
1595
1596
1609
1610
1611
1612
1613
15971614
15981615
1599
1600
1601
1602
1616
1617
1618
1619
1620
16031621
1604
1605
1606
1622
1623
1624
1625
1626
16071627
16081628
16091629
1610
1611
1630
1631
1632
16121633
16131634
1614
1615
1635
1636
1637
16161638
16171639
1640
16181641
16191642
1620
1621
1643
1644
1645
16221646
16231647
1624
1625
1648
1649
1650
1651
16261652
16271653
16281654
1629
1655
1656
16301657
16311658
16321659
1633
1634
1635
1636
1637
1638
1639
1640
1641
1660
1661
16421662
1643
1663
16441664
16451665
1646
1666
1667
16471668
16481669
1649
1670
1671
16501672
16511673
1652
1674
1675
16531676
16541677
16551678
......
16581681
16591682
16601683
1661
1662
1663
16641684
1665
1666
1685
1686
1687
1688
16671689
1668
1669
1690
1691
16701692
16711693
16721694
16731695
16741696
1675
1676
1677
1697
1698
1699
1700
1701
1702
16781703
16791704
16801705
1681
1706
16821707
16831708
1684
1709
1710
1711
16851712
16861713
1687
1688
1689
1714
1715
1716
1717
1718
1719
16901720
16911721
16921722
16931723
16941724
1695
1696
1725
1726
1727
1728
16971729
1698
1699
1730
1731
17001732
17011733
1702
1703
1734
1735
1736
17041737
17051738
17061739
1707
1708
1709
1740
1741
1742
1743
17101744
17111745
17121746
17131747
17141748
1715
1716
1749
1750
17171751
17181752
17191753
1720
1754
17211755
17221756
17231757
1724
1725
1758
1759
1760
17261761
17271762
17281763
......
17381773
17391774
17401775
1741
1742
1776
17431777
1744
1745
1746
1747
1778
1779
1780
1781
1782
1783
1784
17481785
17491786
17501787
17511788
17521789
17531790
1754
1791
1792
17551793
17561794
17571795
......
19241962
19251963
19261964
1927
1965
19281966
19291967
19301968
......
19912029
19922030
19932031
1994
2032
2033
19952034
19962035
1997
2036
19982037
19992038
20002039
20012040
2002
2041
20032042
20042043
20052044
......
20092048
20102049
20112050
2012
2051
20132052
20142053
20152054
2016
2055
2056
2057
2058
20172059
20182060
20192061
20202062
20212063
2022
2023
2064
2065
20242066
20252067
2026
2027
2028
2068
2069
2070
20292071
20302072
2031
2073
20322074
20332075
20342076
20352077
20362078
2037
2079
20382080
20392081
20402082
......
21592201
21602202
21612203
2204
21622205
21632206
21642207
......
23132356
23142357
23152358
2316
2317
23182359
2319
2320
23212360
23222361
23232362
// 0F90 - 0F9F
// 0FA0 - 0FAF
// 0FB0 - 0FBF
{ 0x10DE0FBB,"GeForce GTX 970" },
// 0FC0 - 0FCF
{ 0x10DE0FC0,"GeForce GT 640" },
{ 0x10DE0FC1,"GeForce GT 640" },
{ 0x10DE1391,"GeForce GTX 850M" },
{ 0x10DE1392,"GeForce GTX 860M" },
{ 0x10DE1393,"GeForce 840M" },
{ 0x10DE1398,"GeForce N15S-GT1R" }, //
{ 0x10DE1398,"GeForce 845M" }, //
{ 0x10DE13AD,"GM107 INT52" }, //
{ 0x10DE13AE,"GM107 CS1" }, //
//{ 0x10DE13AF,"Graphics Device" }, // GM107GLM
//{ 0x10DE13C3,"Graphics Device" }, // GM107GLM
{ 0x10DE13D7,"GeForce GTX 980M" }, //
{ 0x10DE13D8,"GeForce GTX 970M" }, //
//{ 0x10DE13D9,"Graphics Device" }, //
{ 0x10DE13D9,"GeForce GTX 965M" },
//{ 0x10DE13F0,"Graphics Device" }, // GM107GLM
//{ 0x10DE13F1,"Graphics Device" }, // GM107GLM
//{ 0x10DE1401,"Graphics Device" }, //
//{ 0x10DE17BA,"Quadro" }, //
//{ 0x10DE17BB,"Quadro" }, //
//{ 0x10DE17BD,"Graphics Device" }, //
{ 0x10DE17BE,"GM107 CS1" } // GM107
{ 0x10DE17BE,"GM107 CS1" }, // GM107
//{ 0x10DE17C1,"Graphics Device" }, //
//{ 0x10DE17C2,"Graphics Device" }, //
//{ 0x10DE17EE,"Graphics Device" }, //
//{ 0x10DE17EF,"Graphics Device" }, //
//{ 0x10DE17F0,"Graphics Device" }, //
{ 0x10DE17F0,"Quadro M6000" }
//{ 0x10DE17FF,"Graphics Device" }, //
};
{ 0x10DE0E23,0x10B00401,"Gainward GeForce GTX 460" },
// 0F00 - 0FFF
{ 0x10DE0FBB,0x38422974,"EVGA GTX 970 OC" },
{ 0x10DE0FD2,0x10280595,"Dell GeForce GT 640M LE" },
{ 0x10DE0FD2,0x102805B2,"Dell GeForce GT 640M LE" },
// 1000 - 10FF
static int patch_nvidia_rom(uint8_t *rom)
{
if (!rom)
uint8_tnum_outputs= 0;
uint8_ti= 0;
uint8_tdcbtable_version;
uint8_theaderlength= 0;
uint8_tnumentries= 0;
uint8_trecordlength= 0;
uint8_tchannel1= 0;
uint8_tchannel2= 0;
uint16_tdcbptr;
uint8_t*dcbtable;
uint8_t*togroup;
inthas_lvds= false;
struct dcbentry {
uint8_t type;
uint8_t index;
uint8_t *heads;
} entries[MAX_NUM_DCB_ENTRIES];
DBG("patch_nvidia_rom.\n");
if (!rom || (rom[0] != 0x55 && rom[1] != 0xaa))
{
printf("ROM not found\n");
DBG("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]);
return PATCH_ROM_FAILED;
}
if (rom[0] != 0x55 && rom[1] != 0xaa)
{
printf("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]);
return PATCH_ROM_FAILED;
}
uint16_t dcbptr = READ_LE_SHORT(rom, 0x36);
dcbptr = *(uint16_t *)&rom[0x36];
if (!dcbptr) {
printf("no dcb table found\n");
if (!dcbptr)
{
DBG("no dcb table found\n");
return PATCH_ROM_FAILED;
}
//else
//printf("dcb table at offset 0x%04x\n", dcbptr);
//{
//DBG("dcb table at offset 0x%04x\n", dcbptr);
//}
uint8_t *dcbtable = &rom[dcbptr];
uint8_t dcbtable_version = dcbtable[0];
uint8_t headerlength = 0;
uint8_t numentries = 0;
uint8_t recordlength = 0;
if (dcbtable_version >= 0x20) {
dcbtable= &rom[dcbptr];
dcbtable_version= dcbtable[0];
if (dcbtable_version >= 0x20)
{
uint32_t sig;
if (dcbtable_version >= 0x30) {
headerlength = dcbtable[1];
numentries = dcbtable[2];
recordlength = dcbtable[3];
if (dcbtable_version >= 0x30)
{
headerlength= dcbtable[1];
numentries= dcbtable[2];
recordlength= dcbtable[3];
sig = READ_LE_INT(dcbtable, 6);
} else {
sig = READ_LE_INT(dcbtable, 4);
sig = *(uint32_t *)&dcbtable[6];
}
else
{
sig = *(uint32_t *)&dcbtable[4];
headerlength = 8;
}
if (sig != 0x4edcbdcb) {
printf("Bad display config block signature (0x%8x)\n", sig); //Azi: issue #48
if (sig != 0x4edcbdcb)
{
DBG("Bad display config block signature (0x%8x)\n", sig); //Azi: issue #48
return PATCH_ROM_FAILED;
}
} else if (dcbtable_version >= 0x14) { /* some NV15/16, and NV11+ */
char sig[8] = { 0 };
}
else if (dcbtable_version >= 0x14) { /* some NV15/16, and NV11+ */
char sig[8];
strncpy(sig, (char *)&dcbtable[-7], 7);
sig[7] = 0;
recordlength = 10;
if (strcmp(sig, "DEV_REC")) {
printf("Bad Display Configuration Block signature (%s)\n", sig);
if (strcmp(sig, "DEV_REC"))
{
DBG("Bad Display Configuration Block signature (%s)\n", sig);
return PATCH_ROM_FAILED;
}
} else {
printf("ERROR: dcbtable_version is 0x%X\n", dcbtable_version);
}
else
{
DBG("ERROR: dcbtable_version is 0x%X\n", dcbtable_version);
return PATCH_ROM_FAILED;
}
if (numentries >= MAX_NUM_DCB_ENTRIES) {
if (numentries >= MAX_NUM_DCB_ENTRIES)
{
numentries = MAX_NUM_DCB_ENTRIES;
}
uint8_t num_outputs = 0, i = 0;
struct dcbentry {
uint8_t type;
uint8_t index;
uint8_t *heads;
} entries[numentries];
for (i = 0; i < numentries; i++) {
for (i = 0; i < numentries; i++)
{
uint32_t connection;
connection = READ_LE_INT(dcbtable,headerlength + recordlength * i);
connection = *(uint32_t *)&dcbtable[headerlength + recordlength * i];
/* Should we allow discontinuous DCBs? Certainly DCB I2C tables can be discontinuous */
if ((connection & 0x0000000f) == 0x0000000f) { /* end of records */
if ((connection & 0x0000000f) == 0x0000000f) /* end of records */
{
continue;
}
if (connection == 0x00000000) { /* seen on an NV11 with DCB v1.5 */
if (connection == 0x00000000) /* seen on an NV11 with DCB v1.5 */
{
continue;
}
if ((connection & 0xf) == 0x6) { /* we skip type 6 as it doesnt appear on macbook nvcaps */
if ((connection & 0xf) == 0x6) /* we skip type 6 as it doesnt appear on macbook nvcaps */
{
continue;
}
entries[num_outputs++].heads = (uint8_t*)&(dcbtable[(headerlength + recordlength * i) + 1]);
}
int has_lvds = false;
uint8_t channel1 = 0, channel2 = 0;
for (i = 0; i < num_outputs; i++) {
if (entries[i].type == 3) {
for (i = 0; i < num_outputs; i++)
{
if (entries[i].type == 3)
{
has_lvds = true;
//printf("found LVDS\n");
channel1 |= ( 0x1 << entries[i].index);
//DBG("found LVDS\n");
channel1 |= ( 0x1 << entries[i].index );
entries[i].type = TYPE_GROUPED;
}
}
// if we have a LVDS output, we group the rest to the second channel
if (has_lvds) {
for (i = 0; i < num_outputs; i++) {
if (entries[i].type == TYPE_GROUPED) {
if (has_lvds)
{
for (i = 0; i < num_outputs; i++)
{
if (entries[i].type == TYPE_GROUPED)
{
continue;
}
channel2 |= ( 0x1 << entries[i].index);
channel2 |= ( 0x1 << entries[i].index );
entries[i].type = TYPE_GROUPED;
}
} else {
}
else
{
int x;
// we loop twice as we need to generate two channels
for (x = 0; x <= 1; x++) {
for (i=0; i<num_outputs; i++) {
if (entries[i].type == TYPE_GROUPED) {
for (x = 0; x <= 1; x++)
{
for (i=0; i<num_outputs; i++)
{
if (entries[i].type == TYPE_GROUPED)
{
continue;
}
// if type is TMDS, the prior output is ANALOG
// we always group ANALOG and TMDS
// if there is a TV output after TMDS, we group it to that channel as well
if (i && entries[i].type == 0x2) {
switch (x) {
if (i && entries[i].type == 0x2)
{
switch (x)
{
case 0:
//printf("group channel 1\n");
channel1 |= ( 0x1 << entries[i].index);
//DBG("group channel 1\n");
channel1 |= ( 0x1 << entries[i].index );
entries[i].type = TYPE_GROUPED;
if (entries[i-1].type == 0x0) {
channel1 |= ( 0x1 << entries[i-1].index);
if (entries[i-1].type == 0x0)
{
channel1 |= ( 0x1 << entries[i-1].index );
entries[i-1].type = TYPE_GROUPED;
}
// group TV as well if there is one
if ( ((i+1) < num_outputs) && (entries[i+1].type == 0x1) ) {
//printf("group tv1\n");
channel1 |= ( 0x1 << entries[i+1].index);
if ( ((i+1) < num_outputs) && (entries[i+1].type == 0x1) )
{
//DBG("group tv1\n");
channel1 |= ( 0x1 << entries[i+1].index );
entries[i+1].type = TYPE_GROUPED;
}
break;
case 1:
//printf("group channel 2 : %d\n", i);
channel2 |= ( 0x1 << entries[i].index);
//DBG("group channel 2 : %d\n", i);
channel2 |= ( 0x1 << entries[i].index );
entries[i].type = TYPE_GROUPED;
if (entries[i - 1].type == 0x0) {
channel2 |= ( 0x1 << entries[i-1].index);
channel2 |= ( 0x1 << entries[i-1].index );
entries[i-1].type = TYPE_GROUPED;
}
// group TV as well if there is one
if ( ((i+1) < num_outputs) && (entries[i+1].type == 0x1) ) {
//printf("group tv2\n");
if ( ((i+1) < num_outputs) && (entries[i+1].type == 0x1) )
{
//DBG("group tv2\n");
channel2 |= ( 0x1 << entries[i+1].index);
entries[i+1].type = TYPE_GROUPED;
}
}
// if we have left ungrouped outputs merge them to the empty channel
uint8_t *togroup;// = (channel1 ? (channel2 ? NULL : &channel2) : &channel1);
togroup = &channel2;
togroup = &channel2; // = (channel1 ? (channel2 ? NULL : &channel2) : &channel1);
for (i = 0; i < num_outputs; i++) {
if (entries[i].type != TYPE_GROUPED) {
//printf("%d not grouped\n", i);
if (togroup) {
for (i = 0; i < num_outputs; i++)
{
if (entries[i].type != TYPE_GROUPED)
{
//DBG("%d not grouped\n", i);
if (togroup)
{
*togroup |= ( 0x1 << entries[i].index);
}
entries[i].type = TYPE_GROUPED;
}
}
if (channel1 > channel2) {
if (channel1 > channel2)
{
uint8_t buff = channel1;
channel1 = channel2;
channel2 = buff;
unsigned long long mem_detect(volatile uint8_t *regs, uint8_t nvCardType, pci_dt_t *nvda_dev, uint32_t device_id, uint32_t subsys_id)
{
unsigned long long vram_size = 0;
uint64_t vram_size = 0;
// First check if any value exist in the plist
cardList_t * nvcard = FindCardWithIds(device_id, subsys_id);
}
if (!vram_size)
{ // Finally, if vram_size still not set do the calculation with our own method
{
// Finally, if vram_size still not set do the calculation with our own method
if (nvCardType < NV_ARCH_50)
{
vram_size = REG32(NV04_PFB_FIFO_DATA);
vram_size = (uint64_t)(REG32(NV04_PFB_FIFO_DATA));
vram_size &= NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_MASK;
}
else if (nvCardType < NV_ARCH_C0)
{
vram_size = REG32(NV04_PFB_FIFO_DATA);
vram_size = (uint64_t)(REG32(NV04_PFB_FIFO_DATA));
vram_size |= (vram_size & 0xff) << 32;
vram_size &= 0xffffffff00ll;
}
vram_size *= REG32(NVC0_MEM_CTRLR_COUNT);
}
}
DBG("mem_detected %ld\n", vram_size);
return vram_size;
}
static bool checkNvRomSig(uint8_t * aRom){
static uint8_t connector_type_1[]= {0x00, 0x08, 0x00, 0x00};
static bool checkNvRomSig(uint8_t * aRom)
{
return aRom != NULL && (aRom[0] == 0x55 && aRom[1] == 0xaa);
}
bool setup_nvidia_devprop(pci_dt_t *nvda_dev)
{
struct DevPropDevice*device = NULL;
char*devicepath = NULL;
struct DevPropDevice*device= NULL;
char*devicepath= NULL;
option_rom_pci_header_t*rom_pci_header;
volatile uint8_t*regs;
uint8_t*rom = NULL;
uint8_tnvCardType = 0;
unsigned long longvideoRam = 0;
uint8_t*rom= NULL;
uint8_tnvCardType= 0;
uint64_tvideoRam= 0;
uint32_tnvBiosOveride;
uint32_tbar[7];
uint32_tboot_display = 0;
uint32_tboot_display= 0;
intnvPatch = 0;
intlen;
charbiosVersion[64];
charnvFilename[64];
charkNVCAP[12];
char*model = NULL;
char*model= NULL;
const char*value;
fill_card_list();
{
string = devprop_create_string();
}
device = devprop_add_device(string, devicepath);
/* FIXME: for primary graphics card only */
//http://forge.voodooprojects.org/p/chameleon/issues/67/
if(getBoolForKey(kEnableHDMIAudio, &doit, &bootInfo->chameleonConfig) && doit)
{
static uint8_t connector_type_1[]= {0x00, 0x08, 0x00, 0x00};
//devprop_add_value(device, "@0,connector-type",connector_type_1, 4);
devprop_add_value(device, "@1,connector-type",connector_type_1, 4);
//devprop_add_value(device, "@2,connector-type",connector_type_1, 4);
//devprop_add_value(device, "@3,connector-type",connector_type_1, 4);
}
/************************ End Audio *************************/

Archive Download the corresponding diff file

Revision: 2552