gallium: Preparations for adding more PIPE_TRANSFER_* usage flags.

[mesa.git] / src / gallium / drivers / nv50 / nv50_transfer.c

diff --git a/src/gallium/drivers/nv50/nv50_transfer.c b/src/gallium/drivers/nv50/nv50_transfer.c
index d0b7f0bef43900cce8f4126703b4bd05604764ce..9c289026bbb14498adccdfa5f1ee602794c71416 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_transfer.c
+++ b/src/gallium/drivers/nv50/nv50_transfer.c
@@ -8,6 +8,7 @@ struct nv50_transfer {
        struct pipe_transfer base;
        struct nouveau_bo *bo;
        unsigned level_offset;
+       unsigned level_tiling;
        int level_pitch;
        int level_width;
        int level_height;
@@ -16,11 +17,14 @@ struct nv50_transfer {
 };
 
 static void
-nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, struct nouveau_bo *src_bo,
-                       unsigned src_offset, int src_pitch, int sx, int sy,
-                       int sw, int sh, struct nouveau_bo *dst_bo,
-                       unsigned dst_offset, int dst_pitch, int dx, int dy,
-                       int dw, int dh, int cpp, int width, int height,
+nv50_transfer_rect_m2mf(struct pipe_screen *pscreen,
+                       struct nouveau_bo *src_bo, unsigned src_offset,
+                       int src_pitch, unsigned src_tile_mode,
+                       int sx, int sy, int sw, int sh,
+                       struct nouveau_bo *dst_bo, unsigned dst_offset,
+                       int dst_pitch, unsigned dst_tile_mode,
+                       int dx, int dy, int dw, int dh,
+                       int cpp, int width, int height,
                        unsigned src_reloc, unsigned dst_reloc)
 {
        struct nv50_screen *screen = nv50_screen(pscreen);
@@ -33,15 +37,18 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, struct nouveau_bo *src_bo,
        WAIT_RING (chan, 14);
 
        if (!src_bo->tile_flags) {
-               BEGIN_RING(chan, m2mf, 0x0200, 1);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 1);
                OUT_RING  (chan, 1);
-               BEGIN_RING(chan, m2mf, 0x0314, 1);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_PITCH_IN, 1);
                OUT_RING  (chan, src_pitch);
                src_offset += (sy * src_pitch) + (sx * cpp);
        } else {
-               BEGIN_RING(chan, m2mf, 0x0200, 6);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 6);
                OUT_RING  (chan, 0);
-               OUT_RING  (chan, src_bo->tile_mode << 4);
+               OUT_RING  (chan, src_tile_mode << 4);
                OUT_RING  (chan, sw * cpp);
                OUT_RING  (chan, sh);
                OUT_RING  (chan, 1);
@@ -49,15 +56,18 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, struct nouveau_bo *src_bo,
        }
 
        if (!dst_bo->tile_flags) {
-               BEGIN_RING(chan, m2mf, 0x021c, 1);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 1);
                OUT_RING  (chan, 1);
-               BEGIN_RING(chan, m2mf, 0x0318, 1);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_PITCH_OUT, 1);
                OUT_RING  (chan, dst_pitch);
                dst_offset += (dy * dst_pitch) + (dx * cpp);
        } else {
-               BEGIN_RING(chan, m2mf, 0x021c, 6);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 6);
                OUT_RING  (chan, 0);
-               OUT_RING  (chan, dst_bo->tile_mode << 4);
+               OUT_RING  (chan, dst_tile_mode << 4);
                OUT_RING  (chan, dw * cpp);
                OUT_RING  (chan, dh);
                OUT_RING  (chan, 1);
@@ -68,25 +78,30 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, struct nouveau_bo *src_bo,
                int line_count = height > 2047 ? 2047 : height;
 
                WAIT_RING (chan, 15);
-               BEGIN_RING(chan, m2mf, 0x0238, 2);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN_HIGH, 2);
                OUT_RELOCh(chan, src_bo, src_offset, src_reloc);
                OUT_RELOCh(chan, dst_bo, dst_offset, dst_reloc);
