Mesa (master): nouveau: Turn off debug cannon.

[Younes Manton]

Module: Mesa
Branch: master
Commit: 78aaf2a4f16bafd8f3880e63982dea7219125ff0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=78aaf2a4f16bafd8f3880e63982dea7219125ff0

Author: Younes Manton <younes.m at gmail.com>
Date:   Wed Jun 24 19:38:52 2009 -0400

nouveau: Turn off debug cannon.

---

 src/gallium/drivers/nv04/nv04_surface_2d.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv04/nv04_surface_2d.c b/src/gallium/drivers/nv04/nv04_surface_2d.c
index 5afd028..f315cf5 100644
--- a/src/gallium/drivers/nv04/nv04_surface_2d.c
+++ b/src/gallium/drivers/nv04/nv04_surface_2d.c
@@ -267,8 +267,7 @@ nv04_surface_copy(struct nv04_surface_2d *ctx, struct pipe_surface *dst,
 	 * to NV_MEMORY_TO_MEMORY_FORMAT in this case.
 	 */
 	if ((src->offset & 63) || (dst->offset & 63) ||
-	    (src_pitch & 63) || (dst_pitch & 63) ||
-	    debug_get_bool_option("NOUVEAU_NO_COPYBLIT", FALSE)) {
+	    (src_pitch & 63) || (dst_pitch & 63)) {
 		nv04_surface_copy_m2mf(ctx, dst, dx, dy, src, sx, sy, w, h);
 		return;
 	}