diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3975-drm-amdgpu-Export-setup_vm_pt_regs-logic-for-gfxhub-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3975-drm-amdgpu-Export-setup_vm_pt_regs-logic-for-gfxhub-.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3975-drm-amdgpu-Export-setup_vm_pt_regs-logic-for-gfxhub-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3975-drm-amdgpu-Export-setup_vm_pt_regs-logic-for-gfxhub-.patch new file mode 100644 index 00000000..75d54bb5 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3975-drm-amdgpu-Export-setup_vm_pt_regs-logic-for-gfxhub-.patch @@ -0,0 +1,69 @@ +From d02e0ed0789df185c8069a2fcaf38aed86636e94 Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Tue, 24 Sep 2019 17:08:30 -0400 +Subject: [PATCH 3975/4256] drm/amdgpu: Export setup_vm_pt_regs() logic for + gfxhub 2.0 + +The KFD code will call this function later. + +Change-Id: I88a53368cdee719b2c75393e5cdbd8290584548e +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 20 ++++++++++++-------- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 2 ++ + 2 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +index a9238735d361..b601c6740ef5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +@@ -46,21 +46,25 @@ u64 gfxhub_v2_0_get_mc_fb_offset(struct amdgpu_device *adev) + return (u64)RREG32_SOC15(GC, 0, mmGCMC_VM_FB_OFFSET) << 24; + } + +-static void gfxhub_v2_0_init_gart_pt_regs(struct amdgpu_device *adev) ++void gfxhub_v2_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid, ++ uint64_t page_table_base) + { +- uint64_t value = amdgpu_gmc_pd_addr(adev->gart.bo); ++ /* two registers distance between mmGCVM_CONTEXT0_* to mmGCVM_CONTEXT1_* */ ++ int offset = mmGCVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 ++ - mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32; + ++ WREG32_SOC15_OFFSET(GC, 0, mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, ++ offset * vmid, lower_32_bits(page_table_base)); + +- WREG32_SOC15(GC, 0, mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, +- lower_32_bits(value)); +- +- WREG32_SOC15(GC, 0, mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, +- upper_32_bits(value)); ++ WREG32_SOC15_OFFSET(GC, 0, mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, ++ offset * vmid, upper_32_bits(page_table_base)); + } + + static void gfxhub_v2_0_init_gart_aperture_regs(struct amdgpu_device *adev) + { +- gfxhub_v2_0_init_gart_pt_regs(adev); ++ uint64_t pt_base = amdgpu_gmc_pd_addr(adev->gart.bo); ++ ++ gfxhub_v2_0_setup_vm_pt_regs(adev, 0, pt_base); + + WREG32_SOC15(GC, 0, mmGCVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, + (u32)(adev->gmc.gart_start >> 12)); +diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h +index 06807940748b..392b8cd94fc0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h ++++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h +@@ -31,5 +31,7 @@ void gfxhub_v2_0_set_fault_enable_default(struct amdgpu_device *adev, + bool value); + void gfxhub_v2_0_init(struct amdgpu_device *adev); + u64 gfxhub_v2_0_get_mc_fb_offset(struct amdgpu_device *adev); ++void gfxhub_v2_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid, ++ uint64_t page_table_base); + + #endif +-- +2.17.1 + |