3.10-stable patches

added patches:
	drm-radeon-use-post-decrement-in-error-handling.patch

diff --git a/queue-3.10/drm-radeon-use-post-decrement-in-error-handling.patch b/queue-3.10/drm-radeon-use-post-decrement-in-error-handling.patch
new file mode 100644 (file)
index 0000000..6b153a9
--- /dev/null
+++ b/queue-3.10/drm-radeon-use-post-decrement-in-error-handling.patch
@@ -0,0 +1,36 @@
+From bc3f5d8c4ca01555820617eb3b6c0857e4df710d Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Date: Mon, 15 Feb 2016 19:41:47 +0100
+Subject: drm/radeon: use post-decrement in error handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+
+commit bc3f5d8c4ca01555820617eb3b6c0857e4df710d upstream.
+
+We need to use post-decrement to get the pci_map_page undone also for
+i==0, and to avoid some very unpleasant behaviour if pci_map_page
+failed already at i==0.
+
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_ttm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_ttm.c
++++ b/drivers/gpu/drm/radeon/radeon_ttm.c
+@@ -619,7 +619,7 @@ static int radeon_ttm_tt_populate(struct
+                                                      0, PAGE_SIZE,
+                                                      PCI_DMA_BIDIRECTIONAL);
+               if (pci_dma_mapping_error(rdev->pdev, gtt->ttm.dma_address[i])) {
+-                      while (--i) {
++                      while (i--) {
+                               pci_unmap_page(rdev->pdev, gtt->ttm.dma_address[i],
+                                              PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+                               gtt->ttm.dma_address[i] = 0;

diff --git a/queue-3.10/series b/queue-3.10/series
index ae79d170dfe634cd19679f96bb9d07cc65e784a0..ffe7f1bb8bccbfab0c92d11dd3e210adaa2fbf41 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -63,3 +63,4 @@ sparc64-fix-incorrect-sign-extension-in-sys_sparc64_personality.patch
 drm-vmwgfx-respect-nomodeset.patch
 drm-radeon-clean-up-fujitsu-quirks.patch
 drm-radeon-hold-reference-to-fences-in-radeon_sa_bo_new.patch
+drm-radeon-use-post-decrement-in-error-handling.patch