From b204c4fb23a04dcd319d1eec58f7a7ec148ea9fd Mon Sep 17 00:00:00 2001
From: Friedrich Vock <friedrich.vock@gmx.de>
Date: Wed, 18 Jan 2023 18:14:37 +0100
Subject: [PATCH] radv/rmv: Also check the other pid field

Sometimes it seems like this field contains the correct pid instead.

Fixes: 8d0e6c02 ("radv: Add RMV tracing utilities")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20820>
(cherry picked from commit 2dec10c297588bc6d356188fa4d0264215f397e1)
---
 .pick_status.json         | 2 +-
 src/amd/vulkan/radv_rmv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a41c65de05b..114d548f4e3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -337,7 +337,7 @@
         "description": "radv/rmv: Also check the other pid field",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8d0e6c02c7024fd3a1e8f60bde8dd4428943bd46"
     },
diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/radv_rmv.c
index 2efd4ed7e3b..13b3b822a4f 100644
--- a/src/amd/vulkan/radv_rmv.c
+++ b/src/amd/vulkan/radv_rmv.c
@@ -183,7 +183,7 @@ static void
 evaluate_trace_event(struct radv_device *device, uint64_t timestamp, struct util_dynarray *tokens,
                      struct trace_event_amdgpu_vm_update_ptes *event)
 {
-   if (event->common.pid != getpid()) {
+   if (event->common.pid != getpid() && event->pid != getpid()) {
       return;
    }