drm/amdgpu: Implement get_vmid_pasid_mapping for gfx11

Implement gmc_v11_0_get_vmid_pasid_mapping_info to fix
gmc_v11_0_flush_gpu_tlb_pasid logic. Change from gfx10 to use
IH_VMID_*_LUT registers for VMID -> PASID mapping.

Signed-off-by: Graham Sider <Graham.Sider@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Graham Sider 2022-04-21 10:32:02 -04:00 committed by Alex Deucher
parent 3055e5d155
commit 3cc69021e5
1 changed files with 4 additions and 12 deletions

View File

@ -155,21 +155,13 @@ static bool gmc_v11_0_use_invalidate_semaphore(struct amdgpu_device *adev,
(!amdgpu_sriov_vf(adev))); (!amdgpu_sriov_vf(adev)));
} }
static bool gmc_v11_0_get_atc_vmid_pasid_mapping_info( static bool gmc_v11_0_get_vmid_pasid_mapping_info(
struct amdgpu_device *adev, struct amdgpu_device *adev,
uint8_t vmid, uint16_t *p_pasid) uint8_t vmid, uint16_t *p_pasid)
{ {
#if 0 // TODO: *p_pasid = RREG32(SOC15_REG_OFFSET(OSSSYS, 0, regIH_VMID_0_LUT) + vmid) & 0xffff;
uint32_t value;
value = RREG32(SOC15_REG_OFFSET(ATHUB, 0, mmATC_VMID0_PASID_MAPPING) return !!(*p_pasid);
+ vmid);
*p_pasid = value & ATC_VMID0_PASID_MAPPING__PASID_MASK;
return !!(value & ATC_VMID0_PASID_MAPPING__VALID_MASK);
#else
return 0;
#endif
} }
/* /*
@ -340,7 +332,7 @@ static int gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
for (vmid = 1; vmid < 16; vmid++) { for (vmid = 1; vmid < 16; vmid++) {
ret = gmc_v11_0_get_atc_vmid_pasid_mapping_info(adev, vmid, ret = gmc_v11_0_get_vmid_pasid_mapping_info(adev, vmid,
&queried_pasid); &queried_pasid);
if (ret && queried_pasid == pasid) { if (ret && queried_pasid == pasid) {
if (all_hub) { if (all_hub) {