projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad47b8f
)
drm/radeon: fix count in cik_sdma_ring_test()
author
Alex Deucher
<alexdeucher@gmail.com>
Tue, 22 Apr 2014 12:17:18 +0000
(08:17 -0400)
committer
Christian König
<christian.koenig@amd.com>
Tue, 22 Apr 2014 12:51:51 +0000
(14:51 +0200)
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>
drivers/gpu/drm/radeon/cik_sdma.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/cik_sdma.c
b/drivers/gpu/drm/radeon/cik_sdma.c
index 89b4afa5041c322a15afc67bfbba7f7cf2cef8d6..f7e46cf682afdcbe051cb4a6ecf6dfe66570a5c3 100644
(file)
--- 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;