From cdafa21188ea32a7d257dadfd0ed15cd2f0344f6 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 14 Mar 2013 20:38:34 -0400 Subject: [PATCH] r600g: fix dma copies on cayman (v3) Need to set the non_disp bit for 128 bit formats. v3: only set if src is tiled Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60802 Note: this is a candidate for the 9.1 branch. Signed-off-by: Alex Deucher --- src/gallium/drivers/r600/evergreen_state.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 2bdefb0..fa9ff12 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -3528,7 +3528,7 @@ static void evergreen_dma_copy_tile(struct r600_context *rctx, struct r600_texture *rdst = (struct r600_texture*)dst; unsigned array_mode, lbpp, pitch_tile_max, slice_tile_max, size; unsigned ncopy, height, cheight, detile, i, x, y, z, src_mode, dst_mode; - unsigned sub_cmd, bank_h, bank_w, mt_aspect, nbanks, tile_split; + unsigned sub_cmd, bank_h, bank_w, mt_aspect, nbanks, tile_split, non_disp_tiling = 0; uint64_t base, addr; /* make sure that the dma ring is only one active */ @@ -3572,6 +3572,10 @@ static void evergreen_dma_copy_tile(struct r600_context *rctx, tile_split = eg_tile_split(rsrc->surface.tile_split); base += r600_resource_va(&rctx->screen->screen, src); addr += r600_resource_va(&rctx->screen->screen, dst); + if (rctx->chip_class == CAYMAN) { + if (util_format_get_blocksize(src->format) >= 16) + non_disp_tiling = 1; + } } else { /* L2T */ array_mode = evergreen_array_mode(dst_mode); @@ -3620,7 +3624,7 @@ static void evergreen_dma_copy_tile(struct r600_context *rctx, cs->buf[cs->cdw++] = (pitch_tile_max << 0) | ((height - 1) << 16); cs->buf[cs->cdw++] = (slice_tile_max << 0); cs->buf[cs->cdw++] = (x << 0) | (z << 18); - cs->buf[cs->cdw++] = (y << 0) | (tile_split << 21) | (nbanks << 25); + cs->buf[cs->cdw++] = (y << 0) | (tile_split << 21) | (nbanks << 25) | (non_disp_tiling << 28); cs->buf[cs->cdw++] = addr & 0xfffffffc; cs->buf[cs->cdw++] = (addr >> 32UL) & 0xff; copy_height -= cheight; -- 1.7.7.5