nv50: fix tile size calculations

diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index aadffeec36a070d8c3c185df847b11759b87f4f9..ae6b26af1ebfb2fd8803b20d1e8fb208ab2d4145 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -61,7 +61,7 @@ static INLINE unsigned
 calc_zslice_offset(uint32_t tile_mode, unsigned z, unsigned pitch, unsigned nbh)
 {
    unsigned tile_h = NV50_TILE_HEIGHT(tile_mode);
-   unsigned tile_d_shift = NV50_TILE_DIM_SHIFT(tile_mode, 2);
+   unsigned tile_d_shift = NV50_TILE_DIM_SHIFT(tile_mode, 1);
    unsigned tile_d = 1 << tile_d_shift;
 
    /* stride_2d == to next slice within this volume tile */

diff --git a/src/gallium/drivers/nv50/nv50_resource.h b/src/gallium/drivers/nv50/nv50_resource.h
index 76229298f7caec123644385ed36b3d3d2c22788e..0e9f0a2557e22d24e1b82461fa3e6bbbe818c576 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_resource.h
+++ b/src/gallium/drivers/nv50/nv50_resource.h
@@ -21,7 +21,7 @@ nv50_screen_init_resource_functions(struct pipe_screen *pscreen);
 #define NV50_TILE_HEIGHT(m) ( 4 << NV50_TILE_DIM_SHIFT(m, 0))
 #define NV50_TILE_DEPTH(m)  ( 1 << NV50_TILE_DIM_SHIFT(m, 1))
 
-#define NV50_TILE_SIZE_2D(m) ((64 * 8) <<                     \
+#define NV50_TILE_SIZE_2D(m) ((64 * 4) <<                     \
                               NV50_TILE_DIM_SHIFT(m, 0))
 
 #define NV50_TILE_SIZE(m) (NV50_TILE_SIZE_2D(m) << NV50_TILE_DIM_SHIFT(m, 1))