mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
gpu: nova-core: make formatting compatible with rust tree
Commit 38b7cc448a ("gpu: nova-core: implement Display for Spec") in
drm-rust-next introduced some usage of the Display trait, but the
Display trait is being modified in the rust tree this cycle. Thus, to
avoid conflicts with the Rust tree, tweak how the formatting machinery
is used in a way where it works both with and without the changes in the
Rust tree.
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Link: https://patch.msgid.link/20251117-nova-fmt-rust-v1-1-651ca28cd98f@google.com
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
This commit is contained in:
@@ -227,13 +227,12 @@ impl TryFrom<regs::NV_PMC_BOOT_42> for Spec {
|
||||
|
||||
impl fmt::Display for Spec {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(
|
||||
f,
|
||||
f.write_fmt(fmt!(
|
||||
"Chipset: {}, Architecture: {:?}, Revision: {}",
|
||||
self.chipset,
|
||||
self.chipset.arch(),
|
||||
self.revision
|
||||
)
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,13 +6,11 @@ mod r570_144;
|
||||
// Alias to avoid repeating the version number with every use.
|
||||
use r570_144 as bindings;
|
||||
|
||||
use core::{
|
||||
fmt,
|
||||
ops::Range, //
|
||||
};
|
||||
use core::ops::Range;
|
||||
|
||||
use kernel::{
|
||||
dma::CoherentAllocation,
|
||||
fmt,
|
||||
prelude::*,
|
||||
ptr::{
|
||||
Alignable,
|
||||
|
||||
Reference in New Issue
Block a user