panfrost: Fix build with Perfetto (again)

Sync UAPI for the upstream fix.

Upstream commit: https://cgit.freedesktop.org/drm-misc/commit/?h=drm-misc-fixes&id=c4299907c09a638c0a30f029338d07941c049d73

Closes: #7195
Fixes: 6a4532cbabf ("panfrost: Sync panfrost_drm.h from drm-misc-next")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Tested-by: Chris Healy <healych@amazon.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19581>
(cherry picked from commit d40af879098bea90176619dc11facbd68c555f32)

diff --git a/.pick_status.json b/.pick_status.json
index c735ee0..04e258f 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -139,7 +139,7 @@
         "description": "panfrost: Fix build with Perfetto (again)",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "6a4532cbabf7770b71d63db24714fc07efb280cf"
     },

diff --git a/include/drm-uapi/panfrost_drm.h b/include/drm-uapi/panfrost_drm.h
index 6f93c91..9f231d4 100644 (file)
--- a/include/drm-uapi/panfrost_drm.h
+++ b/include/drm-uapi/panfrost_drm.h
@@ -254,7 +254,7 @@ struct panfrost_dump_object_header {
                        __u64 nbos;
                } reghdr;
 
-               struct pan_bomap_hdr {
+               struct {
                        __u32 valid;
                        __u64 iova;
                        __u32 data[2];