[pull] amdgpu, amdkfd drm-fixes-5.15

[pull] amdgpu, amdkfd drm-fixes-5.15

[Alex Deucher]

Hi Dave, Daniel,

Fixes for 5.15.

The following changes since commit e4e737bb5c170df6135a127739a9e6148ee3da82:

  Linux 5.15-rc2 (2021-09-19 17:28:22 -0700)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.15-2021-09-23

for you to fetch changes up to 197ae17722e989942b36e33e044787877f158574:

  drm/amdkfd: fix svm_migrate_fini warning (2021-09-23 17:06:11 -0400)

----------------------------------------------------------------
amd-drm-fixes-5.15-2021-09-23:

amdgpu:
- Update MAINTAINERS entry for powerplay
- Fix empty macros
- SI DPM fix

amdkfd:
- SVM fixes
- DMA mapping fix

----------------------------------------------------------------
Alex Deucher (1):
      MAINTAINERS: fix up entry for AMD Powerplay

Arnd Bergmann (1):
      drm/amd/display: fix empty debug macros

Lijo Lazar (1):
      drm/amd/pm: Update intermediate power state for SI

Philip Yang (4):
      drm/amdkfd: SVM map to gpus check vma boundary
      drm/amdkfd: fix dma mapping leaking warning
      drm/amdkfd: handle svm migrate init error
      drm/amdkfd: fix svm_migrate_fini warning

 MAINTAINERS                                  |  4 ++--
 drivers/gpu/drm/amd/amdkfd/kfd_device.c      |  1 -
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c     | 16 +++++++---------
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h     |  5 -----
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c         | 24 +++++++++++++++++++-----
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c |  4 ++--
 drivers/gpu/drm/amd/pm/powerplay/si_dpm.c    |  2 ++
 7 files changed, 32 insertions(+), 24 deletions(-)

[pull] amdgpu, amdkfd drm-fixes-5.15

[Alex Deucher]

Hi Dave, Daniel,

Fixes for 5.15.

The following changes since commit 9e1ff307c779ce1f0f810c7ecce3d95bbae40896:

  Linux 5.15-rc4 (2021-10-03 14:08:47 -0700)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.15-2021-10-06

for you to fetch changes up to 5a1fef027846e7635b9d320b2cc0b416fd11a3be:

  drm/amd/display: Fix detection of 4 lane for DPALT (2021-10-06 16:14:17 -0400)

----------------------------------------------------------------
amd-drm-fixes-5.15-2021-10-06:

amdgpu:
- DCN 3.1 DP alt mode fixes
- S0ix gfxoff fix
- Fix DRM_AMD_DC_SI dependencies
- PCIe DPC handling fix
- DCN 3.1 scaling fix
- Documentation fix

amdkfd:
- Fix potential memory leak
- IOMMUv2 init fixes

----------------------------------------------------------------
Alex Deucher (2):
      Documentation/gpu: remove spurious "+" in amdgpu.rst
      drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI

George Shen (1):
      drm/amd/display: Skip override for preferred link settings during link training

Guchun Chen (1):
      drm/amdgpu: handle the case of pci_channel_io_frozen only in amdgpu_pci_resume

Hansen (1):
      drm/amd/display: Fix detection of 4 lane for DPALT

Jude Shih (1):
      drm/amd/display: USB4 bring up set correct address

Lang Yu (1):
      drm/amdkfd: fix a potential ttm->sg memory leak

Lijo Lazar (1):
      drm/amdgpu: During s0ix don't wait to signal GFXOFF

Liu, Zhan (2):
      drm/amd/display: Fix B0 USB-C DP Alt mode
      drm/amd/display: Fix DCN3 B0 DP Alt Mapping

Nikola Cornij (1):
      drm/amd/display: Limit display scaling to up to 4k for DCN 3.1

Yifan Zhang (2):
      drm/amdkfd: remove redundant iommu cleanup code
      drm/amdgpu: init iommu after amdkfd device init

 Documentation/gpu/amdgpu.rst                       |  4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         | 14 +++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            | 14 ++++-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |  8 +--
 drivers/gpu/drm/amd/display/Kconfig                |  2 +
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |  6 --
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h  |  1 +
 .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c  | 66 +++++++++++++++++++++-
 .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h  | 14 ++++-
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |  8 ++-
 drivers/gpu/drm/amd/display/include/dal_asic_id.h  |  2 +-
 .../amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h  | 27 +++++++++
 14 files changed, 142 insertions(+), 26 deletions(-)