From be587ecfe0a003f5f898b1cdb20ea17e8acefa84 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 4 Mar 2016 17:12:08 -0600 Subject: [PATCH] radeon_hd: Clean up PCI ID names and add a few missing --- .../drivers/graphics/radeon_hd/driver.cpp | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) 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 2f2df49c7e..dec0630c6c 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp @@ -1,6 +1,6 @@ /* * Copyright (c) 2002, Thomas Kurschel - * Copyright 2004-2011 Haiku, Inc. All rights reserved. + * Copyright 2004-2016 Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -293,7 +293,7 @@ const struct supported_device { {0x682f, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x6830, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x6831, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, - {0x6835, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, + {0x6835, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon R7 Series"}, {0x6837, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x6838, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, {0x6839, 6, 0, RADEON_CAPEVERDE, CHIP_STD, "Radeon HD Verde"}, @@ -366,20 +366,24 @@ const struct supported_device { // Oland DCE 6,4 {0x990c, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD 8670"}, {0x990e, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD 8570"}, - {0x6600, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6601, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6602, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6603, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6606, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6607, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6610, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD R7 250"}, + {0x6600, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon HD 8750M"}, + {0x6601, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon HD 8730M"}, + {0x6602, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon HD Oland"}, + {0x6603, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon HD Oland"}, + {0x6604, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon R7 M270"}, + {0x6605, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon R7 M260"}, + {0x6606, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon HD Oland"}, + {0x6607, 6, 4, RADEON_OLAND, CHIP_MOBILE, "Radeon HD Oland"}, + {0x6608, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, + {0x6610, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon R7 250"}, {0x6611, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, - {0x6613, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD R7 240"}, - {0x6620, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD R7 240"}, + {0x6613, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon R7 240"}, + {0x6620, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon R7 240"}, {0x6621, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, {0x6623, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, {0x6631, 6, 4, RADEON_OLAND, CHIP_STD, "Radeon HD Oland"}, // Hainan NODCE. No display hardware, OpenCL 3D engine. + //{0x6670, 0, 0, RADEON_HAINAN, CHIP_COM, "Radeon HD Hainan compute"}, // Introduced: Late 2013 // Codename: Sea Islands @@ -390,27 +394,28 @@ const struct supported_device { {0x1306, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, {0x1307, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, {0x1308, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x1309, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x130a, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x130b, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x130c, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x130d, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x130e, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x130f, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, + {0x1309, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R6/R7 Series"}, + {0x130a, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R5/R6 Series"}, + {0x130b, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R4 Series"}, + {0x130c, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R7 Series"}, + {0x130d, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R6 Series"}, + {0x130e, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R5 Series"}, + {0x130f, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R7 Series"}, {0x1310, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, {0x1311, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, {0x1312, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x1313, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, + {0x1313, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R7 Series"}, {0x1314, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x1315, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x1316, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, + {0x1315, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R5 Series"}, + {0x1316, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R5 Series"}, {0x1317, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x131b, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x131c, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, - {0x131d, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, + {0x1318, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon HD Kaveri"}, + {0x131b, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R5 Series"}, + {0x131c, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R7 Series"}, + {0x131d, 8, 1, RADEON_KAVERI, CHIP_STD, "Radeon R6 Series"}, // Bonaire DCE 8.2 - {0x6640, 8, 2, RADEON_BONAIRE, CHIP_MOBILE, "Radeon HD Bonaire"}, - {0x6641, 8, 2, RADEON_BONAIRE, CHIP_MOBILE, "Radeon HD Bonaire"}, + {0x6640, 8, 2, RADEON_BONAIRE, CHIP_MOBILE, "Radeon HD 8950"}, + {0x6641, 8, 2, RADEON_BONAIRE, CHIP_MOBILE, "Radeon HD 8930M"}, {0x6646, 8, 2, RADEON_BONAIRE, CHIP_MOBILE, "Radeon HD Bonaire"}, {0x6647, 8, 2, RADEON_BONAIRE, CHIP_MOBILE, "Radeon HD Bonaire"}, {0x6649, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, @@ -418,7 +423,7 @@ const struct supported_device { {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"}, + {0x665d, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon R7 200"}, {0x665f, 8, 2, RADEON_BONAIRE, CHIP_STD, "Radeon HD Bonaire"}, // Kabini DCE 8.3 {0x9830, 8, 3, RADEON_KABINI, CHIP_STD, "Radeon HD 8400"},