From: Lionel Landwerlin Date: Fri, 12 Apr 2019 10:05:33 +0000 (+0100) Subject: anv: leave the top 4Gb of the high heap VMA unused X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e7b0988d6e98690eb8902e477b51713a6ef9cae;p=mesa.git anv: leave the top 4Gb of the high heap VMA unused In 628c9ca9089789 I forgot to apply the same -4Gb of the high address of the high heap VMA. This was previously computed in the HIGH_HEAP_MAX_ADDRESS. Many thanks to James for pointing this out. Signed-off-by: Lionel Landwerlin Reported-by: Xiong, James Fixes: 628c9ca9089789 ("anv: store heap address bounds when initializing physical device") Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index fad5db196c9..48b2c256a17 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -171,7 +171,11 @@ anv_physical_device_init_heaps(struct anv_physical_device *device, int fd) device->memory.heap_count = 2; device->memory.heaps[0] = (struct anv_memory_heap) { .vma_start = HIGH_HEAP_MIN_ADDRESS, - .vma_size = gtt_size - HIGH_HEAP_MIN_ADDRESS, + /* Leave the last 4GiB out of the high vma range, so that no state + * base address + size can overflow 48 bits. For more information see + * the comment about Wa32bitGeneralStateOffset in anv_allocator.c + */ + .vma_size = gtt_size - (1ull << 32) - HIGH_HEAP_MIN_ADDRESS, .size = heap_size_48bit, .flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT, .supports_48bit_addresses = true, @@ -1988,10 +1992,6 @@ VkResult anv_CreateDevice( util_vma_heap_init(&device->vma_lo, low_heap->vma_start, low_heap->vma_size); device->vma_lo_available = low_heap->size; - /* Leave the last 4GiB out of the high vma range, so that no state base - * address + size can overflow 48 bits. For more information see the - * comment about Wa32bitGeneralStateOffset in anv_allocator.c - */ struct anv_memory_heap *high_heap = &physical_device->memory.heaps[0]; util_vma_heap_init(&device->vma_hi, high_heap->vma_start, high_heap->vma_size);