drm/asahi: Classless mutex etc

Signed-off-by: Asahi Lina <[email protected]>

Author: hoshinolina

drivers/gpu/drm/asahi/alloc.rs

@@ -12,7 +12,7 @@
 //! debugging with a GPU memory snapshot, since it makes it easier to identify use-after-free and
 //! caching issues.
 
-use kernel::{c_str, drm::mm, error::Result, prelude::*, str::CString, sync::LockClassKey};
+use kernel::{drm::mm, error::Result, prelude::*, str::CString};
 
 use crate::debug::*;
 use crate::driver::{AsahiDevRef, AsahiDevice};
@@ -692,8 +692,6 @@ pub(crate) struct HeapAllocator {
     name: CString,
 }
 
-static LOCK_KEY: LockClassKey = kernel::static_lock_class!();
-
 impl HeapAllocator {
     /// Create a new HeapAllocator for a given `Vm` and address range.
     #[allow(dead_code)]
@@ -730,13 +728,7 @@ impl HeapAllocator {
             total_garbage: 0,
         };
 
-        let mm = mm::Allocator::new(
-            start,
-            end - start + 1,
-            inner,
-            c_str!("HeapAllocator"),
-            LOCK_KEY,
-        )?;
+        let mm = mm::Allocator::new(start, end - start + 1, inner)?;
 
         Ok(HeapAllocator {
             dev: dev.into(),

drivers/gpu/drm/asahi/mmu.rs

@@ -794,13 +794,7 @@ impl Vm {
             IOVA_USER_TOP
         };
 
-        let mm = mm::Allocator::new(
-            min_va as u64,
-            (max_va - min_va + 1) as u64,
-            (),
-            c_str!("asahi Vm"),
-            static_lock_class!(),
-        )?;
+        let mm = mm::Allocator::new(min_va as u64, (max_va - min_va + 1) as u64, ())?;
 
         Ok(Vm {
             id,

drivers/gpu/drm/asahi/slotalloc.rs

@@ -156,7 +156,7 @@ impl<T: SlotItem> SlotAllocator<T> {
 
         let alloc = Arc::pin_init(pin_init!(SlotAllocatorOuter {
             // SAFETY: `mutex_init!` is called below.
-            inner <- Mutex::new(inner, name, lock_key1),
+            inner <- Mutex::new_with_key(inner, name, lock_key1),
             // SAFETY: `condvar_init!` is called below.
             cond <- CondVar::new(name, lock_key2),
         }))?;

rust/kernel/sync/lock.rs

@@ -110,6 +110,7 @@ impl<T, B: Backend> Lock<T, B> {
     }
 
     /// Constructs a new lock initialiser taking an initialiser/
+    #[track_caller]
     pub fn pin_init<E>(t: impl PinInit<T, E>) -> impl PinInit<Self, E>
     where
         E: core::convert::From<core::convert::Infallible>,
@@ -119,14 +120,14 @@ impl<T, B: Backend> Lock<T, B> {
     }
 
     /// Constructs a new lock initialiser.
-    #[allow(clippy::new_ret_no_self)]
     #[track_caller]
     pub fn new_named(t: T, name: &'static CStr) -> impl PinInit<Self> {
         let (key, _) = caller_lock_class();
         Self::new_with_key(t, name, key)
     }
 
     /// Constructs a new lock initialiser taking an initialiser/
+    #[track_caller]
     pub fn pin_init_named<E>(t: impl PinInit<T, E>, name: &'static CStr) -> impl PinInit<Self, E>
     where
         E: core::convert::From<core::convert::Infallible>,