From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10D6DC5DF71 for ; Tue, 2 Jun 2026 06:40:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7011810EC44; Tue, 2 Jun 2026 06:40:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="fWnrKExD"; dkim-atps=neutral Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85FD810EC44 for ; Tue, 2 Jun 2026 06:40:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1780382445; bh=jl2nMSoVVJ4DyVjw9OL/RKqK6+ZYOFx277e056b+nwc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fWnrKExDGqTy/dz7UQV4Z8KmpgItlp/69zNJ8fRlO5aVR5ea4pqiGJ/V1Nm2Saw8B 4OUC2qOqX2G5+5bghPK+RPpXPZw2pZPNHyA9U5lxzTfyIITJ2Ws/FIByQr2w+N35OC YmWE04odtEDUwWwCV/Aks9cC8J4k8GAHCzEN5CAMtad00m0h4IqiaIkrNK6oPm5zOU 51CgArEgXPIrCUEaamZLkCQlfDs+nYk3Fqe51t+jzGcxLL+PP7vRA9akS7TfvG1nbS 3fCDpug2f2eYYzBQDBVLtM9vdROio/uoYpbvg4meUKlJTReZTRw8Ok4be0FzYw6yYe mmTYlXRKkpUVw== Received: from fedora-2.home (unknown [100.64.0.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbrezillon) by bali.collaboradmins.com (Postfix) with ESMTPSA id D0DB717E09B8; Tue, 2 Jun 2026 08:40:44 +0200 (CEST) Date: Tue, 2 Jun 2026 08:40:40 +0200 From: Boris Brezillon To: Danilo Krummrich Cc: aliceryhl@google.com, daniel.almeida@collabora.com, deborah.brouwer@collabora.com, gary@garyguo.net, dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org, Eliot Courtney , Alexandre Courbot Subject: Re: [PATCH v2 2/2] drm/tyr: use IoMem directly instead of Devres Message-ID: <20260602084040.7c63e06d@fedora-2.home> In-Reply-To: <20260529000106.2257996-3-dakr@kernel.org> References: <20260529000106.2257996-1-dakr@kernel.org> <20260529000106.2257996-3-dakr@kernel.org> Organization: Collabora X-Mailer: Claws Mail 4.4.0 (GTK 3.24.52; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, 29 May 2026 02:00:54 +0200 Danilo Krummrich wrote: > Now that IoMem is lifetime-parameterized, use it directly in probe > rather than wrapping it in Devres and Arc. The I/O memory mapping is > only used during probe and not stored in driver data, so device-managed > revocation is unnecessary. > > This removes the Devres access(dev) pattern from issue_soft_reset(), > GpuInfo::new(), and l2_power_on(), simplifying register access. > > Reviewed-by: Eliot Courtney > Reviewed-by: Alexandre Courbot > Signed-off-by: Danilo Krummrich Reviewed-by: Boris Brezillon > --- > drivers/gpu/drm/tyr/driver.rs | 19 ++++++------------- > drivers/gpu/drm/tyr/gpu.rs | 17 +++++------------ > 2 files changed, 11 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs > index 6276e9743c32..227ea2adccea 100644 > --- a/drivers/gpu/drm/tyr/driver.rs > +++ b/drivers/gpu/drm/tyr/driver.rs > @@ -6,11 +6,9 @@ > OptionalClk, // > }, > device::{ > - Bound, > Core, > Device, // > }, > - devres::Devres, > dma::{ > Device as DmaDevice, > DmaMask, // > @@ -30,7 +28,6 @@ > sizes::SZ_2M, > sync::{ > aref::ARef, > - Arc, > Mutex, // > }, > time, // > @@ -44,7 +41,7 @@ > regs::gpu_control::*, // > }; > > -pub(crate) type IoMem = kernel::io::mem::IoMem<'static, SZ_2M>; > +pub(crate) type IoMem<'a> = kernel::io::mem::IoMem<'a, SZ_2M>; > > pub(crate) struct TyrDrmDriver; > > @@ -74,15 +71,11 @@ pub(crate) struct TyrDrmDeviceData { > pub(crate) gpu_info: GpuInfo, > } > > -fn issue_soft_reset(dev: &Device, iomem: &Devres) -> Result { > - let io = (*iomem).access(dev)?; > - io.write_reg(GPU_COMMAND::reset(ResetMode::SoftReset)); > +fn issue_soft_reset(dev: &Device, iomem: &IoMem<'_>) -> Result { > + iomem.write_reg(GPU_COMMAND::reset(ResetMode::SoftReset)); > > poll::read_poll_timeout( > - || { > - let io = (*iomem).access(dev)?; > - Ok(io.read(GPU_IRQ_RAWSTAT)) > - }, > + || Ok(iomem.read(GPU_IRQ_RAWSTAT)), > |status| status.reset_completed(), > time::Delta::from_millis(1), > time::Delta::from_millis(100), > @@ -123,12 +116,12 @@ fn probe<'bound>( > let sram_regulator = Regulator::::get(pdev.as_ref(), c"sram")?; > > let request = pdev.io_request_by_index(0).ok_or(ENODEV)?; > - let iomem = Arc::new(request.iomap_sized::()?.into_devres()?, GFP_KERNEL)?; > + let iomem = request.iomap_sized::()?; > > issue_soft_reset(pdev.as_ref(), &iomem)?; > gpu::l2_power_on(pdev.as_ref(), &iomem)?; > > - let gpu_info = GpuInfo::new(pdev.as_ref(), &iomem)?; > + let gpu_info = GpuInfo::new(&iomem); > gpu_info.log(pdev.as_ref()); > > let pa_bits = MMU_FEATURES::from_raw(gpu_info.mmu_features) > diff --git a/drivers/gpu/drm/tyr/gpu.rs b/drivers/gpu/drm/tyr/gpu.rs > index 652556026f50..592b8bb16eba 100644 > --- a/drivers/gpu/drm/tyr/gpu.rs > +++ b/drivers/gpu/drm/tyr/gpu.rs > @@ -9,7 +9,6 @@ > Bound, > Device, // > }, > - devres::Devres, > io::{ > poll, > register::Array, > @@ -40,10 +39,8 @@ > pub(crate) struct GpuInfo(pub(crate) uapi::drm_panthor_gpu_info); > > impl GpuInfo { > - pub(crate) fn new(dev: &Device, iomem: &Devres) -> Result { > - let io = (*iomem).access(dev)?; > - > - Ok(Self(uapi::drm_panthor_gpu_info { > + pub(crate) fn new(io: &IoMem<'_>) -> Self { > + Self(uapi::drm_panthor_gpu_info { > gpu_id: io.read(GPU_ID).into_raw(), > gpu_rev: io.read(REVIDR).into_raw(), > csf_id: io.read(CSF_ID).into_raw(), > @@ -81,7 +78,7 @@ pub(crate) fn new(dev: &Device, iomem: &Devres) -> Result { > pad: 0, > //GPU_FEATURES register is not available; it was introduced in arch 11.x. > gpu_features: 0, > - })) > + }) > } > > pub(crate) fn log(&self, dev: &Device) { > @@ -163,15 +160,11 @@ struct GpuModels { > }]; > > /// Powers on the l2 block. > -pub(crate) fn l2_power_on(dev: &Device, iomem: &Devres) -> Result { > - let io = (*iomem).access(dev)?; > +pub(crate) fn l2_power_on(dev: &Device, io: &IoMem<'_>) -> Result { > io.write_reg(L2_PWRON_LO::zeroed().with_const_request::<1>()); > > poll::read_poll_timeout( > - || { > - let io = (*iomem).access(dev)?; > - Ok(io.read(L2_READY_LO)) > - }, > + || Ok(io.read(L2_READY_LO)), > |status| status.ready() == 1, > Delta::from_millis(1), > Delta::from_millis(100),