From da6842007fad52eb71b93061b0e7aacaf50d3c6d Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Tue, 4 Apr 2023 00:20:39 +0300
Subject: [PATCH] intel/ds: add a new timeline row for frames

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22276>
---
 src/intel/ds/intel_driver_ds.cc | 6 +++++-
 src/intel/ds/intel_driver_ds.h  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/intel/ds/intel_driver_ds.cc b/src/intel/ds/intel_driver_ds.cc
index c88fc83945f..d9287a87b34 100644
--- a/src/intel/ds/intel_driver_ds.cc
+++ b/src/intel/ds/intel_driver_ds.cc
@@ -59,6 +59,10 @@ static const struct {
       "queue",
       INTEL_DS_QUEUE_STAGE_QUEUE,
    },
+   {
+      "frame",
+      INTEL_DS_QUEUE_STAGE_FRAME,
+   },
    {
       "cmd-buffer",
       INTEL_DS_QUEUE_STAGE_CMD_BUFFER,
@@ -367,7 +371,7 @@ extern "C" {
                 &trace_payload_as_extra_intel_end_##event_name);        \
    }                                                                    \
 
-CREATE_DUAL_EVENT_CALLBACK(frame, INTEL_DS_QUEUE_STAGE_QUEUE)
+CREATE_DUAL_EVENT_CALLBACK(frame, INTEL_DS_QUEUE_STAGE_FRAME)
 CREATE_DUAL_EVENT_CALLBACK(batch, INTEL_DS_QUEUE_STAGE_CMD_BUFFER)
 CREATE_DUAL_EVENT_CALLBACK(cmd_buffer, INTEL_DS_QUEUE_STAGE_CMD_BUFFER)
 CREATE_DUAL_EVENT_CALLBACK(render_pass, INTEL_DS_QUEUE_STAGE_RENDER_PASS)
diff --git a/src/intel/ds/intel_driver_ds.h b/src/intel/ds/intel_driver_ds.h
index b2169cf79ce..82b298de93e 100644
--- a/src/intel/ds/intel_driver_ds.h
+++ b/src/intel/ds/intel_driver_ds.h
@@ -65,6 +65,7 @@ typedef enum intel_ds_stall_flag (*intel_ds_stall_cb_t)(uint32_t flags);
 
 enum intel_ds_queue_stage {
    INTEL_DS_QUEUE_STAGE_QUEUE,
+   INTEL_DS_QUEUE_STAGE_FRAME,
    INTEL_DS_QUEUE_STAGE_CMD_BUFFER,
    INTEL_DS_QUEUE_STAGE_GENERATE_DRAWS,
    INTEL_DS_QUEUE_STAGE_STALL,