From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 22 Apr 2014 12:17:18 +0000 (-0400)
Subject: drm/radeon: fix count in cik_sdma_ring_test()
X-Git-Tag: v4.0~1940^2~8^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e95cfb0b797678cd3493ca0322ef2675547a0bc;p=platform%2Fkernel%2Flinux-amlogic.git

drm/radeon: fix count in cik_sdma_ring_test()

Should be 5 rather than 4.

Noticed-by: Mathias Fröhlich <Mathias.Froehlich@gmx.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Christian König <christian.koenig@amd.com>
---

diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 89b4afa..f7e46cf 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -597,7 +597,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev,
 	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;