[PATCH v2 11/19] gpu: nova-core: register: improve `Debug` implementation

[Daniel Almeida]

> On 18 Jul 2025, at 04:26, Alexandre Courbot <acourbot at nvidia.com> wrote:
> 
> Now that we have an internal rule to dispatch field information where
> needed, use it to generate a better `Debug` implementation where the raw
> hexadecimal value of the register is displayed, as well as the `Debug`
> values of its individual fields.
> 
> Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
> ---
> drivers/gpu/nova-core/regs/macros.rs | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/nova-core/regs/macros.rs b/drivers/gpu/nova-core/regs/macros.rs
> index 8b081242595de620cbf94b405838a2dac67b8e83..485cac806e4a6578059c657f3b31f15e361becbd 100644
> --- a/drivers/gpu/nova-core/regs/macros.rs
> +++ b/drivers/gpu/nova-core/regs/macros.rs
> @@ -122,16 +122,6 @@ macro_rules! register {
>         #[derive(Clone, Copy, Default)]
>         pub(crate) struct $name(u32);
> 
> -        // TODO[REGA]: display the raw hex value, then the value of all the fields. This requires
> -        // matching the fields, which will complexify the syntax considerably...
> -        impl ::core::fmt::Debug for $name {
> -            fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
> -                f.debug_tuple(stringify!($name))
> -                    .field(&format_args!("0x{0:x}", &self.0))
> -                    .finish()
> -            }
> -        }
> -
>         impl ::core::ops::BitOr for $name {
>             type Output = Self;
> 
> @@ -171,6 +161,7 @@ fn from(reg: $name) -> u32 {
>             ;
>             )*
>         });
> +        register!(@debug $name { $($field;)* });
>     };
> 
>     // Defines all the field getter/methods methods for `$name`.
> @@ -316,6 +307,20 @@ pub(crate) fn [<set_ $field>](mut self, value: $to_type) -> Self {
>         );
>     };
> 
> +    // Generates the `Debug` implementation for `$name`.
> +    (@debug $name:ident { $($field:ident;)* }) => {
> +        impl ::core::fmt::Debug for $name {
> +            fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
> +                f.debug_struct(stringify!($name))
> +                    .field("<raw>", &format_args!("{:#x}", &self.0))
> +                $(
> +                    .field(stringify!($field), &self.$field())
> +                )*
> +                    .finish()
> +            }
> +        }
> +    };
> +
>     // Generates the IO accessors for a fixed offset register.
>     (@io $name:ident @ $offset:expr) => {
>         #[allow(dead_code)]
> 
> -- 
> 2.50.1
> 

Reviewed-by: Daniel Almeida <daniel.almeida at collabora.com>