Skip to content

Commit d3ea23b

Browse files
committed
drm/asahi: initdata: Port to init!()
Signed-off-by: Asahi Lina <[email protected]>
1 parent 8929c79 commit d3ea23b

2 files changed

Lines changed: 691 additions & 705 deletions

File tree

drivers/gpu/drm/asahi/fw/initdata.rs

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ pub(crate) mod raw {
156156
}
157157
default_zeroed!(HwDataA130Extra);
158158

159-
#[derive(Default)]
160159
#[repr(C)]
161160
pub(crate) struct T81xxData {
162161
pub(crate) unk_d8c: u32,
@@ -177,6 +176,7 @@ pub(crate) mod raw {
177176
pub(crate) unk_dc8: u32,
178177
pub(crate) max_pstate_scaled: u32,
179178
}
179+
default_zeroed!(T81xxData);
180180

181181
#[versions(AGX)]
182182
#[derive(Default, Copy, Clone)]
@@ -1262,22 +1262,10 @@ trivial_gpustruct!(GpuGlobalStatsFrag);
12621262
trivial_gpustruct!(GpuStatsComp);
12631263

12641264
#[versions(AGX)]
1265-
#[derive(Debug, Default)]
1266-
pub(crate) struct HwDataA {}
1265+
trivial_gpustruct!(HwDataA::ver);
12671266

12681267
#[versions(AGX)]
1269-
impl GpuStruct for HwDataA::ver {
1270-
type Raw<'a> = raw::HwDataA::ver;
1271-
}
1272-
1273-
#[versions(AGX)]
1274-
#[derive(Debug, Default)]
1275-
pub(crate) struct HwDataB {}
1276-
1277-
#[versions(AGX)]
1278-
impl GpuStruct for HwDataB::ver {
1279-
type Raw<'a> = raw::HwDataB::ver;
1280-
}
1268+
trivial_gpustruct!(HwDataB::ver);
12811269

12821270
#[versions(AGX)]
12831271
#[derive(Debug)]
@@ -1310,13 +1298,7 @@ impl GpuStruct for RuntimePointers::ver {
13101298
}
13111299

13121300
#[versions(AGX)]
1313-
#[derive(Debug, Default)]
1314-
pub(crate) struct Globals {}
1315-
1316-
#[versions(AGX)]
1317-
impl GpuStruct for Globals::ver {
1318-
type Raw<'a> = raw::Globals::ver;
1319-
}
1301+
trivial_gpustruct!(Globals::ver);
13201302

13211303
#[versions(AGX)]
13221304
#[derive(Debug)]

0 commit comments

Comments
 (0)