Skip to contentSkip to conversation

rust: drm: gpuvm: update DriverGpuVm for DeviceContext

PATCH Applied Deborah Brouwer 4 participants 5 messages Jun 11 – Jun 12

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rust: drm: gpuvm: update DriverGpuVm for DeviceContext

Since the introduction of DeviceContext, there is no longer a single driver object type to equate with the GPUVM object type.

Instead of threading DeviceContext through GPUVM, remove the strict identity between DriverGpuVm::Object and drm::Driver::Object and instead tighten the requirement that the DriverGpuVm::Object be an allocatable GEM object associated with the same DRM driver.

Also, make GpuVm::new() generic over DeviceContext so it can accept a drm::Device<T::Driver, Ctx>.

---
 rust/kernel/drm/gpuvm/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
rust/kernel/drm/gpuvm/mod.rs +4 -4
index ae58f6f667c1..a625fcd9b5f2 100644
@@ -116,9 +116,9 @@ const fn vtable() -> &'static bindings::drm_gpuvm_ops {
 
     /// Creates a GPUVM instance.
     #[expect(clippy::new_ret_no_self)]
-    pub fn new<E>(
+    pub fn new<E, Ctx: drm::DeviceContext>(
         name: &'static CStr,
-        dev: &drm::Device<T::Driver>,
+        dev: &drm::Device<T::Driver, Ctx>,
         r_obj: &T::Object,
         range: Range<u64>,
         reserve_range: Range<u64>,
@@ -252,10 +252,10 @@ fn raw_resv(&self) -> *mut bindings::dma_resv {
 /// The manager for a GPUVM.
 pub trait DriverGpuVm: Sized + Send {
     /// Parent `Driver` for this object.
-    type Driver: drm::Driver<Object = Self::Object>;
+    type Driver: drm::Driver;
 
     /// The kind of GEM object stored in this GPUVM.
-    type Object: IntoGEMObject;
+    type Object: drm::driver::AllocImpl<Driver = Self::Driver>;
 
     /// Data stored with each [`struct drm_gpuva`](struct@GpuVa).
     type VaData;

---
base-commit: 550dc7536644db2d67c6f8cf525bba682fba08d9
change-id: 20260610-gpuvm_device_context_v1-367c21f94e1e

Best regards,

Signature · 1 line
Deborah Brouwer <[email protected]>
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Deborah Brouwer

Since the introduction of DeviceContext, there is no longer a single driver object type to equate with the GPUVM object type.

Instead of threading DeviceContext through GPUVM, remove the strict identity between DriverGpuVm::Object and drm::Driver::Object and instead tighten the requirement that the DriverGpuVm::Object be an allocatable GEM object associated with the same DRM driver.

Quoted 4 lines

Also, make GpuVm::new() generic over DeviceContext so it can accept a drm::Device<T::Driver, Ctx>.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Deborah Brouwer
Quoted 8 lines · Deborah Brouwer

Since the introduction of DeviceContext, there is no longer a single driver object type to equate with the GPUVM object type.

Instead of threading DeviceContext through GPUVM, remove the strict identity between DriverGpuVm::Object and drm::Driver::Object and instead tighten the requirement that the DriverGpuVm::Object be an allocatable GEM object associated with the same DRM driver.

Quoted 4 lines

Also, make GpuVm::new() generic over DeviceContext so it can accept a drm::Device<T::Driver, Ctx>.

Sami

maintainer
#3 lore raw
In reply to Deborah Brouwer
Quoted 8 lines · Deborah Brouwer

Since the introduction of DeviceContext, there is no longer a single driver object type to equate with the GPUVM object type.

Instead of threading DeviceContext through GPUVM, remove the strict identity between DriverGpuVm::Object and drm::Driver::Object and instead tighten the requirement that the DriverGpuVm::Object be an allocatable GEM object associated with the same DRM driver.

Quoted 4 lines

Also, make GpuVm::new() generic over DeviceContext so it can accept a drm::Device<T::Driver, Ctx>.

Fixes 0023a1e8d01a ("rust/drm/gem: Use DeviceContext with GEM objects")