drm/asahi: fw, queue: Add UserTimestamp object to job structs

Signed-off-by: Asahi Lina <lina@asahilina.net>

Author: hoshinolina

drivers/gpu/drm/asahi/fw/compute.rs

@@ -101,6 +101,7 @@ pub(crate) struct RunCompute {
     pub(crate) micro_seq: microseq::MicroSequence,
     pub(crate) vm_bind: mmu::VmBind,
     pub(crate) timestamps: Arc<GpuObject<job::JobTimestamps>>,
+    pub(crate) user_timestamps: job::UserTimestamps,
 }
 
 #[versions(AGX)]

drivers/gpu/drm/asahi/fw/fragment.rs

@@ -275,6 +275,7 @@ pub(crate) struct RunFragment {
     pub(crate) vm_bind: mmu::VmBind,
     pub(crate) aux_fb: GpuArray<u8>,
     pub(crate) timestamps: Arc<GpuObject<job::RenderTimestamps>>,
+    pub(crate) user_timestamps: job::UserTimestamps,
 }
 
 #[versions(AGX)]

drivers/gpu/drm/asahi/fw/job.rs

@@ -3,7 +3,8 @@
 //! Common GPU job firmware structures
 
 use super::types::*;
-use crate::{default_zeroed, trivial_gpustruct};
+use crate::{default_zeroed, mmu, trivial_gpustruct};
+use kernel::sync::Arc;
 
 pub(crate) mod raw {
     use super::*;
@@ -119,3 +120,15 @@ pub(crate) mod raw {
 
 trivial_gpustruct!(JobTimestamps);
 trivial_gpustruct!(RenderTimestamps);
+
+#[derive(Debug)]
+pub(crate) struct UserTimestamp {
+    pub(crate) mapping: Arc<mmu::KernelMapping>,
+    pub(crate) offset: usize,
+}
+
+#[derive(Debug, Default)]
+pub(crate) struct UserTimestamps {
+    pub(crate) start: Option<UserTimestamp>,
+    pub(crate) end: Option<UserTimestamp>,
+}

drivers/gpu/drm/asahi/fw/vertex.rs

@@ -172,6 +172,7 @@ pub(crate) struct RunVertex {
     pub(crate) micro_seq: microseq::MicroSequence,
     pub(crate) vm_bind: mmu::VmBind,
     pub(crate) timestamps: Arc<GpuObject<job::RenderTimestamps>>,
+    pub(crate) user_timestamps: job::UserTimestamps,
 }
 
 #[versions(AGX)]

drivers/gpu/drm/asahi/queue/compute.rs

@@ -85,6 +85,8 @@ impl super::QueueInner::ver {
             return Err(EINVAL);
         }
 
+        let mut user_timestamps: fw::job::UserTimestamps = Default::default();
+
         // This sequence number increases per new client/VM? assigned to some slot,
         // but it's unclear *which* slot...
         let slot_client_seq: u8 = (self.id & 0xff) as u8;
@@ -263,6 +265,7 @@ impl super::QueueInner::ver {
                     notifier,
                     vm_bind,
                     timestamps,
+                    user_timestamps,
                 })
             },
             |inner, _ptr| {

drivers/gpu/drm/asahi/queue/render.rs

@@ -271,6 +271,9 @@ impl super::QueueInner::ver {
             return Err(EINVAL);
         }
 
+        let mut vtx_user_timestamps: fw::job::UserTimestamps = Default::default();
+        let mut frg_user_timestamps: fw::job::UserTimestamps = Default::default();
+
         if cmdbuf.fb_width == 0
             || cmdbuf.fb_height == 0
             || cmdbuf.fb_width > 16384
@@ -772,6 +775,7 @@ impl super::QueueInner::ver {
                     vm_bind,
                     aux_fb: self.ualloc.lock().array_empty_tagged(0x8000, b"AXFB")?,
                     timestamps,
+                    user_timestamps: frg_user_timestamps,
                 })
             },
             |inner, _ptr| {
@@ -1295,6 +1299,7 @@ impl super::QueueInner::ver {
                     scene,
                     vm_bind,
                     timestamps,
+                    user_timestamps: vtx_user_timestamps,
                 })
             },
             |inner, _ptr| {