AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: add radv_hide_rebar_on_dgpu and enable for Red Dead Redemption 2

Browse Source 
RDR2 VRAM memory management when resizable BAR is enabled seems
incorrect because it keeps allocating VRAM without freeing anything.

This introduces a drirc option to emulate a fake carveout of 256MiB to
workaround this game bug. This also adjust memory budgets by
distributing it between visible and invisible because AMDGPU reports
the same value for both when REBAR is enabled.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12091
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38627>
This commit is contained in:
Samuel Pitoiset
2025-11-24 19:03:18 +01:00
committed by Marge Bot
parent 9cca79d8f8
commit f14e0d9f09
5 changed files with 92 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_instance.c
View File

@@ -205,6 +205,7 @@ static const driOptionDescription radv_dri_options[] = {
DRI_CONF_RADV_COOPERATIVE_MATRIX2_NV(false)
DRI_CONF_RADV_WAIT_FOR_VM_MAP_UPDATES(false)
DRI_CONF_RADV_NO_IMPLICIT_VARYING_SUBGROUP_SIZE(false)
DRI_CONF_RADV_HIDE_REBAR_ON_DGPU(false)
DRI_CONF_SECTION_END
};
// clang-format on
@@ -251,6 +252,7 @@ radv_init_dri_debug_options(struct radv_instance *instance)
driQueryOptioni(&drirc->options, "radv_override_uniform_offset_alignment");
drirc->debug.rt_wave64 = driQueryOptionb(&drirc->options, "radv_rt_wave64");
drirc->debug.hide_rebar_on_dgpu = driQueryOptionb(&drirc->options, "radv_hide_rebar_on_dgpu");
}
static void

1
src/amd/vulkan/radv_instance.h
View File

@@ -61,6 +61,7 @@ struct radv_drirc {
bool wait_for_vm_map_updates;
bool no_implicit_varying_subgroup_size;
bool rt_wave64;
bool hide_rebar_on_dgpu;
char *app_layer;
int override_uniform_offset_alignment;
} debug;

109
src/amd/vulkan/radv_physical_device.c
View File

