This is a note to let you know that I've just added the patch titled
drm/radeon: fix count in cik_sdma_ring_test()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-fix-count-in-cik_sdma_ring_test.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 7e95cfb0b797678cd3493ca0322ef2675547a0bc Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 22 Apr 2014 08:17:18 -0400
Subject: drm/radeon: fix count in cik_sdma_ring_test()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alex Deucher <[email protected]>
commit 7e95cfb0b797678cd3493ca0322ef2675547a0bc upstream.
Should be 5 rather than 4.
Noticed-by: Mathias Fröhlich <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Christian König <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/cik_sdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -599,7 +599,7 @@ int cik_sdma_ring_test(struct radeon_dev
tmp = 0xCAFEDEAD;
writel(tmp, ptr);
- r = radeon_ring_lock(rdev, ring, 4);
+ r = radeon_ring_lock(rdev, ring, 5);
if (r) {
DRM_ERROR("radeon: dma failed to lock ring %d (%d).\n",
ring->idx, r);
return r;
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/drm-radeon-disable-mclk-dpm-on-r7-260x.patch
queue-3.14/drm-radeon-fix-audio-pin-counts-for-dce6-v2.patch
queue-3.14/drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch
queue-3.14/drm-radeon-don-t-allow-runpm-1-on-systems-with-out-atpx.patch
queue-3.14/drm-radeon-re-enable-mclk-dpm-on-r7-260x-asics.patch
queue-3.14/drm-radeon-pm-don-t-walk-the-crtc-list-before-it-has-been-initialized-v2.patch
queue-3.14/drm-radeon-si-make-sure-mc-ucode-is-loaded-before-checking-the-size.patch
queue-3.14/drm-radeon-fix-count-in-cik_sdma_ring_test.patch
queue-3.14/drm-radeon-fix-runpm-handling-on-apus-v4.patch
queue-3.14/drm-radeon-add-support-for-newer-mc-ucode-on-si-v2.patch
queue-3.14/drm-radeon-properly-unregister-hwmon-interface-v2.patch
queue-3.14/drm-radeon-disable-dpm-on-rv770-by-default.patch
queue-3.14/drm-radeon-ci-make-sure-mc-ucode-is-loaded-before-checking-the-size.patch
queue-3.14/drm-radeon-add-support-for-newer-mc-ucode-on-ci-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
