diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2015-04-19 14:17:51 +0800 |
|---|---|---|
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | 2015-04-19 14:17:51 +0800 |
| commit | 7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5 (patch) | |
| tree | d008a2a75a361d653e491578cd89c2e64aa481d5 /pci_ids | |
| parent | 68a74eb31f139ad285a49451cf2ca8271c54f9bb (diff) | |
| parent | dc21193e3252ba2d6526546ba1d0c02116baf3ee (diff) | |
| download | external_drm_gralloc-7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5.zip external_drm_gralloc-7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5.tar.gz external_drm_gralloc-7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5.tar.bz2 | |
Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86
Diffstat (limited to 'pci_ids')
| -rw-r--r-- | pci_ids/pci_id_driver_map.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pci_ids/pci_id_driver_map.h b/pci_ids/pci_id_driver_map.h index c3eec14..b89414a 100644 --- a/pci_ids/pci_id_driver_map.h +++ b/pci_ids/pci_id_driver_map.h @@ -53,6 +53,12 @@ static const int r600_chip_ids[] = { #undef CHIPSET }; +static const int radeonsi_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/radeonsi_pci_ids.h" +#undef CHIPSET +}; + static const int vmwgfx_chip_ids[] = { #define CHIPSET(chip, name, family) chip, #include "pci_ids/vmwgfx_pci_ids.h" @@ -76,6 +82,7 @@ static const struct { #endif { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) }, { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, + { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, { 0x10de, "nouveau", NULL, -1 }, { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, { 0x0000, NULL, NULL, 0 }, |