Chameleon

Chameleon Commit Details

Date:2011-08-08 02:12:33 (12 years 8 months ago)
Author:Azimutz
Commit:1329
Parents: 1328
Message:Sync these two with trunk (r1326).
Changes:
M/branches/azimutz/trunkAutoResolution/i386/libsaio/ati.c
M/branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c
M/branches/azimutz/trunkAutoResolution

File differences

branches/azimutz/trunkAutoResolution/i386/libsaio/ati.c
540540
541541
542542
543
544
543
544
545545
546546
547547
......
12151215
12161216
12171217
1218
1218
12191219
1220
1221
12201222
12211223
12221224
␉␊
␉/* Northen Islands */␊
␉{ 0x6718,␉0x00000000,␉CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970 Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x6738,␉0x00000000,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870 Series",␉␉kDuckweed␉},␊
␉{ 0x6719, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950 Series", kNull },␊
␉{ 0x6738, 0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870 Series",␉␉kDuckweed␉},␊
␉{ 0x6739,␉0x00000000,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850 Series",␉␉kDuckweed␉},␊
␉{ 0x673E,␉0x00000000,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6790 Series",␉␉kNull␉␉},␊
␉␊
␉}␊
␉␊
␉getIntForKey(kAtiPorts, &n_ports, &bootInfo->bootConfig);␊
␉if (n_ports > 0)␊
␉if (n_ports > 0){␊
␉␉card->ports = n_ports;␊
verbose("AtiPorts set to %d\n",n_ports); //AniV␊
}␊
␉␊
␉sprintf(name, "ATY,%s", card->cfg_name);␊
␉aty_name.type = kStr;␊␊
branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c
546546
547547
548548
549
549
550550
551551
552552
......
12211221
12221222
12231223
1224
1224
12251225
1226
1227
12261228
12271229
12281230
␉␊
␉/* Northen Islands */␊
␉{ 0x6718,␉0x00000000,␉CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970 Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x6719, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950 Series", kNull },␊
␉{ 0x6738,␉0x00000000,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870 Series",␉␉kDuckweed␉},␊
␉{ 0x6739,␉0x00000000,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6850 Series",␉␉kDuckweed␉},␊
␉{ 0x673E,␉0x00000000,␉CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6790 Series",␉␉kNull␉␉},␊
␉}␊
␉␊
␉getIntForKey(kAtiPorts, &n_ports, &bootInfo->bootConfig);␊
␉if (n_ports > 0)␊
␉if (n_ports > 0){␊
␉␉card->ports = n_ports;␊
verbose("AtiPorts set to %d\n",n_ports); //AniV␊
}␊
␉␊
␉sprintf(name, "ATY,%s", card->cfg_name);␊
␉aty_name.type = kStr;␊

Archive Download the corresponding diff file

Revision: 1329