From 0a1f910f71ed28adc18300fbd993c2649aaa625c Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 14 Jan 2021 19:02:41 +0100 Subject: [PATCH] nouveau/nvc0: 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 Reviewed-by: Ilia Mirkin Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/36 Cc: mesa-stable Part-of: (cherry picked from commit 6650c53e64198d1b2a283778e620be8458765dae) --- .pick_status.json | 2 +- .../drivers/nouveau/nvc0/nvc0_miptree.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c65a22f7c5a..62e050f7bb1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1948,7 +1948,7 @@ "description": "nouveau/nvc0: fix linear buffer alignment for scan-out/cursors", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c index a095515e48d..c8e94d6ad7b 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c @@ -377,6 +377,7 @@ nvc0_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; @@ -421,10 +422,19 @@ nvc0_miptree_create(struct pipe_screen *pscreen, } else if (likely(bo_config.nvc0.memtype)) { nvc0_miptree_init_layout_tiled(mt); - } else - if (!nv50_miptree_init_layout_linear(mt, 128)) { - FREE(mt); - return NULL; + } else { + /* When modifiers are supplied, usage is zero. TODO: detect the + * modifiers+cursor case. */ + if (pt->usage & PIPE_BIND_CURSOR) + pitch_align = 1; + else if ((pt->usage & PIPE_BIND_SCANOUT) || count > 0) + pitch_align = 256; + else + pitch_align = 128; + if (!nv50_miptree_init_layout_linear(mt, pitch_align)) { + FREE(mt); + return NULL; + } } bo_config.nvc0.tile_mode = mt->level[0].tile_mode;