OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nouveau: treat DRM_FORMAT_INVALID as implicit modifier

Browse Source 
Failing to allocate resources when DRM_FORMAT_INVALID
is passed as a modifier breaks tegra. Change this behaviour
so that this modifier is instead interpreted as a don't care,
allowing for the driver to choose an appropriate modifier internally.

v2: change nouveau instead of tegra (Thierry Rieding)

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6693
Fixes: 129d83cac2 ("nouveau: Use format modifiers in buffer allocation")
Signed-off-by: Diogo Ivo <diogo.ivo@tecnico.ulisboa.pt>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18649>
This commit is contained in:
Diogo Ivo
2022-09-23 14:40:34 +01:00
committed by Marge Bot
parent 5cd3e39503
commit 941c70a28a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
View File

@@ -423,9 +423,12 @@ nvc0_miptree_select_best_modifier(struct pipe_screen *pscreen,
for (i = 0u; i < count; i++) {
for (p = 0; p < ARRAY_SIZE(prio_supported_mods); p++) {
if (prio_supported_mods[p] == modifiers[i]) {
if (top_mod_slot > p) top_mod_slot = p;
break;
if (prio_supported_mods[p] != DRM_FORMAT_MOD_INVALID) {
if (modifiers[i] == DRM_FORMAT_MOD_INVALID ||
prio_supported_mods[p] == modifiers[i]) {
if (top_mod_slot > p) top_mod_slot = p;
break;
}
}
}
}