diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3661-drm-amdgpu-keep-the-stolen-memory-in-visible-vram-re.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3661-drm-amdgpu-keep-the-stolen-memory-in-visible-vram-re.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3661-drm-amdgpu-keep-the-stolen-memory-in-visible-vram-re.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3661-drm-amdgpu-keep-the-stolen-memory-in-visible-vram-re.patch new file mode 100644 index 00000000..8c842421 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3661-drm-amdgpu-keep-the-stolen-memory-in-visible-vram-re.patch @@ -0,0 +1,75 @@ +From f5d61899743a1b8d27860789c60300c57b00167b Mon Sep 17 00:00:00 2001 +From: "Tianci.Yin" <tianci.yin@amd.com> +Date: Wed, 28 Aug 2019 18:51:19 +0800 +Subject: [PATCH 3661/4256] drm/amdgpu: keep the stolen memory in visible vram + region +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +stolen memory should be fixed in visible region. + +Change-Id: Icbbbd39fd113e93423aad8d2555f4073c08020e5 +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Tianci.Yin <tianci.yin@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 ++++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 5b21dae64755..7377bff42335 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -2046,6 +2046,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) + uint64_t gtt_size; + int r; + u64 vis_vram_limit; ++ void *stolen_vga_buf; + + /* initialize global references for vram/gtt */ + r = amdgpu_ttm_global_init(adev); +@@ -2105,7 +2106,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) + r = amdgpu_bo_create_kernel(adev, adev->gmc.stolen_size, PAGE_SIZE, + AMDGPU_GEM_DOMAIN_VRAM, + &adev->stolen_vga_memory, +- NULL, NULL); ++ NULL, &stolen_vga_buf); + if (r) + return r; + DRM_INFO("amdgpu: %uM of VRAM memory ready\n", +@@ -2174,8 +2175,9 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) + */ + void amdgpu_ttm_late_init(struct amdgpu_device *adev) + { ++ void *stolen_vga_buf; + /* return the VGA stolen memory (if any) back to VRAM */ +- amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL); ++ amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf); + } + + /** +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index b97ea92bda51..e01fe0678243 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -1248,6 +1248,7 @@ static int gmc_v9_0_sw_init(void *handle) + static int gmc_v9_0_sw_fini(void *handle) + { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; ++ void *stolen_vga_buf; + + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) && + adev->gmc.umc_ras_if) { +@@ -1280,7 +1281,7 @@ static int gmc_v9_0_sw_fini(void *handle) + amdgpu_vm_manager_fini(adev); + + if (gmc_v9_0_keep_stolen_memory(adev)) +- amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL); ++ amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf); + + amdgpu_gart_table_vram_free(adev); + amdgpu_bo_fini(adev); +-- +2.17.1 + |