-               BEGIN_RING(chan, m2mf, 0x030c, 2);
+               BEGIN_RING(chan, m2mf,
+                       NV50_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) {
-                       BEGIN_RING(chan, m2mf, 0x0218, 1);
-                       OUT_RING  (chan, (dy << 16) | sx);
+                       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) {
-                       BEGIN_RING(chan, m2mf, 0x0234, 1);
-                       OUT_RING  (chan, (sy << 16) | dx);
+                       BEGIN_RING(chan, m2mf,
+                               NV50_MEMORY_TO_MEMORY_FORMAT_TILING_POSITION_OUT, 1);
+                       OUT_RING  (chan, (dy << 16) | (dx * cpp));
                } else {
                        dst_offset += (line_count * dst_pitch);
                }
-               BEGIN_RING(chan, m2mf, 0x031c, 4);
+               BEGIN_RING(chan, m2mf,
+                       NV50_MEMORY_TO_MEMORY_FORMAT_LINE_LENGTH_IN, 4);
                OUT_RING  (chan, width * cpp);
                OUT_RING  (chan, line_count);
                OUT_RING  (chan, 0x00000101);
@@ -133,9 +148,10 @@ nv50_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
        tx->base.usage = usage;
 
        tx->level_pitch = lvl->pitch;
-       tx->level_width = mt->base.width[level];
-       tx->level_height = mt->base.height[level];
+       tx->level_width = mt->base.base.width[level];
+       tx->level_height = mt->base.base.height[level];
        tx->level_offset = lvl->image_offset[image];
+       tx->level_tiling = lvl->tile_mode;
        tx->level_x = x;
        tx->level_y = y;
        ret = nouveau_bo_new(dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 0,
@@ -145,11 +161,13 @@ nv50_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                return NULL;
        }
 
-       if (usage != PIPE_TRANSFER_WRITE) {
-               nv50_transfer_rect_m2mf(pscreen, mt->bo, tx->level_offset,
-                                       tx->level_pitch, x, y, tx->level_width,
-                                       tx->level_height, tx->bo, 0,
-                                       tx->base.stride, 0, 0,
+       if (usage & PIPE_TRANSFER_READ) {
+               nv50_transfer_rect_m2mf(pscreen, mt->base.bo, tx->level_offset,
+                                       tx->level_pitch, tx->level_tiling,
+                                       x, y,
+                                       tx->level_width, tx->level_height,
+                                       tx->bo, 0, tx->base.stride,
+                                       tx->bo->tile_mode, 0, 0,
                                        tx->base.width, tx->base.height,
                                        tx->base.block.size, w, h,
                                        NOUVEAU_BO_VRAM | NOUVEAU_BO_GART,
@@ -165,15 +183,17 @@ nv50_transfer_del(struct pipe_transfer *ptx)
        struct nv50_transfer *tx = (struct nv50_transfer *)ptx;
        struct nv50_miptree *mt = nv50_miptree(ptx->texture);
 
-       if (ptx->usage != PIPE_TRANSFER_READ) {
+       if (ptx->usage & PIPE_TRANSFER_WRITE) {
                struct pipe_screen *pscreen = ptx->texture->screen;
                nv50_transfer_rect_m2mf(pscreen, tx->bo, 0, tx->base.stride,
-                                       0, 0, tx->base.width, tx->base.height,
-                                       mt->bo, tx->level_offset,
-                                       tx->level_pitch, tx->level_x,
-                                       tx->level_y, tx->level_width,
-                                       tx->level_height, tx->base.block.size,
+                                       tx->bo->tile_mode, 0, 0,
                                        tx->base.width, tx->base.height,
+                                       mt->base.bo, tx->level_offset,
+                                       tx->level_pitch, tx->level_tiling,
+                                       tx->level_x, tx->level_y,
+                                       tx->level_width, tx->level_height,
+                                       tx->base.block.size, tx->base.width,
+                                       tx->base.height,
                                        NOUVEAU_BO_GART, NOUVEAU_BO_VRAM |
                                        NOUVEAU_BO_GART);
        }