diff options
-rw-r--r-- | drivers/gpu/drm/radeon/r600_cp.c | 4 | ||||
-rw-r--r-- | include/drm/drm_pciids.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index aa4eee4b7f3a..146f3570af8e 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c | |||
@@ -478,13 +478,13 @@ static void r700_cp_load_microcode(drm_radeon_private_t *dev_priv) | |||
478 | 478 | ||
479 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV770)) { | 479 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV770)) { |
480 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); | 480 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); |
481 | DRM_INFO("Loading RV770 PFP Microcode\n"); | 481 | DRM_INFO("Loading RV770/RV790 PFP Microcode\n"); |
482 | for (i = 0; i < R700_PFP_UCODE_SIZE; i++) | 482 | for (i = 0; i < R700_PFP_UCODE_SIZE; i++) |
483 | RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV770_pfp_microcode[i]); | 483 | RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV770_pfp_microcode[i]); |
484 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); | 484 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); |
485 | 485 | ||
486 | RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); | 486 | RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); |
487 | DRM_INFO("Loading RV770 CP Microcode\n"); | 487 | DRM_INFO("Loading RV770/RV790 CP Microcode\n"); |
488 | for (i = 0; i < R700_PM4_UCODE_SIZE; i++) | 488 | for (i = 0; i < R700_PM4_UCODE_SIZE; i++) |
489 | RADEON_WRITE(R600_CP_ME_RAM_DATA, RV770_cp_microcode[i]); | 489 | RADEON_WRITE(R600_CP_ME_RAM_DATA, RV770_cp_microcode[i]); |
490 | RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); | 490 | RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); |
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h index c7a1a8dc5ea4..f8634ab53b8f 100644 --- a/include/drm/drm_pciids.h +++ b/include/drm/drm_pciids.h | |||
@@ -273,6 +273,8 @@ | |||
273 | {0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ | 273 | {0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ |
274 | {0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 274 | {0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
275 | {0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 275 | {0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
276 | {0x1002, 0x9460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | ||
277 | {0x1002, 0x9462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | ||
276 | {0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 278 | {0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
277 | {0x1002, 0x946B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 279 | {0x1002, 0x946B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
278 | {0x1002, 0x947A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 280 | {0x1002, 0x947A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |