From: Greg Kroah-Hartman Date: Fri, 17 Aug 2012 17:31:21 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.5.3~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18ffcd4a45fc2a5f2ac3dafd58e0072ba2be2580;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: drm-radeon-add-some-new-si-pci-ids.patch drm-radeon-fix-bank-tiling-parameters-on-cayman.patch drm-radeon-fix-bank-tiling-parameters-on-evergreen.patch --- diff --git a/queue-3.4/drm-radeon-add-some-new-si-pci-ids.patch b/queue-3.4/drm-radeon-add-some-new-si-pci-ids.patch new file mode 100644 index 00000000000..05008f2932b --- /dev/null +++ b/queue-3.4/drm-radeon-add-some-new-si-pci-ids.patch @@ -0,0 +1,31 @@ +From 2f292004dd1fb005788dc0a9cdd5559812ed866e Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Mon, 6 Aug 2012 10:03:59 -0400 +Subject: drm/radeon: add some new SI pci ids + +From: Alex Deucher + +commit 2f292004dd1fb005788dc0a9cdd5559812ed866e upstream. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + include/drm/drm_pciids.h | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -217,9 +217,12 @@ + {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}, \ ++ {0x1002, 0x6806, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6810, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x6816, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x6817, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6818, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6819, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ diff --git a/queue-3.4/drm-radeon-fix-bank-tiling-parameters-on-cayman.patch b/queue-3.4/drm-radeon-fix-bank-tiling-parameters-on-cayman.patch new file mode 100644 index 00000000000..819bde4823b --- /dev/null +++ b/queue-3.4/drm-radeon-fix-bank-tiling-parameters-on-cayman.patch @@ -0,0 +1,42 @@ +From 5b23c9045a8b61352986270b2d109edf5085e113 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 31 Jul 2012 11:05:11 -0400 +Subject: drm/radeon: fix bank tiling parameters on cayman + +From: Alex Deucher + +commit 5b23c9045a8b61352986270b2d109edf5085e113 upstream. + +Handle the 16 bank case. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/ni.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/radeon/ni.c ++++ b/drivers/gpu/drm/radeon/ni.c +@@ -880,10 +880,18 @@ static void cayman_gpu_init(struct radeo + if (rdev->flags & RADEON_IS_IGP) + rdev->config.cayman.tile_config |= 1 << 4; + else { +- if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) +- rdev->config.cayman.tile_config |= 1 << 4; +- else ++ switch ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) { ++ case 0: /* four banks */ + rdev->config.cayman.tile_config |= 0 << 4; ++ break; ++ case 1: /* eight banks */ ++ rdev->config.cayman.tile_config |= 1 << 4; ++ break; ++ case 2: /* sixteen banks */ ++ default: ++ rdev->config.cayman.tile_config |= 2 << 4; ++ break; ++ } + } + rdev->config.cayman.tile_config |= + ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; diff --git a/queue-3.4/drm-radeon-fix-bank-tiling-parameters-on-evergreen.patch b/queue-3.4/drm-radeon-fix-bank-tiling-parameters-on-evergreen.patch new file mode 100644 index 00000000000..d1fb460dc4c --- /dev/null +++ b/queue-3.4/drm-radeon-fix-bank-tiling-parameters-on-evergreen.patch @@ -0,0 +1,42 @@ +From c8d15edc17d836686d1f071e564800e1a2724fa6 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 31 Jul 2012 11:01:10 -0400 +Subject: drm/radeon: fix bank tiling parameters on evergreen + +From: Alex Deucher + +commit c8d15edc17d836686d1f071e564800e1a2724fa6 upstream. + +Handle the 16 bank case. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/evergreen.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/radeon/evergreen.c ++++ b/drivers/gpu/drm/radeon/evergreen.c +@@ -2085,10 +2085,18 @@ static void evergreen_gpu_init(struct ra + if (rdev->flags & RADEON_IS_IGP) + rdev->config.evergreen.tile_config |= 1 << 4; + else { +- if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) +- rdev->config.evergreen.tile_config |= 1 << 4; +- else ++ switch ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) { ++ case 0: /* four banks */ + rdev->config.evergreen.tile_config |= 0 << 4; ++ break; ++ case 1: /* eight banks */ ++ rdev->config.evergreen.tile_config |= 1 << 4; ++ break; ++ case 2: /* sixteen banks */ ++ default: ++ rdev->config.evergreen.tile_config |= 2 << 4; ++ break; ++ } + } + rdev->config.evergreen.tile_config |= + ((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT) << 8; diff --git a/queue-3.4/series b/queue-3.4/series index e2a2ea9e871..562e8454136 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -10,3 +10,6 @@ drm-i915-ignore-edp-bpc-settings-from-vbt.patch drm-i915-reorder-edp-disabling-to-fix-ivb-macbook-air.patch drm-radeon-properly-handle-crtc-powergating.patch drm-radeon-do-not-reenable-crtc-after-moving-vram-start-address.patch +drm-radeon-add-some-new-si-pci-ids.patch +drm-radeon-fix-bank-tiling-parameters-on-cayman.patch +drm-radeon-fix-bank-tiling-parameters-on-evergreen.patch