mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 04:46:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nova-core: rename heap size field

Browse Source 
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 <ecourtney@nvidia.com>
Link: https://patch.msgid.link/20260804-blackwell-fixes-v4-2-ac858b6a1935@nvidia.com
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
This commit is contained in:
Eliot Courtney
2026-08-04 14:41:13 +09:00
committed by Alexandre Courbot
parent 5c9deba557
commit b2bc53d344
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nova-core/fb.rs
View File

@@ -164,7 +164,7 @@ pub(crate) struct FbLayout {
pub(crate) wpr2_heap: FbRange,
/// WPR2 region range, starting with an instance of `GspFwWprMeta`.
pub(crate) wpr2: FbRange,
pub(crate) heap: FbRange,
pub(crate) non_wpr_heap: FbRange,
pub(crate) vf_partition_count: u8,
/// PMU reserved memory size, in bytes.
pub(crate) pmu_reserved_size: u32,
@@ -270,9 +270,9 @@ pub(crate) fn new(
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 {
@@ -283,7 +283,7 @@ pub(crate) fn new(
elf,
wpr2_heap,
wpr2,
heap,
non_wpr_heap,
vf_partition_count,
pmu_reserved_size: hal.pmu_reserved_size(),
})

6
drivers/gpu/nova-core/gsp/fw.rs
View File

@@ -196,9 +196,9 @@ pub(crate) fn new<'a>(
sizeOfSignature: u64::from_safe_cast(gsp_firmware.signatures.size()),
},
},
gspFwRsvdStart: fb_layout.heap.start,
nonWprHeapOffset: fb_layout.heap.start,
nonWprHeapSize: fb_layout.heap.end - fb_layout.heap.start,
gspFwRsvdStart: fb_layout.non_wpr_heap.start,
nonWprHeapOffset: fb_layout.non_wpr_heap.start,
nonWprHeapSize: fb_layout.non_wpr_heap.end - fb_layout.non_wpr_heap.start,
gspFwWprStart: fb_layout.wpr2.start,
gspFwHeapOffset: fb_layout.wpr2_heap.start,
gspFwHeapSize: fb_layout.wpr2_heap.end - fb_layout.wpr2_heap.start,