diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2705-drm-amdkfd-Use-functions-from-amdgpu-for-setting-up-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2705-drm-amdkfd-Use-functions-from-amdgpu-for-setting-up-.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2705-drm-amdkfd-Use-functions-from-amdgpu-for-setting-up-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2705-drm-amdkfd-Use-functions-from-amdgpu-for-setting-up-.patch new file mode 100644 index 00000000..c53f6cea --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2705-drm-amdkfd-Use-functions-from-amdgpu-for-setting-up-.patch @@ -0,0 +1,60 @@ +From 6eb60315fc6ef4608218acb3d7f227d4ccdfe038 Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Fri, 12 Oct 2018 15:27:39 -0400 +Subject: [PATCH 2705/2940] drm/amdkfd: Use functions from amdgpu for setting + up page table base +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use the functions from amdgpu to avoid directly programming registers in +amdgpu_amdkfd_gfx_v9.c. + +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 12 +++--------- + 1 file changed, 3 insertions(+), 9 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 988c222e4f3d..7c6cc5ac70ac 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +@@ -47,6 +47,7 @@ + #include "v9_structs.h" + #include "soc15.h" + #include "soc15d.h" ++#include "gmc_v9_0.h" + + /* HACK: MMHUB and GC both have VM-related register with the same + * names but different offsets. Define the MMHUB register we need here +@@ -60,11 +61,6 @@ + #define mmMMHUB_VM_INVALIDATE_ENG16_ACK 0x0705 + #define mmMMHUB_VM_INVALIDATE_ENG16_ACK_BASE_IDX 0 + +-#define mmMMHUB_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32 0x072b +-#define mmMMHUB_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32_BASE_IDX 0 +-#define mmMMHUB_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32 0x072c +-#define mmMMHUB_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32_BASE_IDX 0 +- + #define mmMMHUB_VM_INVALIDATE_ENG16_ADDR_RANGE_LO32 0x0727 + #define mmMMHUB_VM_INVALIDATE_ENG16_ADDR_RANGE_LO32_BASE_IDX 0 + #define mmMMHUB_VM_INVALIDATE_ENG16_ADDR_RANGE_HI32 0x0728 +@@ -1018,9 +1014,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. + */ +- WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmMMHUB_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32) + (vmid*2), lower_32_bits(base)); +- WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmMMHUB_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32) + (vmid*2), upper_32_bits(base)); ++ mmhub_v1_0_setup_vm_pt_regs(adev, vmid, base); + +- WREG32(SOC15_REG_OFFSET(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32) + (vmid*2), lower_32_bits(base)); +- WREG32(SOC15_REG_OFFSET(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32) + (vmid*2), upper_32_bits(base)); ++ gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, base); + } +-- +2.17.1 + |