Mesa (master): r200: enable tiling flags on blitter setup.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec  6 09:44:37 2011 +0000

r200: enable tiling flags on blitter setup.

The r200 blitter also didn't set the correct tiling flags.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/drivers/dri/r200/r200_blit.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_blit.c b/src/mesa/drivers/dri/r200/r200_blit.c
index 04ab6d0..fbded53 100644
--- a/src/mesa/drivers/dri/r200/r200_blit.c
+++ b/src/mesa/drivers/dri/r200/r200_blit.c
@@ -149,6 +149,11 @@ static void inline emit_tx_setup(struct r200_context *r200,
 	    break;
     }
 
+    if (bo->flags & RADEON_BO_FLAGS_MACRO_TILE)
+	offset |= R200_TXO_MACRO_TILE;
+    if (bo->flags & RADEON_BO_FLAGS_MICRO_TILE)
+	offset |= R200_TXO_MICRO_TILE;
+
     switch (dst_mesa_format) {
     case MESA_FORMAT_ARGB8888:
     case MESA_FORMAT_XRGB8888:
@@ -327,6 +332,11 @@ static inline void emit_cb_setup(struct r200_context *r200,
 	    break;
     }
 
+    if (bo->flags & RADEON_BO_FLAGS_MACRO_TILE)
+	dst_pitch |= R200_COLOR_TILE_ENABLE;
+    if (bo->flags & RADEON_BO_FLAGS_MICRO_TILE)
+	dst_pitch |= R200_COLOR_MICROTILE_ENABLE;
+
     BEGIN_BATCH_NO_AUTOSTATE(22);
     OUT_BATCH_REGVAL(R200_RE_AUX_SCISSOR_CNTL, 0);
     OUT_BATCH_REGVAL(R200_RE_CNTL, 0);