diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2026-03-06 07:52:41 +0300 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2026-03-09 04:35:40 +0300 |
| commit | 99d451cb8e76bd299b036003f067959816975b9c (patch) | |
| tree | a17c463810b34eb8d6bf47b14dca60e30d79b2d1 | |
| parent | 8a623869b8269dbf52d52711cd7b9355044b6b53 (diff) | |
| download | linux-99d451cb8e76bd299b036003f067959816975b9c.tar.xz | |
gpu: nova-core: falcon: remove FalconFirmware's dependency on FalconDmaLoadable
Not all firmware is necessarily loaded by DMA. Remove the requirement
for `FalconFirmware` to implement `FalconDmaLoadable`, and adapt
`Falcon`'s methods constraints accordingly.
Reviewed-by: Eliot Courtney <ecourtney@nvidia.com>
Acked-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/20260306-turing_prep-v11-4-8f0042c5d026@nvidia.com
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
| -rw-r--r-- | drivers/gpu/nova-core/falcon.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon.rs index 9eb827477e5e..450431804e1c 100644 --- a/drivers/gpu/nova-core/falcon.rs +++ b/drivers/gpu/nova-core/falcon.rs @@ -378,7 +378,7 @@ pub(crate) trait FalconDmaLoadable { /// Trait for a falcon firmware. /// /// A falcon firmware can be loaded on a given engine. -pub(crate) trait FalconFirmware: FalconDmaLoadable { +pub(crate) trait FalconFirmware { /// Engine on which this firmware is to be loaded. type Target: FalconEngine; } @@ -521,7 +521,7 @@ impl<E: FalconEngine + 'static> Falcon<E> { } /// Perform a DMA load into `IMEM` and `DMEM` of `fw`, and prepare the falcon to run it. - fn dma_load<F: FalconFirmware<Target = E>>( + fn dma_load<F: FalconFirmware<Target = E> + FalconDmaLoadable>( &self, dev: &Device<device::Bound>, bar: &Bar0, @@ -660,7 +660,7 @@ impl<E: FalconEngine + 'static> Falcon<E> { } // Load a firmware image into Falcon memory - pub(crate) fn load<F: FalconFirmware<Target = E>>( + pub(crate) fn load<F: FalconFirmware<Target = E> + FalconDmaLoadable>( &self, dev: &Device<device::Bound>, bar: &Bar0, |