Merge tag 'amd-drm-next-5.14-2021-06-02' of https://gitlab.freedesktop.org/agd5f...

amd-drm-next-5.14-2021-06-02:

amdgpu:
- GC/MM register access macro clean up for SR-IOV
- Beige Goby updates
- W=1 Fixes
- Aldebaran fixes
- Misc display fixes
- ACPI ATCS/ATIF handling rework
- SR-IOV fixes
- RAS fixes
- 16bpc fixed point format support
- Initial smartshift support
- RV/PCO power tuning fixes for suspend/resume
- More buffer object subclassing work
- Add new INFO query for additional vbios information
- Add new placement for preemptable SG buffers

amdkfd:
- Misc fixes

radeon:
- W=1 Fixes
- Misc cleanups

UAPI:
- Add new INFO query for additional vbios information
  Useful for debugging vbios related issues.  Proposed umr patch:
  https://patchwork.freedesktop.org/patch/433297/
- 16bpc fixed point format support
  IGT test:
  https://lists.freedesktop.org/archives/igt-dev/2021-May/031507.html
  Proposed Vulkan patch:
  https://github.com/kleinerm/pal/commit/a25d4802074b13a8d5f7edc96ae45469ecbac3c4
- Add a new GEM flag which is only used internally in the kernel driver.  Userspace
  is not allowed to set it.

drm:
- 16bpc fixed point format fourcc

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602214009.4553-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
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index d1bb69a7747068e4bde885c05b1bbe74e1e9ade3,c354ffa62483bda169e0983db658828f208cdc00..425596c2f6f80813df69eaec8422677f1af45796
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@@ -92,8 -91,11 +92,11 @@@ void amdgpu_driver_unload_kms(struct dr
                pm_runtime_forbid(dev->dev);
        }
  
+       if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DRV_UNLOAD))
+               DRM_WARN("smart shift update failed\n");
+ 
        amdgpu_acpi_fini(adev);
 -      amdgpu_device_fini(adev);
 +      amdgpu_device_fini_hw(adev);
  }
  
  void amdgpu_register_gpu_instance(struct amdgpu_device *adev)

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 80437b6ba5f34f540b529fa38b2d77c68a96f491,86259435803ecf860b8e33c0f1dd35b935c3e4b5..832970cff64c0104f0fb814e67addb116096d141
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -1765,8 -1809,13 +1789,9 @@@ void amdgpu_ttm_fini(struct amdgpu_devi
        amdgpu_bo_free_kernel(&adev->mman.discovery_memory, NULL, NULL);
        amdgpu_ttm_fw_reserve_vram_fini(adev);
  
 -      if (adev->mman.aper_base_kaddr)
 -              iounmap(adev->mman.aper_base_kaddr);
 -      adev->mman.aper_base_kaddr = NULL;
 -
        amdgpu_vram_mgr_fini(adev);
        amdgpu_gtt_mgr_fini(adev);
+       amdgpu_preempt_mgr_fini(adev);
        ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS);
        ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GWS);
        ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/vcn_v3_0.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_mst_types.c
Simple merge

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

diff --cc drivers/gpu/drm/drm_fourcc.c
Simple merge