drm/radeon: Make CIK support in Radeon conditional
Subsystems (3)
PATCH 1/1 drm/radeon: Make CIK support in Radeon conditional
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.
--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.c +3 -0
@@ -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 };
include/drm/drm_pciids.h +58 -56
141 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1491580889-1117-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
Quoted 9 lines · Felix Kuehling
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.
Signed-off-by Felix Kuehling <[email protected]>
Good idea. We could do something similar for SI down the road too.
Tom
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
Quoted 7 lines
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.
2. Do the same thing for SI as well.
Regards,
Christian.
Quoted 161 lines
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +3
-0@@ -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 };include/drm/drm_pciids.h +58
-49@@ -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}, \
include/drm/drm_pciids.h line 668
Quoted 10 lines
include/drm/drm_pciids.h +0
-7- {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}, \
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 746b6d7b-b1e3-7a32-aabf-6ec5fe17a313-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Quoted 9 lines · Christian König
Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
Quoted 7 lines
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.
Quoted 7 lines
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.
Quoted 2 lines
2. Do the same thing for SI as well.
OK. In the same commit or separate?
Regards,
Felix
Quoted 305 lines
Regards,
Christian.Quoted 301 lines
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +3
-0@@ -302,6 +302,9 @@ static inline voidradeon_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.hindex 8bc073d..cf17901 100644
include/drm/drm_pciids.h +1
-1@@ -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}, \
include/drm/drm_pciids.h +1
-0@@ -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}include/drm/drm_pciids.h +2
-0+ +#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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
Quoted 10 lines
Quoted 8 lines
- {
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}, \
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 317b518e-0d62-2552-acc5-536425152f4a-5C7GfCeVMHo@public.gmane.org
Quoted 16 lines · Felix Kuehling
Quoted 14 lines · Christian König
Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
Quoted 7 lines
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.
Quoted 9 lines
Quoted 2 lines
We clearly want to be able to enable both Radeon and Amdgpu to compare them without recompile.
How about an option
DRM_RADEON_FORCE_CIKthat enables Radeon CIK support even ifDRM_AMDGPU_CIKis enabled? That way the default depends only on the AMDGPU configuration and makes sense for end users and distributions. TheDRM_RADEON_FORCE_CIKoption would be an override for developers to make testing and comparison of both drivers simpler.
Seems reasonable.
Quoted 4 lines
Quoted 2 lines
2. Do the same thing for SI as well.
OK. In the same commit or separate?
Separate please.
Alex
Quoted 320 lines
Regards,
FelixQuoted 305 lines
Regards,
Christian.Quoted 301 lines
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +3
-0@@ -302,6 +302,9 @@ static inline voidradeon_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.hindex 8bc073d..cf17901 100644
include/drm/drm_pciids.h +1
-1@@ -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}, \
include/drm/drm_pciids.h +1
-0@@ -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}include/drm/drm_pciids.h +2
-0+ +#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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \Quoted 10 lines
Quoted 8 lines
- {
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}, \
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_PJBREhV3UgzP=Qe8SD7bW9UTkecx=h8H1fDsvroJgNFQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Kconfig still calls CIK and SI support in amdgpu "experimental". Is that still true? Should we stop calling it experimental if we actually want distributions to start using it?
Regards,
Felix
Quoted 23 lines · Alex Deucher
Quoted 14 lines · Felix Kuehling
Quoted 13 lines · Christian König
Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
Quoted 7 lines
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.Quoted 8 lines
Quoted 2 lines
We clearly want to be able to enable both Radeon and Amdgpu to compare them without recompile.
How about an option
DRM_RADEON_FORCE_CIKthat enables Radeon CIK support even ifDRM_AMDGPU_CIKis enabled? That way the default depends only on the AMDGPU configuration and makes sense for end users and distributions. TheDRM_RADEON_FORCE_CIKoption would be an override for developers to make testing and comparison of both drivers simpler.
Quoted 327 lines
Seems reasonable.
Quoted 2 lines
Quoted 1 line
2. Do the same thing for SI as well.
OK. In the same commit or separate?
Separate please.
Alex
Quoted 319 lines
Regards,
FelixQuoted 303 lines
Regards,
Christian.Quoted 300 lines
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +3
-0@@ -302,6 +302,9 @@ static inline voidradeon_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.hindex 8bc073d..cf17901 100644
include/drm/drm_pciids.h +1
-1@@ -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}, \
include/drm/drm_pciids.h +1
-0@@ -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}include/drm/drm_pciids.h +2
-0+ +#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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \Quoted 9 lines
Quoted 8 lines
- {
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}, \
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 2ebc2e8d-c3b5-9b74-f852-cc0012b5b819-5C7GfCeVMHo@public.gmane.org
Quoted 3 lines · Felix Kuehling
Kconfigstill calls CIK and SI support in amdgpu "experimental". Is that still true? Should we stop calling it experimental if we actually want distributions to start using it?
I guess they aren't really experimental anymore. We can drop that from CIK, but should probably keep it for SI for the moment since SI on amdgpu still lacks UVD and VCE support.
Alex
Quoted 357 lines
Regards,
FelixQuoted 350 lines · Alex Deucher
Quoted 14 lines · Felix Kuehling
Quoted 13 lines · Christian König
Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
Quoted 7 lines
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.Quoted 8 lines
Quoted 2 lines
We clearly want to be able to enable both Radeon and Amdgpu to compare them without recompile.
How about an option
DRM_RADEON_FORCE_CIKthat enables Radeon CIK support even ifDRM_AMDGPU_CIKis enabled? That way the default depends only on the AMDGPU configuration and makes sense for end users and distributions. TheDRM_RADEON_FORCE_CIKoption would be an override for developers to make testing and comparison of both drivers simpler.Seems reasonable.
Quoted 2 lines
Quoted 1 line
2. Do the same thing for SI as well.
OK. In the same commit or separate?
Separate please.
Alex
Quoted 319 lines
Regards,
FelixQuoted 303 lines
Regards,
Christian.Quoted 300 lines
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +3
-0@@ -302,6 +302,9 @@ static inline voidradeon_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.hindex 8bc073d..cf17901 100644
include/drm/drm_pciids.h +1
-1@@ -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}, \
include/drm/drm_pciids.h +1
-0@@ -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}include/drm/drm_pciids.h +2
-0+ +#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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \Quoted 9 lines
Quoted 8 lines
- {
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}, \
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_NC5vyBeZbAT006kqPta7ySTG_wcOJF66WqPcKv17Aayw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 7 lines
How about an option
DRM_RADEON_FORCE_CIKthat enables Radeon CIK support even ifDRM_AMDGPU_CIKis enabled? That way the default depends only on the AMDGPU configuration and makes sense for end users and distributions. TheDRM_RADEON_FORCE_CIKoption would be an override for developers to make testing and comparison of both drivers simpler.Seems reasonable.
Completely agree.
Am 07.04.2017 um 21:50 schrieb Alex Deucher:
Quoted 7 lines · Felix Kuehling
Quoted 3 lines
Kconfigstill calls CIK and SI support in amdgpu "experimental". Is that still true? Should we stop calling it experimental if we actually want distributions to start using it?I guess they aren't really experimental anymore. We can drop that from CIK, but should probably keep it for SI for the moment since SI on amdgpu still lacks UVD and VCE support.
Yeah, CIK is quite stable now.
Nobody tackled UVD/VCE support on SI yet? Sounds like a good starting job if anybody wants to earn some credits.
Anybody want to volunteer?
Christian.
Quoted 357 lines
Alex
Quoted 354 lines
Regards,
FelixQuoted 349 lines · Alex Deucher
Quoted 14 lines · Felix Kuehling
Quoted 13 lines · Christian König
Am 07.04.2017 um 18:01 schrieb Felix Kuehling:
Quoted 7 lines
Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the
CONFIG_DRM_AMDGPU_CIKto 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.Quoted 8 lines
Quoted 2 lines
We clearly want to be able to enable both Radeon and Amdgpu to compare them without recompile.
How about an option
DRM_RADEON_FORCE_CIKthat enables Radeon CIK support even ifDRM_AMDGPU_CIKis enabled? That way the default depends only on the AMDGPU configuration and makes sense for end users and distributions. TheDRM_RADEON_FORCE_CIKoption would be an override for developers to make testing and comparison of both drivers simpler.Seems reasonable.
Quoted 2 lines
Quoted 1 line
2. Do the same thing for SI as well.
OK. In the same commit or separate?
Separate please.
Alex
Quoted 318 lines
Regards,
FelixQuoted 303 lines
Regards,
Christian.Quoted 300 lines
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 3 + include/drm/drm_pciids.h | 114 ++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 56 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +3
-0@@ -302,6 +302,9 @@ static inline voidradeon_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.hindex 8bc073d..cf17901 100644
include/drm/drm_pciids.h +1
-1@@ -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}, \
include/drm/drm_pciids.h +1
-0@@ -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}include/drm/drm_pciids.h +2
-0+ +#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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \
include/drm/drm_pciids.h +0
-1@@ -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}, \Quoted 8 lines
Quoted 8 lines
- {
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}, \
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx