[pull] amdgpu, amdkfd drm-fixes-5.14

[Alex Deucher]

Hi Dave, Daniel,

Fixes for 5.14.

The following changes since commit 7c60610d476766e128cc4284bb6349732cbd6606:

  Linux 5.14-rc6 (2021-08-15 13:40:53 -1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.14-2021-08-18

for you to fetch changes up to 37717b8c9f0e8c4dd73fc522769cc14649b4f657:

  drm/amd/display: Use DCN30 watermark calc for DCN301 (2021-08-18 18:30:00 -0400)

----------------------------------------------------------------
amd-drm-fixes-5.14-2021-08-18:

amdgpu:
- vega10 SMU workload fix
- DCN VM fix
- DCN 3.01 watermark fix

amdkfd:
- SVM fix

----------------------------------------------------------------
Jake Wang (1):
      drm/amd/display: Ensure DCN save after VM setup

Kenneth Feng (2):
      Revert "drm/amd/pm: fix workload mismatch on vega10"
      drm/amd/pm: change the workload type for some cards

Yifan Zhang (1):
      drm/amdkfd: fix random KFDSVMRangeTest.SetGetAttributesTest test failure

Zhan Liu (1):
      drm/amd/display: Use DCN30 watermark calc for DCN301

 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |  8 ++
 drivers/gpu/drm/amd/display/dc/core/dc.c           |  6 ++
 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c |  3 +
 drivers/gpu/drm/amd/display/dc/dc.h                |  1 +
 .../drm/amd/display/dc/dcn301/dcn301_resource.c    | 96 +---------------------
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 12 +++
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h |  1 +
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c  |  1 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |  1 +
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |  5 ++
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c  | 15 +++-
 11 files changed, 53 insertions(+), 96 deletions(-)