aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher2013-04-25 13:06:05 -0500
committerGreg Kroah-Hartman2013-05-11 15:54:09 -0500
commit9c9a03e19d6414c7c6f482d8130c7592cbd0ef6a (patch)
tree0018f5abb15ffac8e473f2d2ae7ce9bc9cffc634
parentd2444704cc6b3135247ee3533e6e04c562141afd (diff)
downloadkernel-omap-9c9a03e19d6414c7c6f482d8130c7592cbd0ef6a.tar.gz
kernel-omap-9c9a03e19d6414c7c6f482d8130c7592cbd0ef6a.tar.xz
kernel-omap-9c9a03e19d6414c7c6f482d8130c7592cbd0ef6a.zip
drm/radeon: add new richland pci ids
commit 62d1f92e06aef9665d71ca7e986b3047ecf0b3c7 upstream. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/ni.c6
-rw-r--r--include/drm/drm_pciids.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index ccc3987080bd..10e1bd112709 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -471,7 +471,8 @@ static void cayman_gpu_init(struct radeon_device *rdev)
471 (rdev->pdev->device == 0x990F) || 471 (rdev->pdev->device == 0x990F) ||
472 (rdev->pdev->device == 0x9910) || 472 (rdev->pdev->device == 0x9910) ||
473 (rdev->pdev->device == 0x9917) || 473 (rdev->pdev->device == 0x9917) ||
474 (rdev->pdev->device == 0x9999)) { 474 (rdev->pdev->device == 0x9999) ||
475 (rdev->pdev->device == 0x999C)) {
475 rdev->config.cayman.max_simds_per_se = 6; 476 rdev->config.cayman.max_simds_per_se = 6;
476 rdev->config.cayman.max_backends_per_se = 2; 477 rdev->config.cayman.max_backends_per_se = 2;
477 } else if ((rdev->pdev->device == 0x9903) || 478 } else if ((rdev->pdev->device == 0x9903) ||
@@ -480,7 +481,8 @@ static void cayman_gpu_init(struct radeon_device *rdev)
480 (rdev->pdev->device == 0x990D) || 481 (rdev->pdev->device == 0x990D) ||
481 (rdev->pdev->device == 0x990E) || 482 (rdev->pdev->device == 0x990E) ||
482 (rdev->pdev->device == 0x9913) || 483 (rdev->pdev->device == 0x9913) ||
483 (rdev->pdev->device == 0x9918)) { 484 (rdev->pdev->device == 0x9918) ||
485 (rdev->pdev->device == 0x999D)) {
484 rdev->config.cayman.max_simds_per_se = 4; 486 rdev->config.cayman.max_simds_per_se = 4;
485 rdev->config.cayman.max_backends_per_se = 2; 487 rdev->config.cayman.max_backends_per_se = 2;
486 } else if ((rdev->pdev->device == 0x9919) || 488 } else if ((rdev->pdev->device == 0x9919) ||
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 36e5b94c32c3..d7da55c10195 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -593,6 +593,8 @@
593 {0x1002, 0x9999, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 593 {0x1002, 0x9999, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
594 {0x1002, 0x999A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 594 {0x1002, 0x999A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
595 {0x1002, 0x999B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 595 {0x1002, 0x999B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
596 {0x1002, 0x999C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
597 {0x1002, 0x999D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
596 {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 598 {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
597 {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 599 {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
598 {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 600 {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \