This field is called non_wpr_heap_size everywhere else. Unify the name to make it more obvious which heap it is.
Signed-off-by: Eliot Courtney <[email protected]> --- drivers/gpu/nova-core/fb.rs | 14 +++++++------- drivers/gpu/nova-core/gsp/fw.rs | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs index 5ffe66af282f..431828cad1a1 100644 --- a/drivers/gpu/nova-core/fb.rs +++ b/drivers/gpu/nova-core/fb.rs @@ -183,7 +183,7 @@ pub(crate) struct FbRanges { /// WPR2 region range, starting with an instance of `GspFwWprMeta`. pub(crate) wpr2: FbRange, /// Non-WPR heap, located just below WPR2. - pub(crate) heap: FbRange, + pub(crate) non_wpr_heap: FbRange, /// Number of VF partitions. pub(crate) vf_partition_count: u8, /// PMU reserved memory size, in bytes. @@ -272,9 +272,9 @@ fn new(chipset: Chipset, bar: Bar0<'_>, gsp_fw: &GspFirmware) -> Result<Self> { FbRange(wpr2_addr..frts.end) }; - let heap = { - let heap_size = u64::from(hal.non_wpr_heap_size()); - FbRange(wpr2.start - heap_size..wpr2.start) + let non_wpr_heap = { + let non_wpr_heap_size = u64::from(hal.non_wpr_heap_size()); + FbRange(wpr2.start - non_wpr_heap_size..wpr2.start) }; Ok(Self { @@ -285,7 +285,7 @@ fn new(chipset: Chipset, bar: Bar0<'_>, gsp_fw: &GspFirmware) -> Result<Self> { elf, wpr2_heap, wpr2, - heap, + non_wpr_heap, vf_partition_count: 0, pmu_reserved_size: hal.pmu_reserved_size(), }) @@ -302,7 +302,7 @@ pub(crate) struct FbSizes { /// WPR2 heap size, in bytes. pub(crate) wpr2_heap_size: u64, /// Non-WPR heap size, in bytes. - pub(crate) heap_size: u64, + pub(crate) non_wpr_heap_size: u64, /// PMU reserved memory size, in bytes. pub(crate) pmu_reserved_size: u32, /// Size reserved at the end of the framebuffer. This is architecture dependent and used to @@ -323,7 +323,7 @@ fn new(chipset: Chipset, bar: Bar0<'_>) -> Result<Self> { frts_size: hal.frts_size(), wpr2_heap_size: gsp::LibosParams::from_chipset(chipset) .wpr_heap_size(chipset, fb_size)?, - heap_size: u64::from(hal.non_wpr_heap_size()), + non_wpr_heap_size: u64::from(hal.non_wpr_heap_size()), pmu_reserved_size: hal.pmu_reserved_size(), fb_end_reserved_size: hal.fb_end_reserved_size(), vf_partition_count: 0, diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs index 3b148147cb18..5a2fa1a4a495 100644 --- a/drivers/gpu/nova-core/gsp/fw.rs +++ b/drivers/gpu/nova-core/gsp/fw.rs @@ -242,9 +242,9 @@ struct WprMetaFields { let fields = match fb_info { GspFbInfo::Ranges(ranges) => WprMetaFields { - gsp_fw_rsvd_start: ranges.heap.start, - non_wpr_heap_offset: ranges.heap.start, - non_wpr_heap_size: ranges.heap.len(), + gsp_fw_rsvd_start: ranges.non_wpr_heap.start, + non_wpr_heap_offset: ranges.non_wpr_heap.start, + non_wpr_heap_size: ranges.non_wpr_heap.len(), gsp_fw_wpr_start: ranges.wpr2.start, gsp_fw_heap_offset: ranges.wpr2_heap.start, gsp_fw_heap_size: ranges.wpr2_heap.len(), @@ -263,7 +263,7 @@ struct WprMetaFields { pmu_reserved_size: ranges.pmu_reserved_size, }, GspFbInfo::Sizes(sizes) => WprMetaFields { - non_wpr_heap_size: sizes.heap_size, + non_wpr_heap_size: sizes.non_wpr_heap_size, gsp_fw_heap_size: sizes.wpr2_heap_size, frts_size: sizes.frts_size, gsp_fw_heap_vf_partition_count: sizes.vf_partition_count, -- 2.54.0
