Commit 173c99b8 authored by John Hubbard's avatar John Hubbard Committed by Alexandre Courbot
Browse files

gpu: nova-core: apply the one "use" item per line policy 

As per [1], we need one "use" item per line, in order to reduce merge
conflicts. Furthermore, we need a trailing ", //" in order to tell
rustfmt(1) to leave it alone.

This does that for the entire nova-core driver.

[1] https://docs.kernel.org/rust/coding-guidelines.html#imports



Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
[acourbot@nvidia.com: remove imports already in prelude as pointed out
by Danilo.]
[acourbot@nvidia.com: remove a few unneeded trailing `//`.]
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Message-ID: <20251107021006.434109-1-jhubbard@nvidia.com>
parent ade19c50

drivers/gpu/nova-core/dma.rs

+11 −6
Original line number Diff line number Diff line
@@ -2,12 +2,17 @@ 


//! Simple DMA object wrapper.



use core::ops::{Deref, DerefMut};



use kernel::device;

use kernel::dma::CoherentAllocation;

use kernel::page::PAGE_SIZE;

use kernel::prelude::*;

use core::ops::{

    Deref,

    DerefMut, //

};



use kernel::{

    device,

    dma::CoherentAllocation,

    page::PAGE_SIZE,

    prelude::*, //

};



pub(crate) struct DmaObject {

    dma: CoherentAllocation<u8>,

drivers/gpu/nova-core/driver.rs

+8 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



use kernel::{

    auxiliary, c_str,

    auxiliary,

    c_str,

    device::Core,

    pci,

    pci::{Class, ClassMask, Vendor},

    pci::{

        Class,

        ClassMask,

        Vendor, //

    },

    prelude::*,

    sizes::SZ_16M,

    sync::Arc,

    sync::Arc, //

};



use crate::gpu::Gpu;

drivers/gpu/nova-core/falcon.rs

+21 −13
Original line number Diff line number Diff line
@@ -3,20 +3,28 @@ 
//! Falcon microprocessor base support



use core::ops::Deref;



use hal::FalconHal;

use kernel::device;

use kernel::dma::DmaAddress;

use kernel::io::poll::read_poll_timeout;

use kernel::prelude::*;

use kernel::sync::aref::ARef;

use kernel::time::delay::fsleep;

use kernel::time::Delta;



use crate::dma::DmaObject;

use crate::driver::Bar0;

use crate::gpu::Chipset;

use crate::regs;

use crate::regs::macros::RegisterBase;



use kernel::{

    device,

    dma::DmaAddress,

    io::poll::read_poll_timeout,

    prelude::*,

    sync::aref::ARef,

    time::{

        delay::fsleep,

        Delta, //

    },

};



use crate::{

    dma::DmaObject,

    driver::Bar0,

    gpu::Chipset,

    regs,

    regs::macros::RegisterBase, //

};



pub(crate) mod gsp;

mod hal;

drivers/gpu/nova-core/falcon/gsp.rs

+10 −2
Original line number Diff line number Diff line
@@ -2,8 +2,16 @@ 


use crate::{

    driver::Bar0,

    falcon::{Falcon, FalconEngine, PFalcon2Base, PFalconBase},

    regs::{self, macros::RegisterBase},

    falcon::{

        Falcon,

        FalconEngine,

        PFalcon2Base,

        PFalconBase, //

    },

    regs::{

        self,

        macros::RegisterBase, //

    },

};



/// Type specifying the `Gsp` falcon engine. Cannot be instantiated.

drivers/gpu/nova-core/falcon/hal.rs

+9 −3
Original line number Diff line number Diff line
@@ -2,9 +2,15 @@ 


use kernel::prelude::*;



use crate::driver::Bar0;

use crate::falcon::{Falcon, FalconBromParams, FalconEngine};

use crate::gpu::Chipset;

use crate::{

    driver::Bar0,

    falcon::{

        Falcon,

        FalconBromParams,

        FalconEngine, //

    },

    gpu::Chipset,

};



mod ga102;