From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C97942036E9; Wed, 6 May 2026 22:10:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778105442; cv=none; b=ET8ID2MkEfYFssAo78QcrDz1mXeYkhO91yzmm3C5xeiaoBeiWJOLVsgDNP2ZM12fnqp9ozc10kP5kaHtSvyYgY00y1gDYaadR2ej6RDWbDCFB8gnFXX/kISv83tl1EqKEYKA2zQwk2ZsWaeEzYo8vuWddFddNyEzwN1M7D+e0Ks= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778105442; c=relaxed/simple; bh=bALF/IYTJIqtzlU1XsvpEU8iNO0MoFwZPtOvka/AV1Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gYzRnui/4IYqAe5+UqcIWKRYqAIDPC+mhweB/DH3jDeW+CqP1cwJntijc4jpslD7W2xykdSJ6WMce+c4Y2sTPDDUngQFnEnB1g/WmIadZjzmfedVYNOK3v9G5I53WfGbhxtL6a0a5NhGU4XLRcuYfCwDISmXNNS86KxbC8y1paw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jW4NqOd2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jW4NqOd2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71481C2BCF6; Wed, 6 May 2026 22:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778105442; bh=bALF/IYTJIqtzlU1XsvpEU8iNO0MoFwZPtOvka/AV1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jW4NqOd2ITWs7bcupuc+pcnamlrDh/tUSYzAO/vw0oaffZIMZh6Lxo4Ugu/dqCJnA 6Ix3aue/N93hwT8uISFOOvVwnDM41rkJ51fk505IIW4MhbQ0rf0pXX32LWXkqGTgBL WkkmNHy2PcOd0FM8akF+6vYeqY0a0DR2mii7yjKWArOi9Ei5E8BQ8lkI8auOnvHASP b+6jbO2oafL2KgedAFwkIvldI3+SClMKgdWE8L9jPWFXQLp1caJK0bWbQqvtTOWFgu /j8MOi8+nXg3CzDnEVbQgrDFyPaprKKuDWHtr2+I9Mesc0JV6vaecSk5CzXeeGPQ6x mSe+k2BkP2h1A== From: Danilo Krummrich To: aliceryhl@google.com, airlied@gmail.com, simona@ffwll.ch, daniel.almeida@collabora.com, acourbot@nvidia.com, apopple@nvidia.com, ecourtney@nvidia.com, deborah.brouwer@collabora.com, lyude@redhat.com, ojeda@kernel.org, boqun@kernel.org, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, tmgross@umich.edu Cc: driver-core@lists.linux.dev, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Danilo Krummrich Subject: [PATCH 1/6] rust: drm: Add Driver::ParentDevice associated type Date: Thu, 7 May 2026 00:05:59 +0200 Message-ID: <20260506221027.858481-2-dakr@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260506221027.858481-1-dakr@kernel.org> References: <20260506221027.858481-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: driver-core@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a ParentDevice associated type to the Driver trait, allowing each DRM driver to declare its parent bus device type (e.g. auxiliary::Device, platform::Device). Change UnregisteredDevice::new() to take &T::ParentDevice, ensuring at the type level that the DRM device's parent matches the declared bus device type. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nova/driver.rs | 8 ++++++-- drivers/gpu/drm/tyr/driver.rs | 6 ++++-- rust/kernel/drm/device.rs | 7 +++++-- rust/kernel/drm/driver.rs | 3 +++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nova/driver.rs b/drivers/gpu/drm/nova/driver.rs index 9eef28b506bb..9d4100f01ea7 100644 --- a/drivers/gpu/drm/nova/driver.rs +++ b/drivers/gpu/drm/nova/driver.rs @@ -2,7 +2,10 @@ use kernel::{ auxiliary, - device::Core, + device::{ + Core, + DeviceContext, // + }, drm::{ self, gem, @@ -59,7 +62,7 @@ fn probe( ) -> impl PinInit + 'bound { let data = try_pin_init!(NovaData { adev: adev.into() }); - let drm = drm::UnregisteredDevice::::new(adev.as_ref(), data)?; + let drm = drm::UnregisteredDevice::::new(adev, data)?; let drm = drm::Registration::new_foreign_owned(drm, adev.as_ref(), 0)?; Ok(Self { drm: drm.into() }) @@ -71,6 +74,7 @@ impl drm::Driver for NovaDriver { type Data = NovaData; type File = File; type Object = gem::Object; + type ParentDevice = auxiliary::Device; const INFO: drm::DriverInfo = INFO; diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs index 2743178af325..747745d23f31 100644 --- a/drivers/gpu/drm/tyr/driver.rs +++ b/drivers/gpu/drm/tyr/driver.rs @@ -8,7 +8,8 @@ device::{ Bound, Core, - Device, // + Device, + DeviceContext, // }, drm, drm::ioctl, @@ -131,7 +132,7 @@ fn probe( gpu_info, }); - let tdev = drm::UnregisteredDevice::::new(pdev.as_ref(), data)?; + let tdev = drm::UnregisteredDevice::::new(pdev, data)?; let tdev = drm::driver::Registration::new_foreign_owned(tdev, pdev.as_ref(), 0)?; let driver = TyrPlatformDriverData { @@ -176,6 +177,7 @@ impl drm::Driver for TyrDrmDriver { type Data = TyrDrmDeviceData; type File = TyrDrmFileData; type Object = drm::gem::Object; + type ParentDevice = platform::Device; const INFO: drm::DriverInfo = INFO; diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs index d91f19dcc375..492c2f2c7ca4 100644 --- a/rust/kernel/drm/device.rs +++ b/rust/kernel/drm/device.rs @@ -197,7 +197,10 @@ impl UnregisteredDevice { /// Create a new `UnregisteredDevice` for a `drm::Driver`. /// /// This can be used to create a [`Registration`](kernel::drm::Registration). - pub fn new(dev: &device::Device, data: impl PinInit) -> Result { + pub fn new( + dev: &T::ParentDevice, + data: impl PinInit, + ) -> Result { // `__drm_dev_alloc` uses `kmalloc()` to allocate memory, hence ensure a `kmalloc()` // compatible `Layout`. let layout = Kmalloc::aligned_layout(Layout::new::>()); @@ -207,7 +210,7 @@ pub fn new(dev: &device::Device, data: impl PinInit) -> Result = unsafe { bindings::__drm_dev_alloc( - dev.as_raw(), + dev.as_ref().as_raw(), &Self::VTABLE, layout.size(), mem::offset_of!(Device, dev), diff --git a/rust/kernel/drm/driver.rs b/rust/kernel/drm/driver.rs index 294e17af86a3..9d06f8c5b2da 100644 --- a/rust/kernel/drm/driver.rs +++ b/rust/kernel/drm/driver.rs @@ -114,6 +114,9 @@ pub trait Driver { /// The type used to represent a DRM File (client) type File: drm::file::DriverFile; + /// The bus device type of the parent device that the DRM device is associated with. + type ParentDevice: device::AsBusDevice; + /// Driver metadata const INFO: DriverInfo; -- 2.54.0