Please use this updated patch for 3.10 and earlier kernels. Thanks, Alex > -----Original Message----- > From: gregkh@xxxxxxxxxxxxxxxxxxx [mailto:gregkh@xxxxxxxxxxxxxxxxxxx] > Sent: Sunday, August 04, 2013 11:11 PM > To: Deucher, Alexander; Koenig, Christian; golden.fleeced@xxxxxxxxx; > gregkh@xxxxxxxxxxxxxxxxxxx > Cc: stable@xxxxxxxxxxxxxxx; stable-commits@xxxxxxxxxxxxxxx > Subject: Patch "drm/radeon: Disable dma rings for bo moves on r6xx" has > been added to the 3.10-stable tree > > > This is a note to let you know that I've just added the patch titled > > drm/radeon: Disable dma rings for bo moves on r6xx > > to the 3.10-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-disable-dma-rings-for-bo-moves-on-r6xx.patch > and it can be found in the queue-3.10 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > From aeea40cbf9388fc829e66fa049f64d97fd72e118 Mon Sep 17 00:00:00 2001 > From: Alex Deucher <alexander.deucher@xxxxxxx> > Date: Thu, 11 Jul 2013 14:20:11 -0400 > Subject: drm/radeon: Disable dma rings for bo moves on r6xx > > From: Alex Deucher <alexander.deucher@xxxxxxx> > > commit aeea40cbf9388fc829e66fa049f64d97fd72e118 upstream. > > They still seem to cause instability on some r6xx parts. > As a follow up, we can switch to using CP DMA for bo > moves on r6xx as a lighter weight alternative to using > the 3D engine. > > A version of this patch should also go to stable kernels. > > Tested-by: J.N. <golden.fleeced@xxxxxxxxx> > Reviewed-by: Christian K??nig <christian.koenig@xxxxxxx> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/gpu/drm/radeon/radeon_asic.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- a/drivers/gpu/drm/radeon/radeon_asic.c > +++ b/drivers/gpu/drm/radeon/radeon_asic.c > @@ -986,8 +986,8 @@ static struct radeon_asic r600_asic = { > .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, > .dma = &r600_copy_dma, > .dma_ring_index = R600_RING_TYPE_DMA_INDEX, > - .copy = &r600_copy_dma, > - .copy_ring_index = R600_RING_TYPE_DMA_INDEX, > + .copy = &r600_copy_blit, > + .copy_ring_index = RADEON_RING_TYPE_GFX_INDEX, > }, > .surface = { > .set_reg = r600_set_surface_reg, > @@ -1074,8 +1074,8 @@ static struct radeon_asic rs780_asic = { > .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, > .dma = &r600_copy_dma, > .dma_ring_index = R600_RING_TYPE_DMA_INDEX, > - .copy = &r600_copy_dma, > - .copy_ring_index = R600_RING_TYPE_DMA_INDEX, > + .copy = &r600_copy_blit, > + .copy_ring_index = RADEON_RING_TYPE_GFX_INDEX, > }, > .surface = { > .set_reg = r600_set_surface_reg, > > > Patches currently in stable-queue which might be from > alexander.deucher@xxxxxxx are > > queue-3.10/drm-radeon-disable-dma-rings-for-bo-moves-on-r6xx.patch
Attachment:
0001-drm-radeon-Disable-dma-rings-for-bo-moves-on-r6xx.patch
Description: 0001-drm-radeon-Disable-dma-rings-for-bo-moves-on-r6xx.patch