From 4bc615a5237a641ddb2235236c21b1eaadb76963 Mon Sep 17 00:00:00 2001 From: Le Ma Date: Sat, 12 Nov 2022 17:01:05 +0800 Subject: [PATCH] drm/amdgpu: fix vm context register assignment in mmhub v1.8 Assign the vm context register addr per aid instance. Signed-off-by: Le Ma Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c index 67338cb3d7bc..6f469b9aa9a0 100644 --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c @@ -515,19 +515,19 @@ static void mmhub_v1_8_init(struct amdgpu_device *adev) for (i = 0; i < adev->num_aid; i++) { hub = &adev->vmhub[AMDGPU_MMHUB0(i)]; - hub->ctx0_ptb_addr_lo32 = SOC15_REG_OFFSET(MMHUB, 0, + hub->ctx0_ptb_addr_lo32 = SOC15_REG_OFFSET(MMHUB, i, regVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32); - hub->ctx0_ptb_addr_hi32 = SOC15_REG_OFFSET(MMHUB, 0, + hub->ctx0_ptb_addr_hi32 = SOC15_REG_OFFSET(MMHUB, i, regVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32); hub->vm_inv_eng0_req = - SOC15_REG_OFFSET(MMHUB, 0, regVM_INVALIDATE_ENG0_REQ); + SOC15_REG_OFFSET(MMHUB, i, regVM_INVALIDATE_ENG0_REQ); hub->vm_inv_eng0_ack = - SOC15_REG_OFFSET(MMHUB, 0, regVM_INVALIDATE_ENG0_ACK); + SOC15_REG_OFFSET(MMHUB, i, regVM_INVALIDATE_ENG0_ACK); hub->vm_context0_cntl = - SOC15_REG_OFFSET(MMHUB, 0, regVM_CONTEXT0_CNTL); - hub->vm_l2_pro_fault_status = SOC15_REG_OFFSET(MMHUB, 0, + SOC15_REG_OFFSET(MMHUB, i, regVM_CONTEXT0_CNTL); + hub->vm_l2_pro_fault_status = SOC15_REG_OFFSET(MMHUB, i, regVM_L2_PROTECTION_FAULT_STATUS); - hub->vm_l2_pro_fault_cntl = SOC15_REG_OFFSET(MMHUB, 0, + hub->vm_l2_pro_fault_cntl = SOC15_REG_OFFSET(MMHUB, i, regVM_L2_PROTECTION_FAULT_CNTL); hub->ctx_distance = regVM_CONTEXT1_CNTL - regVM_CONTEXT0_CNTL; -- 2.25.1