drm/asahi: queue/render,compute: Handle cmdbuf size mismatches

This allows extending the render/compute cmdbufs at the end.

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

Author: hoshinolina

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

@@ -14,7 +14,6 @@ use crate::fw::types::*;
 use crate::gpu::GpuManager;
 use crate::{file, fw, gpu, microseq};
 use crate::{inner_ptr, inner_weak_ptr};
-use core::mem::MaybeUninit;
 use core::sync::atomic::Ordering;
 use kernel::dma_fence::RawDmaFence;
 use kernel::drm::sched::Job;
@@ -57,31 +56,20 @@ impl super::QueueInner::ver {
 
         mod_dev_dbg!(self.dev, "[Submission {}] Compute!\n", id);
 
-        if cmd.cmd_buffer_size as usize != core::mem::size_of::<uapi::drm_asahi_cmd_compute>() {
-            cls_pr_debug!(
-                Errors,
-                "Invalid compute command size ({:#x})\n",
-                cmd.cmd_buffer_size
-            );
-            return Err(EINVAL);
-        }
-
+        let cmdbuf_read_size =
+            (cmd.cmd_buffer_size as usize).min(core::mem::size_of::<uapi::drm_asahi_cmd_compute>());
         let mut cmdbuf_reader = unsafe {
             UserSlicePtr::new(
                 cmd.cmd_buffer as usize as *mut _,
-                core::mem::size_of::<uapi::drm_asahi_cmd_compute>(),
+                cmd.cmd_buffer_size as usize,
             )
             .reader()
         };
 
-        let mut cmdbuf: MaybeUninit<uapi::drm_asahi_cmd_compute> = MaybeUninit::uninit();
+        let mut cmdbuf: uapi::drm_asahi_cmd_compute = Default::default();
         unsafe {
-            cmdbuf_reader.read_raw(
-                cmdbuf.as_mut_ptr() as *mut u8,
-                core::mem::size_of::<uapi::drm_asahi_cmd_compute>(),
-            )?;
+            cmdbuf_reader.read_raw(&mut cmdbuf as *mut _ as *mut u8, cmdbuf_read_size)?;
         }
-        let cmdbuf = unsafe { cmdbuf.assume_init() };
 
         if cmdbuf.flags & !(uapi::ASAHI_COMPUTE_NO_PREEMPTION as u64) != 0 {
             return Err(EINVAL);

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

@@ -16,7 +16,6 @@ use crate::util::*;
 use crate::workqueue::WorkError;
 use crate::{buffer, file, fw, gpu, microseq, workqueue};
 use crate::{inner_ptr, inner_weak_ptr};
-use core::mem::MaybeUninit;
 use core::sync::atomic::Ordering;
 use kernel::dma_fence::RawDmaFence;
 use kernel::drm::sched::Job;
@@ -234,31 +233,20 @@ impl super::QueueInner::ver {
 
         mod_dev_dbg!(self.dev, "[Submission {}] Render!\n", id);
 
-        if cmd.cmd_buffer_size as usize != core::mem::size_of::<uapi::drm_asahi_cmd_render>() {
-            cls_pr_debug!(
-                Errors,
-                "Invalid render command size ({:#x})\n",
-                cmd.cmd_buffer_size
-            );
-            return Err(EINVAL);
-        }
-
+        let cmdbuf_read_size =
+            (cmd.cmd_buffer_size as usize).min(core::mem::size_of::<uapi::drm_asahi_cmd_render>());
         let mut cmdbuf_reader = unsafe {
             UserSlicePtr::new(
                 cmd.cmd_buffer as usize as *mut _,
-                core::mem::size_of::<uapi::drm_asahi_cmd_render>(),
+                cmd.cmd_buffer_size as usize,
             )
             .reader()
         };
 
-        let mut cmdbuf: MaybeUninit<uapi::drm_asahi_cmd_render> = MaybeUninit::uninit();
+        let mut cmdbuf: uapi::drm_asahi_cmd_render = Default::default();
         unsafe {
-            cmdbuf_reader.read_raw(
-                cmdbuf.as_mut_ptr() as *mut u8,
-                core::mem::size_of::<uapi::drm_asahi_cmd_render>(),
-            )?;
+            cmdbuf_reader.read_raw(&mut cmdbuf as *mut _ as *mut u8, cmdbuf_read_size)?;
         }
-        let cmdbuf = unsafe { cmdbuf.assume_init() };
 
         if cmdbuf.flags
             & !(uapi::ASAHI_RENDER_NO_CLEAR_PIPELINE_TEXTURES