drm/amdgpu: Disable retry faults in VMID0
Subsystems (2)
PATCH 1/1 drm/amdgpu: Disable retry faults in VMID0
There is no point retrying page faults in VMID0. Those faults are always fatal.
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 ++ 5 files changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2 -0
@@ -178,6 +178,8 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL, tmp); }
drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +2 -0
@@ -166,6 +166,8 @@ static void gfxhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL, tmp); }
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2 -0
@@ -207,6 +207,8 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL, tmp); }
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +2 -0
@@ -152,6 +152,8 @@ static void mmhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL, tmp); }
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +2 -0
@@ -240,6 +240,8 @@ static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, hubid * MMHUB_INSTANCE_REGISTER_OFFSET); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15_OFFSET (MMHUB ,0 , mmVML2VC0_VM_CONTEXT0_CNTL, hubid *MMHUB_INSTANCE_REGISTER_OFFSET , tmp); }
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): 20190904233053.9767-1-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
Yang, Philip
Reviewed-by Philip YangVMID0 init path was missed when enabling amdgpu_noretry option. Good catch and fix.
Quoted 70 lines · Felix
There is no point retrying page faults in VMID0. Those faults are always fatal.
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 ++ 5 files changed, 10 insertions(+)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0@@ -178,6 +178,8 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +2
-0@@ -166,6 +166,8 @@ static void gfxhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-0@@ -207,6 +207,8 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +2
-0@@ -152,6 +152,8 @@ static void mmhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +0
-0
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, · line 247
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +2
-0@@ -240,6 +240,8 @@ static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, hubid * MMHUB_INSTANCE_REGISTER_OFFSET); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15_OFFSET (MMHUB ,0 , mmVML2VC0_VM_CONTEXT0_CNTL, hubid *MMHUB_INSTANCE_REGISTER_OFFSET , tmp); }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines · Felix
There is no point retrying page faults in VMID0. Those faults are always fatal.
Signed-off-by Felix Kuehling <[email protected]>
Thanks! I have verified it in my platform.
Quoted 76 lines
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 ++ 5 files changed, 10 insertions(+)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0@@ -178,6 +178,8 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +2
-0@@ -166,6 +166,8 @@ static void gfxhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-0@@ -207,6 +207,8 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +2
-0@@ -152,6 +152,8 @@ static void mmhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +2
-0@@ -240,6 +240,8 @@ static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, hubid * MMHUB_INSTANCE_REGISTER_OFFSET); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15_OFFSET (MMHUB ,0 , mmVML2VC0_VM_CONTEXT0_CNTL, hubid *MMHUB_INSTANCE_REGISTER_OFFSET , tmp); }Signature · 1 line
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Reviewed-byAm 05.09.19 um 01:31 schrieb Kuehling, Felix:
Quoted 4 lines
There is no point retrying page faults in VMID0. Those faults are always fatal.
Signed-off-by Felix Kuehling <[email protected]>
Quoted 65 lines
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 ++ 5 files changed, 10 insertions(+)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0@@ -178,6 +178,8 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c +2
-0@@ -166,6 +166,8 @@ static void gfxhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,GCVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (GC ,0 , mmGCVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-0@@ -207,6 +207,8 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +2
-0@@ -152,6 +152,8 @@ static void mmhub_v2_0_enable_system_domain(struct amdgpu_device *adev) tmp =RREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,MMVM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15 (MMHUB ,0 , mmMMVM_CONTEXT0_CNTL, tmp); }drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +0
-0
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, · line 247
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +2
-0@@ -240,6 +240,8 @@ static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, hubid * MMHUB_INSTANCE_REGISTER_OFFSET); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); + tmp =REG_SET_FIELD (tmp,VML2VC0_VM_CONTEXT0_CNTL , +RETRY_PERMISSION_OR_INVALID_PAGE_FAULT ,0 );WREG32_SOC15_OFFSET (MMHUB ,0 , mmVML2VC0_VM_CONTEXT0_CNTL, hubid *MMHUB_INSTANCE_REGISTER_OFFSET , tmp); }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx