Vega10 S3 following up
Subsystems (2)
cover Vega10 S3 following up
Hi all,
These patches refines gfxhub/mmhub programming sequence to make them clear and readable. And actually, gfxhub + mmhub = GMCv9 for vega10, we don't need specific gfxhub and mmhub ip blocks, and meanwhile, they have different resume sequence during gfxhub, mmhub, and gmc. That will make thing confused and easily miss some register configrations. So remove gfxhub and mmhub ip block here, and merge them into GMC v9.
Patch 1 -> 8: refine gfxhub/mmhub programming sequence
Patch 9: fix missed invalidation at resume
Patch 10 -> 15: remove gfxhub/mmhub ip blocks
Patch 16 -> 17: add prints to make ip_block mask clear.
Patch 18: fix gart table cleared and other BOs cleared issue which blocked S3.
(Extend stollen memory for VBIOS)
Huang Rui (18):
drm/amdgpu: abstract gart table initialization for gfxhub/mmhub drm/amdgpu: abstract gart aperture initialization for gfxhub/mmhub drm/amdgpu: abstract system aperture initialization for gfxhub/mmhub drm/amdgpu: abstract TLB initialization for gfxhub/mmhub drm/amdgpu: abstract cache initialization for gfxhub/mmhub drm/amdgpu: abstract system domain enablement for gfxhub/mmhub drm/amdgpu: abstract disable identity aperture for gfxhub/mmhub drm/amdgpu: abstract setup vmid config for gfxhub/mmhub drm/amdgpu: fix to miss program invalidation at resume drm/amdgpu: export gfxhub sw_init into gmc
drm/amdgpu: export mmhub sw_init into gmc
drm/amdgpu: export mmhub set clockgating into gmc drm/amdgpu: export mmhub get clockgating into gmc drm/amdgpu: remove gfxhub ip
drm/amdgpu: remove mmhub ip
drm/amdgpu: add ip name print for selecting ips with ip_block_mask drm/amdgpu: add ip block number prints
drm/amdgpu: fix the gart table cleared issue for S3
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 361 +++++++++++----------------- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 373 ++++++++++++----------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 4 + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 - drivers/gpu/drm/amd/include/amd_shared.h | 2 - 13 files changed, 330 insertions(+), 448 deletions(-)
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): 1496247293-16429-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH 1/18 drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33 +++++++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +20 -13
@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +/* Update configuration */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 );
@@ -154,19 +174,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start - + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +20 -13
@@ -44,6 +44,24 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } +static void mmhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/* valid bit */ + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -52,6 +70,8 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +mmhub_v1_0_init_pt_regs (adev); +/* Update configuration */ DRM_INFO ("%s -- in\n" , __func__); WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR),
@@ -168,19 +188,6 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start + - adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));
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): 1496247293-16429-2-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
Quoted 22 lines
-----Original Message-----
From: Huang Rui [mailto:[email protected]]
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huan, Alvin; Huang, Ray
Subject: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhubSigned-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33 +++++++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c line 34
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-0@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev)
Name this function gfxhub_v1_0_init_gart_pt_regs() for consistency.
Alex
Quoted 125 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +17
-0+{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev){
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0u32 tmp;@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +/* Update configuration */ WREG32(SOC15_REG_OFFSET(GC, 0,
mmMC_VM_SYSTEM_APERTURE_LOW_ADDR),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-11adev->mc.vram_start >> 18);@@ -154,19 +174,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start - + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); - WREG32(SOC15_REG_OFFSET(GC, 0, -mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-2- (u32)(value >> 32)); - WREG32(SOC15_REG_OFFSET(GC, 0,
mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0(u32)(adev->dummy_page.addr >> 12));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +18
-0@@ -44,6 +44,24 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } +static void mmhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/* valid bit */ + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int
mmhub_v1_0_gart_enable(struct amdgpu_device *adev){drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-0u32 tmp;@@ -52,6 +70,8 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +mmhub_v1_0_init_pt_regs (adev); +/* Update configuration */ DRM_INFO ("%s -- in\n" , __func__);WREG32(SOC15_REG_OFFSET(MMHUB, 0,
mmMC_VM_SYSTEM_APERTURE_LOW_ADDR),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-11@@ -168,19 +188,6 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start + - adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); - WREG32(SOC15_REG_OFFSET(MMHUB, 0, -mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-2- (u32)(value >> 32)); - WREG32(SOC15_REG_OFFSET(MMHUB, 0,
Quoted 4 lines
mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32),
(u32)(adev->dummy_page.addr >> 12));
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
In reply to a message not in the archiveAm 31.05.2017 um 18:14 schrieb Huang Rui:
Quoted 78 lines
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33 +++++++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +20
-13@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +/* Update configuration */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 );@@ -154,19 +174,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start - + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +6
-0@@ -44,6 +44,24 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } +static void mmhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start +
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev) · line 62
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +10
-0+ adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/* valid bit */ + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 ));
While at it please use the upper_32_bits() and lower_32_bits() macros for this.
Additional to that since you cleanup the code anyway (which is very appreciated!) please use the WREG32_SOC15() macro instead.
Regards,
Christian.
Quoted 24 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +4
-6+} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -52,6 +70,8 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +mmhub_v1_0_init_pt_regs (adev); +/* Update configuration */ DRM_INFO ("%s -- in\n" , __func__); WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR),@@ -168,19 +188,6 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start + - adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ -
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) · line 193
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-7-WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));
_______________________________________________
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): 1bda3f76-870e-02a0-b51e-f37f02e4ef52-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
Quoted 97 lines · Christian
Am 31.05.2017 um 18:14 schrieb Huang Rui:
Quoted 3 lines
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33+++++++++++++++++++-------------
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33+++++++++++++++++++-------------
drivers/gpu/drm/amd/
Quoted 3 lines
2 files changed, 40 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/ renamed from drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0
amdgpu/gfxhub_v1_0.cdrivers/gpu/drm/amd/
Quoted 58 lines
index 7c430c4..8cf30b7 100644
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +20
-13@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +/* Update configuration */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 );@@ -154,19 +174,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start - + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));drivers/gpu/drm/amd/ renamed from drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0
amdgpu/mmhub_v1_0.cQuoted 13 lines
index afd9d85..84eb3a3 100644
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +6
-0@@ -44,6 +44,24 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } +static void mmhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start +drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev) · line 62
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +10
-0+ adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/* valid bit */ + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 ));While at it please use the
upper_32_bits()andlower_32_bits()macros for this.
Quoted 3 lines
Additional to that since you cleanup the code anyway (which is very appreciated!) please use the
WREG32_SOC15()macro instead.
My pleasure. I found original mmhub/gfxhub programming sequence was really hard to read when I was debugging S3 issue. So I have to break it down to make it clearly.
Could I add one more patches at top of patch set to use WREG32_SOC15/REG32_SOC15 instead for the whole GMC, GFXHUB, and MMHUB blocks.
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
In reply to a message not in the archiveQuoted 36 lines · Huang Rui
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33 +++++++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +18
-0@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) · line 60
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +
abstraction is fine, but why you change code location?
Regards,
David Zhou
Quoted 71 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-13/* Update configuration */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 );@@ -154,19 +174,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start - + adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/*valid bit*/ - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +20
-6@@ -44,6 +44,24 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } +static void mmhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/* valid bit */ + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -52,6 +70,8 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +mmhub_v1_0_init_pt_regs (adev); +/* Update configuration */ DRM_INFO ("%s -- in\n" , __func__); WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR),@@ -168,19 +188,6 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), (u32)(adev->mc.gtt_end >> 44)); -BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); - value = adev->gart.table_addr - adev->mc.vram_start + - adev->vm_manager.vram_base_offset; - value &=0x0000FFFFFFFFF000ULL ; - value |=0x1 ;/* valid bit */ -
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) · line 193
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-7-WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));
_______________________________________________
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]
Re: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
Quoted 34 lines · On Thu, Jun 01, 2017 at 12:19:19PM +0800, zhoucm1 wrote:
Quoted 31 lines · Huang Rui
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33 +++++++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +18
-0@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev)
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) · line 59
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0{u32 tmp;@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +abstraction is fine, but why you change code location?
Because we would better to align the programming sequence with windows part. That's helpful to debug in future.
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 01/18] drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
Quoted 43 lines · Huang Rui
Quoted 33 lines · On Thu, Jun 01, 2017 at 12:19:19PM +0800, zhoucm1 wrote:
Quoted 31 lines · Huang Rui
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 33 +++++++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +18
-0@@ -31,6 +31,24 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_pt_regs (struct amdgpu_device *adev) +{ +uint64_t value; + +BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); + value = adev->gart.table_addr - adev->mc.vram_start + + adev->vm_manager.vram_base_offset; + value &=0x0000FFFFFFFFF000ULL ; + value |=0x1 ;/*valid bit*/ + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), + (u32 )value); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), + (u32)(value >>32 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev)Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) · line 59
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0{u32 tmp;@@ -38,6 +56,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_pt_regs (adev); +abstraction is fine, but why you change code location?
Quoted 2 lines
Because we would better to align the programming sequence with windows part.
If you make sure it aligns with windows, then that's good. Otherwise we should keep same with previous.
Regards,
David Zhou
Quoted 4 lines
That's helpful to debug in future.
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/18 drm/amdgpu: abstract gart aperture initialization for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 34 +++++++++++++++++--------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++-------------- 2 files changed, 36 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +18 -16
@@ -49,6 +49,23 @@ static void gfxhub_v1_0_init_pt_regs(struct amdgpu_device *adev) (u32)(value >> 32)); } +static void gfxhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) +{ +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), + (u32)(adev->mc.gtt_start >>12 )); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), + (u32)(adev->mc.gtt_start >>44 )); + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32), + (u32)(adev->mc.gtt_end >>12 )); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), + (u32)(adev->mc.gtt_end >>44 )); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -57,8 +74,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)/* Program MC. */ gfxhub_v1_0_init_pt_regs (adev); +gfxhub_v1_0_init_gart_aperture_regs (adev); -/* Update configuration */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 ); WREG32(SOC15_REG_OFFSET(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR),
@@ -159,21 +176,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) 0);WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); -/* setup context0 */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), - (u32)(adev->mc.gtt_start >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), - (u32)(adev->mc.gtt_start >>44 )); - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32), - (u32)(adev->mc.gtt_end >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), - (u32)(adev->mc.gtt_end >>44 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +18 -15
@@ -62,6 +62,23 @@ static void mmhub_v1_0_init_pt_regs(struct amdgpu_device *adev) (u32)(value >> 32)); } +static void mmhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) +{ +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), + (u32)(adev->mc.gtt_start >>12 )); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), + (u32)(adev->mc.gtt_start >>44 )); + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32), + (u32)(adev->mc.gtt_end >>12 )); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), + (u32)(adev->mc.gtt_end >>44 )); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -71,6 +88,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)/* Program MC. */ mmhub_v1_0_init_pt_regs (adev); +mmhub_v1_0_init_gart_aperture_regs (adev);/* Update configuration */ DRM_INFO ("%s -- in\n" , __func__);
@@ -173,21 +191,6 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) 0);WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL4), tmp); -/* setup context0 */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), - (u32)(adev->mc.gtt_start >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), - (u32)(adev->mc.gtt_start >>44 )); - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32), - (u32)(adev->mc.gtt_end >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), - (u32)(adev->mc.gtt_end >>44 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), (u32)(adev->dummy_page.addr >>12 ));
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): 1496247293-16429-3-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 02/18] drm/amdgpu: abstract gart aperture initialization for gfxhub/mmhub
Quoted 23 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huang, Ray; Huan, Alvin
Subject: [PATCH 02/18] drm/amdgpu: abstract gart aperture initialization for gfxhub/mmhubSigned-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 34 +++++++++++++++++-- ------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 33 +++++++++++++++++- ------------- 2 files changed, 36 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c static void gfxhub_v1_0_init_pt_regs(struct · line 54
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-0@@ -49,6 +49,23 @@ static void gfxhub_v1_0_init_pt_regs(struct amdgpu_device *adev) (u32)(value >> 32)); } +static void gfxhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev)
I think we can merge code from patch 1 into this function as well rather than having two functions since the page table base is technically part of the gart aperture. Same for mmhub.
Alex
Quoted 139 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +6
-0+{ +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), + (u32)(adev->mc.gtt_start >>12 )); + WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +4
-0+ (u32)(adev->mc.gtt_start >> 44)); + + WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-0+ (u32)(adev->mc.gtt_end >> 12)); + WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +4
-1+ (u32)(adev->mc.gtt_end >> 44)); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -57,8 +74,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)/* Program MC. */ gfxhub_v1_0_init_pt_regs (adev); +gfxhub_v1_0_init_gart_aperture_regs (adev); -/* Update configuration */ WREG32(SOC15_REG_OFFSET(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0adev->mc.vram_start >> 18); WREG32(SOC15_REG_OFFSET(GC, 0,
mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-10@@ -159,21 +176,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) 0);WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); -/* setup context0 */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), - (u32)(adev->mc.gtt_start >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), - (u32)(adev->mc.gtt_start >>44 )); - - WREG32(SOC15_REG_OFFSET(GC, 0, -mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-3- (u32)(adev->mc.gtt_end >> 12)); - WREG32(SOC15_REG_OFFSET(GC, 0, -mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-2- (u32)(adev->mc.gtt_end >> 44)); - WREG32(SOC15_REG_OFFSET(GC, 0,
mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0(u32)(adev->dummy_page.addr >> 12));drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +7
-0@@ -62,6 +62,23 @@ static void mmhub_v1_0_init_pt_regs(struct amdgpu_device *adev) (u32)(value >> 32)); } +static void mmhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) +{ +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), + (u32)(adev->mc.gtt_start >>12 )); + WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +4
-0+ (u32)(adev->mc.gtt_start >> 44)); + + WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3
-0+ (u32)(adev->mc.gtt_end >> 12)); + WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +4
-0+ (u32)(adev->mc.gtt_end >> 44)); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -71,6 +88,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)/* Program MC. */ mmhub_v1_0_init_pt_regs (adev); +mmhub_v1_0_init_gart_aperture_regs (adev);/* Update configuration */ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-10DRM_INFO ("%s -- in\n" , __func__);@@ -173,21 +191,6 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) 0);WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL4), tmp); -/* setup context0 */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), - (u32)(adev->mc.gtt_start >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), - (u32)(adev->mc.gtt_start >>44 )); - - WREG32(SOC15_REG_OFFSET(MMHUB, 0, -mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-3- (u32)(adev->mc.gtt_end >> 12)); - WREG32(SOC15_REG_OFFSET(MMHUB, 0, -mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-2- (u32)(adev->mc.gtt_end >> 44)); - WREG32(SOC15_REG_OFFSET(MMHUB, 0,
mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32),
(u32)(adev->dummy_page.addr >> 12));
--
2.7.4
Quoted 4 lines
_______________________________________________
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
PATCH 3/18 drm/amdgpu: abstract system aperture initialization for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 61 ++++++++++--------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 101 ++++++++++++++----------------- 2 files changed, 81 insertions(+), 81 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +34 -27
@@ -66,30 +66,52 @@ static void gfxhub_v1_0_init_gart_aperture_regs(struct amdgpu_device *adev) (u32)(adev->mc.gtt_end >> 44)); } -int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) +static void gfxhub_v1_0_init_system_aperture_regs (struct amdgpu_device *adev) { -u32 tmp; -u64 value; -u32 i; +uint64_t value; +uint32_t tmp; -/* Program MC. */ -gfxhub_v1_0_init_pt_regs (adev); -gfxhub_v1_0_init_gart_aperture_regs (adev); +/* Disable AGP. */ +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_BASE),0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_TOP),0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_BOT),0xFFFFFFFF ); +/* Program the system aperture low logical page number. */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 );WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR), adev->mc.vram_end >>18 ); +/* Set default page address. */ value = adev->vram_scratch.gpu_addr - adev->mc.vram_start + adev->vm_manager.vram_base_offset;WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB), - (u32)(value >>12 )); + (u32)(value >>12 ));WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB), - (u32)(value >>44 )); + (u32)(value >>44 )); +/* Program "protection fault". */ +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), + (u32)(adev->dummy_page.addr >>12 )); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32), + (u32)((u64 )adev->dummy_page.addr >>44 )); + + tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2)); + tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL2 , +ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); +} + +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) +{ +u32 tmp; +u32 i; + +DRM_INFO ("%s -- in\n" , __func__);if (amdgpu_sriov_vf (adev)) {/* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are VF copy registers so vbios post doesn't program them, for SRIOV driver need to program them */
@@ -99,12 +121,10 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) adev->mc.vram_end >> 24); } -/* Disable AGP. */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_BASE),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_TOP),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_BOT),0xFFFFFFFF ); -/* GART Enable. */ +gfxhub_v1_0_init_pt_regs (adev); +gfxhub_v1_0_init_gart_aperture_regs (adev); +gfxhub_v1_0_init_system_aperture_regs (adev);/* Setup TLB control */ tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL));
@@ -176,19 +196,6 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) 0);WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), - (u32)(adev->dummy_page.addr >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32), - (u32)((u64 )adev->dummy_page.addr >>44 )); - - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2)); - tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL2 , -ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY , -1 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); - tmp =RREG32 (SOC15_REG_OFFSET (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 );
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +47 -54
138 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/18 drm/amdgpu: abstract TLB initialization for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 51 ++++++++++++++------------------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 22 ++++++++++++++ 2 files changed, 44 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +22 -29
@@ -106,6 +106,27 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); } +static void gfxhub_v1_0_init_tlb_regs (struct amdgpu_device *adev) +{ +uint32_t tmp; + +/* Setup TLB control */ + tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,1 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,SYSTEM_ACCESS_MODE ,3 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL , +ENABLE_ADVANCED_DRIVER_MODEL ,1 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL , +SYSTEM_APERTURE_UNMAPPED_ACCESS ,0 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ECO_BITS ,0 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL , +MTYPE ,MTYPE_UC );/* XXX for emulation. */ + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ATC_EN ,1 ); + +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -125,35 +146,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_init_pt_regs (adev);gfxhub_v1_0_init_gart_aperture_regs (adev);gfxhub_v1_0_init_system_aperture_regs (adev); - -/* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL)); - tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,1 ); - tmp =REG_SET_FIELD (tmp, -MC_VM_MX_L1_TLB_CNTL , -SYSTEM_ACCESS_MODE , -3 ); - tmp =REG_SET_FIELD (tmp, -MC_VM_MX_L1_TLB_CNTL , -ENABLE_ADVANCED_DRIVER_MODEL , -1 ); - tmp =REG_SET_FIELD (tmp, -MC_VM_MX_L1_TLB_CNTL , -SYSTEM_APERTURE_UNMAPPED_ACCESS , -0 ); - tmp =REG_SET_FIELD (tmp, -MC_VM_MX_L1_TLB_CNTL , -ECO_BITS , -0 ); - tmp =REG_SET_FIELD (tmp, -MC_VM_MX_L1_TLB_CNTL , -MTYPE , -MTYPE_UC );/* XXX for emulation. */ - tmp =REG_SET_FIELD (tmp, -MC_VM_MX_L1_TLB_CNTL , -ATC_EN , -1 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +gfxhub_v1_0_init_tlb_regs (adev);/* Setup L2 cache */ tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL));
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +22 -0
@@ -119,6 +119,27 @@ static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); } +static void mmhub_v1_0_init_tlb_regs (struct amdgpu_device *adev) +{ +uint32_t tmp; + +/* Setup TLB control */ + tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,1 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,SYSTEM_ACCESS_MODE ,3 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL , +ENABLE_ADVANCED_DRIVER_MODEL ,1 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL , +SYSTEM_APERTURE_UNMAPPED_ACCESS ,0 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ECO_BITS ,0 ); + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL , +MTYPE ,MTYPE_UC );/* XXX for emulation. */ + tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ATC_EN ,1 ); + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -139,6 +160,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)mmhub_v1_0_init_pt_regs (adev);mmhub_v1_0_init_gart_aperture_regs (adev);mmhub_v1_0_init_system_aperture_regs (adev); +mmhub_v1_0_init_tlb_regs (adev);/* Setup TLB control */ tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL));
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/18 drm/amdgpu: abstract cache initialization for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 72 +++++++++++--------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 88 +++++++++++--------------------- 2 files changed, 62 insertions(+), 98 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +31 -41
@@ -127,6 +127,36 @@ static void gfxhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); } +static void gfxhub_v1_0_init_cache_regs (struct amdgpu_device *adev) +{ +uint32_t tmp; + +/* Setup L2 cache */ + tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL)); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,1 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_FRAGMENT_PROCESSING ,0 ); +/* XXX for emulation, Refer to closed source code.*/ + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,L2_PDE0_CACHE_TAG_GENERATION_MODE , +0 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,PDE_FAULT_CLASSIFICATION ,1 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,CONTEXT1_IDENTITY_ACCESS_MODE ,1 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,IDENTITY_MODE_FRAGMENT_SIZE ,0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL), tmp); + + tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2)); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2), tmp); + + tmp = mmVM_L2_CNTL3_DEFAULT; +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL3), tmp); + + tmp = mmVM_L2_CNTL4_DEFAULT; + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL4 ,VMC_TAP_PDE_REQUEST_PHYSICAL ,0 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL4 ,VMC_TAP_PTE_REQUEST_PHYSICAL ,0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -147,47 +177,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_init_gart_aperture_regs (adev);gfxhub_v1_0_init_system_aperture_regs (adev);gfxhub_v1_0_init_tlb_regs (adev); - -/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL)); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,1 ); - tmp =REG_SET_FIELD (tmp, -VM_L2_CNTL , -ENABLE_L2_FRAGMENT_PROCESSING , -0 ); - tmp =REG_SET_FIELD (tmp, -VM_L2_CNTL , -L2_PDE0_CACHE_TAG_GENERATION_MODE , -0 );/* XXX for emulation, Refer to closed source code.*/ - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,PDE_FAULT_CLASSIFICATION ,1 ); - tmp =REG_SET_FIELD (tmp, -VM_L2_CNTL , -CONTEXT1_IDENTITY_ACCESS_MODE , -1 ); - tmp =REG_SET_FIELD (tmp, -VM_L2_CNTL , -IDENTITY_MODE_FRAGMENT_SIZE , -0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL), tmp); - - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2)); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2), tmp); - - tmp = mmVM_L2_CNTL3_DEFAULT; -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL3), tmp); - - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4)); - tmp =REG_SET_FIELD (tmp, -VM_L2_CNTL4 , -VMC_TAP_PDE_REQUEST_PHYSICAL , -0 ); - tmp =REG_SET_FIELD (tmp, -VM_L2_CNTL4 , -VMC_TAP_PTE_REQUEST_PHYSICAL , -0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); +gfxhub_v1_0_init_cache_regs (adev); tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL)); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 );
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +31 -57
100 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/18 drm/amdgpu: abstract system domain enablement for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 22 ++++++++++++++++------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 ++++++++++++++++----------- 2 files changed, 32 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +16 -6
@@ -157,6 +157,16 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); } +static void gfxhub_v1_0_enable_system_domain (struct amdgpu_device *adev) +{ +uint32_t tmp; + + tmp =RREG32 (SOC15_REG_OFFSET (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 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL), tmp); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -164,8 +174,11 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)DRM_INFO ("%s -- in\n" , __func__);if (amdgpu_sriov_vf (adev)) { -/* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are VF copy registers so -vbios post doesn't program them, for SRIOV driver need to program them */ +/* +* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are +* VF copy registers so vbios post doesn't program them, for +* SRIOV driver need to program them +*/ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_BASE), adev->mc.vram_start >>24 ); WREG32(SOC15_REG_OFFSET(GC, 0, mmMC_VM_FB_LOCATION_TOP),
@@ -179,10 +192,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_init_tlb_regs (adev);gfxhub_v1_0_init_cache_regs (adev); - tmp =RREG32 (SOC15_REG_OFFSET (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 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL), tmp); +gfxhub_v1_0_enable_system_domain (adev);/* Disable identity aperture.*/ WREG32(SOC15_REG_OFFSET(GC, 0,
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +16 -11
@@ -170,16 +170,28 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL4), tmp); } +static void mmhub_v1_0_enable_system_domain (struct amdgpu_device *adev) +{ +uint32_t tmp; + + tmp =RREG32 (SOC15_REG_OFFSET (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 ); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL), tmp); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp; -uint64_t addr;u32 i;DRM_INFO ("%s -- in\n" , __func__);if (amdgpu_sriov_vf (adev)) { -/* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are VF copy registers so -vbios post doesn't program them, for SRIOV driver need to program them */ +/* +* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are +* VF copy registers so vbios post doesn't program them, for +* SRIOV driver need to program them +*/ WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE), adev->mc.vram_start >>24 ); WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmMC_VM_FB_LOCATION_TOP),
@@ -193,14 +205,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)mmhub_v1_0_init_tlb_regs (adev);mmhub_v1_0_init_cache_regs (adev); - addr =SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL); - tmp =RREG32 (addr); - - tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); - tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL), tmp); - - tmp =RREG32 (addr); +mmhub_v1_0_enable_system_domain (adev);/* Disable identity aperture.*/ WREG32(SOC15_REG_OFFSET(MMHUB, 0,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/18 drm/amdgpu: abstract disable identity aperture for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 37 ++++++++++++++++++-------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 36 +++++++++++++++++-------------- 2 files changed, 41 insertions(+), 32 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +21 -16
@@ -167,6 +167,26 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL), tmp); } +static void gfxhub_v1_0_dis_identity_aperture (struct amdgpu_device *adev) +{ +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32), +0XFFFFFFFF ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),0x0000000F ); + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32),0 ); + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0 ); + +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -193,22 +213,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_init_cache_regs (adev);gfxhub_v1_0_enable_system_domain (adev); - -/* Disable identity aperture.*/ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),0XFFFFFFFF ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),0x0000000F ); - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32),0 ); - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0 ); +gfxhub_v1_0_dis_identity_aperture (adev);for (i =0 ; i <=14 ; i++) { tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_CNTL) + i);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +20 -16
@@ -180,6 +180,25 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL), tmp); } +static void mmhub_v1_0_dis_identity_aperture (struct amdgpu_device *adev) +{ +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32), +0XFFFFFFFF ); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),0x0000000F ); + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0 ); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32),0 ); + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0 ); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0 ); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -206,22 +225,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)mmhub_v1_0_init_cache_regs (adev);mmhub_v1_0_enable_system_domain (adev); - -/* Disable identity aperture.*/ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),0XFFFFFFFF ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),0x0000000F ); - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32),0 ); - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0 ); +mmhub_v1_0_dis_identity_aperture (adev);for (i =0 ; i <=14 ; i++) { tmp = RREG32(SOC15_REG_OFFSET(MMHUB, 0, mmVM_CONTEXT1_CNTL)
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): 1496247293-16429-8-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 07/18] drm/amdgpu: abstract disable identity aperture for gfxhub/mmhub
Quoted 23 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huang, Ray; Huan, Alvin
Subject: [PATCH 07/18] drm/amdgpu: abstract disable identity aperture for gfxhub/mmhubSigned-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 37 ++++++++++++++++++- ------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 36 +++++++++++++++++- ------------- 2 files changed, 41 insertions(+), 32 deletions(-)drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c static void · line 173
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-0@@ -167,6 +167,26 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev) WREG32(SOC15_REG_OFFSET(GC, 0, mmVM_CONTEXT0_CNTL), tmp); } +static void gfxhub_v1_0_dis_identity_aperture (struct amdgpu_device *adev)
Call this function gfxhub_v1_0_disable_identity_aperture() for consistency with the other newly abstracted functions. Same for mmhub.
Alex
Quoted 145 lines
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-0+{ + WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-0+ 0XFFFFFFFF); + WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),
0x0000000F);drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-0+ + WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0);
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0+ WREG32(SOC15_REG_OFFSET(GC, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-0+ + WREG32(SOC15_REG_OFFSET(GC, 0, + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0);
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-0+ WREG32(SOC15_REG_OFFSET(GC, 0, + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0);
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-6+ +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -193,22 +213,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_init_cache_regs (adev);gfxhub_v1_0_enable_system_domain (adev); - -/* Disable identity aperture.*/ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32), 0XFFFFFFFF); - WREG32(SOC15_REG_OFFSET(GC, 0, - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),
0x0000000F);drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-3- - WREG32(SOC15_REG_OFFSET(GC, 0, -mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0);
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-2- WREG32(SOC15_REG_OFFSET(GC, 0, -mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-3- - WREG32(SOC15_REG_OFFSET(GC, 0, - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0);
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0
-2- WREG32(SOC15_REG_OFFSET(GC, 0, - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0);
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +1
-0+gfxhub_v1_0_dis_identity_aperture (adev);for (i =0 ; i <=14 ; i++) { tmp = RREG32(SOC15_REG_OFFSET(GC, 0,
mmVM_CONTEXT1_CNTL) + i);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +4
-0@@ -180,6 +180,25 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev) WREG32(SOC15_REG_OFFSET(MMHUB, 0,mmVM_CONTEXT0_CNTL ), tmp); } +static void mmhub_v1_0_dis_identity_aperture (struct amdgpu_device *adev) +{ + WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3
-0+ 0XFFFFFFFF); + WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),
0x0000000F);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3
-0+ + WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-0+ WREG32(SOC15_REG_OFFSET(MMHUB, 0, +mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3
-0+ + WREG32(SOC15_REG_OFFSET(MMHUB, 0, + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-0+ WREG32(SOC15_REG_OFFSET(MMHUB, 0, + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-6+} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;@@ -206,22 +225,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)mmhub_v1_0_init_cache_regs (adev );mmhub_v1_0_enable_system_domain (adev); - -/* Disable identity aperture.*/ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32), 0XFFFFFFFF); - WREG32(SOC15_REG_OFFSET(MMHUB, 0, - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),
0x0000000F);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-3- - WREG32(SOC15_REG_OFFSET(MMHUB, 0, -mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-2- WREG32(SOC15_REG_OFFSET(MMHUB, 0, -mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-3- - WREG32(SOC15_REG_OFFSET(MMHUB, 0, - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-2- WREG32(SOC15_REG_OFFSET(MMHUB, 0, - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-0+mmhub_v1_0_dis_identity_aperture (adev);for (i =0 ; i <=14 ; i++) { tmp = RREG32(SOC15_REG_OFFSET(MMHUB, 0,
mmVM_CONTEXT1_CNTL)
--
2.7.4
Quoted 4 lines
_______________________________________________
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
PATCH 8/18 drm/amdgpu: abstract setup vmid config for gfxhub/mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 55 ++++++++++++++++--------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 56 +++++++++++++++++--------------- 2 files changed, 59 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +29 -26
@@ -187,33 +187,10 @@ static void gfxhub_v1_0_dis_identity_aperture(struct amdgpu_device *adev) } -int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) +static void gfxhub_v1_0_setup_vmid_config (struct amdgpu_device *adev) { -u32 tmp; -u32 i; - -DRM_INFO ("%s -- in\n" , __func__); -if (amdgpu_sriov_vf (adev)) { -/* -* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are -* VF copy registers so vbios post doesn't program them, for -* SRIOV driver need to program them -*/ -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_BASE), - adev->mc.vram_start >>24 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_TOP), - adev->mc.vram_end >>24 ); - } - -/* GART Enable. */ -gfxhub_v1_0_init_pt_regs (adev); -gfxhub_v1_0_init_gart_aperture_regs (adev); -gfxhub_v1_0_init_system_aperture_regs (adev); -gfxhub_v1_0_init_tlb_regs (adev); -gfxhub_v1_0_init_cache_regs (adev); - -gfxhub_v1_0_enable_system_domain (adev); -gfxhub_v1_0_dis_identity_aperture (adev); +int i; +uint32_t tmp;for (i =0 ; i <=14 ; i++) { tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_CNTL) + i);
@@ -248,7 +225,33 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32) + i*2 ,upper_32_bits (adev->vm_manager.max_pfn -1 )); } +} + +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) +{ +DRM_INFO ("%s -- in\n" , __func__); +if (amdgpu_sriov_vf (adev)) { +/* +* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are +* VF copy registers so vbios post doesn't program them, for +* SRIOV driver need to program them +*/ +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_BASE), + adev->mc.vram_start >>24 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_TOP), + adev->mc.vram_end >>24 ); + } +/* GART Enable. */ +gfxhub_v1_0_init_pt_regs (adev); +gfxhub_v1_0_init_gart_aperture_regs (adev); +gfxhub_v1_0_init_system_aperture_regs (adev); +gfxhub_v1_0_init_tlb_regs (adev); +gfxhub_v1_0_init_cache_regs (adev); + +gfxhub_v1_0_enable_system_domain (adev); +gfxhub_v1_0_dis_identity_aperture (adev); +gfxhub_v1_0_setup_vmid_config (adev);return 0 ; }
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +30 -26
69 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/18 drm/amdgpu: fix to miss program invalidation at resume
In reply to a message not in the archiveThis patch moves invalidation into gart enable function from hw_init. Because we would like align the sequence calling between init and resume.
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 27 +++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 +++++++++++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +15 -12
@@ -227,6 +227,20 @@ static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev) } } +static void gfxhub_v1_0_program_invalidation (struct amdgpu_device *adev) +{ +unsigned i; + +for (i =0 ; i <18 ; ++i) { +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32) + +2 * i,0xffffffff ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32) + +2 * i,0x1f ); + } +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {DRM_INFO ("%s -- in\n" , __func__);
@@ -252,6 +266,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_enable_system_domain (adev);gfxhub_v1_0_dis_identity_aperture (adev);gfxhub_v1_0_setup_vmid_config (adev); +gfxhub_v1_0_program_invalidation (adev);return 0 ; }
@@ -361,18 +376,6 @@ static int gfxhub_v1_0_sw_fini(void *handle)static int gfxhub_v1_0_hw_init (void *handle) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle; -unsigned i; - -for (i =0 ; i <18 ; ++i) { -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32) + -2 * i,0xffffffff ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32) + -2 * i,0x1f ); - } -return 0 ; }
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +15 -12
@@ -241,6 +241,20 @@ static void mmhub_v1_0_setup_vmid_config(struct amdgpu_device *adev) } } +static void mmhub_v1_0_program_invalidation (struct amdgpu_device *adev) +{ +unsigned i; + +for (i =0 ; i <18 ; ++i) { +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32) + +2 * i,0xffffffff ); +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32) + +2 * i,0x1f ); + } +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {DRM_INFO ("%s -- in\n" , __func__);
@@ -266,6 +280,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)mmhub_v1_0_enable_system_domain (adev);mmhub_v1_0_dis_identity_aperture (adev);mmhub_v1_0_setup_vmid_config (adev); +mmhub_v1_0_program_invalidation (adev);return 0 ; }
@@ -374,18 +389,6 @@ static int mmhub_v1_0_sw_fini(void *handle)static int mmhub_v1_0_hw_init (void *handle) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle; -unsigned i; - -for (i =0 ; i <18 ; ++i) { -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32) + -2 * i,0xffffffff ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32) + -2 * i,0x1f ); - } -return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/18 drm/amdgpu: export gfxhub sw_init into gmc
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 26 ++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 ++ 3 files changed, 17 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +14 -12
@@ -334,19 +334,8 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); } -static int gfxhub_v1_0_early_init (void *handle) -{ -return 0 ; -} - -static int gfxhub_v1_0_late_init (void *handle) +void gfxhub_v1_0_init (struct amdgpu_device *adev) { -return 0 ; -} - -static int gfxhub_v1_0_sw_init (void *handle) -{ -struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB ]; hub->ctx0_ptb_addr_lo32 =
@@ -365,7 +354,20 @@ static int gfxhub_v1_0_sw_init(void *handle)SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_STATUS); hub->vm_l2_pro_fault_cntl =SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); +} +static int gfxhub_v1_0_early_init (void *handle) +{ +return 0 ; +} + +static int gfxhub_v1_0_late_init (void *handle) +{ +return 0 ; +} + +static int gfxhub_v1_0_sw_init (void *handle) +{return 0 ; }
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h +1 -0
@@ -28,6 +28,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev);void gfxhub_v1_0_gart_disable (struct amdgpu_device *adev);void gfxhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value); +void gfxhub_v1_0_init (struct amdgpu_device *adev);extern const struct amd_ip_funcs gfxhub_v1_0_ip_funcs;extern const struct amdgpu_ip_block_version gfxhub_v1_0_ip_block;
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -0
@@ -551,6 +551,8 @@ static int gmc_v9_0_sw_init(void *handle)int dma_bits;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +gfxhub_v1_0_init (adev); +spin_lock_init (&adev->mc.invalidate_lock);if (adev->flags &AMD_IS_APU ) {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/18 drm/amdgpu: export mmhub sw_init into gmc
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 +++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 + 3 files changed, 17 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -0
@@ -552,6 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;gfxhub_v1_0_init (adev); +mmhub_v1_0_init (adev);spin_lock_init (&adev->mc.invalidate_lock);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +15 -12
@@ -347,19 +347,8 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value)WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); } -static int mmhub_v1_0_early_init (void *handle) +void mmhub_v1_0_init (struct amdgpu_device *adev) { -return 0 ; -} - -static int mmhub_v1_0_late_init (void *handle) -{ -return 0 ; -} - -static int mmhub_v1_0_sw_init (void *handle) -{ -struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB ]; hub->ctx0_ptb_addr_lo32 =
@@ -379,6 +368,20 @@ static int mmhub_v1_0_sw_init(void *handle) hub->vm_l2_pro_fault_cntl =SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); +} + +static int mmhub_v1_0_early_init (void *handle) +{ +return 0 ; +} + +static int mmhub_v1_0_late_init (void *handle) +{ +return 0 ; +} + +static int mmhub_v1_0_sw_init (void *handle) +{return 0 ; }
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +1 -0
@@ -28,6 +28,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev);void mmhub_v1_0_gart_disable (struct amdgpu_device *adev);void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value); +void mmhub_v1_0_init (struct amdgpu_device *adev);extern const struct amd_ip_funcs mmhub_v1_0_ip_funcs;extern const struct amdgpu_ip_block_version mmhub_v1_0_ip_block;
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): 1496247293-16429-12-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/18] drm/amdgpu: export mmhub sw_init into gmc
Am 31.05.2017 um 18:14 schrieb Huang Rui:
Quoted 53 lines
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 +++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 + 3 files changed, 17 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-0@@ -552,6 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;gfxhub_v1_0_init (adev); +mmhub_v1_0_init (adev);spin_lock_init (&adev->mc.invalidate_lock);drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +6
-12@@ -347,19 +347,8 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value)WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); } -static int mmhub_v1_0_early_init (void *handle) +void mmhub_v1_0_init (struct amdgpu_device *adev) { -return 0 ; -} - -static int mmhub_v1_0_late_init (void *handle) -{ -return 0 ; -} - -static int mmhub_v1_0_sw_init (void *handle) -{ -struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB ]; hub->ctx0_ptb_addr_lo32 =@@ -379,6 +368,20 @@ static int mmhub_v1_0_sw_init(void *handle) hub->vm_l2_pro_fault_cntl =SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); +} + +static int mmhub_v1_0_early_init (void *handle) +{ +return 0 ;
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static int mmhub_v1_0_sw_init(void *handle) · line 385
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +9
-0+} + +static int mmhub_v1_0_late_init (void *handle) +{ +return 0 ; +} + +static int mmhub_v1_0_sw_init (void *handle) +{return 0 ;
Return with a value in a function returning void?
Check the compile log for warnings introduced by the patch set.
Christian.
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0}drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0
-0
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h int mmhub_v1_0_gart_enable(struct amdgpu_device *adev); · line 34
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +1
-0@@ -28,6 +28,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev);void mmhub_v1_0_gart_disable (struct amdgpu_device *adev);void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value); +void mmhub_v1_0_init (struct amdgpu_device *adev);extern const struct amd_ip_funcs mmhub_v1_0_ip_funcs;extern const struct amdgpu_ip_block_version mmhub_v1_0_ip_block;
_______________________________________________
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): fd87586c-8609-bd81-b7e3-46f2a72a90e2-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/18] drm/amdgpu: export mmhub sw_init into gmc
Quoted 71 lines · Christian
Am 31.05.2017 um 18:14 schrieb Huang Rui:
drivers/gpu/drm/amd/
Quoted 8 lines
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 +++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 + 3 files changed, 17 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/ renamed from drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0
amdgpu/gmc_v9_0.cdrivers/gpu/drm/amd/
Quoted 12 lines
index 2fee1c6..077b7ce 100644
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-0@@ -552,6 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;gfxhub_v1_0_init (adev); +mmhub_v1_0_init (adev);spin_lock_init (&adev->mc.invalidate_lock);drivers/gpu/drm/amd/ renamed from drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0
amdgpu/mmhub_v1_0.cdrivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c void mmhub_v1_0_set_fault_enable_default(struct
Quoted 4 lines
index 2f85647..20d8d2c 100644
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0@@ -347,19 +347,8 @@ void mmhub_v1_0_set_fault_enable_default(struct
amdgpu_device*adev, bool value)drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c void mmhub_v1_0_set_fault_enable_default(struct · line 347
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmVM_L2_PROTECTION_FAULT_CNTL),tmp);
Quoted 28 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +6
-12} -static int mmhub_v1_0_early_init (void *handle) +void mmhub_v1_0_init (struct amdgpu_device *adev) { -return 0 ; -} - -static int mmhub_v1_0_late_init (void *handle) -{ -return 0 ; -} - -static int mmhub_v1_0_sw_init (void *handle) -{ -struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB ]; hub->ctx0_ptb_addr_lo32 =@@ -379,6 +368,20 @@ static int mmhub_v1_0_sw_init(void *handle) hub->vm_l2_pro_fault_cntl =SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); +} + +static int mmhub_v1_0_early_init (void *handle) +{ +return 0 ;drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static int mmhub_v1_0_sw_init(void *handle) · line 385
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +9
-0+} + +static int mmhub_v1_0_late_init (void *handle) +{ +return 0 ; +} + +static int mmhub_v1_0_sw_init (void *handle) +{return 0 ;Return with a value in a function returning void?
Quoted 2 lines
Check the compile log for warnings introduced by the patch set.
The diff log doesn't show it well.
Actually, I just define new function named mmhub_v1_0_init as "void" and its return type is also "void". And mmhub_v1_0_sw_init returning value should be "0" here.
Yes, I checked compile log, no warning introduced.
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/18 drm/amdgpu: export mmhub set clockgating into gmc
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 12 ++++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3 -1
@@ -827,7 +827,9 @@ static int gmc_v9_0_soft_reset(void *handle)static int gmc_v9_0_set_clockgating_state (void *handle,enum amd_clockgating_state state) { -return 0 ; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +return mmhub_v1_0_set_clockgating (adev, state); } static int gmc_v9_0_set_powergating_state(void *handle,
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +8 -4
@@ -527,11 +527,9 @@ static void athub_update_medium_grain_light_sleep(struct amdgpu_device *adev,WREG32 (SOC15_REG_OFFSET (ATHUB ,0 , mmATHUB_MISC_CNTL), data); } -static int mmhub_v1_0_set_clockgating_state (void *handle, -enum amd_clockgating_state state) +int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, +enum amd_clockgating_state state) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (amdgpu_sriov_vf (adev))return 0 ;
@@ -553,6 +551,12 @@ static int mmhub_v1_0_set_clockgating_state(void *handle,return 0 ; } +static int mmhub_v1_0_set_clockgating_state (void *handle, +enum amd_clockgating_state state) +{ +return 0 ; +} +static void mmhub_v1_0_get_clockgating_state (void *handle,u32 *flags) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +2 -0
@@ -29,6 +29,8 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev);void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value);void mmhub_v1_0_init (struct amdgpu_device *adev); +int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, +enum amd_clockgating_state state);extern const struct amd_ip_funcs mmhub_v1_0_ip_funcs;extern const struct amdgpu_ip_block_version mmhub_v1_0_ip_block;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/18 drm/amdgpu: export mmhub get clockgating into gmc
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +8 -0
@@ -832,6 +832,13 @@ static int gmc_v9_0_set_clockgating_state(void *handle,return mmhub_v1_0_set_clockgating (adev, state); } +static void gmc_v9_0_get_clockgating_state (void *handle,u32 *flags) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +mmhub_v1_0_get_clockgating (adev, flags); +} +static int gmc_v9_0_set_powergating_state (void *handle,enum amd_powergating_state state) {
@@ -853,6 +860,7 @@ const struct amd_ip_funcs gmc_v9_0_ip_funcs = { .soft_reset = gmc_v9_0_soft_reset, .set_clockgating_state = gmc_v9_0_set_clockgating_state, .set_powergating_state = gmc_v9_0_set_powergating_state, + .get_clockgating_state = gmc_v9_0_get_clockgating_state, }; const struct amdgpu_ip_block_version gmc_v9_0_ip_block =
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1 -3
@@ -557,9 +557,8 @@ static int mmhub_v1_0_set_clockgating_state(void *handle,return 0 ; } -static void mmhub_v1_0_get_clockgating_state (void *handle,u32 *flags) +void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle;int data;if (amdgpu_sriov_vf (adev))
@@ -597,7 +596,6 @@ const struct amd_ip_funcs mmhub_v1_0_ip_funcs = { .soft_reset = mmhub_v1_0_soft_reset, .set_clockgating_state = mmhub_v1_0_set_clockgating_state, .set_powergating_state = mmhub_v1_0_set_powergating_state, - .get_clockgating_state = mmhub_v1_0_get_clockgating_state, }; const struct amdgpu_ip_block_version mmhub_v1_0_ip_block =
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +1 -0
@@ -31,6 +31,7 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,void mmhub_v1_0_init (struct amdgpu_device *adev);int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state); +void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags);extern const struct amd_ip_funcs mmhub_v1_0_ip_funcs;extern const struct amdgpu_ip_block_version mmhub_v1_0_ip_block;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/18 drm/amdgpu: remove gfxhub ip
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 93 ------------------------------ drivers/gpu/drm/amd/amdgpu/soc15.c | 1 - drivers/gpu/drm/amd/include/amd_shared.h | 1 - 4 files changed, 96 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
@@ -1746,7 +1746,6 @@ static int amdgpu_sriov_reinit_early(struct amdgpu_device *adev)static enum amd_ip_block_type ip_order[] = {AMD_IP_BLOCK_TYPE_GMC ,AMD_IP_BLOCK_TYPE_COMMON , -AMD_IP_BLOCK_TYPE_GFXHUB ,AMD_IP_BLOCK_TYPE_MMHUB ,AMD_IP_BLOCK_TYPE_IH , };
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +0 -93
96 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -1
@@ -464,7 +464,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_VEGA10 :amdgpu_ip_block_add (adev, &vega10_common_ip_block); -amdgpu_ip_block_add (adev, &gfxhub_v1_0_ip_block);amdgpu_ip_block_add (adev, &mmhub_v1_0_ip_block);amdgpu_ip_block_add (adev, &gmc_v9_0_ip_block);amdgpu_ip_block_add (adev, &vega10_ih_ip_block);
drivers/gpu/drm/amd/include/amd_shared.h +0 -1
@@ -75,7 +75,6 @@ enum amd_ip_block_type {AMD_IP_BLOCK_TYPE_UVD ,AMD_IP_BLOCK_TYPE_VCE ,AMD_IP_BLOCK_TYPE_ACP , -AMD_IP_BLOCK_TYPE_GFXHUB , AMD_IP_BLOCK_TYPE_MMHUB };
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/18 drm/amdgpu: remove mmhub ip
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 93 ------------------------------ drivers/gpu/drm/amd/amdgpu/soc15.c | 1 - drivers/gpu/drm/amd/include/amd_shared.h | 1 - 4 files changed, 96 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
@@ -1746,7 +1746,6 @@ static int amdgpu_sriov_reinit_early(struct amdgpu_device *adev)static enum amd_ip_block_type ip_order[] = {AMD_IP_BLOCK_TYPE_GMC ,AMD_IP_BLOCK_TYPE_COMMON , -AMD_IP_BLOCK_TYPE_MMHUB ,AMD_IP_BLOCK_TYPE_IH , };
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0 -93
108 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -1
@@ -464,7 +464,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_VEGA10 :amdgpu_ip_block_add (adev, &vega10_common_ip_block); -amdgpu_ip_block_add (adev, &mmhub_v1_0_ip_block);amdgpu_ip_block_add (adev, &gmc_v9_0_ip_block);amdgpu_ip_block_add (adev, &vega10_ih_ip_block);if (amdgpu_fw_load_type ==2 || amdgpu_fw_load_type ==-1 )
drivers/gpu/drm/amd/include/amd_shared.h +0 -1
@@ -75,7 +75,6 @@ enum amd_ip_block_type {AMD_IP_BLOCK_TYPE_UVD ,AMD_IP_BLOCK_TYPE_VCE , AMD_IP_BLOCK_TYPE_ACP, -AMD_IP_BLOCK_TYPE_MMHUB }; enum amd_clockgating_state {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/18 drm/amdgpu: add ip name print for selecting ips with ip_block_mask
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -1
@@ -1490,7 +1490,8 @@ static int amdgpu_early_init(struct amdgpu_device *adev)for (i =0 ; i < adev->num_ip_blocks; i++) {if ((amdgpu_ip_block_mask & (1 << i)) ==0 ) { -DRM_ERROR ("disabled ip block: %d\n" , i); +DRM_ERROR ("disabled ip block: %d <%s>\n" , + i, adev->ip_blocks[i].version->funcs->name); adev->ip_blocks[i].status.valid = false; }else {if (adev->ip_blocks[i].version->funcs->early_init) {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/18 drm/amdgpu: add ip block number prints
In reply to a message not in the archiveUser is able to follow the ip block number to write the ip_block_mask for selecting the one which user would like to enable.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -0
@@ -1368,6 +1368,9 @@ int amdgpu_ip_block_add(struct amdgpu_device *adev,if (!ip_block_version)return -EINVAL ; +DRM_DEBUG ("add ip block number %d <%s>\n" , adev->num_ip_blocks, + ip_block_version->funcs->name); + adev->ip_blocks[adev->num_ip_blocks++].version = ip_block_version;return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/18 drm/amdgpu: fix the gart table cleared issue for S3
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +++ 6 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -624,6 +624,7 @@ struct amdgpu_mc {uint32_t srbm_soft_reset;struct amdgpu_mode_mc_save save;bool prt_warning; +unsigned long stollen_size;/* apertures */ u64 shared_aperture_start;u64 shared_aperture_end;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -1
@@ -1381,7 +1381,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)/* Change the size here instead of the init above so only lpfn is affected */ amdgpu_ttm_set_active_vram_size (adev, adev->mc.visible_vram_size); - r = amdgpu_bo_create(adev, 256 * 1024, PAGE_SIZE, true, + r = amdgpu_bo_create(adev, adev->mc.stollen_size, PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2 -0
@@ -873,6 +873,8 @@ static int gmc_v6_0_sw_init(void *handle) adev->mc.mc_mask =0xffffffffffULL ; + adev->mc.stollen_size =256 *1024 ; + adev->need_dma32 = false; dma_bits = adev->need_dma32 ?32 :40 ; r =pci_set_dma_mask (adev->pdev,DMA_BIT_MASK (dma_bits));
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -0
@@ -1060,6 +1060,8 @@ static int gmc_v7_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffULL ;/* 40 bit MC */ + adev->mc.stollen_size =256 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2 -0
@@ -1148,6 +1148,8 @@ static int gmc_v8_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffULL ;/* 40 bit MC */ + adev->mc.stollen_size =256 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3 -0
@@ -591,6 +591,9 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffffULL ;/* 48 bit MC */ +/* it needs to reserve 8M stollen memory for vega10 */ + adev->mc.stollen_size =8 *1024 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 44-bits. * IGP - can handle 44-bits
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): 1496247293-16429-19-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 18/18] drm/amdgpu: fix the gart table cleared issue for S3
Quoted 24 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huang, Ray; Huan, Alvin
Subject: [PATCH 18/18] drm/amdgpu: fix the gart table cleared issue for S3Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +++ 6 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_mc { · line 627
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -624,6 +624,7 @@ struct amdgpu_mc {uint32_t srbm_soft_reset;struct amdgpu_mode_mc_save save;bool prt_warning; +unsigned long stollen_size;
Typo: stolen_size
With that fixed:
Quoted 81 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0/* apertures */ u64 shared_aperture_start;u64 shared_aperture_end;drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0@@ -1381,7 +1381,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)/* Change the size here instead of the init above so only lpfn is affected */
amdgpu_ttm_set_active_vram_size(adev, adev-Quoted 1 line
mc.visible_vram_size);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1- r = amdgpu_bo_create(adev, 256 * 1024, PAGE_SIZE, true, + r = amdgpu_bo_create(adev, adev->mc.stollen_size, PAGE_SIZE,true,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0AMDGPU_GEM_DOMAIN_VRAM ,AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2
-0@@ -873,6 +873,8 @@ static int gmc_v6_0_sw_init(void *handle) adev->mc.mc_mask =0xffffffffffULL ; + adev->mc.stollen_size =256 *1024 ; + adev->need_dma32 = false; dma_bits = adev->need_dma32 ?32 :40 ; r =pci_set_dma_mask (adev->pdev,DMA_BIT_MASK (dma_bits));drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2
-0@@ -1060,6 +1060,8 @@ static int gmc_v7_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffULL ;/* 40 bit MC */ + adev->mc.stollen_size =256 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-0@@ -1148,6 +1148,8 @@ static int gmc_v8_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffULL ;/* 40 bit MC */ + adev->mc.stollen_size =256 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-1@@ -591,6 +591,9 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffffULL ;/* 48 bit MC */ +/* it needs to reserve 8M stollen memory for vega10 */ + adev->mc.stollen_size =8 *1024 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 44-bits. * IGP - can handle 44-bits -- 2.7.4
Quoted 4 lines
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB16529494252B5889988E00BBF7F10-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 18/18] drm/amdgpu: fix the gart table cleared issue for S3
Am 31.05.2017 um 18:29 schrieb Deucher, Alexander:
Quoted 32 lines
Quoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Huang Rui
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huang, Ray; Huan, Alvin
Subject: [PATCH 18/18] drm/amdgpu: fix the gart table cleared issuefor S3
Quoted 17 lines
Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +++ 6 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_mc { · line 627
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -624,6 +624,7 @@ struct amdgpu_mc {uint32_t srbm_soft_reset;struct amdgpu_mode_mc_save save;bool prt_warning; +unsigned long stollen_size;Typo:
stolen_size
With that fixed:
Quoted 1 line
Reviewed-by Alex Deucher <[email protected]>
Additional to that this should be an uint64_t otherwise 32bit systems will break.
Please also add a "/* TODO: Figure out how to avoid that... */ to setting the size to 8MB on Vega10.
With that fixed Reviewed-by: Christian König <[email protected]>.
Quoted 82 lines
Quoted 82 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0/* apertures */ u64 shared_aperture_start;u64 shared_aperture_end;drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0@@ -1381,7 +1381,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)/* Change the size here instead of the init above so only lpfn is affected */
amdgpu_ttm_set_active_vram_size(adev, adev-Quoted 1 line
mc.visible_vram_size);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1- r = amdgpu_bo_create(adev, 256 * 1024, PAGE_SIZE, true, + r = amdgpu_bo_create(adev, adev->mc.stollen_size, PAGE_SIZE,true,
AMDGPU_GEM_DOMAIN_VRAM,AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED
|AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2
-0@@ -873,6 +873,8 @@ static int gmc_v6_0_sw_init(void *handle) adev->mc.mc_mask =0xffffffffffULL ; + adev->mc.stollen_size =256 *1024 ; + adev->need_dma32 = false; dma_bits = adev->need_dma32 ?32 :40 ; r =pci_set_dma_mask (adev->pdev,DMA_BIT_MASK (dma_bits));drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2
-0@@ -1060,6 +1060,8 @@ static int gmc_v7_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffULL ;/* 40 bit MC */ + adev->mc.stollen_size =256 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-0@@ -1148,6 +1148,8 @@ static int gmc_v8_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffULL ;/* 40 bit MC */ + adev->mc.stollen_size =256 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-1@@ -591,6 +591,9 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffffULL ;/* 48 bit MC */ +/* it needs to reserve 8M stollen memory for vega10 */ + adev->mc.stollen_size =8 *1024 *1024 ; +/* set DMA mask + need_dma32 flags. * PCIE - can handle 44-bits. * IGP - can handle 44-bits -- 2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): e2d9fdd5-7544-8b2c-031d-3894e2a7ec07-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 18/18] drm/amdgpu: fix the gart table cleared issue for S3
Quoted 37 lines · Christian
Am 31.05.2017 um 18:29 schrieb Deucher, Alexander:
Quoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huang, Ray; Huan, Alvin
Subject: [PATCH 18/18] drm/amdgpu: fix the gart table cleared issue forS3 > > Signed-off-by: Huang Rui <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- > drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +++ > 6 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 37f9869..50ed985 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -624,6 +624,7 @@ struct amdgpu_mc { > uint32_t srbm_soft_reset; > struct amdgpu_mode_mc_save save; > bool prt_warning; > + unsigned long stollen_size; Typo: stolen_size With that fixed: Reviewed-by: Alex Deucher <[email protected]>
Quoted 8 lines
Additional to that this should be an
uint64_totherwise 32bit systems will break.Please also add a "/* TODO: Figure out how to avoid that... */ to setting the size to 8MB on Vega10.
With that fixed Reviewed-by: Christian König <[email protected]>.
OK, will fix that.
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 21 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Wednesday, May 31, 2017 12:15 PM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huang, Ray; Huan, Alvin
Subject: [PATCH 00/18] Vega10 S3 following upHi all,
These patches refines gfxhub/mmhub programming sequence to make them clear and
readable. And actually, gfxhub + mmhub = GMCv9 for vega10, we don't need specific gfxhub and mmhub ip blocks, and meanwhile, they have different resume
sequence during gfxhub, mmhub, and gmc. That will make thing confused and easily
miss some register configrations. So remove gfxhub and mmhub ip block here, and
merge them into GMC v9.
Quoted 6 lines
Patch 1 -> 8: refine gfxhub/mmhub programming sequence
Patch 9: fix missed invalidation at resume
Patch 10 -> 15: remove gfxhub/mmhub ip blocks
Patch 16 -> 17: add prints to makeip_blockmask clear.
Patch 18: fix gart table cleared and other BOs cleared issue which blocked S3.
(Extend stollen memory for VBIOS)
I'm not sure we need to break this down so fined grained, but I don't really have a strong opinion either way. With the comments on patches 1, 2, 7, and 18 addressed, the series is:
Quoted 38 lines
Huang Rui (18):
drm/amdgpu: abstract gart table initialization for gfxhub/mmhub drm/amdgpu: abstract gart aperture initialization for gfxhub/mmhub drm/amdgpu: abstract system aperture initialization for gfxhub/mmhub drm/amdgpu: abstract TLB initialization for gfxhub/mmhub drm/amdgpu: abstract cache initialization for gfxhub/mmhub drm/amdgpu: abstract system domain enablement for gfxhub/mmhub drm/amdgpu: abstract disable identity aperture for gfxhub/mmhub drm/amdgpu: abstract setup vmid config for gfxhub/mmhub drm/amdgpu: fix to miss program invalidation at resume drm/amdgpu: export gfxhubsw_initinto gmc
drm/amdgpu: export mmhubsw_initinto gmc
drm/amdgpu: export mmhub set clockgating into gmc drm/amdgpu: export mmhub get clockgating into gmc drm/amdgpu: remove gfxhub ip
drm/amdgpu: remove mmhub ip
drm/amdgpu: add ip name print for selecting ips withip_block_maskdrm/amdgpu: add ip block number prints
drm/amdgpu: fix the gart table cleared issue for S3drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 361 +++++++++++--------- -------- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 373 ++++++++++++------ ----------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 4 + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 - drivers/gpu/drm/amd/include/amd_shared.h | 2 - 13 files changed, 330 insertions(+), 448 deletions(-)
Quoted 7 lines
--
2.7.4_______________________________________________
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
I would suggest to use RREG32_SOC15/ WREG32_SOC15 to avoid code refactor again...
Regards,
Hawking
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Thursday, June 01, 2017 0:15
To: [email protected]; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>
Cc: Wang, Ken <[email protected]>; Huang, Ray <[email protected]>; Huan, Alvin <[email protected]>
Subject: [PATCH 00/18] Vega10 S3 following up
Hi all,
These patches refines gfxhub/mmhub programming sequence to make them clear and readable. And actually, gfxhub + mmhub = GMCv9 for vega10, we don't need specific gfxhub and mmhub ip blocks, and meanwhile, they have different resume sequence during gfxhub, mmhub, and gmc. That will make thing confused and easily miss some register configrations. So remove gfxhub and mmhub ip block here, and merge them into GMC v9.
Patch 1 -> 8: refine gfxhub/mmhub programming sequence Patch 9: fix missed invalidation at resume Patch 10 -> 15: remove gfxhub/mmhub ip blocks Patch 16 -> 17: add prints to make ip_block mask clear. Patch 18: fix gart table cleared and other BOs cleared issue which blocked S3.
(Extend stollen memory for VBIOS)
Huang Rui (18):
drm/amdgpu: abstract gart table initialization for gfxhub/mmhub drm/amdgpu: abstract gart aperture initialization for gfxhub/mmhub drm/amdgpu: abstract system aperture initialization for gfxhub/mmhub drm/amdgpu: abstract TLB initialization for gfxhub/mmhub drm/amdgpu: abstract cache initialization for gfxhub/mmhub drm/amdgpu: abstract system domain enablement for gfxhub/mmhub drm/amdgpu: abstract disable identity aperture for gfxhub/mmhub drm/amdgpu: abstract setup vmid config for gfxhub/mmhub drm/amdgpu: fix to miss program invalidation at resume drm/amdgpu: export gfxhub sw_init into gmc
drm/amdgpu: export mmhub sw_init into gmc
drm/amdgpu: export mmhub set clockgating into gmc drm/amdgpu: export mmhub get clockgating into gmc drm/amdgpu: remove gfxhub ip
drm/amdgpu: remove mmhub ip
drm/amdgpu: add ip name print for selecting ips with ip_block_mask drm/amdgpu: add ip block number prints
drm/amdgpu: fix the gart table cleared issue for S3
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 361 +++++++++++----------------- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 373 ++++++++++++----------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 4 + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 - drivers/gpu/drm/amd/include/amd_shared.h | 2 - 13 files changed, 330 insertions(+), 448 deletions(-)
--
2.7.4
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): CY1PR12MB053461B71BE32E7234ECF668FCF10-1s8aH8ViOEf7axfsnaG19wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Quoted 3 lines · Hawking
I would suggest to use RREG32_SOC15/
WREG32_SOC15to avoid code refactor again...
Right. Thanks to reminder. Will update it in next version.
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx