From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 771BC2750F3 for ; Fri, 16 May 2025 17:11:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747415470; cv=none; b=M62MV7qqfv0jFDlRiQvdUeUQBaxTH2SUwhX9AAp8mQyF2dcdgjNxKZw1du/xOvVmyr9LDneG4D8qsq0uabLLB/KduZUnnmilDWz1JtwKgVqOgj7z9e3LhMsBzhkpmpbbzob15klqAo/avITeIdS18iCoZJzhKeyZU+zsqIJRRV4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747415470; c=relaxed/simple; bh=n8gQ3ci7/HccJRaQ1YFW2NrrriSROfbDAOvRcFPN1jg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OYym7DkRCmGcsEN1efkl5Dl8i4UoEstvmWTKE2gLB2IgG1S8zT3GQocrYS4vI74WXle/Rwe+N34/ELnbGHUgRfIhMUVwPA3klkQZnpYOSjjaVM4DAjL9lgs+xX5kvdmTFI4ACBV9Iw7sNPVVdZtseg0rIYvo3mJm8YychUcpsOQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fxOs4M48; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fxOs4M48" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747415467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BurJjKs9pzCfRcZrN7FMvrlgbm4PDmTtPhaZqqv4ewc=; b=fxOs4M48f8hHtIfVow15nASPgNfvBy5l0i2N1f1wWBVGyOPRYBJ8yB1Gp3FOFjRbyFbWkB bV29dmoIB8M709SEfcmCp2XXaDFCRngL7qO8Ib09Z0cPv+fBSS7qWrcwBpicVM2wKrcVfp XAtw13r32rAFW3yiitmYZ3tZBGGRlic= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-444-EtoQMW1HOhuyezN1Q6cgpg-1; Fri, 16 May 2025 13:11:03 -0400 X-MC-Unique: EtoQMW1HOhuyezN1Q6cgpg-1 X-Mimecast-MFC-AGG-ID: EtoQMW1HOhuyezN1Q6cgpg_1747415460 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6FF69195608E; Fri, 16 May 2025 17:11:00 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.82.40]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1178419560B2; Fri, 16 May 2025 17:10:55 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Asahi Lina , Alyssa Rosenzweig Subject: [PATCH v2 3/4] rust: drm: gem: Add ObjectFile type alias Date: Fri, 16 May 2025 13:09:18 -0400 Message-ID: <20250516171030.776924-4-lyude@redhat.com> In-Reply-To: <20250516171030.776924-1-lyude@redhat.com> References: <20250516171030.776924-1-lyude@redhat.com> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Just to reduce the clutter with the File<…> types in gem.rs. Signed-off-by: Lyude Paul --- rust/kernel/drm/gem/mod.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs index c17b36948bae3..2b81298d29765 100644 --- a/rust/kernel/drm/gem/mod.rs +++ b/rust/kernel/drm/gem/mod.rs @@ -17,6 +17,13 @@ /// A type alias for the Object type in use by a [`drm::Driver`]. pub type DriverObject = <::Driver as drm::Driver>::Object; +/// A type alias for retrieving a [`Driver`]s [`DriverFile`] implementation from its +/// [`DriverObject`] implementation. +/// +/// [`Driver`]: drm::Driver +/// [`DriverFile`]: drm::file::DriverFile +pub type ObjectFile = drm::File<<::Driver as drm::Driver>::File>; + /// GEM object functions, which must be implemented by drivers. pub trait BaseDriverObject: Sync + Send + Sized { /// Parent `Driver` for this object. @@ -26,15 +33,12 @@ pub trait BaseDriverObject: Sync + Send + Sized { fn new(dev: &drm::Device, size: usize) -> impl PinInit; /// Open a new handle to an existing object, associated with a File. - fn open( - _obj: &DriverObject, - _file: &drm::File<::File>, - ) -> Result { + fn open(_obj: &DriverObject, _file: &ObjectFile) -> Result { Ok(()) } /// Close a handle to an existing object, associated with a File. - fn close(_obj: &DriverObject, _file: &drm::File<::File>) {} + fn close(_obj: &DriverObject, _file: &ObjectFile) {} } /// Trait that represents a GEM object subtype @@ -78,7 +82,8 @@ extern "C" fn open_callback( raw_file: *mut bindings::drm_file, ) -> core::ffi::c_int { // SAFETY: `open_callback` is only ever called with a valid pointer to a `struct drm_file`. - let file = unsafe { drm::File::<::File>::as_ref(raw_file) }; + let file = unsafe { ObjectFile::::as_ref(raw_file) }; + // SAFETY: `open_callback` is specified in the AllocOps structure for `DriverObject`, // ensuring that `raw_obj` is contained within a `DriverObject` let obj = unsafe { DriverObject::::as_ref(raw_obj) }; @@ -94,7 +99,7 @@ extern "C" fn close_callback( raw_file: *mut bindings::drm_file, ) { // SAFETY: `open_callback` is only ever called with a valid pointer to a `struct drm_file`. - let file = unsafe { drm::File::<::File>::as_ref(raw_file) }; + let file = unsafe { ObjectFile::::as_ref(raw_file) }; // SAFETY: `close_callback` is specified in the AllocOps structure for `Object`, ensuring // that `raw_obj` is indeed contained within a `Object`. @@ -125,7 +130,7 @@ fn size(&self) -> usize { /// Creates a new handle for the object associated with a given `File` /// (or returns an existing one). - fn create_handle(&self, file: &drm::File<::File>) -> Result + fn create_handle(&self, file: &ObjectFile) -> Result where Self: BaseDriverObject, { @@ -138,10 +143,7 @@ fn create_handle(&self, file: &drm::File<::File>) - } /// Looks up an object by its handle for a given `File`. - fn lookup_handle( - file: &drm::File<::File>, - handle: u32, - ) -> Result> + fn lookup_handle(file: &ObjectFile, handle: u32) -> Result> where Self: BaseDriverObject, { -- 2.49.0