[PATCH v2 00/21] S3 following up

Huang Rui ray.huang at amd.com
Thu Jun 1 11:17:38 UTC 2017


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(-)

-- 
2.7.4



More information about the amd-gfx mailing list