From 991183511b154ecf3a60e5be62451cd997c7f6a6 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 9 Jul 2013 12:40:29 -0500 Subject: [PATCH] RadeonHD: Drop marketing names * They are all over the place.. I give up * Going off of engineering names and DCE is more accurate * A lot of this info came from the x.org wiki * I'd like to transition some of the engineering name checks to use DCE versions.. they tend to be more accurate and exact. (in some cases we can't, but most of the time we can) --- .../private/graphics/radeon_hd/radeon_hd.h | 76 ++++++++++--------- .../drivers/graphics/radeon_hd/driver.cpp | 37 +++++---- 2 files changed, 57 insertions(+), 56 deletions(-) diff --git a/headers/private/graphics/radeon_hd/radeon_hd.h b/headers/private/graphics/radeon_hd/radeon_hd.h index 7025ddf8cf..b979e1c7f7 100644 --- a/headers/private/graphics/radeon_hd/radeon_hd.h +++ b/headers/private/graphics/radeon_hd/radeon_hd.h @@ -62,43 +62,45 @@ enum radeon_chipset { RADEON_RS690, RADEON_RS740, RADEON_RV515, - RADEON_R520, //r500, Radeon X1300-X1950 - RADEON_RV530, - RADEON_RV560, - RADEON_RV570, - RADEON_R580, - RADEON_R600, //r600, Radeon HD 2000, 3000 - RADEON_RV610, - RADEON_RV630, - RADEON_RV670, - RADEON_RV620, - RADEON_RV635, - RADEON_RS780, - RADEON_RS880, - RADEON_RV770, //r700, Radeon HD 4000 - RADEON_RV730, - RADEON_RV710, - RADEON_RV740, - RADEON_CEDAR, //Evergreen, Radeon HD 5000 - RADEON_REDWOOD, - RADEON_JUNIPER, - RADEON_CYPRESS, - RADEON_HEMLOCK, - RADEON_PALM, //Fusion APU (NI), Radeon HD 6000 - RADEON_SUMO, - RADEON_SUMO2, - RADEON_CAICOS, //Nothern Islands, Radeon HD 6000 / Low end 7000 - RADEON_TURKS, - RADEON_BARTS, - RADEON_CAYMAN, - RADEON_ANTILLES, - RADEON_CAPEVERDE, //Southern Islands, Radeon HD 7000 aka ARUBA - RADEON_BONAIRE, - RADEON_PITCAIRN, - RADEON_TAHITI, - RADEON_OLAND, //Sea Islands, Radeon HD 8000 - RADEON_HAINAN, // NO DCE? - RADEON_CURACAO, + RADEON_R520, //r500, DCE 1.0 + RADEON_RV530, // DCE 1.0 + RADEON_RV560, // DCE 1.0 + RADEON_RV570, // DCE 1.0 + RADEON_R580, // DCE 1.0 + RADEON_R600, //r600, DCE 2.0 + RADEON_RV610, // DCE 2.0 + RADEON_RV630, // DCE 2.0 + RADEON_RV670, // DCE 2.0 + RADEON_RV620, // DCE 3.0 + RADEON_RV635, // DCE 3.0 + RADEON_RS780, // DCE 3.0 + RADEON_RS880, // DCE 3.0 + RADEON_RV770, //r700, DCE 3.1 + RADEON_RV730, // DCE 3.2 + RADEON_RV710, // DCE 3.2 + RADEON_RV740, // DCE 3.2 + RADEON_CEDAR, //Evergreen, DCE 4.0 + RADEON_REDWOOD, // DCE 4.0 + RADEON_JUNIPER, // DCE 4.0 + RADEON_CYPRESS, // DCE 4.0 + RADEON_HEMLOCK, // DCE 4.0? + RADEON_PALM, //Fusion APU (NI), DCE 4.1 + RADEON_SUMO, // DCE 4.1 + RADEON_SUMO2, // DCE 4.1 + RADEON_CAICOS, //Nothern Islands, DCE 5.0 + RADEON_TURKS, // DCE 5.0 + RADEON_BARTS, // DCE 5.0 + RADEON_CAYMAN, // DCE 5.0 + RADEON_ANTILLES, // DCE 5.0? + RADEON_CAPEVERDE, //Southern Islands, DCE 6.0 + RADEON_PITCAIRN, // DCE 6.0 + RADEON_TAHITI, // DCE 6.0 + RADEON_ARUBA, // DCE 6.1 Trinity/Richland + RADEON_OLAND, // DCE 6.4 + RADEON_HAINAN, // NO DCE + RADEON_KAVERI, //Sea Islands, DCE 8.1 + RADEON_BONAIRE, // DCE 8.2 + RADEON_KABINI, // DCE 8.3 }; diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp index 59ddaff9ed..21bf09c0db 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp @@ -160,8 +160,9 @@ const struct supported_device { {0x9460, 3, 1, RADEON_RV770, CHIP_STD, "Radeon HD 4890"}, // From here on AMD no longer used numeric identifiers + // Marketing names can collide for different generations of cards + // as such we should ignore them at all costs (besides the card name) - // Marketing Names: Radeon HD 5450 - HD 6320 // Introduced: 2009 // Codename: Evergreen // Process: 40 nm @@ -210,7 +211,6 @@ const struct supported_device { {0x9644, 4, 1, RADEON_SUMO2, CHIP_APU, "Radeon HD 6410D"}, {0x9645, 4, 1, RADEON_SUMO2, CHIP_APU, "Radeon HD SUMO2 M"}, - // Radeon HD 6450 - HD 7670 // Introduced: 2010 // Codename: Nothern Islands // Process: 40 nm @@ -268,11 +268,11 @@ const struct supported_device { // Antilles (Top, Dual GPU) {0x671d, 5, 0, RADEON_ANTILLES, CHIP_STD, "Radeon HD 6990"}, - // Marketing Names: Radeon HD 7750 - HD 79xx + // Introduced: Late 2011 // Codename: Southern Islands // Process: 28 nm - // Cape Verde (TODO: Need to find friendly names) + // Cape Verde {0x6820, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x6821, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x6823, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, @@ -292,14 +292,7 @@ const struct supported_device { {0x683b, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x683f, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD 7750"}, {0x683d, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD 7770"}, - // Bonaire (7xxx rebranded HD 8xxx) - {0x6649, 6, 0, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, - {0x6650, 6, 0, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, - {0x6651, 6, 0, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, - {0x6658, 6, 0, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, - {0x665c, 6, 0, RADEON_BONAIRE, CHIP_STD, "Radeon HD 7790"}, - {0x665d, 6, 0, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, - // Pitcairn (TODO: Need to find friendly names) + // Pitcairn {0x6800, 6, 0, RADEON_PITCAIRN, CHIP_MOBILE, "Radeon HD 7970"}, {0x6801, 6, 0, RADEON_PITCAIRN, CHIP_STD, "Radeon HD Pitcairn"}, {0x6802, 6, 0, RADEON_PITCAIRN, CHIP_STD, "Radeon HD Pitcairn"}, @@ -309,7 +302,7 @@ const struct supported_device { {0x6818, 6, 0, RADEON_PITCAIRN, CHIP_STD, "Radeon HD 7870"}, {0x6819, 6, 0, RADEON_PITCAIRN, CHIP_STD, "Radeon HD 7800"}, {0x684c, 6, 0, RADEON_PITCAIRN, CHIP_STD, "Radeon HD Pitcairn"}, - // Tahiti (TODO: Need to find friendly names) + // Tahiti {0x6780, 6, 0, RADEON_TAHITI, CHIP_STD, "Radeon HD Tahiti"}, {0x6784, 6, 0, RADEON_TAHITI, CHIP_STD, "Radeon HD Tahiti"}, {0x6788, 6, 0, RADEON_TAHITI, CHIP_STD, "Radeon HD Tahiti"}, @@ -320,21 +313,27 @@ const struct supported_device { {0x679a, 6, 0, RADEON_TAHITI, CHIP_STD, "Radeon HD 7950"}, {0x6798, 6, 0, RADEON_TAHITI, CHIP_STD, "Radeon HD 7970"}, {0x6799, 6, 0, RADEON_TAHITI, CHIP_STD, "Radeon HD 7990"}, - // Oland DCE 6,4 (7xxx rebranded HD 8xxx) + // Aruba DCE 6.1 Trinity / Richland + // Oland DCE 6,4 + // Hainan NODCE. No display hardware, OpenCL 3D engine. - // Marketing Names: Radeon HD 83xx - HD 89xx // Introduced: Late 2013 // Codename: Sea Islands // Process: 28 nm - // Hainan NODCE. No display hardware, OpenCL 3D engine. - // Curacao DCE 8.0 + // Kaveri DCE 8.1 + // Bonaire DCE 8.2 + {0x6649, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, + {0x6650, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, + {0x6651, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, + {0x6658, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, + {0x665c, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD 7790"}, + {0x665d, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, + // Kabini DCE 8.3 - // Marketing Names: Radeon HD 9xxx - HD 9xxx // Introduced: 2014? // Codename: Volcanic Islands // Process: 20 nm - // Marketing Names: Radeon HD 9xxx - HD 9xxx // Introduced: 2015? // Codename: Pirate Islands // Process: ?? nm