drm/amdgpu: Export setup_vm_pt_regs() logic for mmhub 2.0
Subsystems (2)
PATCH 1/1 drm/amdgpu: Export setup_vm_pt_regs() logic for mmhub 2.0
The KFD code will call this function later.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 19 ++++++++++++------- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +12 -7
@@ -31,20 +31,25 @@#include "soc15_common.h" -static void mmhub_v2_0_init_gart_pt_regs (struct amdgpu_device *adev) +void mmhub_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 mmMMVM_CONTEXT0_* to mmMMVM_CONTEXT1_* */ +int offset = mmMMVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 + - mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32; -WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, -lower_32_bits (value)); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, + offset * vmid,lower_32_bits (page_table_base)); -WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, -upper_32_bits (value)); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, + offset * vmid,upper_32_bits (page_table_base)); }static void mmhub_v2_0_init_gart_aperture_regs (struct amdgpu_device *adev) { -mmhub_v2_0_init_gart_pt_regs (adev); +uint64_t pt_base =amdgpu_gmc_pd_addr (adev->gart.bo); + +mmhub_v2_0_setup_vm_pt_regs (adev,0 , pt_base);WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, (u32)(adev->gmc.gart_start >>12 ));
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +2 -0
@@ -31,5 +31,7 @@ void mmhub_v2_0_init(struct amdgpu_device *adev);int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state);void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); +void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +uint64_t page_table_base);#endif
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Deucher, Alexander
Reviewed-by________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zhao, Yong <[email protected]>
Sent: Friday, September 27, 2019 11:40 PM
To: [email protected] <[email protected]>
Cc: Zhao, Yong <[email protected]>
Subject: [PATCH] drm/amdgpu: Export setup_vm_pt_regs() logic for mmhub 2.0
The KFD code will call this function later.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 19 ++++++++++++------- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +12 -7
@@ -31,20 +31,25 @@#include "soc15_common.h" -static void mmhub_v2_0_init_gart_pt_regs (struct amdgpu_device *adev) +void mmhub_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 mmMMVM_CONTEXT0_* to mmMMVM_CONTEXT1_* */ +int offset = mmMMVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 + - mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32; -WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, -lower_32_bits (value)); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, + offset * vmid,lower_32_bits (page_table_base)); -WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, -upper_32_bits (value)); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, + offset * vmid,upper_32_bits (page_table_base)); }static void mmhub_v2_0_init_gart_aperture_regs (struct amdgpu_device *adev) { -mmhub_v2_0_init_gart_pt_regs (adev); +uint64_t pt_base =amdgpu_gmc_pd_addr (adev->gart.bo); + +mmhub_v2_0_setup_vm_pt_regs (adev,0 , pt_base);WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, (u32)(adev->gmc.gart_start >>12 ));
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +2 -0
@@ -31,5 +31,7 @@ void mmhub_v2_0_init(struct amdgpu_device *adev);int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state);void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); +void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +uint64_t page_table_base);#endif
--
2.17.1
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx