Am 22.04.2014 14:17, schrieb Alex Deucher: > Should be 5 rather than 4. > > Noticed-by: Mathias Fr?hlich <Mathias.Froehlich at gmx.net> > Signed-off-by: Alex Deucher <alexander.deucher at amd.com> > Cc: stable at vger.kernel.org
Added to my 3.15 queue. Christian. > --- > drivers/gpu/drm/radeon/cik_sdma.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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;