There's a few changes here:
* The rename, of course (this should also let us drop the clippy annotation
here)
* Return *mut bindings::drm_gem_object instead of
&Opaque<bindings::drm_gem_object> - the latter doesn't really have any
benefit and just results in conversion from the rust type to the C type
having to be more verbose than necessary.
Signed-off-by: Lyude Paul <ly...@redhat.com>
Reviewed-by: Daniel Almeida <daniel.alme...@collabora.com>
Reviewed-by: Danilo Krummrich <d...@kernel.org>
---
V2:
Rename to as_raw()
Signed-off-by: Lyude Paul <ly...@redhat.com>
---
rust/kernel/drm/gem/mod.rs | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs
index 1ea1f15d8313c..fa293c08f431d 100644
--- a/rust/kernel/drm/gem/mod.rs
+++ b/rust/kernel/drm/gem/mod.rs
@@ -12,7 +12,7 @@
prelude::*,
types::{ARef, Opaque},
};
-use core::{mem, ops::Deref, ptr, ptr::NonNull};
+use core::{mem, ops::Deref, ptr::NonNull};
/// GEM object functions, which must be implemented by drivers.
pub trait BaseDriverObject<T: BaseObject>: Sync + Send + Sized {
@@ -42,8 +42,7 @@ pub trait IntoGEMObject: Sized + super::private::Sealed {
/// Returns a reference to the raw `drm_gem_object` structure, which must
be valid as long as
/// this owning object is valid.
- #[allow(clippy::wrong_self_convention)]
- fn into_gem_obj(&self) -> &Opaque<bindings::drm_gem_object>;
+ fn as_raw(&self) -> *mut bindings::drm_gem_object;
/// Converts a pointer to a `struct drm_gem_object` into a reference to
`Self`.
///
@@ -101,8 +100,8 @@ extern "C" fn close_callback<T: BaseDriverObject<U>, U:
BaseObject>(
impl<T: DriverObject> IntoGEMObject for Object<T> {
type Driver = T::Driver;
- fn into_gem_obj(&self) -> &Opaque<bindings::drm_gem_object> {
- &self.obj
+ fn as_raw(&self) -> *mut bindings::drm_gem_object {
+ self.obj.get()
}
unsafe fn as_ref<'a>(self_ptr: *mut bindings::drm_gem_object) -> &'a Self {
@@ -121,7 +120,7 @@ pub trait BaseObject
fn size(&self) -> usize {
// SAFETY: `self.into_gem_obj()` is guaranteed to be a pointer to a
valid `struct
// drm_gem_object`.
- unsafe { (*self.into_gem_obj().get()).size }
+ unsafe { (*self.as_raw()).size }
}
/// Creates a new handle for the object associated with a given `File`
@@ -133,11 +132,7 @@ fn create_handle(
let mut handle: u32 = 0;
// SAFETY: The arguments are all valid per the type invariants.
to_result(unsafe {
- bindings::drm_gem_handle_create(
- file.as_raw().cast(),
- self.into_gem_obj().get(),
- &mut handle,
- )
+ bindings::drm_gem_handle_create(file.as_raw().cast(),
self.as_raw(), &mut handle)
})?;
Ok(handle)
}
@@ -171,14 +166,10 @@ fn lookup_handle(
/// Creates an mmap offset to map the object from userspace.
fn create_mmap_offset(&self) -> Result<u64> {
// SAFETY: The arguments are valid per the type invariant.
- to_result(unsafe {
bindings::drm_gem_create_mmap_offset(self.into_gem_obj().get()) })?;
+ to_result(unsafe { bindings::drm_gem_create_mmap_offset(self.as_raw())
})?;
// SAFETY: The arguments are valid per the type invariant.
- Ok(unsafe {
- bindings::drm_vma_node_offset_addr(ptr::addr_of_mut!(
- (*self.into_gem_obj().get()).vma_node
- ))
- })
+ Ok(unsafe { bindings::drm_vma_node_offset_addr(&raw mut
(*self.as_raw()).vma_node) })
}
}
--
2.49.0
