From: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu, 3 Jul 2014 01:58:57 +0000 (+0900)
Subject: Revert "radeonsi: Use dma_copy when possible for si_blit."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=370184e813b25b463ad3dc9ca814231c98b95864;p=mesa.git

Revert "radeonsi: Use dma_copy when possible for si_blit."

This reverts commit 5d5c20920e0e570742a497aa047e99a2fa3c04f2.

Caused visual corruption, see e.g.
https://bugs.freedesktop.org/show_bug.cgi?id=80827#c1
---

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 6162dfa5a46..8c3e1364160 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -730,25 +730,6 @@ static void si_blit(struct pipe_context *ctx,
 		return;
 	}
 
-	if (info->src.box.width ==  info->dst.box.width &&
-	    info->src.box.height ==  info->dst.box.height &&
-	    info->src.format == info->dst.format &&
-	    info->src.box.width > 0 &&
-	    info->src.box.height > 0 &&
-	    info->src.resource->nr_samples <= 1 &&
-	    info->dst.resource->nr_samples <= 1 &&
-	    info->src.box.depth == info->dst.box.depth &&
-	    info->mask == PIPE_MASK_RGBA &&
-	    !info->scissor_enable &&
-	    (!info->render_condition_enable ||
-	     !sctx->b.current_render_cond)) {
-		sctx->b.dma_copy(ctx, info->dst.resource, info->dst.level,
-				 info->dst.box.x, info->dst.box.y,
-				 info->dst.box.z, info->src.resource,
-				 info->src.level, &(info->src.box));
-		return;
-	}
-
 	assert(util_blitter_is_blit_supported(sctx->blitter, info));
 
 	/* The driver doesn't decompress resources automatically while