drm/asahi: queue: Plumb through objects XArray and add timestamp getter

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

Author: hoshinolina

drivers/gpu/drm/asahi/file.rs

@@ -1052,9 +1052,11 @@ impl File {
             commands.push(unsafe { cmd.assume_init() }, GFP_KERNEL)?;
         }
 
+        let objects = file.inner().objects();
+
         let ret = queue
             .lock()
-            .submit(id, in_syncs, out_syncs, result_buf, commands);
+            .submit(id, in_syncs, out_syncs, result_buf, commands, objects);
 
         match ret {
             Err(ERESTARTSYS) => Err(ERESTARTSYS),

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

@@ -4,13 +4,16 @@
 //!
 //! Shared helpers used by the submission logic for multiple command types.
 
+use crate::file;
+use crate::fw::job::UserTimestamp;
 use crate::fw::microseq;
 use crate::fw::types::*;
 
 use kernel::io_buffer::IoBufferReader;
 use kernel::prelude::*;
 use kernel::uapi;
 use kernel::user_ptr::UserSlicePtr;
+use kernel::xarray;
 
 use core::mem::MaybeUninit;
 
@@ -56,3 +59,28 @@ pub(super) fn build_attachments(pointer: u64, count: u32) -> Result<microseq::At
 
     Ok(attachments)
 }
+
+pub(super) fn get_timestamp_object(
+    objects: Pin<&xarray::XArray<KBox<file::Object>>>,
+    handle: u32,
+    offset: u32,
+) -> Result<Option<UserTimestamp>> {
+    if handle == 0 {
+        return Ok(None);
+    }
+
+    let object = objects.get(handle.try_into()?).ok_or(ENOENT)?;
+
+    #[allow(irrefutable_let_patterns)]
+    if let file::Object::TimestampBuffer(mapping) = object.borrow() {
+        if (offset.checked_add(8).ok_or(EINVAL)?) as usize > mapping.size() {
+            return Err(ERANGE);
+        }
+        Ok(Some(UserTimestamp {
+            mapping: mapping.clone(),
+            offset: offset as usize,
+        }))
+    } else {
+        Err(EINVAL)
+    }
+}

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

@@ -12,7 +12,7 @@ use crate::alloc::Allocator;
 use crate::debug::*;
 use crate::fw::types::*;
 use crate::gpu::GpuManager;
-use crate::{fw, gpu, microseq};
+use crate::{file, fw, gpu, microseq};
 use crate::{inner_ptr, inner_weak_ptr};
 use core::mem::MaybeUninit;
 use core::sync::atomic::Ordering;
@@ -23,6 +23,7 @@ use kernel::prelude::*;
 use kernel::sync::Arc;
 use kernel::uapi;
 use kernel::user_ptr::UserSlicePtr;
+use kernel::xarray;
 
 const DEBUG_CLASS: DebugFlags = DebugFlags::Compute;
 
@@ -34,6 +35,7 @@ impl super::QueueInner::ver {
         job: &mut Job<super::QueueJob::ver>,
         cmd: &uapi::drm_asahi_command,
         result_writer: Option<super::ResultWriter>,
+        objects: Pin<&xarray::XArray<KBox<file::Object>>>,
         id: u64,
         flush_stamps: bool,
     ) -> Result {

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

@@ -13,7 +13,7 @@ use kernel::{
     drm::sched,
     macros::versions,
     sync::{Arc, Mutex},
-    uapi,
+    uapi, xarray,
 };
 
 use crate::alloc::Allocator;
@@ -43,6 +43,7 @@ pub(crate) trait Queue: Send + Sync {
         out_syncs: KVec<file::SyncItem>,
         result_buf: Option<gem::ObjectRef>,
         commands: KVec<uapi::drm_asahi_command>,
+        objects: Pin<&xarray::XArray<KBox<file::Object>>>,
     ) -> Result;
 }
 
@@ -541,6 +542,7 @@ impl Queue for Queue::ver {
         out_syncs: KVec<file::SyncItem>,
         result_buf: Option<gem::ObjectRef>,
         commands: KVec<uapi::drm_asahi_command>,
+        objects: Pin<&xarray::XArray<KBox<file::Object>>>,
     ) -> Result {
         let dev = self.dev.data();
         let gpu = match dev
@@ -753,6 +755,7 @@ impl Queue for Queue::ver {
                         &mut job,
                         &cmd,
                         result_writer,
+                        objects,
                         id,
                         last_render.unwrap() == i,
                     )?;
@@ -774,6 +777,7 @@ impl Queue for Queue::ver {
                         &mut job,
                         &cmd,
                         result_writer,
+                        objects,
                         id,
                         last_compute.unwrap() == i,
                     )?;

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

@@ -14,7 +14,7 @@ use crate::fw::types::*;
 use crate::gpu::GpuManager;
 use crate::util::*;
 use crate::workqueue::WorkError;
-use crate::{buffer, fw, gpu, microseq, workqueue};
+use crate::{buffer, file, fw, gpu, microseq, workqueue};
 use crate::{inner_ptr, inner_weak_ptr};
 use core::mem::MaybeUninit;
 use core::sync::atomic::Ordering;
@@ -26,6 +26,7 @@ use kernel::prelude::*;
 use kernel::sync::Arc;
 use kernel::uapi;
 use kernel::user_ptr::UserSlicePtr;
+use kernel::xarray;
 
 const DEBUG_CLASS: DebugFlags = DebugFlags::Render;
 
@@ -222,6 +223,7 @@ impl super::QueueInner::ver {
         job: &mut Job<super::QueueJob::ver>,
         cmd: &uapi::drm_asahi_command,
         result_writer: Option<super::ResultWriter>,
+        objects: Pin<&xarray::XArray<KBox<file::Object>>>,
         id: u64,
         flush_stamps: bool,
     ) -> Result {