On Tue, 3 Feb 2026 17:33:31 -0800 Deborah Brouwer <[email protected]> wrote:
> Currently Tyr uses rustfmt style for imports, but the kernel uses a > vertical layout that makes it easier to resolve conflicts and rebase. > > Import guidelines are documented here: > https://docs.kernel.org/rust/coding-guidelines.html#imports > > Change all of Tyr's imports to use the vertical layout. This will > ease the introduction of additional Tyr patches upstream. > > There should be no functional changes in this patch. > > Signed-off-by: Deborah Brouwer <[email protected]> Reviewed-by: Boris Brezillon <[email protected]> > --- > drivers/gpu/drm/tyr/driver.rs | 62 ++++++++++++++++++++--------------- > drivers/gpu/drm/tyr/file.rs | 18 ++++++---- > drivers/gpu/drm/tyr/gem.rs | 13 +++++--- > drivers/gpu/drm/tyr/gpu.rs | 38 ++++++++++++--------- > drivers/gpu/drm/tyr/regs.rs | 14 +++++--- > 5 files changed, 88 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs > index 568cb89aaed8..46b65e004a15 100644 > --- a/drivers/gpu/drm/tyr/driver.rs > +++ b/drivers/gpu/drm/tyr/driver.rs > @@ -1,31 +1,41 @@ > // SPDX-License-Identifier: GPL-2.0 or MIT > > -use kernel::clk::Clk; > -use kernel::clk::OptionalClk; > -use kernel::device::Bound; > -use kernel::device::Core; > -use kernel::device::Device; > -use kernel::devres::Devres; > -use kernel::drm; > -use kernel::drm::ioctl; > -use kernel::io::poll; > -use kernel::new_mutex; > -use kernel::of; > -use kernel::platform; > -use kernel::prelude::*; > -use kernel::regulator; > -use kernel::regulator::Regulator; > -use kernel::sizes::SZ_2M; > -use kernel::sync::aref::ARef; > -use kernel::sync::Arc; > -use kernel::sync::Mutex; > -use kernel::time; > - > -use crate::file::File; > -use crate::gem::TyrObject; > -use crate::gpu; > -use crate::gpu::GpuInfo; > -use crate::regs; > +use kernel::{ > + clk::{ > + Clk, > + OptionalClk, // > + }, > + device::{ > + Bound, > + Core, > + Device, // > + }, > + devres::Devres, > + drm, > + drm::ioctl, > + io::poll, > + new_mutex, > + of, > + platform, > + prelude::*, > + regulator, > + regulator::Regulator, > + sizes::SZ_2M, > + sync::{ > + aref::ARef, > + Arc, > + Mutex, // > + }, > + time, // > +}; > + > +use crate::{ > + file::File, > + gem::TyrObject, > + gpu, > + gpu::GpuInfo, > + regs, // > +}; > > pub(crate) type IoMem = kernel::io::mem::IoMem<SZ_2M>; > > diff --git a/drivers/gpu/drm/tyr/file.rs b/drivers/gpu/drm/tyr/file.rs > index 0ef432947b73..48bff4476d74 100644 > --- a/drivers/gpu/drm/tyr/file.rs > +++ b/drivers/gpu/drm/tyr/file.rs > @@ -1,12 +1,16 @@ > // SPDX-License-Identifier: GPL-2.0 or MIT > > -use kernel::drm; > -use kernel::prelude::*; > -use kernel::uaccess::UserSlice; > -use kernel::uapi; > - > -use crate::driver::TyrDevice; > -use crate::TyrDriver; > +use kernel::{ > + drm, > + prelude::*, > + uaccess::UserSlice, > + uapi, // > +}; > + > +use crate::{ > + driver::TyrDevice, > + TyrDriver, // > +}; > > #[pin_data] > pub(crate) struct File {} > diff --git a/drivers/gpu/drm/tyr/gem.rs b/drivers/gpu/drm/tyr/gem.rs > index 1273bf89dbd5..8f2d23e3c093 100644 > --- a/drivers/gpu/drm/tyr/gem.rs > +++ b/drivers/gpu/drm/tyr/gem.rs > @@ -1,9 +1,14 @@ > // SPDX-License-Identifier: GPL-2.0 or MIT > > -use crate::driver::TyrDevice; > -use crate::driver::TyrDriver; > -use kernel::drm::gem; > -use kernel::prelude::*; > +use kernel::{ > + drm::gem, > + prelude::*, // > +}; > + > +use crate::driver::{ > + TyrDevice, > + TyrDriver, // > +}; > > /// GEM Object inner driver data > #[pin_data] > diff --git a/drivers/gpu/drm/tyr/gpu.rs b/drivers/gpu/drm/tyr/gpu.rs > index bfbf2a1d80e6..affca5b0dc6c 100644 > --- a/drivers/gpu/drm/tyr/gpu.rs > +++ b/drivers/gpu/drm/tyr/gpu.rs > @@ -1,20 +1,28 @@ > // SPDX-License-Identifier: GPL-2.0 or MIT > > -use core::ops::Deref; > -use core::ops::DerefMut; > -use kernel::bits::genmask_u32; > -use kernel::device::Bound; > -use kernel::device::Device; > -use kernel::devres::Devres; > -use kernel::io::poll; > -use kernel::platform; > -use kernel::prelude::*; > -use kernel::time::Delta; > -use kernel::transmute::AsBytes; > -use kernel::uapi; > - > -use crate::driver::IoMem; > -use crate::regs; > +use core::ops::{ > + Deref, > + DerefMut, // > +}; > +use kernel::{ > + bits::genmask_u32, > + device::{ > + Bound, > + Device, // > + }, > + devres::Devres, > + io::poll, > + platform, > + prelude::*, > + time::Delta, > + transmute::AsBytes, > + uapi, // > +}; > + > +use crate::{ > + driver::IoMem, > + regs, // > +}; > > /// Struct containing information that can be queried by userspace. This is > read from > /// the GPU's registers. > diff --git a/drivers/gpu/drm/tyr/regs.rs b/drivers/gpu/drm/tyr/regs.rs > index f46933aaa221..a7672fffbba5 100644 > --- a/drivers/gpu/drm/tyr/regs.rs > +++ b/drivers/gpu/drm/tyr/regs.rs > @@ -7,11 +7,15 @@ > // does. > #![allow(dead_code)] > > -use kernel::bits::bit_u32; > -use kernel::device::Bound; > -use kernel::device::Device; > -use kernel::devres::Devres; > -use kernel::prelude::*; > +use kernel::{ > + bits::bit_u32, > + device::{ > + Bound, > + Device, // > + }, > + devres::Devres, > + prelude::*, // > +}; > > use crate::driver::IoMem; >
