drm/asahi: fw, queue: Plumb through UserTimestamps -> TimestampPointers

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

Author: hoshinolina

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

@@ -4,6 +4,7 @@
 
 use super::types::*;
 use crate::{default_zeroed, mmu, trivial_gpustruct};
+use kernel::prelude::Result;
 use kernel::sync::Arc;
 
 pub(crate) mod raw {
@@ -132,3 +133,24 @@ pub(crate) struct UserTimestamps {
     pub(crate) start: Option<UserTimestamp>,
     pub(crate) end: Option<UserTimestamp>,
 }
+
+impl UserTimestamps {
+    pub(crate) fn any(&self) -> bool {
+        self.start.is_some() || self.end.is_some()
+    }
+
+    pub(crate) fn pointers(&self) -> Result<raw::TimestampPointers<'_>> {
+        Ok(raw::TimestampPointers {
+            start_addr: self
+                .start
+                .as_ref()
+                .map(|a| GpuPointer::from_mapping(&a.mapping, a.offset))
+                .transpose()?,
+            end_addr: self
+                .end
+                .as_ref()
+                .map(|a| GpuPointer::from_mapping(&a.mapping, a.offset))
+                .transpose()?,
+        })
+    }
+}

drivers/gpu/drm/asahi/object.rs

@@ -43,7 +43,7 @@
 //
 // Further discussion: https://github.com/rust-lang/unsafe-code-guidelines/issues/152
 
-use kernel::{error::code::*, prelude::*};
+use kernel::{error::code::*, prelude::*, sync::Arc};
 
 use core::fmt;
 use core::fmt::Debug;
@@ -57,6 +57,7 @@ use core::{mem, ptr, slice};
 use crate::alloc::Allocation;
 use crate::debug::*;
 use crate::fw::types::Zeroable;
+use crate::mmu;
 
 const DEBUG_CLASS: DebugFlags = DebugFlags::Object;
 
@@ -94,6 +95,25 @@ impl<'a, T: ?Sized> GpuPointer<'a, T> {
     }
 }
 
+impl<'a, T> GpuPointer<'a, T> {
+    /// Create a GPU pointer from a KernelMapping and an offset.
+    /// TODO: Change all GPU pointers to point to the raw types so size_of here is GPU-sound.
+    pub(crate) fn from_mapping(
+        mapping: &'a Arc<mmu::KernelMapping>,
+        offset: usize,
+    ) -> Result<GpuPointer<'a, T>> {
+        let addr = mapping.iova().checked_add(offset as u64).ok_or(EINVAL)?;
+        let end = offset
+            .checked_add(core::mem::size_of::<T>())
+            .ok_or(EINVAL)?;
+        if end > mapping.size() {
+            Err(ERANGE)
+        } else {
+            Ok(Self(addr.try_into().unwrap(), PhantomData))
+        }
+    }
+}
+
 impl<'a, T: ?Sized> Debug for GpuPointer<'a, T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         let val = self.0;

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

@@ -177,7 +177,7 @@ impl super::QueueInner::ver {
                             notifier_buf: inner_weak_ptr!(notifier.weak_pointer(), state.unk_buf),
                         })?;
 
-                        if has_result {
+                        if has_result || user_timestamps.any() {
                             builder.add(microseq::Timestamp::ver {
                                 header: microseq::op::Timestamp::new(true),
                                 command_time: inner_weak_ptr!(ptr, command_time),
@@ -201,7 +201,7 @@ impl super::QueueInner::ver {
                             header: microseq::op::WaitForIdle2::HEADER,
                         })?;
 
-                        if has_result {
+                        if has_result || user_timestamps.any() {
                             builder.add(microseq::Timestamp::ver {
                                 header: microseq::op::Timestamp::new(false),
                                 command_time: inner_weak_ptr!(ptr, command_time),
@@ -367,10 +367,7 @@ impl super::QueueInner::ver {
                         start_addr: Some(inner_ptr!(inner.timestamps.gpu_pointer(), start)),
                         end_addr: Some(inner_ptr!(inner.timestamps.gpu_pointer(), end)),
                     }),
-                    user_timestamp_pointers <- try_init!(fw::job::raw::TimestampPointers {
-                        start_addr: None,
-                        end_addr: None,
-                    }),
+                    user_timestamp_pointers: inner.user_timestamps.pointers()?,
                     client_sequence: slot_client_seq,
                     pad_2d1: Default::default(),
                     unk_2d4: 0,

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

@@ -681,7 +681,7 @@ impl super::QueueInner::ver {
                             notifier_buf: inner_weak_ptr!(notifier.weak_pointer(), state.unk_buf),
                         })?;
 
-                        if has_result {
+                        if has_result || frg_user_timestamps.any() {
                             builder.add(microseq::Timestamp::ver {
                                 header: microseq::op::Timestamp::new(true),
                                 command_time: inner_weak_ptr!(ptr, command_time),
@@ -705,7 +705,7 @@ impl super::QueueInner::ver {
                             header: microseq::op::WaitForIdle2::HEADER,
                         })?;
 
-                        if has_result {
+                        if has_result || frg_user_timestamps.any() {
                             builder.add(microseq::Timestamp::ver {
                                 header: microseq::op::Timestamp::new(false),
                                 command_time: inner_weak_ptr!(ptr, command_time),
@@ -1085,10 +1085,7 @@ impl super::QueueInner::ver {
                         start_addr: Some(inner_ptr!(inner.timestamps.gpu_pointer(), frag.start)),
                         end_addr: Some(inner_ptr!(inner.timestamps.gpu_pointer(), frag.end)),
                     }),
-                    user_timestamp_pointers <- try_init!(fw::job::raw::TimestampPointers {
-                        start_addr: None,
-                        end_addr: None,
-                    }),
+                    user_timestamp_pointers: inner.user_timestamps.pointers()?,
                     client_sequence: slot_client_seq,
                     pad_925: Default::default(),
                     unk_928: 0,
@@ -1212,7 +1209,7 @@ impl super::QueueInner::ver {
                             unk_178: (!clustering) as u32,
                         })?;
 
-                        if has_result {
+                        if has_result || vtx_user_timestamps.any() {
                             builder.add(microseq::Timestamp::ver {
                                 header: microseq::op::Timestamp::new(true),
                                 command_time: inner_weak_ptr!(ptr, command_time),
@@ -1236,7 +1233,7 @@ impl super::QueueInner::ver {
                             header: microseq::op::WaitForIdle2::HEADER,
                         })?;
 
-                        if has_result {
+                        if has_result || vtx_user_timestamps.any() {
                             builder.add(microseq::Timestamp::ver {
                                 header: microseq::op::Timestamp::new(false),
                                 command_time: inner_weak_ptr!(ptr, command_time),
@@ -1543,10 +1540,7 @@ impl super::QueueInner::ver {
                         start_addr: Some(inner_ptr!(inner.timestamps.gpu_pointer(), vtx.start)),
                         end_addr: Some(inner_ptr!(inner.timestamps.gpu_pointer(), vtx.end)),
                     }),
-                    user_timestamp_pointers <- try_init!(fw::job::raw::TimestampPointers {
-                        start_addr: None,
-                        end_addr: None,
-                    }),
+                    user_timestamp_pointers: inner.user_timestamps.pointers()?,
                     client_sequence: slot_client_seq,
                     pad_5d5: Default::default(),
                     unk_5d8: 0,