Merge tag 'amd-drm-fixes-6.0-2022-08-17' of https://gitlab.freedesktop.org/agd5f...

amd-drm-fixes-6.0-2022-08-17:

amdgpu:
- Revert some DML stack changes
- Rounding fixes in KFD allocations
- atombios vram info table parsing fix
- DCN 3.1.4 fixes
- Clockgating fixes for various new IPs
- SMU 13.0.4 fixes
- DCN 3.1.4 FP fixes
- TMDS fixes for YCbCr420 4k modes
- DCN 3.2.x fixes
- USB 4 fixes
- SMU 13.0 fixes
- SMU driver unload memory leak fixes
- Display orientation fix
- Regression fix for generic fbdev conversion
- SDMA 6.x fixes
- SR-IOV fixes
- IH 6.x fixes
- Use after free fix in bo list handling
- Revert pipe1 support
- XGMI hive reset fix

amdkfd:
- Fix potential crach in kfd_create_indirect_link_prop()

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220818025206.6463-1-alexander.deucher@amd.com

diff --cc drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 726a5bba40b2023694bafbc5826e4729d6ee6cfa,e8e0004bbb7aa35a8a359e3da159c0cbd225fe2a..a75a286e1ecf37e0927ec05cdfcf7a15f7a3d582
--- 1/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
--- 2/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@@ -20,9 -20,7 +20,8 @@@
   * OTHER DEALINGS IN THE SOFTWARE.
   *
   */
- #include <linux/dev_printk.h>
  #include <drm/drm_drv.h>
 +#include <linux/vmalloc.h>
  #include "amdgpu.h"
  #include "amdgpu_psp.h"
  #include "amdgpu_ucode.h"

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