From 6fb9f61f8a0ef7a7732e3c6d2b84c24ba9043744 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Mon, 18 Dec 2023 14:49:14 +0100
Subject: [PATCH] panvk: Fix tracing

pandecode_next_frame() take a decode context. Passing NULL leads to a
NULL deref.

Fixes: 56be9a55be03 ("pan/decode: handle more than one panfrost_device")
Cc: mesa-stable
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27107>
(cherry picked from commit 35a02560c8932d4b1841772b016b8e672e409eda)
---
 .pick_status.json                     | 2 +-
 src/panfrost/vulkan/panvk_vX_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 54022b3c3d9..024fa42ec03 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -254,7 +254,7 @@
         "description": "panvk: Fix tracing",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "56be9a55be03cce9925989e7d22696733488e05b",
         "notes": null
diff --git a/src/panfrost/vulkan/panvk_vX_device.c b/src/panfrost/vulkan/panvk_vX_device.c
index 433b7bae9fd..bd25a566014 100644
--- a/src/panfrost/vulkan/panvk_vX_device.c
+++ b/src/panfrost/vulkan/panvk_vX_device.c
@@ -117,7 +117,7 @@ panvk_queue_submit_batch(struct panvk_queue *queue, struct panvk_batch *batch,
    }
 
    if (debug & PANVK_DEBUG_TRACE)
-      pandecode_next_frame(0);
+      pandecode_next_frame(pdev->decode_ctx);
 
    batch->issued = true;
 }