From: Danilo Krummrich <dakr@kernel.org>
Date: Wed, 10 Sep 2025 09:07:05 +0000 (+0200)
Subject: Merge drm-misc-next-2025-08-21 into drm-rust-next
X-Git-Tag: v6.18-rc1~134^2~7^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4dc08c530cbf71fb1c7cddb9d1e7e36bd62e22f;p=thirdparty%2Flinux.git

Merge drm-misc-next-2025-08-21 into drm-rust-next

We need the DRM Rust changes that went into drm-misc before the
existence of the drm-rust tree in here as well.

Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---

d4dc08c530cbf71fb1c7cddb9d1e7e36bd62e22f
diff --cc rust/kernel/drm/gem/mod.rs
index fd872de3b6695,a822aedee9498..6ccbb25628a1e
--- a/rust/kernel/drm/gem/mod.rs
+++ b/rust/kernel/drm/gem/mod.rs
@@@ -10,27 -10,21 +10,28 @@@ use crate::
      drm::driver::{AllocImpl, AllocOps},
      error::{to_result, Result},
      prelude::*,
-     types::{ARef, AlwaysRefCounted, Opaque},
+     sync::aref::{ARef, AlwaysRefCounted},
+     types::Opaque,
  };
 -use core::{mem, ops::Deref, ptr::NonNull};
 +use core::{ops::Deref, ptr::NonNull};
 +
 +/// A type alias for retrieving a [`Driver`]s [`DriverFile`] implementation from its
 +/// [`DriverObject`] implementation.
 +///
 +/// [`Driver`]: drm::Driver
 +/// [`DriverFile`]: drm::file::DriverFile
 +pub type DriverFile<T> = drm::File<<<T as DriverObject>::Driver as drm::Driver>::File>;
  
  /// GEM object functions, which must be implemented by drivers.
 -pub trait BaseDriverObject<T: BaseObject>: Sync + Send + Sized {
 +pub trait DriverObject: Sync + Send + Sized {
 +    /// Parent `Driver` for this object.
 +    type Driver: drm::Driver;
 +
      /// Create a new driver data object for a GEM object of a given size.
 -    fn new(dev: &drm::Device<T::Driver>, size: usize) -> impl PinInit<Self, Error>;
 +    fn new(dev: &drm::Device<Self::Driver>, size: usize) -> impl PinInit<Self, Error>;
  
      /// Open a new handle to an existing object, associated with a File.
 -    fn open(
 -        _obj: &<<T as IntoGEMObject>::Driver as drm::Driver>::Object,
 -        _file: &drm::File<<<T as IntoGEMObject>::Driver as drm::Driver>::File>,
 -    ) -> Result {
 +    fn open(_obj: &<Self::Driver as drm::Driver>::Object, _file: &DriverFile<Self>) -> Result {
          Ok(())
      }