Attachment 75277 Details for Bug 50655 – flush fix 4/4

[patch] flush fix 4/4

0004-r600g-enable-CP-DMA-on-r6xx.patch (text/plain), 1.81 KB, created by Alex Deucher on 2013-02-22 00:16:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-02-22 00:16:21 UTC

Size: 1.81 KB

patch

obsolete

>From 5a6160294cfaef78c3d3058ce99d82f001f003c1 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Thu, 21 Feb 2013 18:57:25 -0500
>Subject: [PATCH 4/4] r600g: enable CP DMA on r6xx
>
>With the previous flushing changes this seems to work
>reliably now.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> src/gallium/drivers/r600/r600_blit.c       |    3 +--
> src/gallium/drivers/r600/r600_hw_context.c |    6 ------
> 2 files changed, 1 insertions(+), 8 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
>index 046eab5..019b456 100644
>--- a/src/gallium/drivers/r600/r600_blit.c
>+++ b/src/gallium/drivers/r600/r600_blit.c
>@@ -508,8 +508,7 @@ void r600_copy_buffer(struct pipe_context *ctx, struct pipe_resource *dst, unsig
> {
> 	struct r600_context *rctx = (struct r600_context*)ctx;
> 
>-	/* CP DMA doesn't work on R600 (flushing seems to be unreliable). */
>-	if (rctx->screen->info.drm_minor >= 27 && rctx->chip_class >= R700) {
>+	if (rctx->screen->info.drm_minor >= 27) {
> 		r600_cp_dma_copy_buffer(rctx, dst, dstx, src, src_box->x, src_box->width);
> 	}
> 	else if (rctx->screen->has_streamout &&
>diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
>index 62a88c1..23a8027 100644
>--- a/src/gallium/drivers/r600/r600_hw_context.c
>+++ b/src/gallium/drivers/r600/r600_hw_context.c
>@@ -1113,12 +1113,6 @@ void r600_cp_dma_copy_buffer(struct r600_context *rctx,
> 	struct radeon_winsys_cs *cs = rctx->rings.gfx.cs;
> 
> 	assert(size);
>-	assert(rctx->chip_class != R600);
>-
>-	/* CP DMA doesn't work on R600 (flushing seems to be unreliable). */
>-	if (rctx->chip_class == R600) {
>-		return;
>-	}
> 
> 	dst_offset += r600_resource_va(&rctx->screen->screen, dst);
> 	src_offset += r600_resource_va(&rctx->screen->screen, src);
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 50655: 62474 | 62475 | 62476 | 62478 | 62689 | 66040 | 66047 | 71271 | 71346 | 75272 | 75274 | 75275 | 75276 | 75277 | 75317 | 75318 | 75319 | 75320 | 75321 | 75331 | 75363 | 75373

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.