From: Greg Kroah-Hartman Date: Mon, 7 Mar 2016 22:58:40 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.10.100~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df816469da690574f5ddeebc225dede99d1b29f1;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..f658832bce1 --- /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 +From: Greg Kroah-Hartman +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 +Acked-by: Christian König +Cc: Nicolai Hähnle +Signed-off-by: Greg Kroah-Hartman + +--- + 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 d1adfa88722..bff309a7bb1 100644 --- 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