3.10-stable patches

added patches:
	revert-drm-radeon-hold-reference-to-fences-in-radeon_sa_bo_new.patch

diff --git a/queue-3.10/revert-drm-radeon-hold-reference-to-fences-in-radeon_sa_bo_new.patch b/queue-3.10/revert-drm-radeon-hold-reference-to-fences-in-radeon_sa_bo_new.patch
new file mode 100644 (file)
index 0000000..f658832
--- /dev/null
+++ b/queue-3.10/revert-drm-radeon-hold-reference-to-fences-in-radeon_sa_bo_new.patch
@@ -0,0 +1,37 @@
+From foo@baz Mon Mar  7 14:56:11 PST 2016
+Date: Mon, 07 Mar 2016 14:56:11 -0800
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new"
+
+This reverts commit 8d5e1e5af0c667545c202e8f4051f77aa3bf31b7 which was
+commit f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb upstream.
+
+It breaks working hardware, a backported version might be provided at
+some unknown time in the future.
+
+Reported-by: Erik Andersen <andersen@codepoet.org>
+Acked-by: Christian König <christian.koenig@amd.com>
+Cc: Nicolai Hähnle <nicolai.haehnle@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_sa.c |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_sa.c
++++ b/drivers/gpu/drm/radeon/radeon_sa.c
+@@ -349,13 +349,8 @@ int radeon_sa_bo_new(struct radeon_devic
+                       /* see if we can skip over some allocations */
+               } while (radeon_sa_bo_next_hole(sa_manager, fences, tries));
+ 
+-              for (i = 0; i < RADEON_NUM_RINGS; ++i)
+-                      radeon_fence_ref(fences[i]);
+-
+               spin_unlock(&sa_manager->wq.lock);
+               r = radeon_fence_wait_any(rdev, fences, false);
+-              for (i = 0; i < RADEON_NUM_RINGS; ++i)
+-                      radeon_fence_unref(&fences[i]);
+               spin_lock(&sa_manager->wq.lock);
+               /* if we have nothing to wait for block */
+               if (r == -ENOENT && block) {

diff --git a/queue-3.10/series b/queue-3.10/series
index d1adfa8872202fdc37507effea6effb7af15f2ca..bff309a7bb1aed8b0688f2587534f3890cfcc8bf 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -21,3 +21,4 @@ usb-cp210x-add-id-for-parrot-nmea-gps-flight-recorder.patch
 usb-serial-option-add-support-for-telit-le922-pid-0x1045.patch
 usb-serial-option-add-support-for-quectel-uc20.patch
 ubi-fix-out-of-bounds-write-in-volume-update-code.patch
+revert-drm-radeon-hold-reference-to-fences-in-radeon_sa_bo_new.patch