diff mbox

drm/radeon/6xx: disable use of the DMA ring for ttm bo moves

Message ID 1356287305-16773-1-git-send-email-alexdeucher@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alex Deucher Dec. 23, 2012, 6:28 p.m. UTC 
From: Alex Deucher <alexander.deucher@amd.com>

Seems to fall over in some cases with heavy memory thrashing on
6xx.  Needs more investigation after the holidays, disable for
now.

Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/radeon/radeon_asic.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Comments

Borislav Petkov Dec. 23, 2012, 6:56 p.m. UTC | #1 
On Sun, Dec 23, 2012 at 01:28:25PM -0500, alexdeucher@gmail.com wrote:
> From: Alex Deucher <alexander.deucher@amd.com>
> 
> Seems to fall over in some cases with heavy memory thrashing on
> 6xx.  Needs more investigation after the holidays, disable for
> now.
> 
> Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Yep, running with the revert doesn't show any other adverse effects so
the real fix can take its time, relax and enjoy the holidays :-).

I'll test this one tomorrow just in case, even though it looks trivial.

Thanks.
Borislav Petkov Dec. 25, 2012, 10:55 a.m. UTC | #2 
On Sun, Dec 23, 2012 at 01:28:25PM -0500, alexdeucher@gmail.com wrote:
> From: Alex Deucher <alexander.deucher@amd.com>
> 
> Seems to fall over in some cases with heavy memory thrashing on
> 6xx.  Needs more investigation after the holidays, disable for
> now.
> 
> Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Tested-by: Borislav Petkov <bp@alien8.de>
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 596bcbe..c66b92d 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -974,8 +974,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,
@@ -1058,8 +1058,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,