drm/asahi: rtkit pin adaptation

Signed-off-by: Janne Grunau <j@jannau.net>

Author: jannau

drivers/gpu/drm/asahi/gpu.rs

@@ -1118,7 +1118,7 @@ impl GpuManager::ver {
         mod_dev_dbg!(self.dev, "GPU: run_job: ring doorbell\n");
 
         let mut guard = self.rtkit.lock();
-        let rtk = guard.as_mut().unwrap();
+        let rtk = guard.as_mut().as_pin_mut().unwrap();
         rtk.send_message(
             EP_DOORBELL,
             MSG_TX_DOORBELL | pipe_type as u64 | ((index as u64) << 2),
@@ -1189,7 +1189,7 @@ impl GpuManager::ver {
 
         {
             let mut guard = self.rtkit.lock();
-            let rtk = guard.as_mut().unwrap();
+            let rtk = guard.as_mut().as_pin_mut().unwrap();
             rtk.send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_DEVCTRL)?;
         }
 
@@ -1252,13 +1252,15 @@ impl GpuManager for GpuManager::ver {
 
         let initdata = self.initdata.gpu_va().get();
         let mut guard = self.rtkit.lock();
-        let rtk = guard.as_mut().unwrap();
-
-        rtk.boot()?;
-        rtk.start_endpoint(EP_FIRMWARE)?;
-        rtk.start_endpoint(EP_DOORBELL)?;
-        rtk.send_message(EP_FIRMWARE, MSG_INIT | (initdata & INIT_DATA_MASK))?;
-        rtk.send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_DEVCTRL)?;
+        let mut rtk = guard.as_mut().as_pin_mut().unwrap();
+
+        rtk.as_mut().boot()?;
+        rtk.as_mut().start_endpoint(EP_FIRMWARE)?;
+        rtk.as_mut().start_endpoint(EP_DOORBELL)?;
+        rtk.as_mut()
+            .send_message(EP_FIRMWARE, MSG_INIT | (initdata & INIT_DATA_MASK))?;
+        rtk.as_mut()
+            .send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_DEVCTRL)?;
         core::mem::drop(guard);
 
         self.kick_firmware()?;
@@ -1364,7 +1366,7 @@ impl GpuManager for GpuManager::ver {
         }
 
         let mut guard = self.rtkit.lock();
-        let rtk = guard.as_mut().unwrap();
+        let rtk = guard.as_mut().as_pin_mut().unwrap();
         rtk.send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_KICKFW)?;
 
         Ok(())
@@ -1405,7 +1407,7 @@ impl GpuManager for GpuManager::ver {
         let token = txch.device_control.send(&dc);
         {
             let mut guard = self.rtkit.lock();
-            let rtk = guard.as_mut().unwrap();
+            let rtk = guard.as_mut().as_pin_mut().unwrap();
             rtk.send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_DEVCTRL)?;
         }
 
@@ -1515,7 +1517,7 @@ impl GpuManager for GpuManager::ver {
         let token = txch.device_control.send(&dc);
         {
             let mut guard = self.rtkit.lock();
-            let rtk = guard.as_mut().unwrap();
+            let rtk = guard.as_mut().as_pin_mut().unwrap();
             if rtk
                 .send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_DEVCTRL)
                 .is_err()
@@ -1562,7 +1564,7 @@ impl GpuManager for GpuManager::ver {
         txch.device_control.send(&dc);
         {
             let mut guard = self.rtkit.lock();
-            let rtk = guard.as_mut().unwrap();
+            let rtk = guard.as_mut().as_pin_mut().unwrap();
             if rtk
                 .send_message(EP_DOORBELL, MSG_TX_DOORBELL | DOORBELL_DEVCTRL)
                 .is_err()
@@ -1581,7 +1583,7 @@ impl GpuManager for GpuManager::ver {
         let token = fwctl.send(&msg);
         {
             let mut guard = self.rtkit.lock();
-            let rtk = guard.as_mut().unwrap();
+            let rtk = guard.as_mut().as_pin_mut().unwrap();
             rtk.send_message(EP_DOORBELL, MSG_FWCTL)?;
         }
         fwctl.wait_for(token)?;