fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

etnaviv: Fix incorrect pipe_nn creation

Browse source 
When etna_screen_create(..) is called with gpu != NULL and npu == NULL,
screen->pipe_nn is incorrectly set up. This leads to an unintended
stream configuration for compute-only contexts, as determined by

  pipe = (compute_only && screen->pipe_nn) ? screen->pipe_nn : screen->pipe;

To address this, extend the gpu != npu condition by adding a check for
npu != NULL to ensure pipe_nn is only initialized when both gpu and npu
are provided.

Fixes: a4653587cc ("etnaviv: Add a separate NPU pipe")
Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32025>
(cherry picked from commit f4e8849d79)
This commit is contained in:
Christian Gmeiner 2024-11-07 10:28:00 +01:00 • committed by Eric Engestrom
parent bb0502e57b
commit d73b751b90
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -84,7 +84,7 @@
"description": "etnaviv: Fix incorrect pipe_nn creation",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "a4653587cc434e8dbaa2b06cd18c8132ab611f78",
"notes": null

2
src/gallium/drivers/etnaviv/etnaviv_screen.c
View file

@ -1102,7 +1102,7 @@ etna_screen_create(struct etna_device *dev, struct etna_gpu *gpu,
goto fail;
}
if (gpu != npu) {
if (npu && gpu != npu) {
screen->pipe_nn = etna_pipe_new(npu, ETNA_PIPE_3D);
if (!screen->pipe_nn) {
DBG("could not create nn pipe");