drm/amd/amdgpu: fix BANK_SELECT on Vega10
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: fix BANK_SELECT on Vega10
BANK_SELECT should always be FRAGMENT_SIZE + 3 due to 8-entry (2^3) per cache line in L2 TLB for Vega10.
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1 -2
@@ -143,9 +143,8 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1 -2
@@ -157,9 +157,8 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1503558440-15580-1-git-send-email-Hongbo.He-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 24.08.2017 um 09:07 schrieb Roger He:
Quoted 5 lines
BANK_SELECTshould always beFRAGMENT_SIZE+ 3 due to 8-entry (2^3) per cache line in L2 TLB for Vega10.Change-Id I8cfcff197e2c571c1a547aaed959e492b4a6fe0eSigned-off-by Roger He <[email protected]>
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-2@@ -143,9 +143,8 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) · line 164
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-2@@ -157,9 +157,8 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);
_______________________________________________
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): 59f5a0f3-9b4c-4a30-1a17-202a7e74fa1d-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Hi Roger,
there are a few warnings introduced by this commit:
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c: In function ‘gfxhub_v1_0_init_cache_regs’:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c:127:16: warning: unused variable ‘field’ [-Wunused-variable]uint32_t tmp, field; ^ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c: In function ‘mmhub_v1_0_init_cache_regs’: drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c:141:16: warning: unused variable ‘field’ [-Wunused-variable] uint32_t tmp, field; ^
Please provide a fix.
Thanks,
Christian.
Am 24.08.2017 um 10:19 schrieb Christian König:
Quoted 37 lines
Am 24.08.2017 um 09:07 schrieb Roger He:
Quoted 5 lines
BANK_SELECTshould always beFRAGMENT_SIZE+ 3 due to 8-entry (2^3) per cache line in L2 TLB for Vega10.Change-Id I8cfcff197e2c571c1a547aaed959e492b4a6fe0eSigned-off-by Roger He <[email protected]>Reviewed-by Christian König <[email protected]>Quoted 28 lines
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-1@@ -143,9 +143,8 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp); diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 4395a4f..2a6fa73 100644drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0@@ -157,9 +157,8 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) · line 163
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-1WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);
_______________________________________________
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): 0ec37f92-7ab8-4c5b-2fb2-d676de426904-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Ok.
Thanks
Roger(Hongbo.He)
-----Original Message-----
From: Christian König [mailto:[email protected]]
Sent: Friday, August 25, 2017 3:33 PM
To: He, Roger <[email protected]>; [email protected]
Cc: Koenig, Christian <[email protected]>
Subject: Re: [PATCH] drm/amd/amdgpu: fix BANK_SELECT on Vega10
Hi Roger,
there are a few warnings introduced by this commit:
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c: In function ‘gfxhub_v1_0_init_cache_regs’:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c:127:16: warning: unused variable ‘field’ [-Wunused-variable]
Quoted 8 lines
uint32_t tmp, field; ^
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c: In function ‘mmhub_v1_0_init_cache_regs’:drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c:141:16: warning: unused variable ‘field’ [-Wunused-variable]uint32_t tmp, field; ^
Please provide a fix.
Thanks,
Christian.
Am 24.08.2017 um 10:19 schrieb Christian König:
Quoted 38 lines
Am 24.08.2017 um 09:07 schrieb Roger He:
Quoted 5 lines
BANK_SELECTshould always beFRAGMENT_SIZE+ 3 due to 8-entry (2^3) per cache line in L2 TLB for Vega10.Change-Id I8cfcff197e2c571c1a547aaed959e492b4a6fe0eSigned-off-by Roger He <[email protected]>Reviewed-by Christian König <[email protected]>Quoted 29 lines
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-1@@ -143,9 +143,8 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp); diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 4395a4f..2a6fa73 100644drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0@@ -157,9 +157,8 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) · line 163
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-1WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); - field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx