From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o11.zoho.com (sender4-op-o11.zoho.com [136.143.188.11]) (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 ABB5F3C1402; Thu, 9 Jul 2026 21:37:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.11 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783633041; cv=pass; b=Mgvzqq4BloBZZQpcPhuMA7aK71etVBBLBMP1e0I2A1brqXzNLT7hNryfag+pdTFZChjc5eSxwhPo207Gb4KIO7IJqpXM8kcgeMbpfBPBjfnlHnbxqsNInvv4LCjR8dhgWUgVqytCbHyFBRM6g+BkOei//wUn6rdyydFZnfgBgzo= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783633041; c=relaxed/simple; bh=/sD3Dwni/MdYye4RpZVxgxUSX49sFfnkmHpx+hyNdSY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C+ReyoBvyBvXPBlwzZ1ZgIuSGPZcTMwuB+X/DYgnIuGXKQW5teEbkz0a4kTG4hQeVh4sf27zT7V8u0FcbPThHYjt7dgBam8yOQ4Yq8l1p526MubNkZhEK6i4Wi8rg9TUnM5w/ZJMmuU1dkzufZsa2rjR9E+8gAcxKiFM1Rn/Nt4= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=deborah.brouwer@collabora.com header.b=BPAXKRZu; arc=pass smtp.client-ip=136.143.188.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=deborah.brouwer@collabora.com header.b="BPAXKRZu" ARC-Seal: i=1; a=rsa-sha256; t=1783633016; cv=none; d=zohomail.com; s=zohoarc; b=VEzASF4JL/FZrGknBCbDj5fYOc8u+hc4Lj0s5UArZE0drUCNDekeh23iLr/C9jIEOK4qmFOQMlJU6jedWyPYaUJ3jCFRIwgEpVx60mC8Pa805zG6SEUREMdExZf+HjXH9BW5/5XZVfpSi9f7+9X+fwtNhUHR9U5tC+cDQCjUcrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783633016; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=CqZt6uwrnjXjiwcScBt70Pe/agqwavvDJ7ZlS5w0LwU=; b=JdufYJRiMbq0YsrPVCF8fb2AqIGOF6PqYKLAZjKzmx5toG5CcUzBeDDPv540CWQGYxpaH61Dz2ceHc7BBs8ni8oHuyJwf+Zz2A7VCruWc97bn0l+Wg9Erop9IjMcG64GzhFnCxsv5sIu4Jf3s2XOnRf9SVAU5peC5tI/5MhBEBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=deborah.brouwer@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1783633016; s=zohomail; d=collabora.com; i=deborah.brouwer@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=CqZt6uwrnjXjiwcScBt70Pe/agqwavvDJ7ZlS5w0LwU=; b=BPAXKRZurqfBBTYbuCq6/BSk3Kckre3GDqRptX670HHpEU8sKVmB7nTir4dms3pl V+lqYCHtI7reinbDzy8YcaPfzID5KEj5I+BogLIZ5gWIcGRIQFMeKmhbSfB9yGujTCs FbFYRDjWBkEeblb5+BGB/gWU2q4YC7HR84TO1ue8= Received: by mx.zohomail.com with SMTPS id 1783633014339282.08160232853425; Thu, 9 Jul 2026 14:36:54 -0700 (PDT) From: Deborah Brouwer Date: Thu, 09 Jul 2026 14:36:41 -0700 Subject: [PATCH v6 1/7] drm/tyr: add resources to RegistrationData 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: 7bit Message-Id: <20260709-fw-boot-b4-v6-1-ca391e1a4108@collabora.com> References: <20260709-fw-boot-b4-v6-0-ca391e1a4108@collabora.com> In-Reply-To: <20260709-fw-boot-b4-v6-0-ca391e1a4108@collabora.com> To: Daniel Almeida , Alice Ryhl , Danilo Krummrich , David Airlie , Simona Vetter , Benno Lossin , Gary Guo Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Deborah Brouwer , boris.brezillon@collabora.com, samitolvanen@google.com, acourbot@nvidia.com, alvin.sun@linux.dev, laura.nao@collabora.com, work@onurozkan.dev, beata.michalska@arm.com, steven.price@arm.com, lyude@redhat.com X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5729; i=deborah.brouwer@collabora.com; h=from:subject:message-id; bh=/sD3Dwni/MdYye4RpZVxgxUSX49sFfnkmHpx+hyNdSY=; b=kA0DAAoWeagp5wxefesByyZiAGpQFHTI8wZcZKwThY5o1arCLl1Q8RM9+0QfnbsjvHGWeTlfl Yh1BAAWCgAdFiEEzT8yjBd67zItn/+Deagp5wxefesFAmpQFHQACgkQeagp5wxefevoogEAhQMD XZDeiJftg9h8V2++1wQnl5qTMa+zaZ3j9FVyWVUA/0LWxderEUkvY42H1x23Cx1QApxR9YuLhlB jGuwyaWYK X-Developer-Key: i=deborah.brouwer@collabora.com; a=openpgp; fpr=CD3F328C177AEF322D9FFF8379A829E70C5E7DEB Currently Tyr is not storing any resources in its drm::Driver RegistrationData. Move Tyr's device-private resources and gpu information from drm::Driver::Data to drm::Driver::RegistrationData. This allows Tyr to access this data safely within the lifetime of its binding to its parent platform device and while registered with userspace. Signed-off-by: Deborah Brouwer --- drivers/gpu/drm/tyr/driver.rs | 42 +++++++++++++++++++++--------------------- drivers/gpu/drm/tyr/file.rs | 11 ++++++----- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs index 8348c6cd3929..46ce5c41e310 100644 --- a/drivers/gpu/drm/tyr/driver.rs +++ b/drivers/gpu/drm/tyr/driver.rs @@ -6,6 +6,7 @@ OptionalClk, // }, device::{ + Bound, Core, Device, DeviceContext, // @@ -27,10 +28,7 @@ regulator, regulator::Regulator, sizes::SZ_2M, - sync::{ - aref::ARef, - Mutex, // - }, + sync::Mutex, time, // }; @@ -53,13 +51,17 @@ #[pin_data(PinnedDrop)] pub(crate) struct TyrPlatformDriverData<'bound> { - _device: ARef, _reg: drm::Registration<'bound, TyrDrmDriver>, } +/// Data owned by the DRM [`Registration`]. +/// +/// This data can have references tied to the parent platform device binding scope +/// and is accessible only while the DRM device is registered with userspace. #[pin_data] -pub(crate) struct TyrDrmDeviceData { - pub(crate) pdev: ARef, +pub(crate) struct TyrDrmRegistrationData<'bound> { + /// Parent platform device. + pub(crate) pdev: &'bound platform::Device, #[pin] clks: Mutex, @@ -67,9 +69,10 @@ pub(crate) struct TyrDrmDeviceData { #[pin] regulators: Mutex, - /// Some information on the GPU. - /// - /// This is mainly queried by userspace, i.e.: Mesa. + /// GPU MMIO register mapping. + pub(crate) iomem: IoMem<'bound>, + + /// GPU information read from hardware during probe. pub(crate) gpu_info: GpuInfo, } @@ -134,10 +137,10 @@ fn probe<'bound>( // other threads of execution. unsafe { pdev.dma_set_mask_and_coherent(DmaMask::try_new(pa_bits)?)? }; - let platform: ARef = pdev.into(); + let unreg_dev = drm::UnregisteredDevice::::new(pdev, Ok(()))?; - let data = try_pin_init!(TyrDrmDeviceData { - pdev: platform.clone(), + let reg_data = try_pin_init!(TyrDrmRegistrationData { + pdev, clks <- new_mutex!(Clocks { core: core_clk, stacks: stacks_clk, @@ -147,18 +150,15 @@ fn probe<'bound>( _mali: mali_regulator, _sram: sram_regulator, }), + iomem, gpu_info, }); - let tdev = drm::UnregisteredDevice::::new(pdev, data)?; // SAFETY: `reg` is stored in `TyrPlatformDriverData` and dropped when the driver is // unbound; it is never forgotten. - let reg = unsafe { drm::Registration::new(pdev.as_ref(), tdev, (), 0)? }; + let reg = unsafe { drm::Registration::new(pdev.as_ref(), unreg_dev, reg_data, 0)? }; - let driver = TyrPlatformDriverData { - _device: reg.device().into(), - _reg: reg, - }; + let driver = TyrPlatformDriverData { _reg: reg }; // We need this to be dev_info!() because dev_dbg!() does not work at // all in Rust for now, and we need to see whether probe succeeded. @@ -184,8 +184,8 @@ fn drop(self: Pin<&mut Self>) {} #[vtable] impl drm::Driver for TyrDrmDriver { - type Data = TyrDrmDeviceData; - type RegistrationData<'a> = (); + type Data = (); + type RegistrationData<'bound> = TyrDrmRegistrationData<'bound>; type File = TyrDrmFileData; type Object = drm::gem::shmem::Object; type ParentDevice = platform::Device; diff --git a/drivers/gpu/drm/tyr/file.rs b/drivers/gpu/drm/tyr/file.rs index b686041d5d6b..9f60a90d4948 100644 --- a/drivers/gpu/drm/tyr/file.rs +++ b/drivers/gpu/drm/tyr/file.rs @@ -12,7 +12,8 @@ use crate::driver::{ TyrDrmDevice, - TyrDrmDriver, // + TyrDrmDriver, + TyrDrmRegistrationData, // }; #[pin_data] @@ -31,15 +32,15 @@ fn open(_dev: &drm::Device) -> Result>> { impl TyrDrmFileData { pub(crate) fn dev_query( - ddev: &TyrDrmDevice, - _reg_data: &(), + _ddev: &TyrDrmDevice, + reg_data: &TyrDrmRegistrationData<'_>, devquery: &mut uapi::drm_panthor_dev_query, _file: &TyrDrmFile, ) -> Result { if devquery.pointer == 0 { match devquery.type_ { uapi::drm_panthor_dev_query_type_DRM_PANTHOR_DEV_QUERY_GPU_INFO => { - devquery.size = core::mem::size_of_val(&ddev.gpu_info) as u32; + devquery.size = core::mem::size_of_val(®_data.gpu_info) as u32; Ok(0) } _ => Err(EINVAL), @@ -53,7 +54,7 @@ pub(crate) fn dev_query( ) .writer(); - writer.write(&ddev.gpu_info)?; + writer.write(®_data.gpu_info)?; Ok(0) } -- 2.54.0