summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2014-04-22 08:17:18 -0400
committerChristian König <christian.koenig@amd.com>2014-04-22 14:51:51 +0200
commit7e95cfb0b797678cd3493ca0322ef2675547a0bc (patch)
tree0c3e605d14e82d27c228a98f8132364d834459a7 /drivers/gpu/drm
parentad47b8fa5a679b7acaae831635e40d2e4887e9e7 (diff)
downloadlinux-7e95cfb0b797678cd3493ca0322ef2675547a0bc.tar.gz
linux-7e95cfb0b797678cd3493ca0322ef2675547a0bc.tar.bz2
linux-7e95cfb0b797678cd3493ca0322ef2675547a0bc.zip
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>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/radeon/cik_sdma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 89b4afa5041c..f7e46cf682af 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;