On Thu, Feb 12, 2026 at 09:12:55AM +0100, Boris Brezillon wrote: > On Wed, 11 Feb 2026 17:37:03 -0800 > Deborah Brouwer <[email protected]> wrote: > > > Currently Tyr disables its clocks from TyrDrmDeviceData::drop(), which > > causes them to be shut down before any other fields in TyrDrmDeviceData > > are dropped. This prevents us from using the clocks when dropping the > > other fields in TyrDrmDeviceData. > > > > In order to better control when the clocks are dropped, move this cleanup > > logic into a Drop implementation on the Clocks struct itself. > > > > Signed-off-by: Deborah Brouwer <[email protected]> > > Maybe you should mention that Clocks is no longer considered pinned, > because it's not needed in practice.
Ack will do. > > Reviewed-by: Boris Brezillon <[email protected]> > > > --- > > drivers/gpu/drm/tyr/driver.rs | 23 +++++++++-------------- > > 1 file changed, 9 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs > > index ae4daa12b3e5..9bc6ed56c45e 100644 > > --- a/drivers/gpu/drm/tyr/driver.rs > > +++ b/drivers/gpu/drm/tyr/driver.rs > > @@ -54,7 +54,7 @@ pub(crate) struct TyrPlatformDeviceData { > > _device: ARef<TyrDrmDevice>, > > } > > > > -#[pin_data(PinnedDrop)] > > +#[pin_data] > > pub(crate) struct TyrDrmDeviceData { > > pub(crate) pdev: ARef<platform::Device>, > > > > @@ -168,17 +168,6 @@ impl PinnedDrop for TyrPlatformDeviceData { > > fn drop(self: Pin<&mut Self>) {} > > } > > > > -#[pinned_drop] > > -impl PinnedDrop for TyrDrmDeviceData { > > - fn drop(self: Pin<&mut Self>) { > > - // TODO: the type-state pattern for Clks will fix this. > > - let clks = self.clks.lock(); > > - clks.core.disable_unprepare(); > > - clks.stacks.disable_unprepare(); > > - clks.coregroup.disable_unprepare(); > > - } > > -} > > - > > // We need to retain the name "panthor" to achieve drop-in compatibility > > with > > // the C driver in the userspace stack. > > const INFO: drm::DriverInfo = drm::DriverInfo { > > @@ -202,14 +191,20 @@ impl drm::Driver for TyrDrmDriver { > > } > > } > > > > -#[pin_data] > > struct Clocks { > > core: Clk, > > stacks: OptionalClk, > > coregroup: OptionalClk, > > } > > > > -#[pin_data] > > +impl Drop for Clocks { > > + fn drop(&mut self) { > > + self.core.disable_unprepare(); > > + self.stacks.disable_unprepare(); > > + self.coregroup.disable_unprepare(); > > + } > > +} > > + > > struct Regulators { > > _mali: Regulator<regulator::Enabled>, > > _sram: Regulator<regulator::Enabled>, >
