diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2710-drm-amdkfd-page_table_base-already-have-the-flags-ne.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2710-drm-amdkfd-page_table_base-already-have-the-flags-ne.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2710-drm-amdkfd-page_table_base-already-have-the-flags-ne.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2710-drm-amdkfd-page_table_base-already-have-the-flags-ne.patch new file mode 100644 index 00000000..ca8ea16b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2710-drm-amdkfd-page_table_base-already-have-the-flags-ne.patch @@ -0,0 +1,53 @@ +From 21fa7d40692d83ccbf01e94636a658c48f169b8d Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Tue, 16 Oct 2018 13:12:53 -0400 +Subject: [PATCH 2710/2940] drm/amdkfd: page_table_base already have the flags + needed + +The flags are added when calling amdgpu_gmc_pd_addr(). + +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 5 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +index 381cd2586fb8..ef68a53bd940 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +@@ -978,7 +978,6 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, + uint64_t page_table_base) + { + struct amdgpu_device *adev = get_amdgpu_device(kgd); +- uint64_t base = page_table_base | AMDGPU_PTE_VALID; + + if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) { + pr_err("trying to set page table base for wrong VMID %u\n", +@@ -990,7 +989,7 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, + * now, all processes share the same address space size, like + * on GFX8 and older. + */ +- mmhub_v1_0_setup_vm_pt_regs(adev, vmid, base); ++ mmhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base); + +- gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, base); ++ gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base); + } +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +index 87f9aee48c87..8aeeb98f1997 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +@@ -535,6 +535,7 @@ struct qcm_process_device { + * All the memory management data should be here too + */ + uint64_t gds_context_area; ++ /* Contains page table flags such as AMDGPU_PTE_VALID since gfx9 */ + uint64_t page_table_base; + uint32_t sh_mem_config; + uint32_t sh_mem_bases; +-- +2.17.1 + |