From 70556d35d2350c57669d58770f389334f637475d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Jun 2012 14:44:49 +0900 Subject: [PATCH] 3.4-stable patches added patches: drm-radeon-audio-don-t-hardcode-crtc-id.patch drm-radeon-fix-vm-deadlocks-on-cayman.patch drm-radeon-kms-add-new-btc-pci-ids.patch drm-radeon-kms-add-new-palm-sumo-pci-ids.patch drm-radeon-kms-add-new-si-pci-ids.patch drm-radeon-kms-add-new-trinity-pci-ids.patch --- ...-radeon-audio-don-t-hardcode-crtc-id.patch | 45 +++++++++++ ...rm-radeon-fix-vm-deadlocks-on-cayman.patch | 71 ++++++++++++++++++ .../drm-radeon-kms-add-new-btc-pci-ids.patch | 35 +++++++++ ...radeon-kms-add-new-palm-sumo-pci-ids.patch | 35 +++++++++ .../drm-radeon-kms-add-new-si-pci-ids.patch | 33 ++++++++ ...m-radeon-kms-add-new-trinity-pci-ids.patch | 75 +++++++++++++++++++ queue-3.4/series | 6 ++ 7 files changed, 300 insertions(+) create mode 100644 queue-3.4/drm-radeon-audio-don-t-hardcode-crtc-id.patch create mode 100644 queue-3.4/drm-radeon-fix-vm-deadlocks-on-cayman.patch create mode 100644 queue-3.4/drm-radeon-kms-add-new-btc-pci-ids.patch create mode 100644 queue-3.4/drm-radeon-kms-add-new-palm-sumo-pci-ids.patch create mode 100644 queue-3.4/drm-radeon-kms-add-new-si-pci-ids.patch create mode 100644 queue-3.4/drm-radeon-kms-add-new-trinity-pci-ids.patch diff --git a/queue-3.4/drm-radeon-audio-don-t-hardcode-crtc-id.patch b/queue-3.4/drm-radeon-audio-don-t-hardcode-crtc-id.patch new file mode 100644 index 00000000000..99a1416825a --- /dev/null +++ b/queue-3.4/drm-radeon-audio-don-t-hardcode-crtc-id.patch @@ -0,0 +1,45 @@ +From 0aecb5a4ba1ea4167f31d1790eec027f1e658f2d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Mon, 4 Jun 2012 18:36:58 +0200 +Subject: drm/radeon/audio: don't hardcode CRTC id +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +commit 0aecb5a4ba1ea4167f31d1790eec027f1e658f2d upstream. + +This is based on info released by AMD, should allow using audio in much +more cases. + +Signed-off-by: Rafał Miłecki +Reviewed-by: Alex Deucher +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/r600_audio.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/radeon/r600_audio.c ++++ b/drivers/gpu/drm/radeon/r600_audio.c +@@ -239,6 +239,7 @@ void r600_audio_set_clock(struct drm_enc + struct radeon_device *rdev = dev->dev_private; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; ++ struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); + int base_rate = 48000; + + switch (radeon_encoder->encoder_id) { +@@ -264,8 +265,8 @@ void r600_audio_set_clock(struct drm_enc + WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10); + WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071); + +- /* Some magic trigger or src sel? */ +- WREG32_P(0x5ac, 0x01, ~0x77); ++ /* Select DTO source */ ++ WREG32(0x5ac, radeon_crtc->crtc_id); + } else { + switch (dig->dig_encoder) { + case 0: diff --git a/queue-3.4/drm-radeon-fix-vm-deadlocks-on-cayman.patch b/queue-3.4/drm-radeon-fix-vm-deadlocks-on-cayman.patch new file mode 100644 index 00000000000..80f75381002 --- /dev/null +++ b/queue-3.4/drm-radeon-fix-vm-deadlocks-on-cayman.patch @@ -0,0 +1,71 @@ +From bb4091558228ff4a3e02328c931e683fc7f08722 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= +Date: Sun, 3 Jun 2012 16:09:43 +0200 +Subject: drm/radeon: fix vm deadlocks on cayman +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian König + +commit bb4091558228ff4a3e02328c931e683fc7f08722 upstream. + +Locking mutex in different orders just screams for +deadlocks, and some testing showed that it is actually +quite easy to trigger them. + +Signed-off-by: Christian König +Reviewed-by: Jerome Glisse +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_gart.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +--- a/drivers/gpu/drm/radeon/radeon_gart.c ++++ b/drivers/gpu/drm/radeon/radeon_gart.c +@@ -478,12 +478,18 @@ int radeon_vm_bo_add(struct radeon_devic + + mutex_lock(&vm->mutex); + if (last_pfn > vm->last_pfn) { +- /* grow va space 32M by 32M */ +- unsigned align = ((32 << 20) >> 12) - 1; ++ /* release mutex and lock in right order */ ++ mutex_unlock(&vm->mutex); + radeon_mutex_lock(&rdev->cs_mutex); +- radeon_vm_unbind_locked(rdev, vm); ++ mutex_lock(&vm->mutex); ++ /* and check again */ ++ if (last_pfn > vm->last_pfn) { ++ /* grow va space 32M by 32M */ ++ unsigned align = ((32 << 20) >> 12) - 1; ++ radeon_vm_unbind_locked(rdev, vm); ++ vm->last_pfn = (last_pfn + align) & ~align; ++ } + radeon_mutex_unlock(&rdev->cs_mutex); +- vm->last_pfn = (last_pfn + align) & ~align; + } + head = &vm->va; + last_offset = 0; +@@ -597,8 +603,8 @@ int radeon_vm_bo_rmv(struct radeon_devic + if (bo_va == NULL) + return 0; + +- mutex_lock(&vm->mutex); + radeon_mutex_lock(&rdev->cs_mutex); ++ mutex_lock(&vm->mutex); + radeon_vm_bo_update_pte(rdev, vm, bo, NULL); + radeon_mutex_unlock(&rdev->cs_mutex); + list_del(&bo_va->vm_list); +@@ -643,9 +649,8 @@ void radeon_vm_fini(struct radeon_device + struct radeon_bo_va *bo_va, *tmp; + int r; + +- mutex_lock(&vm->mutex); +- + radeon_mutex_lock(&rdev->cs_mutex); ++ mutex_lock(&vm->mutex); + radeon_vm_unbind_locked(rdev, vm); + radeon_mutex_unlock(&rdev->cs_mutex); + diff --git a/queue-3.4/drm-radeon-kms-add-new-btc-pci-ids.patch b/queue-3.4/drm-radeon-kms-add-new-btc-pci-ids.patch new file mode 100644 index 00000000000..43a74271b9c --- /dev/null +++ b/queue-3.4/drm-radeon-kms-add-new-btc-pci-ids.patch @@ -0,0 +1,35 @@ +From a2bef8ce826dd1e787fd8ad9b6e0566ba59dab43 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 5 Jun 2012 09:50:30 -0400 +Subject: drm/radeon/kms: add new BTC PCI ids + +From: Alex Deucher + +commit a2bef8ce826dd1e787fd8ad9b6e0566ba59dab43 upstream. + +Signed-off-by: Alex Deucher +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + include/drm/drm_pciids.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -181,6 +181,7 @@ + {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x674A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ +@@ -198,6 +199,7 @@ + {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6770, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x6771, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ diff --git a/queue-3.4/drm-radeon-kms-add-new-palm-sumo-pci-ids.patch b/queue-3.4/drm-radeon-kms-add-new-palm-sumo-pci-ids.patch new file mode 100644 index 00000000000..1913c219e4a --- /dev/null +++ b/queue-3.4/drm-radeon-kms-add-new-palm-sumo-pci-ids.patch @@ -0,0 +1,35 @@ +From 4a6991cc1fad514745b79181df3ace72d561e7aa Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 5 Jun 2012 09:50:29 -0400 +Subject: drm/radeon/kms: add new Palm, Sumo PCI ids + +From: Alex Deucher + +commit 4a6991cc1fad514745b79181df3ace72d561e7aa upstream. + +Signed-off-by: Alex Deucher +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + include/drm/drm_pciids.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -531,6 +531,7 @@ + {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ + {0x1002, 0x9648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ ++ {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ + {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x964c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ +@@ -550,6 +551,7 @@ + {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {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, 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}, \ diff --git a/queue-3.4/drm-radeon-kms-add-new-si-pci-ids.patch b/queue-3.4/drm-radeon-kms-add-new-si-pci-ids.patch new file mode 100644 index 00000000000..688b6134a14 --- /dev/null +++ b/queue-3.4/drm-radeon-kms-add-new-si-pci-ids.patch @@ -0,0 +1,33 @@ +From 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 5 Jun 2012 09:50:31 -0400 +Subject: drm/radeon/kms: add new SI PCI ids + +From: Alex Deucher + +commit 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5 upstream. + +Signed-off-by: Alex Deucher +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + include/drm/drm_pciids.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -231,10 +231,11 @@ + {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ +- {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ +- {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ diff --git a/queue-3.4/drm-radeon-kms-add-new-trinity-pci-ids.patch b/queue-3.4/drm-radeon-kms-add-new-trinity-pci-ids.patch new file mode 100644 index 00000000000..126d33a653d --- /dev/null +++ b/queue-3.4/drm-radeon-kms-add-new-trinity-pci-ids.patch @@ -0,0 +1,75 @@ +From d430f7dbf7bd6aaaa40c0660b3204df8cf07b22b Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 5 Jun 2012 09:50:28 -0400 +Subject: drm/radeon/kms: add new Trinity PCI ids + +From: Alex Deucher + +commit d430f7dbf7bd6aaaa40c0660b3204df8cf07b22b upstream. + +Signed-off-by: Alex Deucher +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/ni.c | 21 +++++++++++++++++---- + include/drm/drm_pciids.h | 8 ++++++++ + 2 files changed, 25 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/radeon/ni.c ++++ b/drivers/gpu/drm/radeon/ni.c +@@ -657,15 +657,28 @@ static void cayman_gpu_init(struct radeo + rdev->config.cayman.max_pipes_per_simd = 4; + rdev->config.cayman.max_tile_pipes = 2; + if ((rdev->pdev->device == 0x9900) || +- (rdev->pdev->device == 0x9901)) { ++ (rdev->pdev->device == 0x9901) || ++ (rdev->pdev->device == 0x9905) || ++ (rdev->pdev->device == 0x9906) || ++ (rdev->pdev->device == 0x9907) || ++ (rdev->pdev->device == 0x9908) || ++ (rdev->pdev->device == 0x9909) || ++ (rdev->pdev->device == 0x9910) || ++ (rdev->pdev->device == 0x9917)) { + rdev->config.cayman.max_simds_per_se = 6; + rdev->config.cayman.max_backends_per_se = 2; + } else if ((rdev->pdev->device == 0x9903) || +- (rdev->pdev->device == 0x9904)) { ++ (rdev->pdev->device == 0x9904) || ++ (rdev->pdev->device == 0x990A) || ++ (rdev->pdev->device == 0x9913) || ++ (rdev->pdev->device == 0x9918)) { + rdev->config.cayman.max_simds_per_se = 4; + rdev->config.cayman.max_backends_per_se = 2; +- } else if ((rdev->pdev->device == 0x9990) || +- (rdev->pdev->device == 0x9991)) { ++ } else if ((rdev->pdev->device == 0x9919) || ++ (rdev->pdev->device == 0x9990) || ++ (rdev->pdev->device == 0x9991) || ++ (rdev->pdev->device == 0x9994) || ++ (rdev->pdev->device == 0x99A0)) { + rdev->config.cayman.max_simds_per_se = 3; + rdev->config.cayman.max_backends_per_se = 1; + } else { +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -561,11 +561,19 @@ + {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9910, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9913, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9917, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9918, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0, 0, 0} + + #define r128_PCI_IDS \ diff --git a/queue-3.4/series b/queue-3.4/series index 58371c00020..a00a7ab55b6 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -65,3 +65,9 @@ ext4-don-t-trash-state-flags-in-ext4_ioc_setflags.patch ext4-add-ext4_mb_unload_buddy-in-the-error-path.patch ext4-remove-mb_groups-before-tearing-down-the-buddy_cache.patch radix-tree-fix-contiguous-iterator.patch +drm-radeon-audio-don-t-hardcode-crtc-id.patch +drm-radeon-fix-vm-deadlocks-on-cayman.patch +drm-radeon-kms-add-new-trinity-pci-ids.patch +drm-radeon-kms-add-new-palm-sumo-pci-ids.patch +drm-radeon-kms-add-new-btc-pci-ids.patch +drm-radeon-kms-add-new-si-pci-ids.patch -- 2.47.3