S3 following up
Subsystems (2)
v2 cover S3 following up
Hi all,
Changes from V1 -> V2:
- Rename pt_regs to gart_pt_regs, dis_identity_aperture to disable_identity_aperture.
- Use upper_32_bits/lower_32_bits macros.
- Add comments and fix "uint64_t" for stolen size.
- Merge page table regs function into page table aperture.
- Add three patches to use RREG32_SOC15/WREG32_SOC15 instead.
I just sent the modified patches (1, 2, 7, 18, 19, 20, 21) which compared with v1. Others, please check v1 set.
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)
Patch 19 -> 21: update gmc/mmhub/gfxhub to use RREG32_SOC15/WREG32_SOC15 macro.
Thanks,
Ray
Huang Rui (21):
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 drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gfxhub drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for mmhub drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gmc9
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 | 424 +++++++++++--------------- 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 | 31 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 466 ++++++++++++----------------- 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, 406 insertions(+), 541 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): 1496315865-5140-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH v2 1/21 drm/amdgpu: abstract gart table initialization for gfxhub/mmhub
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 34 ++++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 34 ++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +21 -13
@@ -31,6 +31,25 @@#include "soc15_common.h" +static void gfxhub_v1_0_init_gart_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), +lower_32_bits (value)); + +WREG32 (SOC15_REG_OFFSET (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), +upper_32_bits (value)); +} +int gfxhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -38,6 +57,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +gfxhub_v1_0_init_gart_pt_regs (adev); +/* Update configuration */ WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), adev->mc.vram_start >>18 );
@@ -154,19 +175,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 +21 -13
@@ -44,6 +44,25 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } +static void mmhub_v1_0_init_gart_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), +lower_32_bits (value)); + +WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), +upper_32_bits (value)); +} +int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {u32 tmp;
@@ -52,6 +71,8 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ +mmhub_v1_0_init_gart_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 +189,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
PATCH v2 2/21 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 | 37 +++++++++++++++++--------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 36 +++++++++++++++++-------------- 2 files changed, 40 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +20 -17
@@ -50,6 +50,25 @@ static void gfxhub_v1_0_init_gart_pt_regs(struct amdgpu_device *adev) upper_32_bits(value)); } +static void gfxhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) +{ +gfxhub_v1_0_init_gart_pt_regs (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,9 +76,8 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ -gfxhub_v1_0_init_gart_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),
@@ -160,21 +178,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 +20 -16
@@ -63,6 +63,25 @@ static void mmhub_v1_0_init_gart_pt_regs(struct amdgpu_device *adev) upper_32_bits(value)); } +static void mmhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) +{ +mmhub_v1_0_init_gart_pt_regs (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,7 +90,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)u32 i;/* Program MC. */ -mmhub_v1_0_init_gart_pt_regs (adev); +mmhub_v1_0_init_gart_aperture_regs (adev);/* Update configuration */ DRM_INFO ("%s -- in\n" , __func__);
@@ -174,21 +193,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
PATCH v2 7/21 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
@@ -170,6 +170,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_disable_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;
@@ -195,22 +215,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_disable_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
@@ -183,6 +183,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_disable_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;
@@ -208,22 +227,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_disable_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
PATCH v2 18/21 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 | 6 ++++++ 6 files changed, 14 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; +uint64_t stolen_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.stolen_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.stolen_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.stolen_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.stolen_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 +6 -0
@@ -591,6 +591,12 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->mc.mc_mask =0xffffffffffffULL ;/* 48 bit MC */ +/* +* It needs to reserve 8M stolen memory for vega10 +* TODO: Figure out how to avoid that... +*/ + adev->mc.stolen_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
PATCH v2 19/21 drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gfxhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 141 ++++++++++++++----------------- 1 file changed, 64 insertions(+), 77 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +64 -77
@@ -41,32 +41,26 @@ static void gfxhub_v1_0_init_gart_pt_regs(struct amdgpu_device *adev) value &=0x0000FFFFFFFFF000ULL ; value |=0x1 ;/*valid bit*/ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), -lower_32_bits (value)); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, +lower_32_bits (value)); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), -upper_32_bits (value)); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, +upper_32_bits (value)); }static void gfxhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) {gfxhub_v1_0_init_gart_pt_regs (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 )); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, + (u32)(adev->mc.gtt_start >>12 )); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, + (u32)(adev->mc.gtt_start >>44 )); + +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, + (u32)(adev->mc.gtt_end >>12 )); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, + (u32)(adev->mc.gtt_end >>44 )); }static void gfxhub_v1_0_init_system_aperture_regs (struct amdgpu_device *adev)
@@ -75,38 +69,34 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)uint32_t tmp;/* 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 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_AGP_BASE,0 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_AGP_TOP,0 ); +WREG32_SOC15 (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 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR, + adev->mc.vram_start >>18 ); +WREG32_SOC15 (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 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB), - (u32)(value >>44 )); +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, + (u32)(value >>12 )); +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, + (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)); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32, + (u32)(adev->dummy_page.addr >>12 )); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, + (u32)((u64 )adev->dummy_page.addr >>44 )); + + tmp =RREG32_SOC15 (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); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); }static void gfxhub_v1_0_init_tlb_regs (struct amdgpu_device *adev)
@@ -114,7 +104,7 @@ 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 =RREG32_SOC15 (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 );
@@ -127,7 +117,7 @@ static void gfxhub_v1_0_init_tlb_regs(struct amdgpu_device *adev) 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); +WREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp); }static void gfxhub_v1_0_init_cache_regs (struct amdgpu_device *adev)
@@ -135,7 +125,7 @@ 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 =RREG32_SOC15 (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.*/
@@ -144,49 +134,46 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) 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); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2)); + tmp =RREG32_SOC15 (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); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); tmp = mmVM_L2_CNTL3_DEFAULT; -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL3), tmp); +WREG32_SOC15 (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); +WREG32_SOC15 (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 =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL, tmp); }static void gfxhub_v1_0_disable_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 ); +WREG32_SOC15 (GC ,0 , mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32, +0XFFFFFFFF ); +WREG32_SOC15 (GC ,0 , mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32, +0x0000000F ); + +WREG32_SOC15 (GC ,0 , mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32, +0 ); +WREG32_SOC15 (GC ,0 , mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32, +0 ); + +WREG32_SOC15 (GC ,0 , mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32,0 ); +WREG32_SOC15 (GC ,0 , mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32,0 ); }
@@ -253,10 +240,10 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)* 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 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_FB_LOCATION_BASE, + adev->mc.vram_start >>24 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_FB_LOCATION_TOP, + adev->mc.vram_end >>24 ); }/* GART Enable. */
@@ -283,19 +270,19 @@ void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL) + i,0 );/* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,0 ); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_ADVANCED_DRIVER_MODEL ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL), tmp); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL3),0 ); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL, tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3,0 ); }/**
@@ -308,7 +295,7 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value) {u32 tmp; - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,RANGE_PROTECTION_FAULT_ENABLE_DEFAULT , value); tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,
@@ -333,7 +320,7 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, WRITE_PROTECTION_FAULT_ENABLE_DEFAULT, value); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,EXECUTE_PROTECTION_FAULT_ENABLE_DEFAULT , value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); }void gfxhub_v1_0_init (struct amdgpu_device *adev)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 20/21 drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for mmhub
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 173 +++++++++++++++----------------- 1 file changed, 81 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +81 -92
@@ -36,7 +36,7 @@u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) { -u64 base =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE)); +u64 base =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE); base &=MC_VM_FB_LOCATION_BASE__FB_BASE_MASK ; base <<=24 ;
@@ -54,32 +54,26 @@ static void mmhub_v1_0_init_gart_pt_regs(struct amdgpu_device *adev) value &=0x0000FFFFFFFFF000ULL ; value |=0x1 ;/* valid bit */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), -lower_32_bits (value)); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, +lower_32_bits (value)); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), -upper_32_bits (value)); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, +upper_32_bits (value)); }static void mmhub_v1_0_init_gart_aperture_regs (struct amdgpu_device *adev) {mmhub_v1_0_init_gart_pt_regs (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 )); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, + (u32)(adev->mc.gtt_start >>12 )); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, + (u32)(adev->mc.gtt_start >>44 )); + +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, + (u32)(adev->mc.gtt_end >>12 )); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, + (u32)(adev->mc.gtt_end >>44 )); }static void mmhub_v1_0_init_system_aperture_regs (struct amdgpu_device *adev)
@@ -88,38 +82,34 @@ static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)uint32_t tmp;/* Disable AGP. */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_AGP_BASE),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_AGP_TOP),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_AGP_BOT),0x00FFFFFF ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_AGP_BASE,0 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_AGP_TOP,0 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_AGP_BOT,0x00FFFFFF );/* Program the system aperture low logical page number. */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), - adev->mc.vram_start >>18 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR), - adev->mc.vram_end >>18 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR, + adev->mc.vram_start >>18 ); +WREG32_SOC15 (MMHUB ,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 (MMHUB ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB), - (u32)(value >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB), - (u32)(value >>44 )); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, + (u32)(value >>12 )); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, + (u32)(value >>44 ));/* Program "protection fault". */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), - (u32)(adev->dummy_page.addr >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32), - (u32)((u64 )adev->dummy_page.addr >>44 )); - - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2)); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32, + (u32)(adev->dummy_page.addr >>12 )); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, + (u32)((u64 )adev->dummy_page.addr >>44 )); + + tmp =RREG32_SOC15 (MMHUB ,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 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); }static void mmhub_v1_0_init_tlb_regs (struct amdgpu_device *adev)
@@ -127,7 +117,7 @@ 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 =RREG32_SOC15 (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 );
@@ -140,7 +130,7 @@ static void mmhub_v1_0_init_tlb_regs(struct amdgpu_device *adev) 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); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp); }static void mmhub_v1_0_init_cache_regs (struct amdgpu_device *adev)
@@ -148,7 +138,7 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev)uint32_t tmp;/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,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.*/
@@ -157,49 +147,48 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) 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 (MMHUB ,0 , mmVM_L2_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL2)); + tmp =RREG32_SOC15 (MMHUB ,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 (MMHUB ,0 , mmVM_L2_CNTL2), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); tmp = mmVM_L2_CNTL3_DEFAULT; -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL3), tmp); +WREG32_SOC15 (MMHUB ,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 (MMHUB ,0 , mmVM_L2_CNTL4), tmp); +WREG32_SOC15 (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 =RREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL, tmp); }static void mmhub_v1_0_disable_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 ); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32, +0XFFFFFFFF ); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32, +0x0000000F ); + +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32,0 ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32,0 ); + +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32, +0 ); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32, +0 ); }static void mmhub_v1_0_setup_vmid_config (struct amdgpu_device *adev)
@@ -267,10 +256,10 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)* 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), - adev->mc.vram_end >>24 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE, + adev->mc.vram_start >>24 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_TOP, + adev->mc.vram_end >>24 ); }/* GART Enable. */
@@ -297,19 +286,19 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL) + i,0 );/* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,0 ); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_ADVANCED_DRIVER_MODEL ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL), tmp); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL3),0 ); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL, tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3,0 ); }/**
@@ -321,7 +310,7 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp; - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,RANGE_PROTECTION_FAULT_ENABLE_DEFAULT , value); tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,
@@ -346,7 +335,7 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value) WRITE_PROTECTION_FAULT_ENABLE_DEFAULT, value); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,EXECUTE_PROTECTION_FAULT_ENABLE_DEFAULT , value); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); }void mmhub_v1_0_init (struct amdgpu_device *adev)
@@ -377,9 +366,9 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *ad {uint32_t def, data, def1, data1, def2, data2; - def = data =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG)); - def1 = data1 =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB0_CNTL_MISC2)); - def2 = data2 =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB1_CNTL_MISC2)); + def = data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG); + def1 = data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2); + def2 = data2 =RREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_MC_MGCG )) { data |=ATC_L2_MISC_CG__ENABLE_MASK ;
@@ -416,13 +405,13 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *ad }if (def != data) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG), data); +WREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data);if (def1 != data1) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB0_CNTL_MISC2), data1); +WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2, data1);if (def2 != data2) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB1_CNTL_MISC2), data2); +WREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2, data2); } static void athub_update_medium_grain_clock_gating(struct amdgpu_device *adev,
@@ -430,7 +419,7 @@ static void athub_update_medium_grain_clock_gating(struct amdgpu_device *adev, {uint32_t def, data; - def = data =RREG32 (SOC15_REG_OFFSET (ATHUB ,0 , mmATHUB_MISC_CNTL)); + def = data =RREG32_SOC15 (ATHUB ,0 , mmATHUB_MISC_CNTL);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_MC_MGCG )) data |=ATHUB_MISC_CNTL__CG_ENABLE_MASK ;
@@ -438,7 +427,7 @@ static void athub_update_medium_grain_clock_gating(struct amdgpu_device *adev, data &= ~ATHUB_MISC_CNTL__CG_ENABLE_MASK ;if (def != data) -WREG32 (SOC15_REG_OFFSET (ATHUB ,0 , mmATHUB_MISC_CNTL), data); +WREG32_SOC15 (ATHUB ,0 , mmATHUB_MISC_CNTL, data); } static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *adev,
@@ -446,7 +435,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *ade {uint32_t def, data; - def = data =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG)); + def = data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_MC_LS )) data |=ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ;
@@ -454,7 +443,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *ade data &= ~ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ;if (def != data) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG), data); +WREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data); } static void athub_update_medium_grain_light_sleep(struct amdgpu_device *adev,
@@ -462,7 +451,7 @@ static void athub_update_medium_grain_light_sleep(struct amdgpu_device *adev, {uint32_t def, data; - def = data =RREG32 (SOC15_REG_OFFSET (ATHUB ,0 , mmATHUB_MISC_CNTL)); + def = data =RREG32_SOC15 (ATHUB ,0 , mmATHUB_MISC_CNTL);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_MC_LS ) && (adev->cg_flags &AMD_CG_SUPPORT_HDP_LS ))
@@ -471,7 +460,7 @@ static void athub_update_medium_grain_light_sleep(struct amdgpu_device *adev, data &= ~ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK ;if (def != data) -WREG32 (SOC15_REG_OFFSET (ATHUB ,0 , mmATHUB_MISC_CNTL), data); +WREG32_SOC15 (ATHUB ,0 , mmATHUB_MISC_CNTL, data); } int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,
@@ -506,12 +495,12 @@ void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags) *flags =0 ;/* AMD_CG_SUPPORT_MC_MGCG */ - data =RREG32 (SOC15_REG_OFFSET (ATHUB ,0 , mmATHUB_MISC_CNTL)); + data =RREG32_SOC15 (ATHUB ,0 , mmATHUB_MISC_CNTL);if (data &ATHUB_MISC_CNTL__CG_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_MC_MGCG ;/* AMD_CG_SUPPORT_MC_LS */ - data =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG)); + data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG);if (data &ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_MC_LS ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 21/21 drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gmc9
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +5 -5
@@ -434,7 +434,7 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev)/* hbm memory channel size */ chansize =128 ; - tmp =RREG32 (SOC15_REG_OFFSET (DF ,0 , mmDF_CS_AON0_DramBaseAddress0)); + tmp =RREG32_SOC15 (DF ,0 , mmDF_CS_AON0_DramBaseAddress0); tmp &= DF_CS_AON0_DramBaseAddress0__IntLvNumChan_MASK; tmp >>= DF_CS_AON0_DramBaseAddress0__IntLvNumChan__SHIFT;switch (tmp) {
@@ -721,12 +721,12 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)if (r)return r; - tmp =RREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_MISC_CNTL)); + tmp =RREG32_SOC15 (HDP ,0 , mmHDP_MISC_CNTL); tmp |=HDP_MISC_CNTL__FLUSH_INVALIDATE_CACHE_MASK ; -WREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_MISC_CNTL), tmp); +WREG32_SOC15 (HDP ,0 , mmHDP_MISC_CNTL, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_HOST_PATH_CNTL)); -WREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_HOST_PATH_CNTL), tmp); + tmp =RREG32_SOC15 (HDP ,0 , mmHDP_HOST_PATH_CNTL); +WREG32_SOC15 (HDP ,0 , mmHDP_HOST_PATH_CNTL, tmp);if (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS )
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Patch #18 is Reviewed-by: Christian König <[email protected]>.
The rest of the set is Acked-by: Christian König <[email protected]>.
Regards,
Christian.
Am 01.06.2017 um 13:17 schrieb Huang Rui:
Quoted 55 lines
Hi all,
Changes from V1 -> V2:
- Renamept_regstogart_pt_regs,dis_identity_aperturetodisable_identity_aperture.
- Use upper_32_bits/lower_32_bits macros.
- Add comments and fix "uint64_t" for stolen size.
- Merge page table regs function into page table aperture.
- Add three patches to use RREG32_SOC15/WREG32_SOC15 instead.I just sent the modified patches (1, 2, 7, 18, 19, 20, 21) which compared with v1. Others, please check v1 set.
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 makeip_blockmask clear.
Patch 18: fix gart table cleared and other BOs cleared issue which blocked S3.
(Extend stollen memory for VBIOS)
Patch 19 -> 21: update gmc/mmhub/gfxhub to use RREG32_SOC15/WREG32_SOC15 macro.Thanks,
RayHuang Rui (21):
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 S3 drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gfxhub drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for mmhub drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gmc9
Quoted 15 lines
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 | 424 +++++++++++--------------- 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 | 31 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 466 ++++++++++++----------------- 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, 406 insertions(+), 541 deletions(-)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 17 lines
-----Original Message-----
From: Huang Rui [mailto:[email protected]]
Sent: Thursday, June 01, 2017 7:18 AM
To: [email protected]; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Huan, Alvin; Huang, Ray
Subject: [PATCH v2 00/21] S3 following upHi all,
Changes from V1 -> V2:
- Renamept_regstogart_pt_regs,dis_identity_aperturetodisable_identity_aperture.
- Use upper_32_bits/lower_32_bits macros.
- Add comments and fix "uint64_t" for stolen size.
- Merge page table regs function into page table aperture.
- Add three patches to use RREG32_SOC15/WREG32_SOC15 instead.
Quoted 2 lines
I just sent the modified patches (1, 2, 7, 18, 19, 20, 21) which compared with v1. Others, please check v1 set.
Series is:
Quoted 65 lines
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 makeip_blockmask clear.
Patch 18: fix gart table cleared and other BOs cleared issue which blocked S3.
(Extend stollen memory for VBIOS)
Patch 19 -> 21: update gmc/mmhub/gfxhub to use RREG32_SOC15/WREG32_SOC15 macro.Thanks,
RayHuang Rui (21):
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 S3 drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gfxhub drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for mmhub drm/amdgpu: update to use RREG32_SOC15/WREG32_SOC15 for gmc9drivers/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 | 424 +++++++++++--------- ------ 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 | 31 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 466 ++++++++++++------ ----------- 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, 406 insertions(+), 541 deletions(-)
Quoted 2 lines
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx