Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeea40cb authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: Disable dma rings for bo moves on r6xx 



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: default avatarJ.N. <golden.fleeced@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9847b36a

drivers/gpu/drm/radeon/radeon_asic.c

+6 −6
Original line number Diff line number Diff line
@@ -1026,8 +1026,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,
@@ -1119,8 +1119,8 @@ static struct radeon_asic rv6xx_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,
@@ -1229,8 +1229,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,