Merge tag 'amd-drm-next-5.17-2021-12-16' of https://gitlab.freedesktop.org/agd5f...

amdgpu:
- Add some display debugfs entries
- RAS fixes
- SR-IOV fixes
- W=1 fixes
- Documentation fixes
- IH timestamp fix
- Misc power fixes
- IP discovery fixes
- Large driver documentation updates
- Multi-GPU memory use reductions
- Misc display fixes and cleanups
- Add new SMU debug option

amdkfd:
- SVM fixes

radeon:
- Fix typo in comment

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211216202731.5900-1-alexander.deucher@amd.com

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 90d22a376632874008fb877fbc0d28b547b90836,a24b4c37418890146b1771ee3a78c8620fa8597a..8219e40240cea493b76eb61d19250dc44993f5d4
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -4284,9 -4321,10 +4321,12 @@@ static int amdgpu_device_reset_sriov(st
                                     bool from_hypervisor)
  {
        int r;
+       struct amdgpu_hive_info *hive = NULL;
+ 
+       amdgpu_amdkfd_pre_reset(adev);
  
 +      amdgpu_amdkfd_pre_reset(adev);
 +
        if (from_hypervisor)
                r = amdgpu_virt_request_full_gpu(adev, true);
        else

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index ea00090b3fb36f93e65c3c1d60c93a591c328eaa,65e1f6cc59ddf8171649125e2a233478df19d43a..5bc072220f03220f9c52767eae3b8d6f5344c2e2
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@@ -917,10 -956,8 +956,9 @@@ static int amdgpu_discovery_set_mm_ip_b
                        break;
                case IP_VERSION(3, 0, 0):
                case IP_VERSION(3, 0, 16):
-               case IP_VERSION(3, 0, 64):
                case IP_VERSION(3, 1, 1):
                case IP_VERSION(3, 0, 2):
 +              case IP_VERSION(3, 0, 192):
                        amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);
                        if (!amdgpu_sriov_vf(adev))
                                amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
Simple merge