On 17-04-07 12:10 PM, Christian König wrote:
> Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
>> Advertise CIK PCI IDs only when they are not supported by amdgpu.
>> Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in
>> the kernel config keeps both drivers in sync.
>>
>> This is the simplest possible change. A more complete solution
>> may want to conditionally disable more CIK-specific code in the
>> Radeon driver.
>
> Yeah, thought about that as well.
>
> Just two notes:
> 1. Add a separate Radeon specific config option for this.
>
> We clearly want to be able to enable both Radeon and Amdgpu to compare
> them without recompile.
How about an option DRM_RADEON_FORCE_CIK that enables Radeon CIK support
even if DRM_AMDGPU_CIK is enabled? That way the default depends only on
the AMDGPU configuration and makes sense for end users and
distributions. The DRM_RADEON_FORCE_CIK option would be an override for
developers to make testing and comparison of both drivers simpler.
>
> 2. Do the same thing for SI as well.
OK. In the same commit or separate?
Regards,
Felix
>
> Regards,
> Christian.
>
>>
>> Signed-off-by: Felix Kuehling <Felix.Kuehling at amd.com>
>> ---
>> drivers/gpu/drm/radeon/radeon_drv.c | 3 +
>> include/drm/drm_pciids.h | 114
>> ++++++++++++++++++------------------
>> 2 files changed, 61 insertions(+), 56 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c
>> b/drivers/gpu/drm/radeon/radeon_drv.c
>> index 2e5d680..551cd5f 100644
>> --- a/drivers/gpu/drm/radeon/radeon_drv.c
>> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
>> @@ -302,6 +302,9 @@ static inline void
>> radeon_unregister_atpx_handler(void) {}
>> module_param_named(vce, radeon_vce, int, 0444);
>> static struct pci_device_id pciidlist[] = {
>> +#ifndef CONFIG_DRM_AMDGPU_CIK
>> + radeon_CIK_PCI_IDS,
>> +#endif
>> radeon_PCI_IDS
>> };
>> diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
>> index 8bc073d..cf17901 100644
>> --- a/include/drm/drm_pciids.h
>> +++ b/include/drm/drm_pciids.h
>> @@ -1,4 +1,4 @@
>> -#define radeon_PCI_IDS \
>> +#define radeon_CIK_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}, \
>> @@ -21,6 +21,63 @@
>> {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, 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, 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, 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}
>> +
>> +#define radeon_PCI_IDS \
>> {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}, \
>> @@ -177,17 +234,6 @@
>> {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}, \
>> @@ -268,18 +314,6 @@
>> {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}, \
>> @@ -629,38 +663,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}, \
>
>
