drm/asahi: Lock class fixups

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

Author: hoshinolina

drivers/gpu/drm/asahi/alloc.rs

@@ -692,7 +692,7 @@ pub(crate) struct HeapAllocator {
     name: CString,
 }
 
-static LOCK_KEY: LockClassKey = LockClassKey::new();
+static LOCK_KEY: LockClassKey = kernel::static_lock_class!();
 
 impl HeapAllocator {
     /// Create a new HeapAllocator for a given `Vm` and address range.
@@ -735,7 +735,7 @@ impl HeapAllocator {
             end - start + 1,
             inner,
             c_str!("HeapAllocator"),
-            &LOCK_KEY,
+            LOCK_KEY,
         )?;
 
         Ok(HeapAllocator {

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

@@ -341,7 +341,7 @@ impl ResultWriter {
 }
 
 static QUEUE_NAME: &CStr = c_str!("asahi_fence");
-static QUEUE_CLASS_KEY: kernel::sync::LockClassKey = kernel::sync::LockClassKey::new();
+static QUEUE_CLASS_KEY: kernel::sync::LockClassKey = kernel::static_lock_class!();
 
 #[versions(AGX)]
 impl Queue::ver {
@@ -424,7 +424,7 @@ impl Queue::ver {
             notifier_list: Arc::try_new(notifier_list)?,
             notifier,
             id,
-            fence_ctx: FenceContexts::new(1, QUEUE_NAME, &QUEUE_CLASS_KEY)?,
+            fence_ctx: FenceContexts::new(1, QUEUE_NAME, QUEUE_CLASS_KEY)?,
             #[ver(V >= V13_0B4)]
             counter: AtomicU64::new(0),
         };

drivers/gpu/drm/asahi/slotalloc.rs

@@ -132,8 +132,8 @@ impl<T: SlotItem> SlotAllocator<T> {
         mut data: T::Data,
         mut constructor: impl FnMut(&mut T::Data, u32) -> T,
         name: &'static CStr,
-        lock_key1: &'static LockClassKey,
-        lock_key2: &'static LockClassKey,
+        lock_key1: LockClassKey,
+        lock_key2: LockClassKey,
     ) -> Result<SlotAllocator<T>> {
         let mut slots = Vec::try_with_capacity(num_slots as usize)?;