Mesa (master): nouveau/nv50: fix linear buffer alignment for scan-out/cursors

[GitLab Mirror]

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

Author: Simon Ser <contact at emersion.fr>
Date:   Thu Jan 14 19:12:32 2021 +0100

nouveau/nv50: fix linear buffer alignment for scan-out/cursors

The hardware can only scan-out linear buffers with a pitch
aligned to 256. It can only use packed buffers for cursors.

Signed-off-by: Simon Ser <contact at emersion.fr>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8500>

---

 src/gallium/drivers/nouveau/nv50/nv50_miptree.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_miptree.c b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
index 400ce6c9326..9578fc3d1c7 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
@@ -342,6 +342,7 @@ nv50_miptree_create(struct pipe_screen *pscreen,
    int ret;
    union nouveau_bo_config bo_config;
    uint32_t bo_flags;
+   unsigned pitch_align;
 
    if (!mt)
       return NULL;
@@ -370,10 +371,17 @@ nv50_miptree_create(struct pipe_screen *pscreen,
    } else
    if (bo_config.nv50.memtype != 0) {
       nv50_miptree_init_layout_tiled(mt);
-   } else
-   if (!nv50_miptree_init_layout_linear(mt, 64)) {
-      FREE(mt);
-      return NULL;
+   } else {
+      if (pt->usage & PIPE_BIND_CURSOR)
+         pitch_align = 1;
+      else if (pt->usage & PIPE_BIND_SCANOUT)
+         pitch_align = 256;
+      else
+         pitch_align = 64;
+      if (!nv50_miptree_init_layout_linear(mt, pitch_align)) {
+         FREE(mt);
+         return NULL;
+      }
    }
    bo_config.nv50.tile_mode = mt->level[0].tile_mode;