@@ -435,6 +435,13 @@ radv_physical_device_init_mem_types(struct radv_physical_device *pdev)
}
vram_size = 0;
} else {
if (pdev->info.all_vram_visible && instance->drirc.debug.hide_rebar_on_dgpu) {
const uint32_t carveout_size = 256 * 1024 * 1024; /* 256 MiB for virtual carveout */
vram_size = visible_vram_size - carveout_size;
visible_vram_size = carveout_size;
}
}
/* Only get a VRAM heap if it is significant, not if it is a 16 MiB
@@ -2935,39 +2942,83 @@ radv_get_memory_budget_properties(VkPhysicalDevice physicalDevice,
memoryBudget->heapUsage[gtt_heap_idx] = gtt_internal_usage;
}
} else {
unsigned mask = pdev->heaps;
unsigned heap = 0;
while (mask) {
uint64_t internal_usage = 0, system_usage = 0;
unsigned type = 1u << u_bit_scan(&mask);
if (pdev->info.all_vram_visible && instance->drirc.debug.hide_rebar_on_dgpu) {
/* When resizable BAR is explicitly hidden to workaround game bugs, clamp the VRAM visible
* system usage to the heap size because AMDGPU reports the same usage for both
* visible/invisible VRAM, and substract that from the VRAM usage.
*/
assert(pdev->heaps == (RADV_HEAP_VRAM | RADV_HEAP_GTT | RADV_HEAP_VRAM_VIS));
const uint8_t vram_heap_idx = 0, gtt_heap_idx = 1, vram_vis_heap_idx = 2;
switch (type) {
case RADV_HEAP_VRAM:
internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM);
system_usage = pdev->ws->query_value(pdev->ws, RADEON_VRAM_USAGE);
break;
case RADV_HEAP_VRAM_VIS:
internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM_VIS);
if (!(pdev->heaps & RADV_HEAP_VRAM))
internal_usage += pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM);
system_usage = pdev->ws->query_value(pdev->ws, RADEON_VRAM_VIS_USAGE);
break;
case RADV_HEAP_GTT:
internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_GTT);
system_usage = pdev->ws->query_value(pdev->ws, RADEON_GTT_USAGE);
break;
/* GTT */
const uint64_t gtt_internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_GTT);
const uint64_t gtt_system_usage = pdev->ws->query_value(pdev->ws, RADEON_GTT_USAGE);
const uint64_t gtt_total_usage = MAX2(gtt_internal_usage, gtt_system_usage);
const uint64_t gtt_free_space = pdev->memory_properties.memoryHeaps[gtt_heap_idx].size -
MIN2(pdev->memory_properties.memoryHeaps[gtt_heap_idx].size, gtt_total_usage);
/* VRAM visible/invisible */
const uint64_t vram_internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM);
const uint64_t vram_vis_internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM_VIS);
uint64_t vram_system_usage = pdev->ws->query_value(pdev->ws, RADEON_VRAM_USAGE);
const uint64_t vram_vis_system_usage =
MIN2(vram_system_usage, pdev->memory_properties.memoryHeaps[vram_vis_heap_idx].size);
vram_system_usage -= vram_vis_system_usage;
const uint64_t vram_total_usage = MAX2(vram_internal_usage, vram_system_usage);
const uint64_t vram_free_space =
pdev->memory_properties.memoryHeaps[vram_heap_idx].size -
MIN2(pdev->memory_properties.memoryHeaps[vram_heap_idx].size, vram_total_usage);
const uint64_t vram_vis_total_usage = MAX2(vram_vis_internal_usage, vram_vis_system_usage);
const uint64_t vram_vis_free_space =
pdev->memory_properties.memoryHeaps[vram_vis_heap_idx].size -
MIN2(pdev->memory_properties.memoryHeaps[vram_vis_heap_idx].size, vram_vis_total_usage);
memoryBudget->heapBudget[gtt_heap_idx] = gtt_free_space + gtt_internal_usage;
memoryBudget->heapUsage[gtt_heap_idx] = gtt_internal_usage;
memoryBudget->heapBudget[vram_heap_idx] = vram_free_space + vram_internal_usage;
memoryBudget->heapUsage[vram_heap_idx] = vram_internal_usage;
memoryBudget->heapBudget[vram_vis_heap_idx] = vram_vis_free_space + vram_vis_internal_usage;
memoryBudget->heapUsage[vram_vis_heap_idx] = vram_vis_internal_usage;
} else {
unsigned mask = pdev->heaps;
unsigned heap = 0;
while (mask) {
uint64_t internal_usage = 0, system_usage = 0;
unsigned type = 1u << u_bit_scan(&mask);
switch (type) {
case RADV_HEAP_VRAM:
internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM);
system_usage = pdev->ws->query_value(pdev->ws, RADEON_VRAM_USAGE);
break;
case RADV_HEAP_VRAM_VIS:
internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM_VIS);
if (!(pdev->heaps & RADV_HEAP_VRAM))
internal_usage += pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_VRAM);
system_usage = pdev->ws->query_value(pdev->ws, RADEON_VRAM_VIS_USAGE);
break;
case RADV_HEAP_GTT:
internal_usage = pdev->ws->query_value(pdev->ws, RADEON_ALLOCATED_GTT);
system_usage = pdev->ws->query_value(pdev->ws, RADEON_GTT_USAGE);
break;
}
uint64_t total_usage = MAX2(internal_usage, system_usage);
uint64_t free_space = pdev->memory_properties.memoryHeaps[heap].size -
MIN2(pdev->memory_properties.memoryHeaps[heap].size, total_usage);
memoryBudget->heapBudget[heap] = free_space + internal_usage;
memoryBudget->heapUsage[heap] = internal_usage;
++heap;
}
uint64_t total_usage = MAX2(internal_usage, system_usage);
uint64_t free_space = pdev->memory_properties.memoryHeaps[heap].size -
MIN2(pdev->memory_properties.memoryHeaps[heap].size, total_usage);
memoryBudget->heapBudget[heap] = free_space + internal_usage;
memoryBudget->heapUsage[heap] = internal_usage;
++heap;
assert(heap == memory_properties->memoryHeapCount);
}
assert(heap == memory_properties->memoryHeapCount);
}
/* The heapBudget value must be less than or equal to VkMemoryHeap::size for each heap. */

5
src/util/00-radv-defaults.conf
View File

@@ -158,6 +158,11 @@ Application bugs worked around in this file:
<application name="RDR2" application_name_match="Red Dead Redemption 2">
<option name="radv_enable_unified_heap_on_apu" value="true" />
<!-- Hide resizable (only when detected) and report a carveout of
256MiB to workaround bad VRAM memory management. -->
<option name="radv_hide_rebar_on_dgpu" value="true" />
<option name="radv_zero_vram" value="true" />
<!-- Disable DCC for mips to workaround rendering issues because
the game aliases two images incorrectly. -->

4
src/util/driconf.h
View File

@@ -824,6 +824,10 @@
"Choose the specific HiZ workaround to apply on GFX12 (RDNA4). " \
"Accepted values are: disabled, partial or full")
#define DRI_CONF_RADV_HIDE_REBAR_ON_DGPU(def) \
DRI_CONF_OPT_B(radv_hide_rebar_on_dgpu, def, \
"Hide resizable bar on dGPUs by exposing a fake carveout of 256MiB.")
/**
* \brief ANV specific configuration options
*/