diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3673-drm-amdgpu-reserve-at-least-4MB-of-VRAM-for-page-tab.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3673-drm-amdgpu-reserve-at-least-4MB-of-VRAM-for-page-tab.patch | 116 |
1 files changed, 116 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3673-drm-amdgpu-reserve-at-least-4MB-of-VRAM-for-page-tab.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3673-drm-amdgpu-reserve-at-least-4MB-of-VRAM-for-page-tab.patch new file mode 100644 index 00000000..9b09e760 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3673-drm-amdgpu-reserve-at-least-4MB-of-VRAM-for-page-tab.patch @@ -0,0 +1,116 @@ +From 273c0eab5b863779f158147db7f0c09deaa81c35 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Fri, 30 Aug 2019 14:38:37 +0200 +Subject: [PATCH 3673/4256] drm/amdgpu: reserve at least 4MB of VRAM for page + tables v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This hopefully helps reduce the contention for page tables. + +v2: adjust maximum reported VRAM size as well + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 ++++++++++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 9 +++++++-- + 3 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +index 141b86c1d3db..751c4c8e1cee 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +@@ -630,9 +630,12 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file + struct drm_amdgpu_info_vram_gtt vram_gtt; + + vram_gtt.vram_size = adev->gmc.real_vram_size - +- atomic64_read(&adev->vram_pin_size); +- vram_gtt.vram_cpu_accessible_size = adev->gmc.visible_vram_size - +- atomic64_read(&adev->visible_pin_size); ++ atomic64_read(&adev->vram_pin_size) - ++ AMDGPU_VM_RESERVED_VRAM; ++ vram_gtt.vram_cpu_accessible_size = ++ min(adev->gmc.visible_vram_size - ++ atomic64_read(&adev->visible_pin_size), ++ vram_gtt.vram_size); + vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size; + vram_gtt.gtt_size *= PAGE_SIZE; + vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size); +@@ -645,15 +648,18 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file + memset(&mem, 0, sizeof(mem)); + mem.vram.total_heap_size = adev->gmc.real_vram_size; + mem.vram.usable_heap_size = adev->gmc.real_vram_size - +- atomic64_read(&adev->vram_pin_size); ++ atomic64_read(&adev->vram_pin_size) - ++ AMDGPU_VM_RESERVED_VRAM; + mem.vram.heap_usage = + amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]); + mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4; + + mem.cpu_accessible_vram.total_heap_size = + adev->gmc.visible_vram_size; +- mem.cpu_accessible_vram.usable_heap_size = adev->gmc.visible_vram_size - +- atomic64_read(&adev->visible_pin_size); ++ mem.cpu_accessible_vram.usable_heap_size = ++ min(adev->gmc.visible_vram_size - ++ atomic64_read(&adev->visible_pin_size), ++ mem.vram.usable_heap_size); + mem.cpu_accessible_vram.heap_usage = + amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]); + mem.cpu_accessible_vram.max_allocation = +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +index 6733189db978..269e55082737 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +@@ -99,6 +99,9 @@ struct amdgpu_bo_list_entry; + #define AMDGPU_VM_FAULT_STOP_FIRST 1 + #define AMDGPU_VM_FAULT_STOP_ALWAYS 2 + ++/* Reserve 4MB VRAM for page tables */ ++#define AMDGPU_VM_RESERVED_VRAM (4ULL << 20) ++ + /* max number of VMHUB */ + #define AMDGPU_MAX_VMHUBS 3 + #define AMDGPU_GFXHUB_0 0 +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +index 1150e34bc28f..59440f71d304 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +@@ -24,6 +24,7 @@ + + #include <drm/drmP.h> + #include "amdgpu.h" ++#include "amdgpu_vm.h" + + struct amdgpu_vram_mgr { + struct drm_mm mm; +@@ -276,7 +277,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, + struct drm_mm_node *nodes; + enum drm_mm_insert_mode mode; + unsigned long lpfn, num_nodes, pages_per_node, pages_left; +- uint64_t vis_usage = 0, mem_bytes; ++ uint64_t vis_usage = 0, mem_bytes, max_bytes; + unsigned i; + int r; + +@@ -284,9 +285,13 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, + if (!lpfn) + lpfn = man->size; + ++ max_bytes = adev->gmc.mc_vram_size; ++ if (tbo->type != ttm_bo_type_kernel) ++ max_bytes -= AMDGPU_VM_RESERVED_VRAM; ++ + /* bail out quickly if there's likely not enough VRAM for this BO */ + mem_bytes = (u64)mem->num_pages << PAGE_SHIFT; +- if (atomic64_add_return(mem_bytes, &mgr->usage) > adev->gmc.mc_vram_size) { ++ if (atomic64_add_return(mem_bytes, &mgr->usage) > max_bytes) { + atomic64_sub(mem_bytes, &mgr->usage); + mem->mm_node = NULL; + return 0; +-- +2.17.1 + |