nv50: apply layout_mask to tile_flags

The tile_flags now store more than just nv50 page table entry bits.

diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index ac69c7848e93dfee03dbf3580595793bfe2965b1..bf6a577188be55bafa193188c07c520ab596b015 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -26,6 +26,9 @@
 #define NOUVEAU_MSG(fmt, args...) \
        fprintf(stderr, "nouveau: "fmt, ##args);
 
+#define nouveau_bo_tile_layout(nvbo) \
+       ((nvbo)->tile_flags & NOUVEAU_BO_TILE_LAYOUT_MASK)
+
 /* Constant buffer assignment */
 #define NV50_CB_PMISC          0
 #define NV50_CB_PVP            1

diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index 3f3166261b11837159442d58ed1190ab7216ff2c..f70c138fe1a3e75183c31af38c941aeb94623b62 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -92,7 +92,7 @@ nv50_surface_set(struct nv50_screen *screen, struct pipe_surface *ps, int dst)
                return 1;
        }
 
-       if (!bo->tile_flags) {
+       if (!nouveau_bo_tile_layout(bo)) {
                BEGIN_RING(chan, eng2d, mthd, 2);
                OUT_RING  (chan, format);
                OUT_RING  (chan, 1);

diff --git a/src/gallium/drivers/nv50/nv50_transfer.c b/src/gallium/drivers/nv50/nv50_transfer.c
index f973cf24b9863c49bc1cffdeaadfa0a1b02a8921..0cc2f4a837f0dcefa3cc36643b76519865636256 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_transfer.c
+++ b/src/gallium/drivers/nv50/nv50_transfer.c
@@ -45,7 +45,7 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen,
 
        WAIT_RING (chan, 14);
 
-       if (!src_bo->tile_flags) {
+       if (!nouveau_bo_tile_layout(src_bo)) {
                BEGIN_RING(chan, m2mf,
                        NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 1);
                OUT_RING  (chan, 1);
@@ -64,7 +64,7 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen,
                OUT_RING  (chan, sz); /* copying only 1 zslice per call */
        }
 
-       if (!dst_bo->tile_flags) {
+       if (!nouveau_bo_tile_layout(dst_bo)) {
                BEGIN_RING(chan, m2mf,
                        NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 1);
                OUT_RING  (chan, 1);
@@ -95,14 +95,14 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen,
                        NV04_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 2);
                OUT_RELOCl(chan, src_bo, src_offset, src_reloc);
                OUT_RELOCl(chan, dst_bo, dst_offset, dst_reloc);
-               if (src_bo->tile_flags) {
+               if (nouveau_bo_tile_layout(src_bo)) {
                        BEGIN_RING(chan, m2mf,
                                NV50_MEMORY_TO_MEMORY_FORMAT_TILING_POSITION_IN, 1);
                        OUT_RING  (chan, (sy << 16) | (sx * cpp));
                } else {
                        src_offset += (line_count * src_pitch);
                }
-               if (dst_bo->tile_flags) {
+               if (nouveau_bo_tile_layout(dst_bo)) {
                        BEGIN_RING(chan, m2mf,
                                NV50_MEMORY_TO_MEMORY_FORMAT_TILING_POSITION_OUT, 1);
                        OUT_RING  (chan, (dy << 16) | (dx * cpp));
@@ -280,7 +280,7 @@ nv50_upload_sifc(struct nv50_context *nv50,
 
        MARK_RING (chan, 32, 2); /* flush on lack of space or relocs */
 
-       if (bo->tile_flags) {
+       if (nouveau_bo_tile_layout(bo)) {
                BEGIN_RING(chan, eng2d, NV50_2D_DST_FORMAT, 5);
                OUT_RING  (chan, dst_format);
                OUT_RING  (chan, 0);