releases/3.4.2/drm-radeon-kms-add-new-trinity-pci-ids.patch

   1 From d430f7dbf7bd6aaaa40c0660b3204df8cf07b22b Mon Sep 17 00:00:00 2001
   2 From: Alex Deucher <alexander.deucher@amd.com>
   3 Date: Tue, 5 Jun 2012 09:50:28 -0400
   4 Subject: drm/radeon/kms: add new Trinity PCI ids
   5
   6 From: Alex Deucher <alexander.deucher@amd.com>
   7
   8 commit d430f7dbf7bd6aaaa40c0660b3204df8cf07b22b upstream.
   9
  10 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  11 Signed-off-by: Dave Airlie <airlied@redhat.com>
  12 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  13
  14 ---
  15  drivers/gpu/drm/radeon/ni.c |   21 +++++++++++++++++----
  16  include/drm/drm_pciids.h    |    8 ++++++++
  17  2 files changed, 25 insertions(+), 4 deletions(-)
  18
  19 --- a/drivers/gpu/drm/radeon/ni.c
  20 +++ b/drivers/gpu/drm/radeon/ni.c
  21 @@ -657,15 +657,28 @@ static void cayman_gpu_init(struct radeo
  22                 rdev->config.cayman.max_pipes_per_simd = 4;
  23                 rdev->config.cayman.max_tile_pipes = 2;
  24                 if ((rdev->pdev->device == 0x9900) ||
  25 -                   (rdev->pdev->device == 0x9901)) {
  26 +                   (rdev->pdev->device == 0x9901) ||
  27 +                   (rdev->pdev->device == 0x9905) ||
  28 +                   (rdev->pdev->device == 0x9906) ||
  29 +                   (rdev->pdev->device == 0x9907) ||
  30 +                   (rdev->pdev->device == 0x9908) ||
  31 +                   (rdev->pdev->device == 0x9909) ||
  32 +                   (rdev->pdev->device == 0x9910) ||
  33 +                   (rdev->pdev->device == 0x9917)) {
  34                         rdev->config.cayman.max_simds_per_se = 6;
  35                         rdev->config.cayman.max_backends_per_se = 2;
  36                 } else if ((rdev->pdev->device == 0x9903) ||
  37 -                          (rdev->pdev->device == 0x9904)) {
  38 +                          (rdev->pdev->device == 0x9904) ||
  39 +                          (rdev->pdev->device == 0x990A) ||
  40 +                          (rdev->pdev->device == 0x9913) ||
  41 +                          (rdev->pdev->device == 0x9918)) {
  42                         rdev->config.cayman.max_simds_per_se = 4;
  43                         rdev->config.cayman.max_backends_per_se = 2;
  44 -               } else if ((rdev->pdev->device == 0x9990) ||
  45 -                          (rdev->pdev->device == 0x9991)) {
  46 +               } else if ((rdev->pdev->device == 0x9919) ||
  47 +                          (rdev->pdev->device == 0x9990) ||
  48 +                          (rdev->pdev->device == 0x9991) ||
  49 +                          (rdev->pdev->device == 0x9994) ||
  50 +                          (rdev->pdev->device == 0x99A0)) {
  51                         rdev->config.cayman.max_simds_per_se = 3;
  52                         rdev->config.cayman.max_backends_per_se = 1;
  53                 } else {
  54 --- a/include/drm/drm_pciids.h
  55 +++ b/include/drm/drm_pciids.h
  56 @@ -561,11 +561,19 @@
  57         {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  58         {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  59         {0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  60 +       {0x1002, 0x9910, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  61 +       {0x1002, 0x9913, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  62 +       {0x1002, 0x9917, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  63 +       {0x1002, 0x9918, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  64 +       {0x1002, 0x9919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  65         {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  66         {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  67         {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  68         {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  69         {0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  70 +       {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  71 +       {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  72 +       {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  73         {0, 0, 0}
  74
  75  #define r128_PCI_IDS \