Download raw body.
Use amdgpu for SI and CIK chipsets
The current amdgpu code includes code to use amdgpu with older AMD
chipsets in the SI (Southern Islands / GCN1.0+) [1] and CIK (Sea Islands
/ GCN2.x) [2] family. This code is currently disabled, and these chipset
families instead are handled by the radeon/radeonfb driver in the kernel
and radeon driver in Xenocara.
In Linux, this code can be activated at runtime with a loadable module
flag, which has been available for quite a while. In OpenBSD, this works
a little differently. The chipsets which use radeon/radeonfb vs amdgpu
are controlled essentially by which PCI IDs are present in
radeon_PCI_IDS in the header sys/dev/pci/drm/include/drm/drm_pciids.h
If a PCI ID is present in radeon_PCI_IDS, it will be handled by
radeon/radeonfb. If not, and if the chipset family is supported by
amdgpu, amdgpu instead will load.
The attached patch removes all PCI IDs for chipset families supported by
the SI/CIK support code in AMDGPU, and enables the building of SI/CIK
support in the amdgpu kernel code.
I have limited hardware to test on, but I have tested on my Bonaire/CIK
family AMD FirePro W5100, and not only has it been stable during OpenGL,
accelerated video and general Xenocara usage, the performance and
stability seems improved over radeon/radeonfb.
Note: not all SI and CIK family GPUs, APUs and mobile processors appear
to be supported by the code, however all of the ones currently handled
by radeon/radeonfb which are supported by amdgpu's SI and CIK support
have had their PCI IDs migrated in this patch. It would be great if
anyone with a card in these families could help with testing. It should
just be a matter of applying the patch, rebuilding, making sure amdgpu
firmware is installed (with fw_update amd_gpu) and switching your
xenocara configuration to use amdgpu (if you have manual "Device"
sections) prior to rebooting.
This patch also updates the patterns needed to install the correct amdgpu
firmware for these cards.
[1] https://en.wikipedia.org/wiki/Radeon_HD_7000_series
[2] https://en.wikipedia.org/wiki/Radeon_HD_8000_series
Index: dev/pci/drm/files.drm
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/files.drm,v
diff -u -p -u -p -r1.63 files.drm
--- dev/pci/drm/files.drm 11 Apr 2024 03:40:05 -0000 1.63
+++ dev/pci/drm/files.drm 27 Dec 2024 21:32:50 -0000
@@ -632,7 +632,7 @@ file dev/pci/drm/amd/amdgpu/amdgpu_vce_v
file dev/pci/drm/amd/pm/legacy-dpm/amdgpu_kv_dpm.c amdgpu_cik
file dev/pci/drm/amd/pm/legacy-dpm/amdgpu_kv_smc.c amdgpu_cik
-device amdgpu: drmbase, ttm, wsemuldisplaydev, rasops8, rasops32, firmload, i2cbus, i2c_bitbang, drm_sched
+device amdgpu: drmbase, ttm, wsemuldisplaydev, rasops8, rasops32, firmload, i2cbus, i2c_bitbang, drm_sched, amdgpu_si, amd_dc_si, amdgpu_cik
attach amdgpu at pci
#file dev/pci/drm/amd/acp/acp_hw.c amdgpu
file dev/pci/drm/amd/amdgpu/aldebaran.c amdgpu
Index: dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h,v
diff -u -p -u -p -r1.27 amdgpu_devlist.h
--- dev/pci/drm/amd/amdgpu/amdgpu_devlist.h 15 Nov 2024 04:26:33 -0000 1.27
+++ dev/pci/drm/amd/amdgpu/amdgpu_devlist.h 27 Dec 2024 21:32:50 -0000
@@ -1,4 +1,164 @@
static const struct pci_matchid amdgpu_devices[] = {
+ /* kaveri */
+ {0x1002, 0x1304 },
+ {0x1002, 0x1305 },
+ {0x1002, 0x1306 },
+ {0x1002, 0x1307 },
+ {0x1002, 0x1309 },
+ {0x1002, 0x130A },
+ {0x1002, 0x130B },
+ {0x1002, 0x130C },
+ {0x1002, 0x130D },
+ {0x1002, 0x130E },
+ {0x1002, 0x130F },
+ {0x1002, 0x1310 },
+ {0x1002, 0x1311 },
+ {0x1002, 0x1312 },
+ {0x1002, 0x1313 },
+ {0x1002, 0x1315 },
+ {0x1002, 0x1316 },
+ {0x1002, 0x1317 },
+ {0x1002, 0x1318 },
+ {0x1002, 0x131B },
+ {0x1002, 0x131C },
+ {0x1002, 0x131D },
+ /* oland */
+ {0x1002, 0x6600 },
+ {0x1002, 0x6601 },
+ {0x1002, 0x6602 },
+ {0x1002, 0x6603 },
+ {0x1002, 0x6604 },
+ {0x1002, 0x6605 },
+ {0x1002, 0x6606 },
+ {0x1002, 0x6607 },
+ {0x1002, 0x6608 },
+ {0x1002, 0x6610 },
+ {0x1002, 0x6611 },
+ {0x1002, 0x6613 },
+ {0x1002, 0x6617 },
+ {0x1002, 0x6620 },
+ {0x1002, 0x6621 },
+ {0x1002, 0x6623 },
+ {0x1002, 0x6631 },
+ /* bonaire */
+ {0x1002, 0x6640 },
+ {0x1002, 0x6641 },
+ {0x1002, 0x6646 },
+ {0x1002, 0x6647 },
+ {0x1002, 0x6649 },
+ {0x1002, 0x6650 },
+ {0x1002, 0x6651 },
+ {0x1002, 0x6658 },
+ {0x1002, 0x665c },
+ {0x1002, 0x665d },
+ {0x1002, 0x665f },
+ /* hainan */
+ {0x1002, 0x6660 },
+ {0x1002, 0x6663 },
+ {0x1002, 0x6664 },
+ {0x1002, 0x6665 },
+ {0x1002, 0x6667 },
+ {0x1002, 0x666F },
+ /* tahiti */
+ {0x1002, 0x6780 },
+ {0x1002, 0x6784 },
+ {0x1002, 0x6788 },
+ {0x1002, 0x678A },
+ {0x1002, 0x6790 },
+ {0x1002, 0x6791 },
+ {0x1002, 0x6792 },
+ {0x1002, 0x6798 },
+ {0x1002, 0x6799 },
+ {0x1002, 0x679A },
+ {0x1002, 0x679B },
+ {0x1002, 0x679E },
+ {0x1002, 0x679F },
+ /* hawaii */
+ {0x1002, 0x67A0 },
+ {0x1002, 0x67A1 },
+ {0x1002, 0x67A2 },
+ {0x1002, 0x67A8 },
+ {0x1002, 0x67A9 },
+ {0x1002, 0x67AA },
+ {0x1002, 0x67B0 },
+ {0x1002, 0x67B1 },
+ {0x1002, 0x67B8 },
+ {0x1002, 0x67B9 },
+ {0x1002, 0x67BA },
+ {0x1002, 0x67BE },
+ /* pitcairn */
+ {0x1002, 0x6800 },
+ {0x1002, 0x6801 },
+ {0x1002, 0x6802 },
+ {0x1002, 0x6806 },
+ {0x1002, 0x6808 },
+ {0x1002, 0x6809 },
+ {0x1002, 0x6810 },
+ {0x1002, 0x6811 },
+ {0x1002, 0x6816 },
+ {0x1002, 0x6817 },
+ {0x1002, 0x6818 },
+ {0x1002, 0x6819 },
+ {0x1002, 0x684C },
+ /* verde */
+ {0x1002, 0x6820 },
+ {0x1002, 0x6821 },
+ {0x1002, 0x6822 },
+ {0x1002, 0x6823 },
+ {0x1002, 0x6824 },
+ {0x1002, 0x6825 },
+ {0x1002, 0x6826 },
+ {0x1002, 0x6827 },
+ {0x1002, 0x6828 },
+ {0x1002, 0x6829 },
+ {0x1002, 0x682A },
+ {0x1002, 0x682B },
+ {0x1002, 0x682C },
+ {0x1002, 0x682D },
+ {0x1002, 0x682F },
+ {0x1002, 0x6830 },
+ {0x1002, 0x6831 },
+ {0x1002, 0x6835 },
+ {0x1002, 0x6837 },
+ {0x1002, 0x6838 },
+ {0x1002, 0x6839 },
+ {0x1002, 0x683B },
+ {0x1002, 0x683D },
+ {0x1002, 0x683F },
+ /* kabini */
+ {0x1002, 0x9830 },
+ {0x1002, 0x9831 },
+ {0x1002, 0x9832 },
+ {0x1002, 0x9833 },
+ {0x1002, 0x9834 },
+ {0x1002, 0x9835 },
+ {0x1002, 0x9836 },
+ {0x1002, 0x9837 },
+ {0x1002, 0x9838 },
+ {0x1002, 0x9839 },
+ {0x1002, 0x983a },
+ {0x1002, 0x983b },
+ {0x1002, 0x983c },
+ {0x1002, 0x983d },
+ {0x1002, 0x983e },
+ {0x1002, 0x983f },
+ /* mullins */
+ {0x1002, 0x9850 },
+ {0x1002, 0x9851 },
+ {0x1002, 0x9852 },
+ {0x1002, 0x9853 },
+ {0x1002, 0x9854 },
+ {0x1002, 0x9855 },
+ {0x1002, 0x9856 },
+ {0x1002, 0x9857 },
+ {0x1002, 0x9858 },
+ {0x1002, 0x9859 },
+ {0x1002, 0x985A },
+ {0x1002, 0x985B },
+ {0x1002, 0x985C },
+ {0x1002, 0x985D },
+ {0x1002, 0x985E },
+ {0x1002, 0x985F },
/* topaz */
{0x1002, 0x6900 },
{0x1002, 0x6901 },
Index: dev/pci/drm/include/drm/drm_pciids.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/include/drm/drm_pciids.h,v
diff -u -p -u -p -r1.2 drm_pciids.h
--- dev/pci/drm/include/drm/drm_pciids.h 16 Jan 2024 23:38:12 -0000 1.2
+++ dev/pci/drm/include/drm/drm_pciids.h 27 Dec 2024 21:32:52 -0000
@@ -1,27 +1,5 @@
/* SPDX-License-Identifier: MIT */
#define radeon_PCI_IDS \
- {0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1306, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1309, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x130A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x130B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x130C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x130D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x130E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x130F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1313, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1315, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1316, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1317, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x1318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x131B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x131C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x131D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
{0x1002, 0x3151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
{0x1002, 0x3152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -161,40 +139,6 @@
{0x1002, 0x5e4c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
{0x1002, 0x5e4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
{0x1002, 0x5e4f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6600, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6602, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6603, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6604, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6605, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6606, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6607, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6608, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6617, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6620, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6623, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6631, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6658, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x665c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x665d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x665f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6663, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6664, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6665, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6667, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x666F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAYMAN|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAYMAN|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAYMAN|RADEON_NEW_MEMMAP}, \
@@ -256,73 +200,11 @@
{0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
{0x1002, 0x677B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6784, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x678A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6790, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6791, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6792, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6798, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6799, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x679A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x679B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x679E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x679F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67A8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67A9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67AA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67B0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67B1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67B8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67B9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67BA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x67BE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6802, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6806, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6810, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6811, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6816, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6817, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6818, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6819, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6823, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6826, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x682A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x682C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x683B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x683D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x683F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6841, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6842, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6843, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6849, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
- {0x1002, 0x684C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
{0x1002, 0x6859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
@@ -630,38 +512,6 @@
{0x1002, 0x9808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x980A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9832, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9833, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x983a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x983b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x983c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x983d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x983e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x983f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9851, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9852, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9853, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9854, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9856, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9857, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x9859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x985A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x985B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x985C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x985D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x985E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
Index: dev/pci/drm/include/generated/autoconf.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/include/generated/autoconf.h,v
diff -u -p -u -p -r1.16 autoconf.h
--- dev/pci/drm/include/generated/autoconf.h 16 Aug 2024 10:49:57 -0000 1.16
+++ dev/pci/drm/include/generated/autoconf.h 27 Dec 2024 21:32:52 -0000
@@ -11,8 +11,6 @@
#if defined(__amd64__) || defined(__i386__)
#define CONFIG_DRM_AMD_DC_DCN 1
#define CONFIG_DRM_AMD_DC_FP 1
-#endif
-#if 0
#define CONFIG_DRM_AMDGPU_SI 1
#define CONFIG_DRM_AMD_DC_SI 1
#define CONFIG_DRM_AMDGPU_CIK 1
Index: dev/pci/drm/radeon/radeon_devlist.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/radeon/radeon_devlist.h,v
diff -u -p -u -p -r1.4 radeon_devlist.h
--- dev/pci/drm/radeon/radeon_devlist.h 25 Apr 2018 01:27:46 -0000 1.4
+++ dev/pci/drm/radeon/radeon_devlist.h 27 Dec 2024 21:32:52 -0000
@@ -1,27 +1,5 @@
/* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. */
static const struct pci_matchid radeon_devices[] = {
- { 0x1002, 0x1304 },
- { 0x1002, 0x1305 },
- { 0x1002, 0x1306 },
- { 0x1002, 0x1307 },
- { 0x1002, 0x1309 },
- { 0x1002, 0x130A },
- { 0x1002, 0x130B },
- { 0x1002, 0x130C },
- { 0x1002, 0x130D },
- { 0x1002, 0x130E },
- { 0x1002, 0x130F },
- { 0x1002, 0x1310 },
- { 0x1002, 0x1311 },
- { 0x1002, 0x1312 },
- { 0x1002, 0x1313 },
- { 0x1002, 0x1315 },
- { 0x1002, 0x1316 },
- { 0x1002, 0x1317 },
- { 0x1002, 0x1318 },
- { 0x1002, 0x131B },
- { 0x1002, 0x131C },
- { 0x1002, 0x131D },
{ 0x1002, 0x3150 },
{ 0x1002, 0x3151 },
{ 0x1002, 0x3152 },
@@ -161,40 +139,6 @@ static const struct pci_matchid radeon_d
{ 0x1002, 0x5e4c },
{ 0x1002, 0x5e4d },
{ 0x1002, 0x5e4f },
- { 0x1002, 0x6600 },
- { 0x1002, 0x6601 },
- { 0x1002, 0x6602 },
- { 0x1002, 0x6603 },
- { 0x1002, 0x6604 },
- { 0x1002, 0x6605 },
- { 0x1002, 0x6606 },
- { 0x1002, 0x6607 },
- { 0x1002, 0x6608 },
- { 0x1002, 0x6610 },
- { 0x1002, 0x6611 },
- { 0x1002, 0x6613 },
- { 0x1002, 0x6617 },
- { 0x1002, 0x6620 },
- { 0x1002, 0x6621 },
- { 0x1002, 0x6623 },
- { 0x1002, 0x6631 },
- { 0x1002, 0x6640 },
- { 0x1002, 0x6641 },
- { 0x1002, 0x6646 },
- { 0x1002, 0x6647 },
- { 0x1002, 0x6649 },
- { 0x1002, 0x6650 },
- { 0x1002, 0x6651 },
- { 0x1002, 0x6658 },
- { 0x1002, 0x665c },
- { 0x1002, 0x665d },
- { 0x1002, 0x665f },
- { 0x1002, 0x6660 },
- { 0x1002, 0x6663 },
- { 0x1002, 0x6664 },
- { 0x1002, 0x6665 },
- { 0x1002, 0x6667 },
- { 0x1002, 0x666F },
{ 0x1002, 0x6700 },
{ 0x1002, 0x6701 },
{ 0x1002, 0x6702 },
@@ -256,73 +200,11 @@ static const struct pci_matchid radeon_d
{ 0x1002, 0x6778 },
{ 0x1002, 0x6779 },
{ 0x1002, 0x677B },
- { 0x1002, 0x6780 },
- { 0x1002, 0x6784 },
- { 0x1002, 0x6788 },
- { 0x1002, 0x678A },
- { 0x1002, 0x6790 },
- { 0x1002, 0x6791 },
- { 0x1002, 0x6792 },
- { 0x1002, 0x6798 },
- { 0x1002, 0x6799 },
- { 0x1002, 0x679A },
- { 0x1002, 0x679B },
- { 0x1002, 0x679E },
- { 0x1002, 0x679F },
- { 0x1002, 0x67A0 },
- { 0x1002, 0x67A1 },
- { 0x1002, 0x67A2 },
- { 0x1002, 0x67A8 },
- { 0x1002, 0x67A9 },
- { 0x1002, 0x67AA },
- { 0x1002, 0x67B0 },
- { 0x1002, 0x67B1 },
- { 0x1002, 0x67B8 },
- { 0x1002, 0x67B9 },
- { 0x1002, 0x67BA },
- { 0x1002, 0x67BE },
- { 0x1002, 0x6800 },
- { 0x1002, 0x6801 },
- { 0x1002, 0x6802 },
- { 0x1002, 0x6806 },
- { 0x1002, 0x6808 },
- { 0x1002, 0x6809 },
- { 0x1002, 0x6810 },
- { 0x1002, 0x6811 },
- { 0x1002, 0x6816 },
- { 0x1002, 0x6817 },
- { 0x1002, 0x6818 },
- { 0x1002, 0x6819 },
- { 0x1002, 0x6820 },
- { 0x1002, 0x6821 },
- { 0x1002, 0x6822 },
- { 0x1002, 0x6823 },
- { 0x1002, 0x6824 },
- { 0x1002, 0x6825 },
- { 0x1002, 0x6826 },
- { 0x1002, 0x6827 },
- { 0x1002, 0x6828 },
- { 0x1002, 0x6829 },
- { 0x1002, 0x682A },
- { 0x1002, 0x682B },
- { 0x1002, 0x682C },
- { 0x1002, 0x682D },
- { 0x1002, 0x682F },
- { 0x1002, 0x6830 },
- { 0x1002, 0x6831 },
- { 0x1002, 0x6835 },
- { 0x1002, 0x6837 },
- { 0x1002, 0x6838 },
- { 0x1002, 0x6839 },
- { 0x1002, 0x683B },
- { 0x1002, 0x683D },
- { 0x1002, 0x683F },
{ 0x1002, 0x6840 },
{ 0x1002, 0x6841 },
{ 0x1002, 0x6842 },
{ 0x1002, 0x6843 },
{ 0x1002, 0x6849 },
- { 0x1002, 0x684C },
{ 0x1002, 0x6850 },
{ 0x1002, 0x6858 },
{ 0x1002, 0x6859 },
@@ -630,38 +512,6 @@ static const struct pci_matchid radeon_d
{ 0x1002, 0x9808 },
{ 0x1002, 0x9809 },
{ 0x1002, 0x980A },
- { 0x1002, 0x9830 },
- { 0x1002, 0x9831 },
- { 0x1002, 0x9832 },
- { 0x1002, 0x9833 },
- { 0x1002, 0x9834 },
- { 0x1002, 0x9835 },
- { 0x1002, 0x9836 },
- { 0x1002, 0x9837 },
- { 0x1002, 0x9838 },
- { 0x1002, 0x9839 },
- { 0x1002, 0x983a },
- { 0x1002, 0x983b },
- { 0x1002, 0x983c },
- { 0x1002, 0x983d },
- { 0x1002, 0x983e },
- { 0x1002, 0x983f },
- { 0x1002, 0x9850 },
- { 0x1002, 0x9851 },
- { 0x1002, 0x9852 },
- { 0x1002, 0x9853 },
- { 0x1002, 0x9854 },
- { 0x1002, 0x9855 },
- { 0x1002, 0x9856 },
- { 0x1002, 0x9857 },
- { 0x1002, 0x9858 },
- { 0x1002, 0x9859 },
- { 0x1002, 0x985A },
- { 0x1002, 0x985B },
- { 0x1002, 0x985C },
- { 0x1002, 0x985D },
- { 0x1002, 0x985E },
- { 0x1002, 0x985F },
{ 0x1002, 0x9900 },
{ 0x1002, 0x9901 },
{ 0x1002, 0x9903 },
Use amdgpu for SI and CIK chipsets