From: Eric Anholt <eric@anholt.net>
Date: Tue, 2 Mar 2010 18:41:08 +0000 (-0800)
Subject: intel: Use GTT mapping in the blit fallback path in case there's tiling.
X-Git-Tag: mesa-7.8~250
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55e90e46e0f4f3f8b5da334d84fefb65b9b3d45b;p=platform%2Fupstream%2Fmesa.git

intel: Use GTT mapping in the blit fallback path in case there's tiling.
---

diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c
index 196a64a..1d099e7 100644
--- a/src/mesa/drivers/dri/intel/intel_blit.c
+++ b/src/mesa/drivers/dri/intel/intel_blit.c
@@ -122,21 +122,20 @@ intelEmitCopyBlit(struct intel_context *intel,
    intel_prepare_render(intel);
 
    if (pass >= 2) {
-       dri_bo_map(dst_buffer, GL_TRUE);
-       dri_bo_map(src_buffer, GL_FALSE);
-       _mesa_copy_rect((GLubyte *)dst_buffer->virtual + dst_offset,
-                       cpp,
-                       dst_pitch,
-                       dst_x, dst_y, 
-                       w, h, 
-                       (GLubyte *)src_buffer->virtual + src_offset, 
-                       src_pitch,
-                       src_x, src_y);
-       
-       dri_bo_unmap(src_buffer);
-       dri_bo_unmap(dst_buffer);
-
-       return GL_TRUE;
+      intel_bo_map_gtt_preferred(intel, dst_buffer, GL_TRUE);
+      intel_bo_map_gtt_preferred(intel, src_buffer, GL_FALSE);
+      _mesa_copy_rect((GLubyte *)dst_buffer->virtual + dst_offset,
+		      cpp,
+		      dst_pitch,
+		      dst_x, dst_y,
+		      w, h,
+		      (GLubyte *)src_buffer->virtual + src_offset,
+		      src_pitch,
+		      src_x, src_y);
+      intel_bo_unmap_gtt_preferred(intel, src_buffer);
+      intel_bo_unmap_gtt_preferred(intel, dst_buffer);
+
+      return GL_TRUE;
    }
 
    intel_batchbuffer_require_space(intel->batch, 8 * 4);