fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-21 17:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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@emersion.fr>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8500>
(cherry picked from commit a4c11385b7)
This commit is contained in:
Simon Ser 2021-01-14 19:12:32 +01:00 • committed by Dylan Baker
parent 0a1f910f71
commit 7d9947458d
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1939,7 +1939,7 @@
"description": "nouveau/nv50: fix linear buffer alignment for scan-out/cursors",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

16
src/gallium/drivers/nouveau/nv50/nv50_miptree.c
View file

@ -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;