[Mesa-dev] [PATCH] radeonsi: remove unused field in the PCI ID table

Alex Deucher alexdeucher at gmail.com
Tue Nov 7 15:54:49 UTC 2017


On Tue, Nov 7, 2017 at 9:28 AM, Marek Olšák <maraeo at gmail.com> wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
>  include/pci_ids/radeonsi_pci_ids.h                | 458 +++++++++++-----------
>  src/amd/common/ac_gpu_info.c                      |   2 +-
>  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c |   2 +-
>  src/loader/pci_id_driver_map.h                    |   2 +-
>  4 files changed, 232 insertions(+), 232 deletions(-)

Been wanting to do that for a while.

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>


>
> diff --git a/include/pci_ids/radeonsi_pci_ids.h b/include/pci_ids/radeonsi_pci_ids.h
> index 9453c1c..6a3594e 100644
> --- a/include/pci_ids/radeonsi_pci_ids.h
> +++ b/include/pci_ids/radeonsi_pci_ids.h
> @@ -1,229 +1,229 @@
> -CHIPSET(0x6780, TAHITI_6780, TAHITI)
> -CHIPSET(0x6784, TAHITI_6784, TAHITI)
> -CHIPSET(0x6788, TAHITI_6788, TAHITI)
> -CHIPSET(0x678A, TAHITI_678A, TAHITI)
> -CHIPSET(0x6790, TAHITI_6790, TAHITI)
> -CHIPSET(0x6791, TAHITI_6791, TAHITI)
> -CHIPSET(0x6792, TAHITI_6792, TAHITI)
> -CHIPSET(0x6798, TAHITI_6798, TAHITI)
> -CHIPSET(0x6799, TAHITI_6799, TAHITI)
> -CHIPSET(0x679A, TAHITI_679A, TAHITI)
> -CHIPSET(0x679B, TAHITI_679B, TAHITI)
> -CHIPSET(0x679E, TAHITI_679E, TAHITI)
> -CHIPSET(0x679F, TAHITI_679F, TAHITI)
> -
> -CHIPSET(0x6800, PITCAIRN_6800, PITCAIRN)
> -CHIPSET(0x6801, PITCAIRN_6801, PITCAIRN)
> -CHIPSET(0x6802, PITCAIRN_6802, PITCAIRN)
> -CHIPSET(0x6806, PITCAIRN_6806, PITCAIRN)
> -CHIPSET(0x6808, PITCAIRN_6808, PITCAIRN)
> -CHIPSET(0x6809, PITCAIRN_6809, PITCAIRN)
> -CHIPSET(0x6810, PITCAIRN_6810, PITCAIRN)
> -CHIPSET(0x6811, PITCAIRN_6811, PITCAIRN)
> -CHIPSET(0x6816, PITCAIRN_6816, PITCAIRN)
> -CHIPSET(0x6817, PITCAIRN_6817, PITCAIRN)
> -CHIPSET(0x6818, PITCAIRN_6818, PITCAIRN)
> -CHIPSET(0x6819, PITCAIRN_6819, PITCAIRN)
> -CHIPSET(0x684C, PITCAIRN_684C, PITCAIRN)
> -
> -CHIPSET(0x6820, VERDE_6820, VERDE)
> -CHIPSET(0x6821, VERDE_6821, VERDE)
> -CHIPSET(0x6822, VERDE_6822, VERDE)
> -CHIPSET(0x6823, VERDE_6823, VERDE)
> -CHIPSET(0x6824, VERDE_6824, VERDE)
> -CHIPSET(0x6825, VERDE_6825, VERDE)
> -CHIPSET(0x6826, VERDE_6826, VERDE)
> -CHIPSET(0x6827, VERDE_6827, VERDE)
> -CHIPSET(0x6828, VERDE_6828, VERDE)
> -CHIPSET(0x6829, VERDE_6829, VERDE)
> -CHIPSET(0x682A, VERDE_682A, VERDE)
> -CHIPSET(0x682B, VERDE_682B, VERDE)
> -CHIPSET(0x682C, VERDE_682C, VERDE)
> -CHIPSET(0x682D, VERDE_682D, VERDE)
> -CHIPSET(0x682F, VERDE_682F, VERDE)
> -CHIPSET(0x6830, VERDE_6830, VERDE)
> -CHIPSET(0x6831, VERDE_6831, VERDE)
> -CHIPSET(0x6835, VERDE_6835, VERDE)
> -CHIPSET(0x6837, VERDE_6837, VERDE)
> -CHIPSET(0x6838, VERDE_6838, VERDE)
> -CHIPSET(0x6839, VERDE_6839, VERDE)
> -CHIPSET(0x683B, VERDE_683B, VERDE)
> -CHIPSET(0x683D, VERDE_683D, VERDE)
> -CHIPSET(0x683F, VERDE_683F, VERDE)
> -
> -CHIPSET(0x6600, OLAND_6600, OLAND)
> -CHIPSET(0x6601, OLAND_6601, OLAND)
> -CHIPSET(0x6602, OLAND_6602, OLAND)
> -CHIPSET(0x6603, OLAND_6603, OLAND)
> -CHIPSET(0x6604, OLAND_6604, OLAND)
> -CHIPSET(0x6605, OLAND_6605, OLAND)
> -CHIPSET(0x6606, OLAND_6606, OLAND)
> -CHIPSET(0x6607, OLAND_6607, OLAND)
> -CHIPSET(0x6608, OLAND_6608, OLAND)
> -CHIPSET(0x6610, OLAND_6610, OLAND)
> -CHIPSET(0x6611, OLAND_6611, OLAND)
> -CHIPSET(0x6613, OLAND_6613, OLAND)
> -CHIPSET(0x6617, OLAND_6617, OLAND)
> -CHIPSET(0x6620, OLAND_6620, OLAND)
> -CHIPSET(0x6621, OLAND_6621, OLAND)
> -CHIPSET(0x6623, OLAND_6623, OLAND)
> -CHIPSET(0x6631, OLAND_6631, OLAND)
> -
> -CHIPSET(0x6660, HAINAN_6660, HAINAN)
> -CHIPSET(0x6663, HAINAN_6663, HAINAN)
> -CHIPSET(0x6664, HAINAN_6664, HAINAN)
> -CHIPSET(0x6665, HAINAN_6665, HAINAN)
> -CHIPSET(0x6667, HAINAN_6667, HAINAN)
> -CHIPSET(0x666F, HAINAN_666F, HAINAN)
> -
> -CHIPSET(0x6640, BONAIRE_6640, BONAIRE)
> -CHIPSET(0x6641, BONAIRE_6641, BONAIRE)
> -CHIPSET(0x6646, BONAIRE_6646, BONAIRE)
> -CHIPSET(0x6647, BONAIRE_6647, BONAIRE)
> -CHIPSET(0x6649, BONAIRE_6649, BONAIRE)
> -CHIPSET(0x6650, BONAIRE_6650, BONAIRE)
> -CHIPSET(0x6651, BONAIRE_6651, BONAIRE)
> -CHIPSET(0x6658, BONAIRE_6658, BONAIRE)
> -CHIPSET(0x665C, BONAIRE_665C, BONAIRE)
> -CHIPSET(0x665D, BONAIRE_665D, BONAIRE)
> -CHIPSET(0x665F, BONAIRE_665F, BONAIRE)
> -
> -CHIPSET(0x9830, KABINI_9830, KABINI)
> -CHIPSET(0x9831, KABINI_9831, KABINI)
> -CHIPSET(0x9832, KABINI_9832, KABINI)
> -CHIPSET(0x9833, KABINI_9833, KABINI)
> -CHIPSET(0x9834, KABINI_9834, KABINI)
> -CHIPSET(0x9835, KABINI_9835, KABINI)
> -CHIPSET(0x9836, KABINI_9836, KABINI)
> -CHIPSET(0x9837, KABINI_9837, KABINI)
> -CHIPSET(0x9838, KABINI_9838, KABINI)
> -CHIPSET(0x9839, KABINI_9839, KABINI)
> -CHIPSET(0x983A, KABINI_983A, KABINI)
> -CHIPSET(0x983B, KABINI_983B, KABINI)
> -CHIPSET(0x983C, KABINI_983C, KABINI)
> -CHIPSET(0x983D, KABINI_983D, KABINI)
> -CHIPSET(0x983E, KABINI_983E, KABINI)
> -CHIPSET(0x983F, KABINI_983F, KABINI)
> -
> -CHIPSET(0x9850, MULLINS_9850, MULLINS)
> -CHIPSET(0x9851, MULLINS_9851, MULLINS)
> -CHIPSET(0x9852, MULLINS_9852, MULLINS)
> -CHIPSET(0x9853, MULLINS_9853, MULLINS)
> -CHIPSET(0x9854, MULLINS_9854, MULLINS)
> -CHIPSET(0x9855, MULLINS_9855, MULLINS)
> -CHIPSET(0x9856, MULLINS_9856, MULLINS)
> -CHIPSET(0x9857, MULLINS_9857, MULLINS)
> -CHIPSET(0x9858, MULLINS_9858, MULLINS)
> -CHIPSET(0x9859, MULLINS_9859, MULLINS)
> -CHIPSET(0x985A, MULLINS_985A, MULLINS)
> -CHIPSET(0x985B, MULLINS_985B, MULLINS)
> -CHIPSET(0x985C, MULLINS_985C, MULLINS)
> -CHIPSET(0x985D, MULLINS_985D, MULLINS)
> -CHIPSET(0x985E, MULLINS_985E, MULLINS)
> -CHIPSET(0x985F, MULLINS_985F, MULLINS)
> -
> -CHIPSET(0x1304, KAVERI_1304, KAVERI)
> -CHIPSET(0x1305, KAVERI_1305, KAVERI)
> -CHIPSET(0x1306, KAVERI_1306, KAVERI)
> -CHIPSET(0x1307, KAVERI_1307, KAVERI)
> -CHIPSET(0x1309, KAVERI_1309, KAVERI)
> -CHIPSET(0x130A, KAVERI_130A, KAVERI)
> -CHIPSET(0x130B, KAVERI_130B, KAVERI)
> -CHIPSET(0x130C, KAVERI_130C, KAVERI)
> -CHIPSET(0x130D, KAVERI_130D, KAVERI)
> -CHIPSET(0x130E, KAVERI_130E, KAVERI)
> -CHIPSET(0x130F, KAVERI_130F, KAVERI)
> -CHIPSET(0x1310, KAVERI_1310, KAVERI)
> -CHIPSET(0x1311, KAVERI_1311, KAVERI)
> -CHIPSET(0x1312, KAVERI_1312, KAVERI)
> -CHIPSET(0x1313, KAVERI_1313, KAVERI)
> -CHIPSET(0x1315, KAVERI_1315, KAVERI)
> -CHIPSET(0x1316, KAVERI_1316, KAVERI)
> -CHIPSET(0x1317, KAVERI_1317, KAVERI)
> -CHIPSET(0x1318, KAVERI_1318, KAVERI)
> -CHIPSET(0x131B, KAVERI_131B, KAVERI)
> -CHIPSET(0x131C, KAVERI_131C, KAVERI)
> -CHIPSET(0x131D, KAVERI_131D, KAVERI)
> -
> -CHIPSET(0x67A0, HAWAII_67A0, HAWAII)
> -CHIPSET(0x67A1, HAWAII_67A1, HAWAII)
> -CHIPSET(0x67A2, HAWAII_67A2, HAWAII)
> -CHIPSET(0x67A8, HAWAII_67A8, HAWAII)
> -CHIPSET(0x67A9, HAWAII_67A9, HAWAII)
> -CHIPSET(0x67AA, HAWAII_67AA, HAWAII)
> -CHIPSET(0x67B0, HAWAII_67B0, HAWAII)
> -CHIPSET(0x67B1, HAWAII_67B1, HAWAII)
> -CHIPSET(0x67B8, HAWAII_67B8, HAWAII)
> -CHIPSET(0x67B9, HAWAII_67B9, HAWAII)
> -CHIPSET(0x67BA, HAWAII_67BA, HAWAII)
> -CHIPSET(0x67BE, HAWAII_67BE, HAWAII)
> -
> -CHIPSET(0x6900, ICELAND_, ICELAND)
> -CHIPSET(0x6901, ICELAND_, ICELAND)
> -CHIPSET(0x6902, ICELAND_, ICELAND)
> -CHIPSET(0x6903, ICELAND_, ICELAND)
> -CHIPSET(0x6907, ICELAND_, ICELAND)
> -
> -CHIPSET(0x6920, TONGA_, TONGA)
> -CHIPSET(0x6921, TONGA_, TONGA)
> -CHIPSET(0x6928, TONGA_, TONGA)
> -CHIPSET(0x6929, TONGA_, TONGA)
> -CHIPSET(0x692B, TONGA_, TONGA)
> -CHIPSET(0x692F, TONGA_, TONGA)
> -CHIPSET(0x6930, TONGA_, TONGA)
> -CHIPSET(0x6938, TONGA_, TONGA)
> -CHIPSET(0x6939, TONGA_, TONGA)
> -
> -CHIPSET(0x9870, CARRIZO_, CARRIZO)
> -CHIPSET(0x9874, CARRIZO_, CARRIZO)
> -CHIPSET(0x9875, CARRIZO_, CARRIZO)
> -CHIPSET(0x9876, CARRIZO_, CARRIZO)
> -CHIPSET(0x9877, CARRIZO_, CARRIZO)
> -
> -CHIPSET(0x7300, FIJI_, FIJI)
> -
> -CHIPSET(0x67E0, POLARIS11_, POLARIS11)
> -CHIPSET(0x67E1, POLARIS11_, POLARIS11)
> -CHIPSET(0x67E3, POLARIS11_, POLARIS11)
> -CHIPSET(0x67E7, POLARIS11_, POLARIS11)
> -CHIPSET(0x67E8, POLARIS11_, POLARIS11)
> -CHIPSET(0x67E9, POLARIS11_, POLARIS11)
> -CHIPSET(0x67EB, POLARIS11_, POLARIS11)
> -CHIPSET(0x67EF, POLARIS11_, POLARIS11)
> -CHIPSET(0x67FF, POLARIS11_, POLARIS11)
> -
> -CHIPSET(0x67C0, POLARIS10_, POLARIS10)
> -CHIPSET(0x67C1, POLARIS10_, POLARIS10)
> -CHIPSET(0x67C2, POLARIS10_, POLARIS10)
> -CHIPSET(0x67C4, POLARIS10_, POLARIS10)
> -CHIPSET(0x67C7, POLARIS10_, POLARIS10)
> -CHIPSET(0x67C8, POLARIS10_, POLARIS10)
> -CHIPSET(0x67C9, POLARIS10_, POLARIS10)
> -CHIPSET(0x67CA, POLARIS10_, POLARIS10)
> -CHIPSET(0x67CC, POLARIS10_, POLARIS10)
> -CHIPSET(0x67CF, POLARIS10_, POLARIS10)
> -CHIPSET(0x67D0, POLARIS10_, POLARIS10)
> -CHIPSET(0x67DF, POLARIS10_, POLARIS10)
> -
> -CHIPSET(0x98E4, STONEY_, STONEY)
> -
> -CHIPSET(0x6980, POLARIS12_, POLARIS12)
> -CHIPSET(0x6981, POLARIS12_, POLARIS12)
> -CHIPSET(0x6985, POLARIS12_, POLARIS12)
> -CHIPSET(0x6986, POLARIS12_, POLARIS12)
> -CHIPSET(0x6987, POLARIS12_, POLARIS12)
> -CHIPSET(0x6995, POLARIS12_, POLARIS12)
> -CHIPSET(0x6997, POLARIS12_, POLARIS12)
> -CHIPSET(0x699F, POLARIS12_, POLARIS12)
> -
> -CHIPSET(0x6860, VEGA10_, VEGA10)
> -CHIPSET(0x6861, VEGA10_, VEGA10)
> -CHIPSET(0x6862, VEGA10_, VEGA10)
> -CHIPSET(0x6863, VEGA10_, VEGA10)
> -CHIPSET(0x6864, VEGA10_, VEGA10)
> -CHIPSET(0x6867, VEGA10_, VEGA10)
> -CHIPSET(0x6868, VEGA10_, VEGA10)
> -CHIPSET(0x687F, VEGA10_, VEGA10)
> -CHIPSET(0x686C, VEGA10_, VEGA10)
> -
> -CHIPSET(0x15DD, RAVEN_, RAVEN)
> +CHIPSET(0x6780, TAHITI)
> +CHIPSET(0x6784, TAHITI)
> +CHIPSET(0x6788, TAHITI)
> +CHIPSET(0x678A, TAHITI)
> +CHIPSET(0x6790, TAHITI)
> +CHIPSET(0x6791, TAHITI)
> +CHIPSET(0x6792, TAHITI)
> +CHIPSET(0x6798, TAHITI)
> +CHIPSET(0x6799, TAHITI)
> +CHIPSET(0x679A, TAHITI)
> +CHIPSET(0x679B, TAHITI)
> +CHIPSET(0x679E, TAHITI)
> +CHIPSET(0x679F, TAHITI)
> +
> +CHIPSET(0x6800, PITCAIRN)
> +CHIPSET(0x6801, PITCAIRN)
> +CHIPSET(0x6802, PITCAIRN)
> +CHIPSET(0x6806, PITCAIRN)
> +CHIPSET(0x6808, PITCAIRN)
> +CHIPSET(0x6809, PITCAIRN)
> +CHIPSET(0x6810, PITCAIRN)
> +CHIPSET(0x6811, PITCAIRN)
> +CHIPSET(0x6816, PITCAIRN)
> +CHIPSET(0x6817, PITCAIRN)
> +CHIPSET(0x6818, PITCAIRN)
> +CHIPSET(0x6819, PITCAIRN)
> +CHIPSET(0x684C, PITCAIRN)
> +
> +CHIPSET(0x6820, VERDE)
> +CHIPSET(0x6821, VERDE)
> +CHIPSET(0x6822, VERDE)
> +CHIPSET(0x6823, VERDE)
> +CHIPSET(0x6824, VERDE)
> +CHIPSET(0x6825, VERDE)
> +CHIPSET(0x6826, VERDE)
> +CHIPSET(0x6827, VERDE)
> +CHIPSET(0x6828, VERDE)
> +CHIPSET(0x6829, VERDE)
> +CHIPSET(0x682A, VERDE)
> +CHIPSET(0x682B, VERDE)
> +CHIPSET(0x682C, VERDE)
> +CHIPSET(0x682D, VERDE)
> +CHIPSET(0x682F, VERDE)
> +CHIPSET(0x6830, VERDE)
> +CHIPSET(0x6831, VERDE)
> +CHIPSET(0x6835, VERDE)
> +CHIPSET(0x6837, VERDE)
> +CHIPSET(0x6838, VERDE)
> +CHIPSET(0x6839, VERDE)
> +CHIPSET(0x683B, VERDE)
> +CHIPSET(0x683D, VERDE)
> +CHIPSET(0x683F, VERDE)
> +
> +CHIPSET(0x6600, OLAND)
> +CHIPSET(0x6601, OLAND)
> +CHIPSET(0x6602, OLAND)
> +CHIPSET(0x6603, OLAND)
> +CHIPSET(0x6604, OLAND)
> +CHIPSET(0x6605, OLAND)
> +CHIPSET(0x6606, OLAND)
> +CHIPSET(0x6607, OLAND)
> +CHIPSET(0x6608, OLAND)
> +CHIPSET(0x6610, OLAND)
> +CHIPSET(0x6611, OLAND)
> +CHIPSET(0x6613, OLAND)
> +CHIPSET(0x6617, OLAND)
> +CHIPSET(0x6620, OLAND)
> +CHIPSET(0x6621, OLAND)
> +CHIPSET(0x6623, OLAND)
> +CHIPSET(0x6631, OLAND)
> +
> +CHIPSET(0x6660, HAINAN)
> +CHIPSET(0x6663, HAINAN)
> +CHIPSET(0x6664, HAINAN)
> +CHIPSET(0x6665, HAINAN)
> +CHIPSET(0x6667, HAINAN)
> +CHIPSET(0x666F, HAINAN)
> +
> +CHIPSET(0x6640, BONAIRE)
> +CHIPSET(0x6641, BONAIRE)
> +CHIPSET(0x6646, BONAIRE)
> +CHIPSET(0x6647, BONAIRE)
> +CHIPSET(0x6649, BONAIRE)
> +CHIPSET(0x6650, BONAIRE)
> +CHIPSET(0x6651, BONAIRE)
> +CHIPSET(0x6658, BONAIRE)
> +CHIPSET(0x665C, BONAIRE)
> +CHIPSET(0x665D, BONAIRE)
> +CHIPSET(0x665F, BONAIRE)
> +
> +CHIPSET(0x9830, KABINI)
> +CHIPSET(0x9831, KABINI)
> +CHIPSET(0x9832, KABINI)
> +CHIPSET(0x9833, KABINI)
> +CHIPSET(0x9834, KABINI)
> +CHIPSET(0x9835, KABINI)
> +CHIPSET(0x9836, KABINI)
> +CHIPSET(0x9837, KABINI)
> +CHIPSET(0x9838, KABINI)
> +CHIPSET(0x9839, KABINI)
> +CHIPSET(0x983A, KABINI)
> +CHIPSET(0x983B, KABINI)
> +CHIPSET(0x983C, KABINI)
> +CHIPSET(0x983D, KABINI)
> +CHIPSET(0x983E, KABINI)
> +CHIPSET(0x983F, KABINI)
> +
> +CHIPSET(0x9850, MULLINS)
> +CHIPSET(0x9851, MULLINS)
> +CHIPSET(0x9852, MULLINS)
> +CHIPSET(0x9853, MULLINS)
> +CHIPSET(0x9854, MULLINS)
> +CHIPSET(0x9855, MULLINS)
> +CHIPSET(0x9856, MULLINS)
> +CHIPSET(0x9857, MULLINS)
> +CHIPSET(0x9858, MULLINS)
> +CHIPSET(0x9859, MULLINS)
> +CHIPSET(0x985A, MULLINS)
> +CHIPSET(0x985B, MULLINS)
> +CHIPSET(0x985C, MULLINS)
> +CHIPSET(0x985D, MULLINS)
> +CHIPSET(0x985E, MULLINS)
> +CHIPSET(0x985F, MULLINS)
> +
> +CHIPSET(0x1304, KAVERI)
> +CHIPSET(0x1305, KAVERI)
> +CHIPSET(0x1306, KAVERI)
> +CHIPSET(0x1307, KAVERI)
> +CHIPSET(0x1309, KAVERI)
> +CHIPSET(0x130A, KAVERI)
> +CHIPSET(0x130B, KAVERI)
> +CHIPSET(0x130C, KAVERI)
> +CHIPSET(0x130D, KAVERI)
> +CHIPSET(0x130E, KAVERI)
> +CHIPSET(0x130F, KAVERI)
> +CHIPSET(0x1310, KAVERI)
> +CHIPSET(0x1311, KAVERI)
> +CHIPSET(0x1312, KAVERI)
> +CHIPSET(0x1313, KAVERI)
> +CHIPSET(0x1315, KAVERI)
> +CHIPSET(0x1316, KAVERI)
> +CHIPSET(0x1317, KAVERI)
> +CHIPSET(0x1318, KAVERI)
> +CHIPSET(0x131B, KAVERI)
> +CHIPSET(0x131C, KAVERI)
> +CHIPSET(0x131D, KAVERI)
> +
> +CHIPSET(0x67A0, HAWAII)
> +CHIPSET(0x67A1, HAWAII)
> +CHIPSET(0x67A2, HAWAII)
> +CHIPSET(0x67A8, HAWAII)
> +CHIPSET(0x67A9, HAWAII)
> +CHIPSET(0x67AA, HAWAII)
> +CHIPSET(0x67B0, HAWAII)
> +CHIPSET(0x67B1, HAWAII)
> +CHIPSET(0x67B8, HAWAII)
> +CHIPSET(0x67B9, HAWAII)
> +CHIPSET(0x67BA, HAWAII)
> +CHIPSET(0x67BE, HAWAII)
> +
> +CHIPSET(0x6900, ICELAND)
> +CHIPSET(0x6901, ICELAND)
> +CHIPSET(0x6902, ICELAND)
> +CHIPSET(0x6903, ICELAND)
> +CHIPSET(0x6907, ICELAND)
> +
> +CHIPSET(0x6920, TONGA)
> +CHIPSET(0x6921, TONGA)
> +CHIPSET(0x6928, TONGA)
> +CHIPSET(0x6929, TONGA)
> +CHIPSET(0x692B, TONGA)
> +CHIPSET(0x692F, TONGA)
> +CHIPSET(0x6930, TONGA)
> +CHIPSET(0x6938, TONGA)
> +CHIPSET(0x6939, TONGA)
> +
> +CHIPSET(0x9870, CARRIZO)
> +CHIPSET(0x9874, CARRIZO)
> +CHIPSET(0x9875, CARRIZO)
> +CHIPSET(0x9876, CARRIZO)
> +CHIPSET(0x9877, CARRIZO)
> +
> +CHIPSET(0x7300, FIJI)
> +
> +CHIPSET(0x67E0, POLARIS11)
> +CHIPSET(0x67E1, POLARIS11)
> +CHIPSET(0x67E3, POLARIS11)
> +CHIPSET(0x67E7, POLARIS11)
> +CHIPSET(0x67E8, POLARIS11)
> +CHIPSET(0x67E9, POLARIS11)
> +CHIPSET(0x67EB, POLARIS11)
> +CHIPSET(0x67EF, POLARIS11)
> +CHIPSET(0x67FF, POLARIS11)
> +
> +CHIPSET(0x67C0, POLARIS10)
> +CHIPSET(0x67C1, POLARIS10)
> +CHIPSET(0x67C2, POLARIS10)
> +CHIPSET(0x67C4, POLARIS10)
> +CHIPSET(0x67C7, POLARIS10)
> +CHIPSET(0x67C8, POLARIS10)
> +CHIPSET(0x67C9, POLARIS10)
> +CHIPSET(0x67CA, POLARIS10)
> +CHIPSET(0x67CC, POLARIS10)
> +CHIPSET(0x67CF, POLARIS10)
> +CHIPSET(0x67D0, POLARIS10)
> +CHIPSET(0x67DF, POLARIS10)
> +
> +CHIPSET(0x98E4, STONEY)
> +
> +CHIPSET(0x6980, POLARIS12)
> +CHIPSET(0x6981, POLARIS12)
> +CHIPSET(0x6985, POLARIS12)
> +CHIPSET(0x6986, POLARIS12)
> +CHIPSET(0x6987, POLARIS12)
> +CHIPSET(0x6995, POLARIS12)
> +CHIPSET(0x6997, POLARIS12)
> +CHIPSET(0x699F, POLARIS12)
> +
> +CHIPSET(0x6860, VEGA10)
> +CHIPSET(0x6861, VEGA10)
> +CHIPSET(0x6862, VEGA10)
> +CHIPSET(0x6863, VEGA10)
> +CHIPSET(0x6864, VEGA10)
> +CHIPSET(0x6867, VEGA10)
> +CHIPSET(0x6868, VEGA10)
> +CHIPSET(0x687F, VEGA10)
> +CHIPSET(0x686C, VEGA10)
> +
> +CHIPSET(0x15DD, RAVEN)
> diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
> index 2e56012..6c4630f 100644
> --- a/src/amd/common/ac_gpu_info.c
> +++ b/src/amd/common/ac_gpu_info.c
> @@ -216,21 +216,21 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
>         if (r) {
>                 fprintf(stderr, "amdgpu: amdgpu_query_firmware_version(vce) failed.\n");
>                 return false;
>         }
>
>         /* Set chip identification. */
>         info->pci_id = amdinfo->asic_id; /* TODO: is this correct? */
>         info->vce_harvest_config = amdinfo->vce_harvest_config;
>
>         switch (info->pci_id) {
> -#define CHIPSET(pci_id, name, cfamily) case pci_id: info->family = CHIP_##cfamily; break;
> +#define CHIPSET(pci_id, cfamily) case pci_id: info->family = CHIP_##cfamily; break;
>  #include "pci_ids/radeonsi_pci_ids.h"
>  #undef CHIPSET
>
>         default:
>                 fprintf(stderr, "amdgpu: Invalid PCI ID.\n");
>                 return false;
>         }
>
>         if (info->family >= CHIP_VEGA10)
>                 info->chip_class = GFX9;
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> index d612d9a..e600199 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> @@ -175,21 +175,21 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
>      /* Check PCI ID. */
>      switch (ws->info.pci_id) {
>  #define CHIPSET(pci_id, name, cfamily) case pci_id: ws->info.family = CHIP_##cfamily; ws->gen = DRV_R300; break;
>  #include "pci_ids/r300_pci_ids.h"
>  #undef CHIPSET
>
>  #define CHIPSET(pci_id, name, cfamily) case pci_id: ws->info.family = CHIP_##cfamily; ws->gen = DRV_R600; break;
>  #include "pci_ids/r600_pci_ids.h"
>  #undef CHIPSET
>
> -#define CHIPSET(pci_id, name, cfamily) case pci_id: ws->info.family = CHIP_##cfamily; ws->gen = DRV_SI; break;
> +#define CHIPSET(pci_id, cfamily) case pci_id: ws->info.family = CHIP_##cfamily; ws->gen = DRV_SI; break;
>  #include "pci_ids/radeonsi_pci_ids.h"
>  #undef CHIPSET
>
>      default:
>          fprintf(stderr, "radeon: Invalid PCI ID.\n");
>          return false;
>      }
>
>      switch (ws->info.family) {
>      default:
> diff --git a/src/loader/pci_id_driver_map.h b/src/loader/pci_id_driver_map.h
> index 343fc34..c582aae 100644
> --- a/src/loader/pci_id_driver_map.h
> +++ b/src/loader/pci_id_driver_map.h
> @@ -41,21 +41,21 @@ static const int r300_chip_ids[] = {
>  #undef CHIPSET
>  };
>
>  static const int r600_chip_ids[] = {
>  #define CHIPSET(chip, name, family) chip,
>  #include "pci_ids/r600_pci_ids.h"
>  #undef CHIPSET
>  };
>
>  static const int radeonsi_chip_ids[] = {
> -#define CHIPSET(chip, name, family) chip,
> +#define CHIPSET(chip, family) chip,
>  #include "pci_ids/radeonsi_pci_ids.h"
>  #undef CHIPSET
>  };
>
>  static const int virtio_gpu_chip_ids[] = {
>  #define CHIPSET(chip, name, family) chip,
>  #include "pci_ids/virtio_gpu_pci_ids.h"
>  #undef CHIPSET
>  };
>
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list