drm/tyr: Use vertical style for imports

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.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Link: https://patch.msgid.link/20260223203833.207955-1-deborah.brouwer@collabora.com
Signed-off-by: Alice Ryhl <aliceryhl@google.com>

authored by

Deborah Brouwer and committed by

Alice Ryhl 3 months ago ef2964f1 289cf6f9

+86 -55

5 changed files

expand all

drivers

gpu

drm

tyr

driver.rs

file.rs

gem.rs

gpu.rs

regs.rs

+35 -25

drivers/gpu/drm/tyr/driver.rs

··· 1 1 // SPDX-License-Identifier: GPL-2.0 or MIT 2 2 3 - use kernel::clk::Clk; 4 - use kernel::clk::OptionalClk; 5 - use kernel::device::Bound; 6 - use kernel::device::Core; 7 - use kernel::device::Device; 8 - use kernel::devres::Devres; 9 - use kernel::drm; 10 - use kernel::drm::ioctl; 11 - use kernel::io::poll; 12 - use kernel::new_mutex; 13 - use kernel::of; 14 - use kernel::platform; 15 - use kernel::prelude::*; 16 - use kernel::regulator; 17 - use kernel::regulator::Regulator; 18 - use kernel::sizes::SZ_2M; 19 - use kernel::sync::aref::ARef; 20 - use kernel::sync::Arc; 21 - use kernel::sync::Mutex; 22 - use kernel::time; 3 + use kernel::{ 4 + clk::{ 5 + Clk, 6 + OptionalClk, // 7 + }, 8 + device::{ 9 + Bound, 10 + Core, 11 + Device, // 12 + }, 13 + devres::Devres, 14 + drm, 15 + drm::ioctl, 16 + io::poll, 17 + new_mutex, 18 + of, 19 + platform, 20 + prelude::*, 21 + regulator, 22 + regulator::Regulator, 23 + sizes::SZ_2M, 24 + sync::{ 25 + aref::ARef, 26 + Arc, 27 + Mutex, // 28 + }, 29 + time, // 30 + }; 23 31 24 - use crate::file::File; 25 - use crate::gem::TyrObject; 26 - use crate::gpu; 27 - use crate::gpu::GpuInfo; 28 - use crate::regs; 32 + use crate::{ 33 + file::File, 34 + gem::TyrObject, 35 + gpu, 36 + gpu::GpuInfo, 37 + regs, // 38 + }; 29 39 30 40 pub(crate) type IoMem = kernel::io::mem::IoMem<SZ_2M>; 31 41

+10 -6

drivers/gpu/drm/tyr/file.rs

··· 1 1 // SPDX-License-Identifier: GPL-2.0 or MIT 2 2 3 - use kernel::drm; 4 - use kernel::prelude::*; 5 - use kernel::uaccess::UserSlice; 6 - use kernel::uapi; 3 + use kernel::{ 4 + drm, 5 + prelude::*, 6 + uaccess::UserSlice, 7 + uapi, // 8 + }; 7 9 8 - use crate::driver::TyrDevice; 9 - use crate::TyrDriver; 10 + use crate::{ 11 + driver::TyrDevice, 12 + TyrDriver, // 13 + }; 10 14 11 15 #[pin_data] 12 16 pub(crate) struct File {}

+9 -4

drivers/gpu/drm/tyr/gem.rs

··· 1 1 // SPDX-License-Identifier: GPL-2.0 or MIT 2 2 3 - use crate::driver::TyrDevice; 4 - use crate::driver::TyrDriver; 5 - use kernel::drm::gem; 6 - use kernel::prelude::*; 3 + use kernel::{ 4 + drm::gem, 5 + prelude::*, // 6 + }; 7 + 8 + use crate::driver::{ 9 + TyrDevice, 10 + TyrDriver, // 11 + }; 7 12 8 13 /// GEM Object inner driver data 9 14 #[pin_data]

+22 -14

drivers/gpu/drm/tyr/gpu.rs

··· 1 1 // SPDX-License-Identifier: GPL-2.0 or MIT 2 2 3 - use core::ops::Deref; 4 - use core::ops::DerefMut; 5 - use kernel::bits::genmask_u32; 6 - use kernel::device::Bound; 7 - use kernel::device::Device; 8 - use kernel::devres::Devres; 9 - use kernel::io::poll; 10 - use kernel::platform; 11 - use kernel::prelude::*; 12 - use kernel::time::Delta; 13 - use kernel::transmute::AsBytes; 14 - use kernel::uapi; 3 + use core::ops::{ 4 + Deref, 5 + DerefMut, // 6 + }; 7 + use kernel::{ 8 + bits::genmask_u32, 9 + device::{ 10 + Bound, 11 + Device, // 12 + }, 13 + devres::Devres, 14 + io::poll, 15 + platform, 16 + prelude::*, 17 + time::Delta, 18 + transmute::AsBytes, 19 + uapi, // 20 + }; 15 21 16 - use crate::driver::IoMem; 17 - use crate::regs; 22 + use crate::{ 23 + driver::IoMem, 24 + regs, // 25 + }; 18 26 19 27 /// Struct containing information that can be queried by userspace. This is read from 20 28 /// the GPU's registers.

+10 -6

drivers/gpu/drm/tyr/regs.rs

··· 7 7 // does. 8 8 #![allow(dead_code)] 9 9 10 - use kernel::bits::bit_u32; 11 - use kernel::device::Bound; 12 - use kernel::device::Device; 13 - use kernel::devres::Devres; 14 - use kernel::io::Io; 15 - use kernel::prelude::*; 10 + use kernel::{ 11 + bits::bit_u32, 12 + device::{ 13 + Bound, 14 + Device, // 15 + }, 16 + devres::Devres, 17 + io::Io, 18 + prelude::*, // 19 + }; 16 20 17 21 use crate::driver::IoMem; 18 22

Configure Feed

Configure Feed