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

Author: Nicolai Hähnle <[email protected]>
Date:   Fri May 13 00:04:04 2016 -0500

radeonsi: fix undefined left-shift into sign bit

Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>

---

 src/gallium/drivers/radeonsi/cik_sdma.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c 
b/src/gallium/drivers/radeonsi/cik_sdma.c
index d8ec2a3..a36bbce 100644
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -370,12 +370,13 @@ static bool cik_sdma_copy_texture(struct si_context *sctx,
                    copy_height <= (1 << 14) &&
                    copy_depth <= (1 << 11)) {
                        struct radeon_winsys_cs *cs = sctx->b.dma.cs;
+                       uint32_t direction = linear == rdst ? 1u << 31 : 0;
 
                        r600_need_dma_space(&sctx->b, 14, &rdst->resource, 
&rsrc->resource);
 
                        radeon_emit(cs, CIK_SDMA_PACKET(CIK_SDMA_OPCODE_COPY,
                                                        
CIK_SDMA_COPY_SUB_OPCODE_TILED_SUB_WINDOW, 0) |
-                                       ((linear == rdst) << 31));
+                                       direction);
                        radeon_emit(cs, tiled_address);
                        radeon_emit(cs, tiled_address >> 32);
                        radeon_emit(cs, tiled_x | (tiled_y << 16));

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to