drm/asahi: queue: Access AsahiData via pdev.drvdata

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

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

@@ -10,6 +10,7 @@
 use super::common;
 use crate::alloc::Allocator;
 use crate::debug::*;
+use crate::driver::AsahiDriver;
 use crate::fw::types::*;
 use crate::gpu::GpuManager;
 use crate::{file, fw, gpu, microseq};
@@ -20,6 +21,7 @@ use kernel::dma_fence::RawDmaFence;
 use kernel::drm::sched::Job;
 use kernel::prelude::*;
 use kernel::sync::Arc;
+use kernel::types::ForeignOwnable;
 use kernel::uaccess::{UserPtr, UserSlice};
 use kernel::uapi;
 use kernel::xarray;
@@ -42,8 +44,8 @@ impl super::QueueInner::ver {
             return Err(EINVAL);
         }
 
-        let dev = self.dev.data();
-        let gpu = match dev.gpu.as_any().downcast_ref::<gpu::GpuManager::ver>() {
+        let data = unsafe { &<KBox<AsahiDriver>>::borrow(self.dev.as_ref().get_drvdata()).data };
+        let gpu = match data.gpu.as_any().downcast_ref::<gpu::GpuManager::ver>() {
             Some(gpu) => gpu,
             None => {
                 dev_crit!(self.dev.as_ref(), "GpuManager mismatched with Queue!\n");

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

@@ -13,12 +13,13 @@ use kernel::{
     drm::sched,
     macros::versions,
     sync::{Arc, Mutex},
+    types::ForeignOwnable,
     uapi, xarray,
 };
 
 use crate::alloc::Allocator;
 use crate::debug::*;
-use crate::driver::{AsahiDevRef, AsahiDevice};
+use crate::driver::{AsahiDevRef, AsahiDevice, AsahiDriver};
 use crate::fw::types::*;
 use crate::gpu::GpuManager;
 use crate::inner_weak_ptr;
@@ -259,8 +260,8 @@ impl sched::JobImpl for QueueJob::ver {
     fn run(job: &mut sched::Job<Self>) -> Result<Option<dma_fence::Fence>> {
         mod_dev_dbg!(job.dev, "QueueJob {}: Running Job\n", job.id);
 
-        let dev = job.dev.data();
-        let gpu = match dev
+        let data = unsafe { &<KBox<AsahiDriver>>::borrow(job.dev.as_ref().get_drvdata()).data };
+        let gpu = match data
             .gpu
             .clone()
             .arc_as_any()
@@ -387,7 +388,7 @@ impl Queue::ver {
     ) -> Result<Queue::ver> {
         mod_dev_dbg!(dev, "[Queue {}] Creating queue\n", id);
 
-        let data = dev.data();
+        let data = unsafe { &<KBox<AsahiDriver>>::borrow(dev.as_ref().get_drvdata()).data };
 
         // Must be shared, no cache management on this one!
         let mut notifier_list = alloc.shared.new_default::<fw::event::NotifierList>()?;
@@ -542,8 +543,8 @@ impl Queue for Queue::ver {
         commands: KVec<uapi::drm_asahi_command>,
         objects: Pin<&xarray::XArray<KBox<file::Object>>>,
     ) -> Result {
-        let dev = self.dev.data();
-        let gpu = match dev
+        let data = unsafe { &<KBox<AsahiDriver>>::borrow(self.dev.as_ref().get_drvdata()).data };
+        let gpu = match data
             .gpu
             .clone()
             .arc_as_any()

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

@@ -10,6 +10,7 @@
 use super::common;
 use crate::alloc::Allocator;
 use crate::debug::*;
+use crate::driver::AsahiDriver;
 use crate::fw::types::*;
 use crate::gpu::GpuManager;
 use crate::util::*;
@@ -23,6 +24,7 @@ use kernel::drm::sched::Job;
 use kernel::new_mutex;
 use kernel::prelude::*;
 use kernel::sync::Arc;
+use kernel::types::ForeignOwnable;
 use kernel::uaccess::{UserPtr, UserSlice};
 use kernel::uapi;
 use kernel::xarray;
@@ -364,8 +366,8 @@ impl super::QueueInner::ver {
             return Err(EINVAL);
         }
 
-        let dev = self.dev.data();
-        let gpu = match dev.gpu.as_any().downcast_ref::<gpu::GpuManager::ver>() {
+        let data = unsafe { &<KBox<AsahiDriver>>::borrow(self.dev.as_ref().get_drvdata()).data };
+        let gpu = match data.gpu.as_any().downcast_ref::<gpu::GpuManager::ver>() {
             Some(gpu) => gpu,
             None => {
                 dev_crit!(self.dev.as_ref(), "GpuManager mismatched with Queue!\n");